Skip to contentSkip to conversation

Pull request: u-boot-sunxi/master

DISCUSSION Jagan Teki 4 participants 8 messages Nov 16, 2020 – Nov 17, 2020

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

Hi Tom,

Please pull this PR.

Summary:
- PinePhone support (Samuel)
- V3/S3 support (Icenowy)

thanks,
Jagan.

The following changes since commit de865f7ee1d9b6dff6e265dee44509c8274ea606:

Merge tag 'efi-2021-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-11-14 09:47:33 -0500)

are available in the Git repository at:

https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi master

for you to fetch changes up to 27007e5d4a6c4ac1bbd1bc81fb4c19bc45191f35:

sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1 (2020-11-16 12:34:09 +0530)

----------------------------------------------------------------
Icenowy Zheng (5):
sunxi: add V3/S3 support
sunxi: gpio: introduce compatible string for V3 GPIO
clk: sunxi: add compatible string for V3
sunxi: allow to use AXP20[39] attached to I2C0 on V3 series
sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1

Samuel Holland (7):
sunxi: board: Use a more descriptive variable name
sunxi: board: Add a helper to get the SPL DT name
sunxi: board: Simplify Pine A64 DT selection logic
sunxi: board: Add PinePhone DT selection logic
sunxi: board: Save the chosen DT name in the SPL header
sunxi: board: Set fdtfile to match the DT chosen by SPL
sunxi: DT: A64: update device tree files

 arch/arm/dts/Makefile                           |   4 +
 arch/arm/dts/axp803.dtsi                        |  82 ++--
 arch/arm/dts/sun50i-a64-amarula-relic.dts       | 109 ++++-
 arch/arm/dts/sun50i-a64-bananapi-m64.dts        | 118 ++++--
 arch/arm/dts/sun50i-a64-cpu-opp.dtsi            |  75 ++++
 arch/arm/dts/sun50i-a64-nanopi-a64.dts          |  70 +---
 arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts |  31 +-
 arch/arm/dts/sun50i-a64-olinuxino-emmc.dts      |  12 +-
 arch/arm/dts/sun50i-a64-olinuxino.dts           | 113 +++--
 arch/arm/dts/sun50i-a64-orangepi-win.dts        | 127 ++++--
 arch/arm/dts/sun50i-a64-pine64-lts.dts          |   7 +-
 arch/arm/dts/sun50i-a64-pine64-plus.dts         |  52 +--
 arch/arm/dts/sun50i-a64-pine64.dts              |  97 +++--
 arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi    |  17 -
 arch/arm/dts/sun50i-a64-pinebook.dts            | 237 ++++++++---
 arch/arm/dts/sun50i-a64-pinephone-1.0.dts       |  11 +
 arch/arm/dts/sun50i-a64-pinephone-1.1.dts       |  30 ++
 arch/arm/dts/sun50i-a64-pinephone-1.2.dts       |  40 ++
 arch/arm/dts/sun50i-a64-pinephone.dtsi          | 429 +++++++++++++++++++
 arch/arm/dts/sun50i-a64-pinetab.dts             | 460 ++++++++++++++++++++
 arch/arm/dts/sun50i-a64-sopine-baseboard.dts    | 113 +++--
 arch/arm/dts/sun50i-a64-sopine.dtsi             |  69 ++-
 arch/arm/dts/sun50i-a64-teres-i-u-boot.dtsi     |  41 --
 arch/arm/dts/sun50i-a64-teres-i.dts             | 138 +++++-
 arch/arm/dts/sun50i-a64.dtsi                    | 532 +++++++++++++++++++-----
 arch/arm/dts/sun8i-s3-lichee-zero-plus.dts      |  53 +++
 arch/arm/dts/sun8i-s3-pinecube.dts              | 235 +++++++++++
 arch/arm/dts/sun8i-v3.dtsi                      |  27 ++
 arch/arm/dts/sun8i-v3s-licheepi-zero-dock.dts   |  96 +++++
 arch/arm/dts/sun8i-v3s-licheepi-zero.dts        |  26 +-
 arch/arm/dts/sun8i-v3s.dtsi                     | 318 ++++++++++++--
 arch/arm/include/asm/arch-sunxi/gpio.h          |   1 +
 arch/arm/mach-sunxi/Kconfig                     |  10 +-
 board/sunxi/board.c                             | 101 ++++-
 drivers/clk/sunxi/clk_v3s.c                     |   2 +
 drivers/gpio/sunxi_gpio.c                       |   1 +
 drivers/power/Kconfig                           |   4 +-
 include/dt-bindings/clock/sun50i-a64-ccu.h      |   4 +-
 include/dt-bindings/clock/sun8i-de2.h           |   3 +
 include/dt-bindings/reset/sun8i-de2.h           |   1 +
 40 files changed, 3212 insertions(+), 684 deletions(-)
 create mode 100644 arch/arm/dts/sun50i-a64-cpu-opp.dtsi
 delete mode 100644 arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi
 create mode 100644 arch/arm/dts/sun50i-a64-pinephone-1.0.dts
 create mode 100644 arch/arm/dts/sun50i-a64-pinephone-1.1.dts
 create mode 100644 arch/arm/dts/sun50i-a64-pinephone-1.2.dts
 create mode 100644 arch/arm/dts/sun50i-a64-pinephone.dtsi
 create mode 100644 arch/arm/dts/sun50i-a64-pinetab.dts
 delete mode 100644 arch/arm/dts/sun50i-a64-teres-i-u-boot.dtsi
 create mode 100644 arch/arm/dts/sun8i-s3-lichee-zero-plus.dts
 create mode 100644 arch/arm/dts/sun8i-s3-pinecube.dts
 create mode 100644 arch/arm/dts/sun8i-v3.dtsi
 create mode 100644 arch/arm/dts/sun8i-v3s-licheepi-zero-dock.dts
