Explorar el Código

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>
Eric Anholt hace 9 años
padre
commit
4b8c3907c3

+ 1 - 0
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts

@@ -1,4 +1,5 @@
 /dts-v1/;
+#include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
 
 / {

+ 1 - 0
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts

@@ -1,4 +1,5 @@
 /dts-v1/;
+#include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
 
 / {

+ 1 - 0
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts

@@ -1,4 +1,5 @@
 /dts-v1/;
+#include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
 
 / {

+ 1 - 0
arch/arm/boot/dts/bcm2835-rpi-b.dts

@@ -1,4 +1,5 @@
 /dts-v1/;
+#include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
 
 / {

+ 0 - 2
arch/arm/boot/dts/bcm2835-rpi.dtsi

@@ -1,5 +1,3 @@
-#include "bcm2835.dtsi"
-
 / {
 	memory {
 		reg = <0 0x10000000>;