summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/bcm2835-rpi.dtsi
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2015-12-17 02:55:12 +0300
committerArnd Bergmann <arnd@arndb.de>2015-12-31 19:16:59 +0300
commit4b8c3907c3090d019efdeb02765db209927c0c4f (patch)
treebae739f8e7b4fabdb540f9cdbcb17cbef2476bc3 /arch/arm/boot/dts/bcm2835-rpi.dtsi
parent548c3a39e0359383839d43d0cb435dbb4de101e3 (diff)
downloadlinux-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>
Diffstat (limited to 'arch/arm/boot/dts/bcm2835-rpi.dtsi')
-rw-r--r--arch/arm/boot/dts/bcm2835-rpi.dtsi2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index 3572f0367baf..3afb9fefe2d1 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>;