Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93621d70 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_dts_for_v4.3_part_2' of... 

Merge tag 'socfpga_dts_for_v4.3_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA DTS updates for v4.3, take 2
- Add DTS property "altr,modrst-offset" for reset driver to
  use
- Add updated reset defines for the reset driver
- Add reset property for EMACs on Arria10

* tag 'socfpga_dts_for_v4.3_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

:
  ARM: socfpga: dts: Add resets for EMACs on Arria10
  ARM: socfpga: dts: add "altr,modrst-offset" property
  dt-bindings: Add reset manager offsets for Arria10

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6d511a26 6855e5b7

Documentation/devicetree/bindings/reset/socfpga-reset.txt

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ Altera SOCFPGA Reset Manager 
Required properties:

- compatible : "altr,rst-mgr"

- reg : Should contain 1 register ranges(address and length)

- altr,modrst-offset : Should contain the offset of the first modrst register.

- #reset-cells: 1



Example:
@@ -10,4 +11,5 @@ Example: 
		#reset-cells = <1>;

		compatible = "altr,rst-mgr";

		reg = <0xffd05000 0x1000>;

		altr,modrst-offset = <0x10>;

	};

arch/arm/boot/dts/socfpga.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -783,6 +783,7 @@ 
			#reset-cells = <1>;

			compatible = "altr,rst-mgr";

			reg = <0xffd05000 0x1000>;

			altr,modrst-offset = <0x10>;

		};



		usbphy0: usbphy@0 {

arch/arm/boot/dts/socfpga_arria10.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include "skeleton.dtsi"

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/reset/altr,rst-mgr-a10.h>



/ {

	#address-cells = <1>;
@@ -414,6 +415,8 @@ 
			rx-fifo-depth = <16384>;

			clocks = <&l4_mp_clk>;

			clock-names = "stmmaceth";

			resets = <&rst EMAC0_RESET>;

			reset-names = "stmmaceth";

			status = "disabled";

		};
@@ -431,6 +434,8 @@ 
			rx-fifo-depth = <16384>;

			clocks = <&l4_mp_clk>;

			clock-names = "stmmaceth";

			resets = <&rst EMAC1_RESET>;

			reset-names = "stmmaceth";

			status = "disabled";

		};
@@ -593,6 +598,7 @@ 
			#reset-cells = <1>;

			compatible = "altr,rst-mgr";

			reg = <0xffd05000 0x100>;

			altr,modrst-offset = <0x20>;

		};



		scu: snoop-control-unit@ffffc000 {

include/dt-bindings/reset/altr,rst-mgr-a10.h

0 → 100644
+110 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014, Steffen Trumtrar <s.trumtrar@pengutronix.de>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef _DT_BINDINGS_RESET_ALTR_RST_MGR_A10_H

#define _DT_BINDINGS_RESET_ALTR_RST_MGR_A10_H



/* MPUMODRST */

#define CPU0_RESET		0

#define CPU1_RESET		1

#define WDS_RESET		2

#define SCUPER_RESET		3



/* PER0MODRST */

#define EMAC0_RESET		32

#define EMAC1_RESET		33

#define EMAC2_RESET		34

#define USB0_RESET		35

#define USB1_RESET		36

#define NAND_RESET		37

#define QSPI_RESET		38

#define SDMMC_RESET		39

#define EMAC0_OCP_RESET		40

#define EMAC1_OCP_RESET		41

#define EMAC2_OCP_RESET		42

#define USB0_OCP_RESET		43

#define USB1_OCP_RESET		44

#define NAND_OCP_RESET		45

#define QSPI_OCP_RESET		46

#define SDMMC_OCP_RESET		47

#define DMA_RESET		48

#define SPIM0_RESET		49

#define SPIM1_RESET		50

#define SPIS0_RESET		51

#define SPIS1_RESET		52

#define DMA_OCP_RESET		53

#define EMAC_PTP_RESET		54

/* 55 is empty*/

#define DMAIF0_RESET		56

#define DMAIF1_RESET		57

#define DMAIF2_RESET		58

#define DMAIF3_RESET		59

#define DMAIF4_RESET		60

#define DMAIF5_RESET		61

#define DMAIF6_RESET		62

#define DMAIF7_RESET		63



/* PER1MODRST */

#define L4WD0_RESET		64

#define L4WD1_RESET		65

#define L4SYSTIMER0_RESET	66

#define L4SYSTIMER1_RESET	67

#define SPTIMER0_RESET		68

#define SPTIMER1_RESET		69

/* 70-71 is reserved */

#define I2C0_RESET		72

#define I2C1_RESET		73

#define I2C2_RESET		74

#define I2C3_RESET		75

#define I2C4_RESET		76

/* 77-79 is reserved */

#define UART0_RESET		80

#define UART1_RESET		81

/* 82-87 is reserved */

#define GPIO0_RESET		88

#define GPIO1_RESET		89

#define GPIO2_RESET		90



/* BRGMODRST */

#define HPS2FPGA_RESET		96

#define LWHPS2FPGA_RESET	97

#define FPGA2HPS_RESET		98

#define F2SSDRAM0_RESET		99

#define F2SSDRAM1_RESET		100

#define F2SSDRAM2_RESET		101

#define DDRSCH_RESET		102



/* SYSMODRST*/

#define ROM_RESET		128

#define OCRAM_RESET		129

/* 130 is reserved */

#define FPGAMGR_RESET		131

#define S2F_RESET		132

#define SYSDBG_RESET		133

#define OCRAM_OCP_RESET		134



/* COLDMODRST */

#define CLKMGRCOLD_RESET	160

/* 161-162 is reserved */

#define S2FCOLD_RESET		163

#define TIMESTAMPCOLD_RESET	164

#define TAPCOLD_RESET		165

#define HMCCOLD_RESET		166

#define IOMGRCOLD_RESET		167



/* NRSTMODRST */

#define NRSTPINOE_RESET		192



/* DBGMODRST */

#define DBG_RESET		224

#endif