Commit 50f5ef46 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_dts_updates_for_v5.3' of... 

Merge tag 'socfpga_dts_updates_for_v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/dt

SoCFPGA DTS updates for v5.3
- Use the new "altr,socfpga-stmmac-a10-s10" for the EMAC controllers on
  Arria10/Stratix10
- Add the ltc2497 i2c entry on the Arria10 devkit
- Add the EMAC OCP reset property on the Arria10

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

:
  ARM: dts: arria10: Add EMAC OCP reset property
  ARM: dts: socfpga: add ltc2497 on arria10 devkit
  arm64: dts: stratix10: use the "altr,socfpga-stmmac-a10-s10" binding
  ARM: dts: socfpga: use the "altr,socfpga-stmmac-a10-s10" binding

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ecf89023 c946feaa

arch/arm/boot/dts/socfpga_arria10.dtsi

+11 −10
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ 
		};



		gmac0: ethernet@ff800000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";

			compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.72a", "snps,dwmac";

			altr,sysmgr-syscon = <&sysmgr 0x44 0>;

			reg = <0xff800000 0x2000>;

			interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;
@@ -431,15 +431,15 @@ 
			rx-fifo-depth = <16384>;

			clocks = <&l4_mp_clk>;

			clock-names = "stmmaceth";

			resets = <&rst EMAC0_RESET>;

			reset-names = "stmmaceth";

			resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};



		gmac1: ethernet@ff802000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";

			altr,sysmgr-syscon = <&sysmgr 0x48 0>;

			compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.72a", "snps,dwmac";

			altr,sysmgr-syscon = <&sysmgr 0x48 8>;

		        reg = <0xff802000 0x2000>;

			interrupts = <0 93 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";
@@ -451,15 +451,15 @@ 
			rx-fifo-depth = <16384>;

			clocks = <&l4_mp_clk>;

			clock-names = "stmmaceth";

			resets = <&rst EMAC1_RESET>;

			reset-names = "stmmaceth";

			resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};



		gmac2: ethernet@ff804000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";

			altr,sysmgr-syscon = <&sysmgr 0x4C 0>;

			compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.72a", "snps,dwmac";

			altr,sysmgr-syscon = <&sysmgr 0x4C 16>;

			reg = <0xff804000 0x2000>;

			interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";
@@ -470,8 +470,9 @@ 
			tx-fifo-depth = <4096>;

			rx-fifo-depth = <16384>;

			clocks = <&l4_mp_clk>;

			resets = <&rst EMAC2_RESET>;

			clock-names = "stmmaceth";

			resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};

arch/arm/boot/dts/socfpga_arria10_socdk.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@ 
		};

	};



	ref_033v: 033-v-ref {

		compatible = "regulator-fixed";

		regulator-name = "0.33V";

		regulator-min-microvolt = <330000>;

		regulator-max-microvolt = <330000>;

	};



	soc {

		clkmgr@ffd04000 {

			clocks {
@@ -128,6 +135,18 @@ 
	i2c-sda-falling-time-ns = <6000>;

	i2c-scl-falling-time-ns = <6000>;



	adc@14 {

		compatible = "lltc,ltc2497";

		reg = <0x14>;

		vref-supply = <&ref_033v>;

	};



	adc@16 {

		compatible = "lltc,ltc2497";

		reg = <0x16>;

		vref-supply = <&ref_033v>;

	};



	eeprom@51 {

		compatible = "atmel,24c32";

		reg = <0x51>;

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 
		};



		gmac0: ethernet@ff800000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";

			compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";

			reg = <0xff800000 0x2000>;

			interrupts = <0 90 4>;

			interrupt-names = "macirq";
@@ -156,7 +156,7 @@ 
		};



		gmac1: ethernet@ff802000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";

			compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";

			reg = <0xff802000 0x2000>;

			interrupts = <0 91 4>;

			interrupt-names = "macirq";
@@ -169,12 +169,12 @@ 
			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 2>;

			altr,sysmgr-syscon = <&sysmgr 0x48 0>;

			altr,sysmgr-syscon = <&sysmgr 0x48 8>;

			status = "disabled";

		};



		gmac2: ethernet@ff804000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";

			compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";

			reg = <0xff804000 0x2000>;

			interrupts = <0 92 4>;

			interrupt-names = "macirq";
@@ -187,7 +187,7 @@ 
			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 3>;

			altr,sysmgr-syscon = <&sysmgr 0x4c 0>;

			altr,sysmgr-syscon = <&sysmgr 0x4c 16>;

			status = "disabled";

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE