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>
This commit is contained in:
Eric Anholt 2015-12-16 15:55:12 -08:00 committed by Arnd Bergmann
parent 548c3a39e0
commit 4b8c3907c3
5 changed files with 4 additions and 2 deletions

View File

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

View File

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

View File

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

View File

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

View File

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