#1 lore raw
Quoted 15 lines · Jagan Teki

Hi Tom,

Please pull this PR.

Summary:
- PinePhone support (Samuel)
- V3/S3 support (Icenowy)

thanks,
Jagan.

The following changes since commit de865f7ee1d9b6dff6e265dee44509c8274ea606:

Merge tag 'efi-2021-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-11-14 09:47:33 -0500)

Quoted 8 lines

are available in the Git repository at:

https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi master

for you to fetch changes up to 27007e5d4a6c4ac1bbd1bc81fb4c19bc45191f35:

sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1 (2020-11-16 12:34:09 +0530)

NAK. A large number of sunxi boards fail to build with:
+board/sunxi/board.c:338:13: error: 'set_spl_dt_name' defined but not used [-Werror=unused-function]
+ 338 | static void set_spl_dt_name(const char *name)
+ | ^~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+make[2]: *** [board/sunxi/board.o] Error 1
+make[1]: *** [board/sunxi] Error 2
+make: *** [sub-make] Error 2

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201116/5c5ac971/attachment.sig>
#2 lore raw

On 16/11/2020 15:50, Tom Rini wrote:

Hi Tom,

Quoted 27 lines · Jagan Teki
Quoted 16 lines

Hi Tom,

Please pull this PR.

Summary:
- PinePhone support (Samuel)
- V3/S3 support (Icenowy)

thanks,
Jagan.

The following changes since commit de865f7ee1d9b6dff6e265dee44509c8274ea606:

Merge tag 'efi-2021-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-11-14 09:47:33 -0500)

Quoted 8 lines

are available in the Git repository at:

https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi master

for you to fetch changes up to 27007e5d4a6c4ac1bbd1bc81fb4c19bc45191f35:

sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1 (2020-11-16 12:34:09 +0530)

NAK. A large number of sunxi boards fail to build with:

Review

Quoted 7 lines
(quoted diff) +7 -0
+board/sunxi/board.c:338:13: error: 'set_spl_dt_name' defined but not used [-Werror=unused-function]
+  338 | static void set_spl_dt_name(const char *name)
+      |             ^~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+make[2]: *** [board/sunxi/board.o] Error 1
+make[1]: *** [board/sunxi] Error 2
+make: *** [sub-make] Error 2

