mbox series

[GIT,PULL] Rockchip clock changes for 6.15 #1

Message ID 8574162.T7Z3S40VBb@phil (mailing list archive)
State Accepted, archived
Headers show
Series [GIT,PULL] Rockchip clock changes for 6.15 #1 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v6.15-rockchip-clk1

Message

Heiko Stuebner March 8, 2025, 6:23 p.m. UTC 
Hi Mike, Stephen,

please find below a pull-request with Rockchip clock change for 6.15
The new year started with a flurry of activity it seems :-) .


Please pull.

Thanks
Heiko


The following changes since commit 2014c95afecee3e76ca4a56956a936e23283f05b:

  Linux 6.14-rc1 (2025-02-02 15:39:26 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v6.15-rockchip-clk1

for you to fetch changes up to f863d4cc79a7e2f8c734d1fac84dc275805f41c7:

  clk: rockchip: Add clock controller for the RK3562 (2025-03-02 17:51:51 +0100)

----------------------------------------------------------------
New clock controllers for rk3528 and rk3562 as well as a parent-fix one
additional clock and two newly exported camera clocks on the old rk3188.

----------------------------------------------------------------
Finley Xiao (1):
      clk: rockchip: Add clock controller for the RK3562

Heiko Stuebner (2):
      Merge branch 'v6.15-shared/clkids' into v6.15-clk/next
      Merge branch 'v6.15-shared/clkids' into v6.15-clk/next

Jonas Karlman (1):
      clk: rockchip: rk3528: Add reset lookup table

Kever Yang (1):
      dt-bindings: clock: Add RK3562 cru

Michael Riesch (1):
      clk: rockchip: rk3568: mark hclk_vi as critical

Peter Geis (1):
      clk: rockchip: rk3328: fix wrong clk_ref_usb3otg parent

Val Packett (2):
      dt-bindings: clock: rk3188-common: add PCLK_CIF0/PCLK_CIF1
      clk: rockchip: rk3188: use PCLK_CIF0/1 clock IDs on RK3066

Yao Zi (3):
      dt-bindings: clock: Document clock and reset unit of RK3528
      clk: rockchip: Add PLL flag ROCKCHIP_PLL_FIXED_MODE
      clk: rockchip: Add clock controller driver for RK3528 SoC

 .../bindings/clock/rockchip,rk3528-cru.yaml        |   64 ++
 .../bindings/clock/rockchip,rk3562-cru.yaml        |   55 +
 drivers/clk/rockchip/Kconfig                       |   14 +
 drivers/clk/rockchip/Makefile                      |    2 +
 drivers/clk/rockchip/clk-pll.c                     |   10 +-
 drivers/clk/rockchip/clk-rk3188.c                  |    4 +-
 drivers/clk/rockchip/clk-rk3328.c                  |    2 +-
 drivers/clk/rockchip/clk-rk3528.c                  | 1116 ++++++++++++++++++++
 drivers/clk/rockchip/clk-rk3562.c                  | 1101 +++++++++++++++++++
 drivers/clk/rockchip/clk-rk3568.c                  |    1 +
 drivers/clk/rockchip/clk.h                         |   63 ++
 drivers/clk/rockchip/rst-rk3528.c                  |  306 ++++++
 drivers/clk/rockchip/rst-rk3562.c                  |  429 ++++++++
 include/dt-bindings/clock/rk3188-cru-common.h      |    2 +
 include/dt-bindings/clock/rockchip,rk3528-cru.h    |  453 ++++++++
 include/dt-bindings/clock/rockchip,rk3562-cru.h    |  379 +++++++
 include/dt-bindings/reset/rockchip,rk3528-cru.h    |  241 +++++
 include/dt-bindings/reset/rockchip,rk3562-cru.h    |  358 +++++++
 18 files changed, 4593 insertions(+), 7 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3528-cru.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3562-cru.yaml
 create mode 100644 drivers/clk/rockchip/clk-rk3528.c
 create mode 100644 drivers/clk/rockchip/clk-rk3562.c
 create mode 100644 drivers/clk/rockchip/rst-rk3528.c
 create mode 100644 drivers/clk/rockchip/rst-rk3562.c
 create mode 100644 include/dt-bindings/clock/rockchip,rk3528-cru.h
 create mode 100644 include/dt-bindings/clock/rockchip,rk3562-cru.h
 create mode 100644 include/dt-bindings/reset/rockchip,rk3528-cru.h
 create mode 100644 include/dt-bindings/reset/rockchip,rk3562-cru.h

Comments

Stephen Boyd March 11, 2025, 6:05 p.m. UTC | #1 
Quoting Heiko Stuebner (2025-03-08 10:23:39)
> Hi Mike, Stephen,
> 
> please find below a pull-request with Rockchip clock change for 6.15
> The new year started with a flurry of activity it seems :-) .
> 
> 
> Please pull.
> 
> Thanks
> Heiko
> 
> 
> The following changes since commit 2014c95afecee3e76ca4a56956a936e23283f05b:
> 
>   Linux 6.14-rc1 (2025-02-02 15:39:26 -0800)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v6.15-rockchip-clk1
> 
> for you to fetch changes up to f863d4cc79a7e2f8c734d1fac84dc275805f41c7:
> 
>   clk: rockchip: Add clock controller for the RK3562 (2025-03-02 17:51:51 +0100)
> 
> ----------------------------------------------------------------

Thanks. Pulled into clk-next

Did you see this warning?

drivers/clk/rockchip/rst-rk3562.c:21:57: error: initialized field overwritten [-Werror=override-init]
   21 | #define RK3562_DDRCRU_RESET_OFFSET(id, reg, bit) [id] = (0x20000*4 + reg * 16 + bit)
      |                                                         ^
