| Message ID | 20220925164021.3600-1-stefan.wahren@i2se.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | ARM: dts: bcm283x: Minor clean up | expand |
Hi Florian, Am 25.09.22 um 18:40 schrieb Stefan Wahren: > This series cleans up some minor issues, but this affects most of > the bcm283x DT sources. since you already applied Maximes patches, i want to know if you are fine with this series? > > Stefan Wahren (2): > ARM: dts: bcm283x: Fix underscores in node names > ARM: dts: bcm283x: Move ACT LED into separate dtsi > > arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 31 +++--- > arch/arm/boot/dts/bcm2711-rpi-400.dts | 16 ++-- > arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts | 27 +++--- > arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi | 4 +- > arch/arm/boot/dts/bcm2711.dtsi | 94 +++++++++---------- > arch/arm/boot/dts/bcm2835-common.dtsi | 18 ++-- > arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 27 +++--- > arch/arm/boot/dts/bcm2835-rpi-a.dts | 11 +-- > arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 27 +++--- > arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 11 +-- > arch/arm/boot/dts/bcm2835-rpi-b.dts | 11 +-- > arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 11 +-- > arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 11 +-- > arch/arm/boot/dts/bcm2835-rpi-zero.dts | 11 +-- > arch/arm/boot/dts/bcm2835-rpi.dtsi | 10 -- > arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 27 +++--- > arch/arm/boot/dts/bcm2836.dtsi | 2 +- > arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 27 +++--- > arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 27 +++--- > arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 11 +-- > arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 8 -- > arch/arm/boot/dts/bcm2837-rpi-zero-2-w.dts | 11 +-- > .../boot/dts/bcm283x-rpi-led-deprecated.dtsi | 18 ++++ > arch/arm/boot/dts/bcm283x.dtsi | 70 +++++++------- > 24 files changed, 260 insertions(+), 261 deletions(-) > create mode 100644 arch/arm/boot/dts/bcm283x-rpi-led-deprecated.dtsi >
On 11/9/22 14:39, Stefan Wahren wrote: > Hi Florian, > > Am 25.09.22 um 18:40 schrieb Stefan Wahren: >> This series cleans up some minor issues, but this affects most of >> the bcm283x DT sources. > since you already applied Maximes patches, i want to know if you are > fine with this series? Yes, those patches are fine, just they were not in patchwork because bcm-kernel-feedback-list@broadcom.com was not copied :/ Patch 1 still applies, but patch 2 failed with: Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: y Applying: ARM: dts: bcm283x: Move ACT LED into separate dtsi error: patch failed: arch/arm/boot/dts/bcm2835-rpi-a-plus.dts:2 error: arch/arm/boot/dts/bcm2835-rpi-a-plus.dts: patch does not apply error: patch failed: arch/arm/boot/dts/bcm2835-rpi-a.dts:2 error: arch/arm/boot/dts/bcm2835-rpi-a.dts: patch does not apply error: patch failed: arch/arm/boot/dts/bcm2835-rpi-b-plus.dts:2 error: arch/arm/boot/dts/bcm2835-rpi-b-plus.dts: patch does not apply error: patch failed: arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts:2 error: arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts: patch does not apply error: patch failed: arch/arm/boot/dts/bcm2835-rpi-b.dts:2 error: arch/arm/boot/dts/bcm2835-rpi-b.dts: patch does not apply error: patch failed: arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi:2 error: arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi: patch does not apply error: patch failed: arch/arm/boot/dts/bcm2835-rpi-zero-w.dts:6 error: arch/arm/boot/dts/bcm2835-rpi-zero-w.dts: patch does not apply error: patch failed: arch/arm/boot/dts/bcm2835-rpi-zero.dts:6 error: arch/arm/boot/dts/bcm2835-rpi-zero.dts: patch does not apply Patch failed at 0001 ARM: dts: bcm283x: Move ACT LED into separate dtsi hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am -i --continue". If you prefer to skip this patch, run "git am -i --skip" instead. To restore the original branch and stop patching, run "git am -i --abort". zsh: exit 128 git am -is Do you mind resending based upon devicetree/next and copying bcm-kernel-feedback-list@broadcom.com so this lands in our patchwork? Thanks!