Ouch, thanks for that heads up!
But this only happens after this very patch, and is fixed by a later patch, right? ("sunxi: board: Set fdtfile to match the DT chosen by SPL" introduces another user of set_spl_dt_name(), outside of any #ifdef's).

I will try to think about a solution, unless Samuel beats me to it.

Cheers,
Andre

#3 lore raw
Quoted 30 lines · Andr? Przywara

On 16/11/2020 15:50, Tom Rini wrote:

Hi Tom,

Quoted 26 lines · Jagan Teki
Quoted 24 lines

Hi Tom,

Please pull this PR.

Summary:
- PinePhone support (Samuel)
- V3/S3 support (Icenowy)

thanks,
Jagan.

The following changes since commit de865f7ee1d9b6dff6e265dee44509c8274ea606:

Merge tag 'efi-2021-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-11-14 09:47:33 -0500)

are available in the Git repository at:

https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi master

for you to fetch changes up to 27007e5d4a6c4ac1bbd1bc81fb4c19bc45191f35:

sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1 (2020-11-16 12:34:09 +0530)

Quoted 13 lines

Review

Quoted 8 lines

NAK. A large number of sunxi boards fail to build with:

(quoted diff) +7 -0
+board/sunxi/board.c:338:13: error: 'set_spl_dt_name' defined but not used [-Werror=unused-function]
+  338 | static void set_spl_dt_name(const char *name)
+      |             ^~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+make[2]: *** [board/sunxi/board.o] Error 1
+make[1]: *** [board/sunxi] Error 2
+make: *** [sub-make] Error 2

Ouch, thanks for that heads up!
But this only happens after this very patch, and is fixed by a later patch, right? ("sunxi: board: Set fdtfile to match the DT chosen by SPL" introduces another user of set_spl_dt_name(), outside of any #ifdef's).

No, that's from the PR itself.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201116/45a6c423/attachment.sig>
#4 lore raw
Quoted 45 lines · Tom Rini
Quoted 30 lines · Andr? Przywara

On 16/11/2020 15:50, Tom Rini wrote:

Hi Tom,

Quoted 26 lines · Jagan Teki
Quoted 24 lines

Hi Tom,

Please pull this PR.

Summary:
- PinePhone support (Samuel)
- V3/S3 support (Icenowy)

thanks,
Jagan.

The following changes since commit de865f7ee1d9b6dff6e265dee44509c8274ea606:

Merge tag 'efi-2021-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-11-14 09:47:33 -0500)

are available in the Git repository at:

https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi master

for you to fetch changes up to 27007e5d4a6c4ac1bbd1bc81fb4c19bc45191f35:

sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1 (2020-11-16 12:34:09 +0530)

Quoted 13 lines

Review

Quoted 8 lines

NAK. A large number of sunxi boards fail to build with:

(quoted diff) +7 -0
+board/sunxi/board.c:338:13: error: 'set_spl_dt_name' defined but not used [-Werror=unused-function]
+  338 | static void set_spl_dt_name(const char *name)
+      |             ^~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+make[2]: *** [board/sunxi/board.o] Error 1
+make[1]: *** [board/sunxi] Error 2
+make: *** [sub-make] Error 2

Ouch, thanks for that heads up!
But this only happens after this very patch, and is fixed by a later patch, right? ("sunxi: board: Set fdtfile to match the DT chosen by SPL" introduces another user of set_spl_dt_name(), outside of any #ifdef's).

Quoted 1 line

No, that's from the PR itself.

Right, sorry, looked at the wrong function.
I found the culprit and have a fix, but I will run some actual tests on my boards tonight to make sure it really works.
Jagan or me will send a new PR later then.

Thanks!
Andre.

#5 lore raw
Quoted 46 lines · Andr? Przywara
Quoted 45 lines · Tom Rini
Quoted 43 lines · Andr? Przywara

On 16/11/2020 15:50, Tom Rini wrote:

Hi Tom,

Quoted 27 lines · Jagan Teki
Quoted 16 lines

Hi Tom,

Please pull this PR.

Summary:
- PinePhone support (Samuel)
- V3/S3 support (Icenowy)

thanks,
Jagan.

The following changes since commit de865f7ee1d9b6dff6e265dee44509c8274ea606:

Merge tag 'efi-2021-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-11-14 09:47:33 -0500)

Quoted 8 lines

are available in the Git repository at:

https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi master

for you to fetch changes up to 27007e5d4a6c4ac1bbd1bc81fb4c19bc45191f35:

sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1 (2020-11-16 12:34:09 +0530)

NAK. A large number of sunxi boards fail to build with:

Review

Quoted 7 lines
(quoted diff) +7 -0
+board/sunxi/board.c:338:13: error: 'set_spl_dt_name' defined but not used [-Werror=unused-function]
+  338 | static void set_spl_dt_name(const char *name)
+      |             ^~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+make[2]: *** [board/sunxi/board.o] Error 1
+make[1]: *** [board/sunxi] Error 2
+make: *** [sub-make] Error 2

Ouch, thanks for that heads up!
But this only happens after this very patch, and is fixed by a later patch, right? ("sunxi: board: Set fdtfile to match the DT chosen by SPL" introduces another user of set_spl_dt_name(), outside of any #ifdef's).

Quoted 6 lines
Quoted 1 line

No, that's from the PR itself.

Right, sorry, looked at the wrong function.
I found the culprit and have a fix, but I will run some actual tests on my boards tonight to make sure it really works.
Jagan or me will send a new PR later then.

OK, thanks for the quick follow-up!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201116/3463ef2a/attachment.sig>
#6 lore raw
Quoted 47 lines · Tom Rini
Quoted 46 lines · Andr? Przywara
Quoted 45 lines · Tom Rini
Quoted 43 lines · Andr? Przywara

On 16/11/2020 15:50, Tom Rini wrote:

Hi Tom,

Quoted 27 lines · Jagan Teki
Quoted 16 lines

Hi Tom,

Please pull this PR.

Summary:
- PinePhone support (Samuel)
- V3/S3 support (Icenowy)

thanks,
Jagan.

The following changes since commit de865f7ee1d9b6dff6e265dee44509c8274ea606:

Merge tag 'efi-2021-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-11-14 09:47:33 -0500)

Quoted 8 lines

are available in the Git repository at:

https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi master

for you to fetch changes up to 27007e5d4a6c4ac1bbd1bc81fb4c19bc45191f35:

sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1 (2020-11-16 12:34:09 +0530)

NAK. A large number of sunxi boards fail to build with:

Review

Quoted 7 lines
(quoted diff) +7 -0
+board/sunxi/board.c:338:13: error: 'set_spl_dt_name' defined but not used [-Werror=unused-function]
+  338 | static void set_spl_dt_name(const char *name)
+      |             ^~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+make[2]: *** [board/sunxi/board.o] Error 1
+make[1]: *** [board/sunxi] Error 2
+make: *** [sub-make] Error 2

Ouch, thanks for that heads up!
But this only happens after this very patch, and is fixed by a later patch, right? ("sunxi: board: Set fdtfile to match the DT chosen by SPL" introduces another user of set_spl_dt_name(), outside of any #ifdef's).

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

No, that's from the PR itself.

Right, sorry, looked at the wrong function.
I found the culprit and have a fix, but I will run some actual tests on my boards tonight to make sure it really works.
Jagan or me will send a new PR later then.

OK, thanks for the quick follow-up!

Thank you, Andre, and sorry for the breakage. For what it's worth, I am happy with the fixups you made.

Samuel

#7 lore raw
Quoted 50 lines · Samuel Holland
Quoted 49 lines · Tom Rini
Quoted 48 lines · Andr? Przywara
Quoted 46 lines · Tom Rini
Quoted 30 lines · Andr? Przywara

On 16/11/2020 15:50, Tom Rini wrote:

Hi Tom,

Quoted 26 lines · Jagan Teki
Quoted 24 lines

Hi Tom,

Please pull this PR.

Summary:
- PinePhone support (Samuel)
- V3/S3 support (Icenowy)

thanks,
Jagan.

The following changes since commit de865f7ee1d9b6dff6e265dee44509c8274ea606:

Merge tag 'efi-2021-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-11-14 09:47:33 -0500)

are available in the Git repository at:

https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi master

for you to fetch changes up to 27007e5d4a6c4ac1bbd1bc81fb4c19bc45191f35:

sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1 (2020-11-16 12:34:09 +0530)

Quoted 13 lines

Review

Quoted 8 lines

NAK. A large number of sunxi boards fail to build with:

(quoted diff) +7 -0
+board/sunxi/board.c:338:13: error: 'set_spl_dt_name' defined but not used [-Werror=unused-function]
+  338 | static void set_spl_dt_name(const char *name)
+      |             ^~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+make[2]: *** [board/sunxi/board.o] Error 1
+make[1]: *** [board/sunxi] Error 2
+make: *** [sub-make] Error 2

Ouch, thanks for that heads up!
But this only happens after this very patch, and is fixed by a later patch, right? ("sunxi: board: Set fdtfile to match the DT chosen by SPL" introduces another user of set_spl_dt_name(), outside of any #ifdef's).

No, that's from the PR itself.

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

Right, sorry, looked at the wrong function.
I found the culprit and have a fix, but I will run some actual tests on my boards tonight to make sure it really works.
Jagan or me will send a new PR later then.

OK, thanks for the quick follow-up!

Thank you, Andre, and sorry for the breakage.

No worries, I should have spotted it myself during the review. But it just points to the fact that board.c is "ifdef hell" at its best, we should clean that up one day.

And that taught me a lesson to not forget about those poor 32-bit boards ;-)

Quoted 1 line

For what it's worth, I am happy with the fixups you made.

Thanks for the confirmation!

Cheers,
Andre