| Message ID | Y9Raak4mhdtL0L8e@jernej-laptop (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ffe4bd3db832a36b69a764d3895e34c726f4f3cf |
| Headers | show |
| Series | [GIT,PULL] Allwinner device tree changes for 6.3 | expand |
On Sat, Jan 28, 2023, at 00:12, Jernej Skrabec wrote: > Hi! > > Please pull following device tree changes for 6.3. Note that this PR > depends on following immutable tag: > > https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git > soc2arch-immutable > > Let me know if I should split this PR into two, one for ARM and another > for RISC-V. > > Best regards, > Jernej > > The following changes since commit 3af577f9826fdddefac42b35fc5eb3912c5b7d85: > > RISC-V: stop directly selecting drivers for SOC_CANAAN (2022-12-27 > 18:01:40 +0000) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git > tags/sunxi-dt-for-6.3-1 > > for you to fetch changes up to dca36f7b3dd7eb574f0958484d3d21cfd8af2651: > > riscv: dts: allwinner: d1: Add power controller node (2023-01-27 > 23:21:06 +0100) Something looks wrong here, I get an error when pulling this: ERROR: commit-id mismatch between pull request and remote msg=dca36f7b3dd7eb574f0958484d3d21cfd8af2651, remote=3af577f9826fdddefac42b35fc5eb3912c5b7d85 Topmost hash is not the same. Expected dca36f7b3dd7eb574f0958484d3d21cfd8af2651 Can you check what happened and then either push the correct branch or send a new pull request, depending on which one has the intended commit? Arnd
On Mon, Jan 30, 2023, at 18:19, Arnd Bergmann wrote: > On Sat, Jan 28, 2023, at 00:12, Jernej Skrabec wrote: >> Hi! >> >> Please pull following device tree changes for 6.3. Note that this PR >> depends on following immutable tag: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git >> soc2arch-immutable >> >> Let me know if I should split this PR into two, one for ARM and another >> for RISC-V. >> >> Best regards, >> Jernej >> >> The following changes since commit 3af577f9826fdddefac42b35fc5eb3912c5b7d85: >> >> RISC-V: stop directly selecting drivers for SOC_CANAAN (2022-12-27 >> 18:01:40 +0000) >> >> are available in the Git repository at: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git >> tags/sunxi-dt-for-6.3-1 >> >> for you to fetch changes up to dca36f7b3dd7eb574f0958484d3d21cfd8af2651: >> >> riscv: dts: allwinner: d1: Add power controller node (2023-01-27 >> 23:21:06 +0100) > > Something looks wrong here, I get an error when pulling this: > > ERROR: commit-id mismatch between pull request and remote > msg=dca36f7b3dd7eb574f0958484d3d21cfd8af2651, > remote=3af577f9826fdddefac42b35fc5eb3912c5b7d85 > Topmost hash is not the same. Expected > dca36f7b3dd7eb574f0958484d3d21cfd8af2651 > > Can you check what happened and then either push the correct branch > or send a new pull request, depending on which one has the intended > commit? nevermind, I see what happened: the script parsed the pull request incorrectly and tried to pull the soc2arch-immutable tag instead of your tags/sunxi-dt-for-6.3-1 tag. I can handle that here and fix it up then, it's not your fault. Combining the risc-v and arm bits is fine as long as this makes sense as a branch overall. If you have too many different things in one branch, it makes sense to split it up along some boundary, but that does not have to be between architectures, just based on what makes the most sensible changelog text in each pull request. Arnd
Hello: This pull request was applied to soc/soc.git (for-next) by Arnd Bergmann <arnd@arndb.de>: On Sat, 28 Jan 2023 00:12:42 +0100 you wrote: > Hi! > > Please pull following device tree changes for 6.3. Note that this PR > depends on following immutable tag: > > https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git soc2arch-immutable > > [...] Here is the summary with links: - [GIT,PULL] Allwinner device tree changes for 6.3 https://git.kernel.org/soc/soc/c/ffe4bd3db832 You are awesome, thank you!
Hi! Please pull following device tree changes for 6.3. Note that this PR depends on following immutable tag: https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git soc2arch-immutable Let me know if I should split this PR into two, one for ARM and another for RISC-V. Best regards, Jernej The following changes since commit 3af577f9826fdddefac42b35fc5eb3912c5b7d85: RISC-V: stop directly selecting drivers for SOC_CANAAN (2022-12-27 18:01:40 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-dt-for-6.3-1 for you to fetch changes up to dca36f7b3dd7eb574f0958484d3d21cfd8af2651: riscv: dts: allwinner: d1: Add power controller node (2023-01-27 23:21:06 +0100) ---------------------------------------------------------------- - introduce Allwinner D1 DTSI - add boards: Dongshan Nezha STU, MangoPi MQ (Pro), Sipeed Lichee RV, Nezha - add D1 power controller node - Add SATA regulator to Bananapi M3 - fix regulator reference for nanopi-duo2 - fix GPIO node names - align HDMI CEC node name for h3-beelink-x2 - add DPHY interrupt to A64 and A33 ---------------------------------------------------------------- Andre Przywara (1): ARM: dts: sun8i: a83t: bananapi-m3: describe SATA disk regulator Krzysztof Kozlowski (1): ARM: dts: sun8i: h3-beelink-x2: align HDMI CEC node names with dtschema Samuel Holland (15): ARM: dts: sun8i: a33: Add DPHY interrupt arm64: dts: allwinner: a64: Add DPHY interrupt ARM: dts: sunxi: Fix GPIO LED node names ARM: dts: sun8i: nanopi-duo2: Fix regulator GPIO reference MAINTAINERS: Match the sun20i family of Allwinner SoCs dt-bindings: vendor-prefixes: Add Allwinner D1/D1s board vendors dt-bindings: riscv: Add Allwinner D1/D1s board compatibles riscv: dts: allwinner: Add the D1/D1s SoC devicetree riscv: dts: allwinner: Add MangoPi MQ devicetree riscv: dts: allwinner: Add Allwinner D1 Nezha devicetree riscv: dts: allwinner: Add Sipeed Lichee RV devicetrees riscv: dts: allwinner: Add MangoPi MQ Pro devicetree riscv: dts: allwinner: Add Dongshan Nezha STU devicetree riscv: Add the Allwinner SoC family Kconfig option riscv: dts: allwinner: d1: Add power controller node Documentation/devicetree/bindings/riscv/sunxi.yaml | 69 ++ .../devicetree/bindings/vendor-prefixes.yaml | 4 + MAINTAINERS | 2 +- arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 2 +- arch/arm/boot/dts/sun5i-r8-chip.dts | 2 +- arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 2 +- arch/arm/boot/dts/sun8i-a33.dtsi | 1 + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 15 + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 2 +- arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + arch/riscv/Kconfig.socs | 9 + arch/riscv/boot/dts/Makefile | 1 + arch/riscv/boot/dts/allwinner/Makefile | 9 + .../dts/allwinner/sun20i-common-regulators.dtsi | 28 + .../dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 117 +++ .../sun20i-d1-lichee-rv-86-panel-480p.dts | 29 + .../sun20i-d1-lichee-rv-86-panel-720p.dts | 10 + .../allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 119 +++ .../dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 97 +++ .../boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 87 +++ .../dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 142 ++++ arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 166 ++++ arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 66 ++ .../boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 128 ++++ arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 76 ++ arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 15 + arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 834 +++++++++++++++++++++ 28 files changed, 2029 insertions(+), 6 deletions(-) create mode 100644 Documentation/devicetree/bindings/riscv/sunxi.yaml create mode 100644 arch/riscv/boot/dts/allwinner/Makefile create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi create mode 100644 arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi create mode 100644 arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi