diff options
| author | Eric Anholt <eric@anholt.net> | 2015-12-16 15:55:12 -0800 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-31 17:16:59 +0100 |
| commit | 4b8c3907c3090d019efdeb02765db209927c0c4f (patch) | |
| tree | bae739f8e7b4fabdb540f9cdbcb17cbef2476bc3 | |
| parent | 548c3a39e0359383839d43d0cb435dbb4de101e3 (diff) | |
| download | linux-0-day-4b8c3907c3090d019efdeb02765db209927c0c4f.tar.gz linux-0-day-4b8c3907c3090d019efdeb02765db209927c0c4f.tar.xz | |
ARM: bcm2835: Move the CPU/peripheral include out of common RPi DT.
For Raspberry Pi 2, we want to use the same general pin assignment
bits, but need to use bcm2836.dtsi for the CPU instead.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 |
5 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index b2bff43b135c6..228614ffff448 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -1,4 +1,5 @@ /dts-v1/; +#include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" / { diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index 668442b1bda58..ef5405025223f 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -1,4 +1,5 @@ /dts-v1/; +#include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" / { diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts index eab8b5916e8a0..86f1f2f598a73 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -1,4 +1,5 @@ /dts-v1/; +#include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" / { diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index ff6b2d1c6c907..4859e9d81b23f 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -1,4 +1,5 @@ /dts-v1/; +#include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" / { diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 3572f0367baf2..3afb9fefe2d1f 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -1,5 +1,3 @@ -#include "bcm2835.dtsi" - / { memory { reg = <0 0x10000000>; |