]> asedeno.scripts.mit.edu Git - linux.git/commit
ARM: dts: bcm283x: Move the BCM2837 DT contents from arm64 to arm.
authorEric Anholt <eric@anholt.net>
Wed, 26 Jul 2017 20:01:56 +0000 (13:01 -0700)
committerFlorian Fainelli <f.fainelli@gmail.com>
Fri, 28 Jul 2017 23:54:15 +0000 (16:54 -0700)
commit3bfe25fa9f8a56c5c877c7fd854d89238787c6d8
tree0ee474ae689d2cb87e2a4b3eb5996c901616ca3f
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877
ARM: dts: bcm283x: Move the BCM2837 DT contents from arm64 to arm.

BCM2837 is somewhat unusual in that we build its DT on both arm32 and
arm64.  Most devices are being run in arm32 mode.

Having the body of the DT for 2837 separate from 2835/6 has been a
source of pain, as we often need to make changes that span both
directories simultaneously (for example, the thermal changes for 4.13,
or anything that changes the name of a node referenced by '&' from
board files).  Other changes are made more complicated than they need
to be, such as the SDHOST enabling, because we have to split a single
logical change into a 283[56] half and a 2837 half.

To fix this, make the stub board include file live in arm64 instead of
arm32, and keep all of BCM283x's contents in arm32.  From here on, our
changes to DT contents can be submitted through a single tree.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
arch/arm/boot/dts/bcm2837.dtsi [moved from arch/arm64/boot/dts/broadcom/bcm2837.dtsi with 100% similarity]
arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi [deleted symlink]
arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi [deleted symlink]
arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi [deleted symlink]
arch/arm64/boot/dts/broadcom/bcm283x.dtsi [deleted symlink]