From df6bf2e9a72eb0e77febb15e85a08c5477f874d7 Mon Sep 17 00:00:00 2001 From: Valentin Longchamp Date: Mon, 27 May 2013 17:40:32 +0200 Subject: 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: Valentin Longchamp Signed-off-by: Jason Cooper --- arch/arm/boot/dts/kirkwood-nsa310.dts | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/boot/dts/kirkwood-nsa310.dts') diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 79391ca5d1c3..089024a6deab 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts @@ -1,6 +1,7 @@ /dts-v1/; /include/ "kirkwood.dtsi" +/include/ "kirkwood-6281.dtsi" / { model = "ZyXEL NSA310"; -- cgit v1.2.1