mbox series

[GIT,PULL] Allwinner clock changes for 5.2

Message ID 20190419112518.5zwaeqg7egfimts7@flea
State New
Headers show
Series [GIT,PULL] Allwinner clock changes for 5.2 | expand

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-5.2

Message

Maxime Ripard April 19, 2019, 11:25 a.m. UTC 
Hi Mike, Stephen,

Please pull the following changes for the next merge window.

Thanks!
Maxime

The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:

  Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-5.2

for you to fetch changes up to c77cebac96a9edf1f3a508b475110f5d44196901:

  clk: sunxi-ng: sun5i: Export the MBUS clock (2019-04-10 16:33:01 +0200)

----------------------------------------------------------------
Allwinner clock changes for 5.2

Our usual bunch of changes, this time, it's mainly:

  - Export a new clock for the MBUS controller on the A13
  - H6 fixes to support a finer clocking of the video and VPU engines
  - Add some Kconfig options
  - Some bit offset fixes

----------------------------------------------------------------
Chen-Yu Tsai (1):
      clk: sunxi-ng: a83t: Add pll-video0 as parent of csi-mclk

Icenowy Zheng (1):
      clk: sunxi-ng: f1c100s: fix USB PHY gate bit offset

Jernej Skrabec (3):
      clk: sunxi-ng: Allow DE clock to set parent rate
      clk: sunxi-ng: h6: Preset hdmi-cec clock parent
      clk: sunxi-ng: h6: Allow video & vpu clocks to change parent rate

Maxime Ripard (2):
      clk: sunxi: Add Kconfig options
      clk: sunxi-ng: sun5i: Export the MBUS clock

 drivers/clk/Kconfig                      |  1 +
 drivers/clk/sunxi-ng/ccu-sun50i-a64.c    |  3 +-
 drivers/clk/sunxi-ng/ccu-sun50i-h6.c     | 19 ++++++++++---
 drivers/clk/sunxi-ng/ccu-sun5i.h         |  4 ---
 drivers/clk/sunxi-ng/ccu-sun8i-a83t.c    |  5 ++--
 drivers/clk/sunxi-ng/ccu-sun8i-v3s.c     |  3 +-
 drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c |  2 +-
 drivers/clk/sunxi/Kconfig                | 43 ++++++++++++++++++++++++++++
 drivers/clk/sunxi/Makefile               | 49 ++++++++++++++++++--------------
 include/dt-bindings/clock/sun5i-ccu.h    |  2 +-
 10 files changed, 95 insertions(+), 36 deletions(-)
 create mode 100644 drivers/clk/sunxi/Kconfig

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Comments

Stephen Boyd April 19, 2019, 8:19 p.m. UTC | #1 
Quoting Maxime Ripard (2019-04-19 04:25:18)
> Hi Mike, Stephen,
> 
> Please pull the following changes for the next merge window.
> 
> Thanks!
> Maxime
> 
> The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:
> 
>   Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-5.2

Thanks. Pulled but not yet merged into clk-next, because I see this error
when I try to build just the files that have changed:

	WARNING: unmet direct dependencies detected for MFD_SUN6I_PRCM
	  Depends on [n]: HAS_IOMEM [=y] && ARCH_SUNXI
	  Selected by [y]:
	  - CLK_SUNXI_PRCM_SUN6I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]
	  - CLK_SUNXI_PRCM_SUN8I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]

	WARNING: unmet direct dependencies detected for MFD_SUN6I_PRCM
	  Depends on [n]: HAS_IOMEM [=y] && ARCH_SUNXI
	  Selected by [y]:
	  - CLK_SUNXI_PRCM_SUN6I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]
	  - CLK_SUNXI_PRCM_SUN8I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]

Maybe the Kconfig patch isn't completely proper. I suppose that
MFD_SUN6I_PRCM can be selected via COMPILE_TEST=y path of
CLK_SUNXI_PRCM_SUN6I and then fail to enable because ARCH_SUNXI=n.
Maxime Ripard April 25, 2019, 2:23 p.m. UTC | #2 
Hi,

On Fri, Apr 19, 2019 at 01:19:23PM -0700, Stephen Boyd wrote:
> Quoting Maxime Ripard (2019-04-19 04:25:18)
> > Hi Mike, Stephen,
> >
> > Please pull the following changes for the next merge window.
> >
> > Thanks!
> > Maxime
> >
> > The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:
> >
> >   Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)
> >
> > are available in the Git repository at:
> >
> >   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-5.2
>
> Thanks. Pulled but not yet merged into clk-next, because I see this error
> when I try to build just the files that have changed:
>
> 	WARNING: unmet direct dependencies detected for MFD_SUN6I_PRCM
> 	  Depends on [n]: HAS_IOMEM [=y] && ARCH_SUNXI
> 	  Selected by [y]:
> 	  - CLK_SUNXI_PRCM_SUN6I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]
> 	  - CLK_SUNXI_PRCM_SUN8I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]
>
> 	WARNING: unmet direct dependencies detected for MFD_SUN6I_PRCM
> 	  Depends on [n]: HAS_IOMEM [=y] && ARCH_SUNXI
> 	  Selected by [y]:
> 	  - CLK_SUNXI_PRCM_SUN6I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]
> 	  - CLK_SUNXI_PRCM_SUN8I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]
>
> Maybe the Kconfig patch isn't completely proper. I suppose that
> MFD_SUN6I_PRCM can be selected via COMPILE_TEST=y path of
> CLK_SUNXI_PRCM_SUN6I and then fail to enable because ARCH_SUNXI=n.

There's a fix for that that went through the MFD tree in 5.1-rc4

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Stephen Boyd April 25, 2019, 3:55 p.m. UTC | #3 
Quoting Maxime Ripard (2019-04-25 07:23:06)
> Hi,
> 
> On Fri, Apr 19, 2019 at 01:19:23PM -0700, Stephen Boyd wrote:
> > Quoting Maxime Ripard (2019-04-19 04:25:18)
> > > Hi Mike, Stephen,
> > >
> > > Please pull the following changes for the next merge window.
> > >
> > > Thanks!
> > > Maxime
> > >
> > > The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:
> > >
> > >   Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)
> > >
> > > are available in the Git repository at:
> > >
> > >   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-5.2
> >
> > Thanks. Pulled but not yet merged into clk-next, because I see this error
> > when I try to build just the files that have changed:
> >
> >       WARNING: unmet direct dependencies detected for MFD_SUN6I_PRCM
> >         Depends on [n]: HAS_IOMEM [=y] && ARCH_SUNXI
> >         Selected by [y]:
> >         - CLK_SUNXI_PRCM_SUN6I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]
> >         - CLK_SUNXI_PRCM_SUN8I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]
> >
> >       WARNING: unmet direct dependencies detected for MFD_SUN6I_PRCM
> >         Depends on [n]: HAS_IOMEM [=y] && ARCH_SUNXI
> >         Selected by [y]:
> >         - CLK_SUNXI_PRCM_SUN6I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]
> >         - CLK_SUNXI_PRCM_SUN8I [=y] && COMMON_CLK [=y] && CLK_SUNXI [=y]
> >
> > Maybe the Kconfig patch isn't completely proper. I suppose that
> > MFD_SUN6I_PRCM can be selected via COMPILE_TEST=y path of
> > CLK_SUNXI_PRCM_SUN6I and then fail to enable because ARCH_SUNXI=n.
> 
> There's a fix for that that went through the MFD tree in 5.1-rc4
> 

Ok. I suppose it's easiest to ignore this problem then and merge up
these changes into -next. Thanks!