| Message ID | 20190612025028.13118-1-f.fainelli@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL,1/6] Broadcom devicetree changes for 5.3 | expand |
On Tue, Jun 11, 2019 at 07:50:23PM -0700, Florian Fainelli wrote: > The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: > > Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) > > are available in the Git repository at: > > https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree > > for you to fetch changes up to 34b1441452e550169b4d3647a4f851d9332d4b76: > > ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-11 15:07:56 -0700) > > ---------------------------------------------------------------- > This pull request contain Broadcom ARM-based SoCs Device Tree changes > for 5.3 please pull the following: > > - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI > controller > > - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files > and provides a fix for devices failing to boot after the removal of > skelton.dtsi (that commit has been submitted as a separate fix) > > ---------------------------------------------------------------- > Florian Fainelli (9): > Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next > ARM: dts: bcm: Add missing device_type = "memory" property > ARM: dts: Fix BCM7445 DTC warnings > ARM: dts: Cygnus: Fix most DTC W=1 warnings > ARM: dts: bcm-mobile: Fix most DTC W=1 warnings > ARM: dts: BCM53573: Fix DTC W=1 warnings > ARM: dts: BCM63xx: Fix DTC W=1 warnings > ARM: dts: NSP: Fix the bulk of W=1 DTC warnings > ARM: dts: BCM5301X: Fix most DTC W=1 warnings > > Lukas Wunner (1): > ARM: bcm283x: Enable DMA support for SPI controller Something went wrong here. I merged your pull request for the missing device_type that had commit e8bd76dccd79 for that patch. Here you have the same patch here as 0e9e8c404ec2. While git normally handles this alright, in this case the warning removals changes the line above so you get a merge conflict for every file and that's a lot to fix up. Would you mind rebuilding this branch on top of your fixes to keep that patch at the same commit? Thanks, -Olof
On 6/19/2019 6:35 AM, Olof Johansson wrote: > On Tue, Jun 11, 2019 at 07:50:23PM -0700, Florian Fainelli wrote: >> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: >> >> Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) >> >> are available in the Git repository at: >> >> https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree >> >> for you to fetch changes up to 34b1441452e550169b4d3647a4f851d9332d4b76: >> >> ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-11 15:07:56 -0700) >> >> ---------------------------------------------------------------- >> This pull request contain Broadcom ARM-based SoCs Device Tree changes >> for 5.3 please pull the following: >> >> - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI >> controller >> >> - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files >> and provides a fix for devices failing to boot after the removal of >> skelton.dtsi (that commit has been submitted as a separate fix) >> >> ---------------------------------------------------------------- >> Florian Fainelli (9): >> Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next >> ARM: dts: bcm: Add missing device_type = "memory" property >> ARM: dts: Fix BCM7445 DTC warnings >> ARM: dts: Cygnus: Fix most DTC W=1 warnings >> ARM: dts: bcm-mobile: Fix most DTC W=1 warnings >> ARM: dts: BCM53573: Fix DTC W=1 warnings >> ARM: dts: BCM63xx: Fix DTC W=1 warnings >> ARM: dts: NSP: Fix the bulk of W=1 DTC warnings >> ARM: dts: BCM5301X: Fix most DTC W=1 warnings >> >> Lukas Wunner (1): >> ARM: bcm283x: Enable DMA support for SPI controller > > Something went wrong here. I merged your pull request for the missing > device_type that had commit e8bd76dccd79 for that patch. > > Here you have the same patch here as 0e9e8c404ec2. While git normally handles > this alright, in this case the warning removals changes the line above so you > get a merge conflict for every file and that's a lot to fix up. > > Would you mind rebuilding this branch on top of your fixes to keep that patch > at the same commit? Yes, absolutely. It looks like [GIT PULL 5/6] Broadcom soc changes for 5.3 has not been merged yet, is everything okay with that one?
On Sat, Jun 22, 2019 at 07:22:27PM -0700, Florian Fainelli wrote: > > > On 6/19/2019 6:35 AM, Olof Johansson wrote: > > On Tue, Jun 11, 2019 at 07:50:23PM -0700, Florian Fainelli wrote: > >> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: > >> > >> Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) > >> > >> are available in the Git repository at: > >> > >> https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree > >> > >> for you to fetch changes up to 34b1441452e550169b4d3647a4f851d9332d4b76: > >> > >> ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-11 15:07:56 -0700) > >> > >> ---------------------------------------------------------------- > >> This pull request contain Broadcom ARM-based SoCs Device Tree changes > >> for 5.3 please pull the following: > >> > >> - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI > >> controller > >> > >> - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files > >> and provides a fix for devices failing to boot after the removal of > >> skelton.dtsi (that commit has been submitted as a separate fix) > >> > >> ---------------------------------------------------------------- > >> Florian Fainelli (9): > >> Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next > >> ARM: dts: bcm: Add missing device_type = "memory" property > >> ARM: dts: Fix BCM7445 DTC warnings > >> ARM: dts: Cygnus: Fix most DTC W=1 warnings > >> ARM: dts: bcm-mobile: Fix most DTC W=1 warnings > >> ARM: dts: BCM53573: Fix DTC W=1 warnings > >> ARM: dts: BCM63xx: Fix DTC W=1 warnings > >> ARM: dts: NSP: Fix the bulk of W=1 DTC warnings > >> ARM: dts: BCM5301X: Fix most DTC W=1 warnings > >> > >> Lukas Wunner (1): > >> ARM: bcm283x: Enable DMA support for SPI controller > > > > Something went wrong here. I merged your pull request for the missing > > device_type that had commit e8bd76dccd79 for that patch. > > > > Here you have the same patch here as 0e9e8c404ec2. While git normally handles > > this alright, in this case the warning removals changes the line above so you > > get a merge conflict for every file and that's a lot to fix up. > > > > Would you mind rebuilding this branch on top of your fixes to keep that patch > > at the same commit? > > Yes, absolutely. It looks like [GIT PULL 5/6] Broadcom soc changes for > 5.3 has not been merged yet, is everything okay with that one? It is merged, but arm-soc didn't have the latest contents pushed to it. We mostly use 'soc' as the main tree, and usually I remember to push the same contents to arm-soc but I missed last time around. (We also switched linux-next over the last few days). -Olof
The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) are available in the Git repository at: https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree for you to fetch changes up to 34b1441452e550169b4d3647a4f851d9332d4b76: ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-11 15:07:56 -0700) ---------------------------------------------------------------- This pull request contain Broadcom ARM-based SoCs Device Tree changes for 5.3 please pull the following: - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI controller - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files and provides a fix for devices failing to boot after the removal of skelton.dtsi (that commit has been submitted as a separate fix) ---------------------------------------------------------------- Florian Fainelli (9): Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next ARM: dts: bcm: Add missing device_type = "memory" property ARM: dts: Fix BCM7445 DTC warnings ARM: dts: Cygnus: Fix most DTC W=1 warnings ARM: dts: bcm-mobile: Fix most DTC W=1 warnings ARM: dts: BCM53573: Fix DTC W=1 warnings ARM: dts: BCM63xx: Fix DTC W=1 warnings ARM: dts: NSP: Fix the bulk of W=1 DTC warnings ARM: dts: BCM5301X: Fix most DTC W=1 warnings Lukas Wunner (1): ARM: bcm283x: Enable DMA support for SPI controller arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 12 ++++++------ arch/arm/boot/dts/bcm-cygnus.dtsi | 6 +++--- arch/arm/boot/dts/bcm-nsp.dtsi | 9 +++------ arch/arm/boot/dts/bcm11351.dtsi | 12 ++++++------ arch/arm/boot/dts/bcm21664-garnet.dts | 2 +- arch/arm/boot/dts/bcm21664.dtsi | 10 +++++----- arch/arm/boot/dts/bcm23550-sparrow.dts | 2 +- arch/arm/boot/dts/bcm23550.dtsi | 8 ++++---- arch/arm/boot/dts/bcm28155-ap.dts | 2 +- arch/arm/boot/dts/bcm283x.dtsi | 2 ++ arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 5 ++--- arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 5 ++--- arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 5 ++--- arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 5 ++--- arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 5 ++--- arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 5 ++--- arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 5 ++--- arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 3 +-- arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 5 ++--- arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 5 ++--- arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 4 +--- arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 +--- arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 4 +--- arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 4 +--- arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 4 +--- arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 +--- arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 1 + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 1 + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 1 + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 1 + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 1 + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 1 + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 +--- arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 4 +--- arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 4 +--- arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 4 +--- arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 4 +--- arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 4 +--- arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 4 +--- arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 4 +--- arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 5 ++--- arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 4 +--- arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 4 +--- arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 4 +--- arch/arm/boot/dts/bcm5301x.dtsi | 10 ++++------ arch/arm/boot/dts/bcm53573.dtsi | 2 +- arch/arm/boot/dts/bcm63138.dtsi | 9 +++------ arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 2 +- arch/arm/boot/dts/bcm7445.dtsi | 8 ++++---- arch/arm/boot/dts/bcm911360_entphn.dts | 2 -- arch/arm/boot/dts/bcm94708.dts | 1 + arch/arm/boot/dts/bcm94709.dts | 1 + arch/arm/boot/dts/bcm947189acdbmr.dts | 4 +--- arch/arm/boot/dts/bcm953012er.dts | 4 +--- arch/arm/boot/dts/bcm953012k.dts | 2 +- arch/arm/boot/dts/bcm958522er.dts | 2 +- arch/arm/boot/dts/bcm958525er.dts | 2 +- arch/arm/boot/dts/bcm958525xmc.dts | 2 +- arch/arm/boot/dts/bcm958622hr.dts | 2 +- arch/arm/boot/dts/bcm958623hr.dts | 2 +- arch/arm/boot/dts/bcm958625hr.dts | 2 +- arch/arm/boot/dts/bcm958625k.dts | 2 +- arch/arm/boot/dts/bcm963138dvt.dts | 3 ++- arch/arm/boot/dts/bcm988312hr.dts | 2 +- 64 files changed, 104 insertions(+), 152 deletions(-)