* [GIT PULL] Allwinner clock changes for 4.13
@ 2017-06-14 19:26 Maxime Ripard
2017-06-16 21:50 ` Stephen Boyd
0 siblings, 1 reply; 3+ messages in thread
From: Maxime Ripard @ 2017-06-14 19:26 UTC (permalink / raw)
To: linux-arm-kernel
Hi Mike, Stephen,
Here is the patches for 4.13 for the Allwinner SoCs.
In order to reduce the conflicts, this is based on the fixes tag I
sent a PR for a few minutes ago.
Thanks!
Maxime
The following changes since commit d85da227c3ae43d9ca513d60f244213cb4e55485:
clk: sunxi-ng: a64: Export PLL_PERIPH0 clock for the PRCM (2017-05-31 21:57:30 +0200)
are available in the git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-4.13
for you to fetch changes up to 06e226c7fb233f676b01b144d0b321ebe510fdcd:
clk: sunxi-ng: Move all clock types to a library (2017-06-07 15:33:39 +0200)
----------------------------------------------------------------
Allwinner clock patches for 4.13
Some new clock units are supported, for the display clocks unsed in the
newer SoCs, and the A83T PRCM.
There is also a bunch of minor fixes for clocks that are not used by
anyone, and reworks needed by drivers that will land in 4.13.
----------------------------------------------------------------
Arnd Bergmann (1):
clk: sunxi-ng: select SUNXI_CCU_MULT for sun8i-a83t
Chen-Yu Tsai (7):
dt-bindings: clock: sunxi-ccu: Add compatible string for A83T CCU
clk: sunxi-ng: Support multiple variable pre-dividers
clk: sunxi-ng: Add driver for A83T CCU
clk: sunxi-ng: a83t: Fix PLL lock status register offset
clk: sunxi-ng: a83t: Fix audio PLL divider offset
dt-bindings: clock: sunxi-ccu: Add compatible string for A83T PRCM
clk: sunxi-ng: a83t: Add support for A83T's PRCM
Icenowy Zheng (2):
dt-bindings: add binding for the Allwinner DE2 CCU
clk: sunxi-ng: add support for DE2 CCU
Maxime Ripard (8):
clk: divider: Make divider_round_rate take the parent clock
clk: sunxi-ng: Pass the parent and a pointer to the clocks round rate
clk: sunxi-ng: div: Switch to divider_round_rate
clk: sunxi-ng: mux: Don't just rely on the parent for CLK_SET_RATE_PARENT
clk: sunxi-ng: mux: split out the pre-divider computation code
clk: sunxi-ng: mux: Change pre-divider application function prototype
clk: sunxi-ng: mux: Re-adjust parent rate
clk: sunxi-ng: sun5i: Export video PLLs
Stephen Boyd (1):
clk: sunxi-ng: Move all clock types to a library
Tobias Klauser (1):
clk: sunxi-ng: explicitly include linux/spinlock.h
Wei Yongjun (1):
clk: sunxi-ng: de2: fix wrong pointer passed to PTR_ERR()
.../devicetree/bindings/clock/sun8i-de2.txt | 31 +
.../devicetree/bindings/clock/sunxi-ccu.txt | 5 +-
drivers/clk/clk-divider.c | 19 +-
drivers/clk/sunxi-ng/Kconfig | 116 +--
drivers/clk/sunxi-ng/Makefile | 37 +-
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 10 +-
drivers/clk/sunxi-ng/ccu-sun5i.h | 6 +-
drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 10 +-
drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 10 +-
drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 10 +-
drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 922 +++++++++++++++++++++
drivers/clk/sunxi-ng/ccu-sun8i-a83t.h | 64 ++
drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 260 ++++++
drivers/clk/sunxi-ng/ccu-sun8i-de2.h | 28 +
drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 10 +-
drivers/clk/sunxi-ng/ccu-sun8i-r.c | 117 ++-
drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 10 +-
drivers/clk/sunxi-ng/ccu_div.c | 38 +-
drivers/clk/sunxi-ng/ccu_mp.c | 15 +-
drivers/clk/sunxi-ng/ccu_mult.c | 19 +-
drivers/clk/sunxi-ng/ccu_mux.c | 108 ++-
drivers/clk/sunxi-ng/ccu_mux.h | 24 +-
drivers/clk/sunxi-ng/ccu_nkm.c | 7 +-
drivers/clk/sunxi-ng/ccu_reset.h | 1 +
include/dt-bindings/clock/sun5i-ccu.h | 3 +
include/dt-bindings/clock/sun8i-a83t-ccu.h | 140 ++++
include/dt-bindings/clock/sun8i-de2.h | 18 +
include/dt-bindings/reset/sun8i-a83t-ccu.h | 98 +++
include/dt-bindings/reset/sun8i-de2.h | 14 +
include/linux/clk-provider.h | 16 +-
30 files changed, 1893 insertions(+), 273 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/sun8i-de2.txt
create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a83t.c
create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a83t.h
create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-de2.c
create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-de2.h
create mode 100644 include/dt-bindings/clock/sun8i-a83t-ccu.h
create mode 100644 include/dt-bindings/clock/sun8i-de2.h
create mode 100644 include/dt-bindings/reset/sun8i-a83t-ccu.h
create mode 100644 include/dt-bindings/reset/sun8i-de2.h
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170614/2a1b7c1e/attachment-0001.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL] Allwinner clock changes for 4.13
2017-06-14 19:26 [GIT PULL] Allwinner clock changes for 4.13 Maxime Ripard
@ 2017-06-16 21:50 ` Stephen Boyd
2017-06-20 6:30 ` Maxime Ripard
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Boyd @ 2017-06-16 21:50 UTC (permalink / raw)
To: linux-arm-kernel
On 06/14, Maxime Ripard wrote:
> Hi Mike, Stephen,
>
> Here is the patches for 4.13 for the Allwinner SoCs.
>
> In order to reduce the conflicts, this is based on the fixes tag I
> sent a PR for a few minutes ago.
>
Thanks. Pulled into clk-next. I did notice on new sparse warning
though for which I've applied this diff on top:
diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c
index cfe4538304fb..312664155a54 100644
--- a/drivers/clk/sunxi-ng/ccu_mux.c
+++ b/drivers/clk/sunxi-ng/ccu_mux.c
@@ -68,7 +68,7 @@ unsigned long ccu_mux_helper_apply_prediv(struct ccu_common *common,
return parent_rate / ccu_mux_get_prediv(common, cm, parent_index);
}
-unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common,
+static unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common,
struct ccu_mux_internal *cm,
int parent_index,
unsigned long parent_rate)
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [GIT PULL] Allwinner clock changes for 4.13
2017-06-16 21:50 ` Stephen Boyd
@ 2017-06-20 6:30 ` Maxime Ripard
0 siblings, 0 replies; 3+ messages in thread
From: Maxime Ripard @ 2017-06-20 6:30 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jun 16, 2017 at 02:50:36PM -0700, Stephen Boyd wrote:
> On 06/14, Maxime Ripard wrote:
> > Hi Mike, Stephen,
> >
> > Here is the patches for 4.13 for the Allwinner SoCs.
> >
> > In order to reduce the conflicts, this is based on the fixes tag I
> > sent a PR for a few minutes ago.
> >
>
> Thanks. Pulled into clk-next. I did notice on new sparse warning
> though for which I've applied this diff on top:
>
> diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c
> index cfe4538304fb..312664155a54 100644
> --- a/drivers/clk/sunxi-ng/ccu_mux.c
> +++ b/drivers/clk/sunxi-ng/ccu_mux.c
> @@ -68,7 +68,7 @@ unsigned long ccu_mux_helper_apply_prediv(struct ccu_common *common,
> return parent_rate / ccu_mux_get_prediv(common, cm, parent_index);
> }
>
> -unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common,
> +static unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common,
> struct ccu_mux_internal *cm,
> int parent_index,
> unsigned long parent_rate)
Seems good, thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170620/1891e26f/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-20 6:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-14 19:26 [GIT PULL] Allwinner clock changes for 4.13 Maxime Ripard
2017-06-16 21:50 ` Stephen Boyd
2017-06-20 6:30 ` Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).