Commit df6bf2e9 authored by Valentin Longchamp's avatar Valentin Longchamp Committed by Jason Cooper
Browse files

ARM: kirkwood: refactor dtsi to largest common nodes 

Some kirkwood variants (for instance present in the prestera SoCs) do
not have all the peripherals whose nodes are declared in
kirkwood.dtsi. These missing peripherals are SATA, SDIO, and RTC.

As discussed in [1], to avoid that these missing peripherals get
initialized which could result in system hangs when accessing
undocumented/not present HW registers, their corresponding OF nodes
should not get declared at all for some kirkwood variants.

The corresponding OF nodes of these peripherals thus are moved from
kirkwood.dtsi to the kirkwood-628x.dtsi files so that they still are
initialized for these variants where they are present.

[1]
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-May/167154.html



Signed-off-by: default avatarValentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 9196024a

arch/arm/boot/dts/kirkwood-6281.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -40,5 +40,33 @@ 
				marvell,function = "sdio";

			};

		};



		rtc@10300 {

			compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";

			reg = <0x10300 0x20>;

			interrupts = <53>;

			clocks = <&gate_clk 7>;

		};



		sata@80000 {

			compatible = "marvell,orion-sata";

			reg = <0x80000 0x5000>;

			interrupts = <21>;

			clocks = <&gate_clk 14>, <&gate_clk 15>;

			clock-names = "0", "1";

			status = "disabled";

		};



		mvsdio@90000 {

			compatible = "marvell,orion-sdio";

			reg = <0x90000 0x200>;

			interrupts = <28>;

			clocks = <&gate_clk 4>;

			bus-width = <4>;

			cap-sdio-irq;

			cap-sd-highspeed;

			cap-mmc-highspeed;

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/kirkwood-6282.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -49,6 +49,34 @@ 
			};

		};



		rtc@10300 {

			compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";

			reg = <0x10300 0x20>;

			interrupts = <53>;

			clocks = <&gate_clk 7>;

		};



		sata@80000 {

			compatible = "marvell,orion-sata";

			reg = <0x80000 0x5000>;

			interrupts = <21>;

			clocks = <&gate_clk 14>, <&gate_clk 15>;

			clock-names = "0", "1";

			status = "disabled";

		};



		mvsdio@90000 {

			compatible = "marvell,orion-sdio";

			reg = <0x90000 0x200>;

			interrupts = <28>;

			clocks = <&gate_clk 4>;

			bus-width = <4>;

			cap-sdio-irq;

			cap-sd-highspeed;

			cap-mmc-highspeed;

			status = "disabled";

		};



		thermal@10078 {

			compatible = "marvell,kirkwood-thermal";

			reg = <0x10078 0x4>;

arch/arm/boot/dts/kirkwood-nsa310.dts

+1 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood.dtsi"

/include/ "kirkwood-6281.dtsi"



/ {

	model = "ZyXEL NSA310";

arch/arm/boot/dts/kirkwood.dtsi

+0 −28
Original line number Diff line number Diff line
@@ -71,13 +71,6 @@ 
			status = "disabled";

		};



		rtc@10300 {

			compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";

			reg = <0x10300 0x20>;

			interrupts = <53>;

			clocks = <&gate_clk 7>;

		};



		spi@10600 {

			compatible = "marvell,orion-spi";

			#address-cells = <1>;
@@ -151,15 +144,6 @@ 
			status = "okay";

		};



		sata@80000 {

			compatible = "marvell,orion-sata";

			reg = <0x80000 0x5000>;

			interrupts = <21>;

			clocks = <&gate_clk 14>, <&gate_clk 15>;

			clock-names = "0", "1";

			status = "disabled";

		};



		nand@3000000 {

			#address-cells = <1>;

			#size-cells = <1>;
@@ -194,17 +178,5 @@ 
			clocks = <&gate_clk 17>;

			status = "okay";

		};



		mvsdio@90000 {

			compatible = "marvell,orion-sdio";

			reg = <0x90000 0x200>;

			interrupts = <28>;

			clocks = <&gate_clk 4>;

			bus-width = <4>;

			cap-sdio-irq;

			cap-sd-highspeed;

			cap-mmc-highspeed;

			status = "disabled";

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE