ARM: mach-bcm dt updates for 3.15
The following changes since commit 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2:
Linux 3.14-rc3 (2014-02-16 13:30:25 -0800)
are available in the git repository at:
git://github.com/broadcom/mach-bcm tags/armsoc/for-3.15/dt
for you to fetch changes up to a33705ee8a8af40bbaa379e4567ca451c38fc0d6:
ARM: dts: remove bcm11351-brt.dts (2014-03-05 01:28:56 -0500)
----------------------------------------------------------------
ARM: mach-bcm dt updates for 3.15
- add BCM4708 dt support
- remove bcm11351-brt
- bcm281xx common clock support
----------------------------------------------------------------
Alex Elder (1):
ARM: dts: bcm281xx: define real clocks
Hauke Mehrtens (1):
ARM: BCM5301X: add dts files for BCM4708 SoC
Matt Porter (1):
ARM: dts: remove bcm11351-brt.dts
Tim Kryger (1):
ARM: dts: Leave sdio1 as disabled on bcm28155-ap
arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/bcm11351-brt.dts | 54 -------- arch/arm/boot/dts/bcm11351.dtsi | 192 ++++++++++++++++++++-------- arch/arm/boot/dts/bcm28155-ap.dts | 5 - arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 35 +++++ arch/arm/boot/dts/bcm4708.dtsi | 34 +++++ arch/arm/boot/dts/bcm5301x.dtsi | 95 ++++++++++++++ 7 files changed, 306 insertions(+), 113 deletions(-) delete mode 100644 arch/arm/boot/dts/bcm11351-brt.dts create mode 100644 arch/arm/boot/dts/bcm4708-netgear-r6250.dts create mode 100644 arch/arm/boot/dts/bcm4708.dtsi create mode 100644 arch/arm/boot/dts/bcm5301x.dtsi
Quoted 10 lines · Matt Porter
The following changes since commit
6d0abeca3242a88cab8232e4acd7e2bf088f3bc2:Linux 3.14-rc3 (2014-02-16 13:30:25 -0800)
are available in the git repository at:
git://github.com/broadcom/mach-bcmtags/armsoc/for-3.15/dtfor you to fetch changes up to
a33705ee8a8af40bbaa379e4567ca451c38fc0d6:
Quoted 8 lines
ARM: dts: remove
bcm11351-brt.dts(2014-03-05 01:28:56 -0500)----------------------------------------------------------------
ARM: mach-bcm dt updates for 3.15- add BCM4708 dt support
- remove bcm11351-brt
- bcm281xx common clock support
Merged, but I thought you said that the driver peices of common clock were a prereq for the DT changes? I didn't see this branch based on the driver changes. The only way to guarantee that the driver changes are applied before the DT ones are at all times is to base the two branches on each other (I.e. otherwise you might land on a location where only the DT change is applied when you bisect).
This isn't super-critical in this case; the only person subjected to this problem right now is likely you, so I've merged it anyway. Keep it in mind in the future though -- it's one of the quirks of git that takes a while to get used to.
-Olof
Quoted 20 lines · Olof Johansson
Quoted 10 lines · Matt Porter
The following changes since commit
6d0abeca3242a88cab8232e4acd7e2bf088f3bc2:Linux 3.14-rc3 (2014-02-16 13:30:25 -0800)
are available in the git repository at:
git://github.com/broadcom/mach-bcmtags/armsoc/for-3.15/dtfor you to fetch changes up to
a33705ee8a8af40bbaa379e4567ca451c38fc0d6:Quoted 8 lines
ARM: dts: remove
bcm11351-brt.dts(2014-03-05 01:28:56 -0500)----------------------------------------------------------------
ARM: mach-bcm dt updates for 3.15- add BCM4708 dt support
- remove bcm11351-brt
- bcm281xx common clock support
Quoted 6 lines
Merged, but I thought you said that the driver peices of common clock were a prereq for the DT changes? I didn't see this branch based on the driver changes. The only way to guarantee that the driver changes are applied before the DT ones are at all times is to base the two branches on each other (I.e. otherwise you might land on a location where only the DT change is applied when you bisect).
Yes, that's correct...and, ok I see now.
Quoted 4 lines
This isn't super-critical in this case; the only person subjected to this problem right now is likely you, so I've merged it anyway. Keep it in mind in the future though -- it's one of the quirks of git that takes a while to get used to.
Ok, understood, I'll be sure to properly base these in the future. I have an upcoming similar case with a second soc pull request that will be based on both cleanups and soc that will do it correctly, hopefully.
Thanks,
Matt