drivers/clk/rockchip/rst-rk3562.c:266:9: note: in expansion of macro 'RK3562_DDRCRU_RESET_OFFSET'
  266 |         RK3562_DDRCRU_RESET_OFFSET(SRST_P_DDR_PHY, 0, 8),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/clk/rockchip/rst-rk3562.c:21:57: note: (near initialization for 'rk3562_register_offset[173]')
   21 | #define RK3562_DDRCRU_RESET_OFFSET(id, reg, bit) [id] = (0x20000*4 + reg * 16 + bit)
      |                                                         ^
drivers/clk/rockchip/rst-rk3562.c:266:9: note: in expansion of macro 'RK3562_DDRCRU_RESET_OFFSET'
  266 |         RK3562_DDRCRU_RESET_OFFSET(SRST_P_DDR_PHY, 0, 8),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Heiko Stuebner March 12, 2025, 6:03 a.m. UTC | #2 
Hi Stephen,

Am Dienstag, 11. März 2025, 19:05:50 MEZ schrieb Stephen Boyd:
> Quoting Heiko Stuebner (2025-03-08 10:23:39)
> > Hi Mike, Stephen,
> > 
> > please find below a pull-request with Rockchip clock change for 6.15
> > The new year started with a flurry of activity it seems :-) .
> > 
> > 
> > Please pull.
> > 
> > Thanks
> > Heiko
> > 
> > 
> > The following changes since commit 2014c95afecee3e76ca4a56956a936e23283f05b:
> > 
> >   Linux 6.14-rc1 (2025-02-02 15:39:26 -0800)
> > 
> > are available in the Git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v6.15-rockchip-clk1
> > 
> > for you to fetch changes up to f863d4cc79a7e2f8c734d1fac84dc275805f41c7:
> > 
> >   clk: rockchip: Add clock controller for the RK3562 (2025-03-02 17:51:51 +0100)
> > 
> > ----------------------------------------------------------------
> 
> Thanks. Pulled into clk-next
> 
> Did you see this warning?
> 
> drivers/clk/rockchip/rst-rk3562.c:21:57: error: initialized field overwritten [-Werror=override-init]
>    21 | #define RK3562_DDRCRU_RESET_OFFSET(id, reg, bit) [id] = (0x20000*4 + reg * 16 + bit)
>       |                                                         ^
> drivers/clk/rockchip/rst-rk3562.c:266:9: note: in expansion of macro 'RK3562_DDRCRU_RESET_OFFSET'
>   266 |         RK3562_DDRCRU_RESET_OFFSET(SRST_P_DDR_PHY, 0, 8),
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/clk/rockchip/rst-rk3562.c:21:57: note: (near initialization for 'rk3562_register_offset[173]')
>    21 | #define RK3562_DDRCRU_RESET_OFFSET(id, reg, bit) [id] = (0x20000*4 + reg * 16 + bit)
>       |                                                         ^
> drivers/clk/rockchip/rst-rk3562.c:266:9: note: in expansion of macro 'RK3562_DDRCRU_RESET_OFFSET'
>   266 |         RK3562_DDRCRU_RESET_OFFSET(SRST_P_DDR_PHY, 0, 8),
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors


interestingly, this did not turn up in my build test.
But that splat is really helpful too, because it made it easy to see
that one of the ids is doubled in the dt-binding header.

include/dt-bindings/reset/rockchip,rk3562-cru.h:

#define SRST_P_DDR_HWLP		173
#define SRST_P_DDR_PHY			173


I'll fix up the double id.


Out of curiosity, what toolchain was that?


Thanks
Heiko
Stephen Boyd March 12, 2025, 11:16 p.m. UTC | #3 
Quoting Heiko Stuebner (2025-03-11 23:03:00)
> Am Dienstag, 11. März 2025, 19:05:50 MEZ schrieb Stephen Boyd:
> > 
> > Did you see this warning?
> > 
> > drivers/clk/rockchip/rst-rk3562.c:21:57: error: initialized field overwritten [-Werror=override-init]
> >    21 | #define RK3562_DDRCRU_RESET_OFFSET(id, reg, bit) [id] = (0x20000*4 + reg * 16 + bit)
> >       |                                                         ^
> > drivers/clk/rockchip/rst-rk3562.c:266:9: note: in expansion of macro 'RK3562_DDRCRU_RESET_OFFSET'
> >   266 |         RK3562_DDRCRU_RESET_OFFSET(SRST_P_DDR_PHY, 0, 8),
> >       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/clk/rockchip/rst-rk3562.c:21:57: note: (near initialization for 'rk3562_register_offset[173]')
> >    21 | #define RK3562_DDRCRU_RESET_OFFSET(id, reg, bit) [id] = (0x20000*4 + reg * 16 + bit)
> >       |                                                         ^
> > drivers/clk/rockchip/rst-rk3562.c:266:9: note: in expansion of macro 'RK3562_DDRCRU_RESET_OFFSET'
> >   266 |         RK3562_DDRCRU_RESET_OFFSET(SRST_P_DDR_PHY, 0, 8),
> >       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > cc1: all warnings being treated as errors
> 
> 
> interestingly, this did not turn up in my build test.
> But that splat is really helpful too, because it made it easy to see
> that one of the ids is doubled in the dt-binding header.
> 
> include/dt-bindings/reset/rockchip,rk3562-cru.h:
> 
> #define SRST_P_DDR_HWLP         173
> #define SRST_P_DDR_PHY                  173
> 
> 
> I'll fix up the double id.

Thanks.

> 
> 
> Out of curiosity, what toolchain was that?
> 

$ ~/compilers/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc --version
aarch64-linux-gcc (GCC) 12.2.0
Copyright (C) 2022 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.