Pull request: u-boot-sunxi/master

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

Pull request: u-boot-sunxi/master

Jagan Teki-3
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
Reply | Threaded
Open this post in threaded view
|

Re: Pull request: u-boot-sunxi/master

Tom Rini-4
On Mon, Nov 16, 2020 at 12:42:53PM +0530, Jagan Teki wrote:

> 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)
>
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

--
Tom

signature.asc (673 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Pull request: u-boot-sunxi/master

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

Hi Tom,

> On Mon, Nov 16, 2020 at 12:42:53PM +0530, Jagan Teki wrote:
>
>> 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)
>>
>
> 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

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
Reply | Threaded
Open this post in threaded view
|

Re: Pull request: u-boot-sunxi/master

Tom Rini-4
On Mon, Nov 16, 2020 at 04:09:42PM +0000, André Przywara wrote:

> On 16/11/2020 15:50, Tom Rini wrote:
>
> Hi Tom,
>
> > On Mon, Nov 16, 2020 at 12:42:53PM +0530, Jagan Teki wrote:
> >
> >> 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)
> >>
> >
> > 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
>
> 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.

--
Tom

signature.asc (673 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Pull request: u-boot-sunxi/master

André Przywara
On 16/11/2020 16:13, Tom Rini wrote:

> On Mon, Nov 16, 2020 at 04:09:42PM +0000, André Przywara wrote:
>> On 16/11/2020 15:50, Tom Rini wrote:
>>
>> Hi Tom,
>>
>>> On Mon, Nov 16, 2020 at 12:42:53PM +0530, Jagan Teki wrote:
>>>
>>>> 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)
>>>>
>>>
>>> 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
>>
>> 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.

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.
Reply | Threaded
Open this post in threaded view
|

Re: Pull request: u-boot-sunxi/master

Tom Rini-4
On Mon, Nov 16, 2020 at 04:51:32PM +0000, André Przywara wrote:

> On 16/11/2020 16:13, Tom Rini wrote:
> > On Mon, Nov 16, 2020 at 04:09:42PM +0000, André Przywara wrote:
> >> On 16/11/2020 15:50, Tom Rini wrote:
> >>
> >> Hi Tom,
> >>
> >>> On Mon, Nov 16, 2020 at 12:42:53PM +0530, Jagan Teki wrote:
> >>>
> >>>> 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)
> >>>>
> >>>
> >>> 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
> >>
> >> 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.
>
> 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!

--
Tom

signature.asc (673 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Pull request: u-boot-sunxi/master

Samuel Holland
On 11/16/20 10:58 AM, Tom Rini wrote:

> On Mon, Nov 16, 2020 at 04:51:32PM +0000, André Przywara wrote:
>> On 16/11/2020 16:13, Tom Rini wrote:
>>> On Mon, Nov 16, 2020 at 04:09:42PM +0000, André Przywara wrote:
>>>> On 16/11/2020 15:50, Tom Rini wrote:
>>>>
>>>> Hi Tom,
>>>>
>>>>> On Mon, Nov 16, 2020 at 12:42:53PM +0530, Jagan Teki wrote:
>>>>>
>>>>>> 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)
>>>>>>
>>>>>
>>>>> 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
>>>>
>>>> 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.
>>
>> 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
Reply | Threaded
Open this post in threaded view
|

Re: Pull request: u-boot-sunxi/master

André Przywara
On 17/11/2020 01:56, Samuel Holland wrote:

> On 11/16/20 10:58 AM, Tom Rini wrote:
>> On Mon, Nov 16, 2020 at 04:51:32PM +0000, André Przywara wrote:
>>> On 16/11/2020 16:13, Tom Rini wrote:
>>>> On Mon, Nov 16, 2020 at 04:09:42PM +0000, André Przywara wrote:
>>>>> On 16/11/2020 15:50, Tom Rini wrote:
>>>>>
>>>>> Hi Tom,
>>>>>
>>>>>> On Mon, Nov 16, 2020 at 12:42:53PM +0530, Jagan Teki wrote:
>>>>>>
>>>>>>> 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)
>>>>>>>
>>>>>>
>>>>>> 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
>>>>>
>>>>> 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.
>>>
>>> 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 ;-)

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

Thanks for the confirmation!

Cheers,
Andre