* [PATCH v3 0/5] clk: uniphier: Introduce some clock features and NX1 support
@ 2021-10-12 0:53 Kunihiko Hayashi
2021-10-12 0:53 ` [PATCH v3 1/5] clk: uniphier: Add audio system and video input clock control for PXs3 Kunihiko Hayashi
` (4 more replies)
0 siblings, 5 replies; 13+ messages in thread
From: Kunihiko Hayashi @ 2021-10-12 0:53 UTC (permalink / raw)
To: Michael Turquette, Stephen Boyd, Rob Herring, Masami Hiramatsu
Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi
This series includes the patches to add audio/video clock control for PXs3,
SoC-glue clock source selector for Pro4, and basic clock controls for new
UniPhier NX1 SoC. NX1 SoC also has the same kinds of clock controls as the
other UniPhier SoCs.
---
Changes since v2:
- Remove SoC-glue binding example
Changes since v1:
- Fix dt-bindings to replace spaces from "\t"
Kunihiko Hayashi (5):
clk: uniphier: Add audio system and video input clock control for PXs3
dt-bindings: clock: uniphier: Add NX1 clock binding
clk: uniphier: Add NX1 clock support
dt-bindings: clock: uniphier: Add clock binding for SoC-glue
clk: uniphier: Add SoC-glue clock source selector support for Pro4
.../bindings/clock/socionext,uniphier-clock.yaml | 6 +++
drivers/clk/uniphier/clk-uniphier-core.c | 17 ++++++++
drivers/clk/uniphier/clk-uniphier-sys.c | 47 ++++++++++++++++++++++
drivers/clk/uniphier/clk-uniphier.h | 6 +++
4 files changed, 76 insertions(+)
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH v3 1/5] clk: uniphier: Add audio system and video input clock control for PXs3 2021-10-12 0:53 [PATCH v3 0/5] clk: uniphier: Introduce some clock features and NX1 support Kunihiko Hayashi @ 2021-10-12 0:53 ` Kunihiko Hayashi 2021-11-02 21:37 ` Stephen Boyd 2021-10-12 0:53 ` [PATCH v3 2/5] dt-bindings: clock: uniphier: Add NX1 clock binding Kunihiko Hayashi ` (3 subsequent siblings) 4 siblings, 1 reply; 13+ messages in thread From: Kunihiko Hayashi @ 2021-10-12 0:53 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd, Rob Herring, Masami Hiramatsu Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi Add clocks for audio subsystem (AIO) and video input subsystem (EXIV) on UniPhier PXs3 SoC. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- drivers/clk/uniphier/clk-uniphier-sys.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clk/uniphier/clk-uniphier-sys.c b/drivers/clk/uniphier/clk-uniphier-sys.c index 32b301724183..0ec28ebc39c2 100644 --- a/drivers/clk/uniphier/clk-uniphier-sys.c +++ b/drivers/clk/uniphier/clk-uniphier-sys.c @@ -288,6 +288,8 @@ const struct uniphier_clk_data uniphier_pxs3_sys_clk_data[] = { UNIPHIER_CLK_GATE("sata0", 28, NULL, 0x210c, 7), UNIPHIER_CLK_GATE("sata1", 29, NULL, 0x210c, 8), UNIPHIER_CLK_GATE("sata-phy", 30, NULL, 0x210c, 21), + UNIPHIER_LD11_SYS_CLK_AIO(40), + UNIPHIER_LD11_SYS_CLK_EXIV(42), /* CPU gears */ UNIPHIER_CLK_DIV4("cpll", 2, 3, 4, 8), UNIPHIER_CLK_DIV4("spll", 2, 3, 4, 8), -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v3 1/5] clk: uniphier: Add audio system and video input clock control for PXs3 2021-10-12 0:53 ` [PATCH v3 1/5] clk: uniphier: Add audio system and video input clock control for PXs3 Kunihiko Hayashi @ 2021-11-02 21:37 ` Stephen Boyd 0 siblings, 0 replies; 13+ messages in thread From: Stephen Boyd @ 2021-11-02 21:37 UTC (permalink / raw) To: Kunihiko Hayashi, Masami Hiramatsu, Michael Turquette, Rob Herring Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi Quoting Kunihiko Hayashi (2021-10-11 17:53:51) > Add clocks for audio subsystem (AIO) and video input subsystem (EXIV) on > UniPhier PXs3 SoC. > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- Applied to clk-next _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 2/5] dt-bindings: clock: uniphier: Add NX1 clock binding 2021-10-12 0:53 [PATCH v3 0/5] clk: uniphier: Introduce some clock features and NX1 support Kunihiko Hayashi 2021-10-12 0:53 ` [PATCH v3 1/5] clk: uniphier: Add audio system and video input clock control for PXs3 Kunihiko Hayashi @ 2021-10-12 0:53 ` Kunihiko Hayashi 2021-10-18 19:06 ` Rob Herring 2021-11-02 21:37 ` Stephen Boyd 2021-10-12 0:53 ` [PATCH v3 3/5] clk: uniphier: Add NX1 clock support Kunihiko Hayashi ` (2 subsequent siblings) 4 siblings, 2 replies; 13+ messages in thread From: Kunihiko Hayashi @ 2021-10-12 0:53 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd, Rob Herring, Masami Hiramatsu Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi Update clock binding document for UniPhier NX1 SoC. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml b/Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml index c3930edc410f..ee8d16a8019e 100644 --- a/Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml +++ b/Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml @@ -23,6 +23,7 @@ properties: - socionext,uniphier-ld11-clock - socionext,uniphier-ld20-clock - socionext,uniphier-pxs3-clock + - socionext,uniphier-nx1-clock - description: Media I/O (MIO) clock, SD clock enum: - socionext,uniphier-ld4-mio-clock @@ -33,6 +34,7 @@ properties: - socionext,uniphier-ld11-mio-clock - socionext,uniphier-ld20-sd-clock - socionext,uniphier-pxs3-sd-clock + - socionext,uniphier-nx1-sd-clock - description: Peripheral clock enum: - socionext,uniphier-ld4-peri-clock @@ -43,6 +45,7 @@ properties: - socionext,uniphier-ld11-peri-clock - socionext,uniphier-ld20-peri-clock - socionext,uniphier-pxs3-peri-clock + - socionext,uniphier-nx1-peri-clock "#clock-cells": const: 1 -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v3 2/5] dt-bindings: clock: uniphier: Add NX1 clock binding 2021-10-12 0:53 ` [PATCH v3 2/5] dt-bindings: clock: uniphier: Add NX1 clock binding Kunihiko Hayashi @ 2021-10-18 19:06 ` Rob Herring 2021-11-02 21:37 ` Stephen Boyd 1 sibling, 0 replies; 13+ messages in thread From: Rob Herring @ 2021-10-18 19:06 UTC (permalink / raw) To: Kunihiko Hayashi Cc: Rob Herring, linux-arm-kernel, devicetree, linux-clk, linux-kernel, Stephen Boyd, Masami Hiramatsu, Michael Turquette On Tue, 12 Oct 2021 09:53:52 +0900, Kunihiko Hayashi wrote: > Update clock binding document for UniPhier NX1 SoC. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- > Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml | 3 +++ > 1 file changed, 3 insertions(+) > Acked-by: Rob Herring <robh@kernel.org> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 2/5] dt-bindings: clock: uniphier: Add NX1 clock binding 2021-10-12 0:53 ` [PATCH v3 2/5] dt-bindings: clock: uniphier: Add NX1 clock binding Kunihiko Hayashi 2021-10-18 19:06 ` Rob Herring @ 2021-11-02 21:37 ` Stephen Boyd 1 sibling, 0 replies; 13+ messages in thread From: Stephen Boyd @ 2021-11-02 21:37 UTC (permalink / raw) To: Kunihiko Hayashi, Masami Hiramatsu, Michael Turquette, Rob Herring Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi Quoting Kunihiko Hayashi (2021-10-11 17:53:52) > Update clock binding document for UniPhier NX1 SoC. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- Applied to clk-next _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 3/5] clk: uniphier: Add NX1 clock support 2021-10-12 0:53 [PATCH v3 0/5] clk: uniphier: Introduce some clock features and NX1 support Kunihiko Hayashi 2021-10-12 0:53 ` [PATCH v3 1/5] clk: uniphier: Add audio system and video input clock control for PXs3 Kunihiko Hayashi 2021-10-12 0:53 ` [PATCH v3 2/5] dt-bindings: clock: uniphier: Add NX1 clock binding Kunihiko Hayashi @ 2021-10-12 0:53 ` Kunihiko Hayashi 2021-11-02 21:37 ` Stephen Boyd 2021-10-12 0:53 ` [PATCH v3 4/5] dt-bindings: clock: uniphier: Add clock binding for SoC-glue Kunihiko Hayashi 2021-10-12 0:53 ` [PATCH v3 5/5] clk: uniphier: Add SoC-glue clock source selector support for Pro4 Kunihiko Hayashi 4 siblings, 1 reply; 13+ messages in thread From: Kunihiko Hayashi @ 2021-10-12 0:53 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd, Rob Herring, Masami Hiramatsu Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi Add basic clock data for UniPhier NX1 SoC. This includes PLL and clock division data for cpufreq support. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- drivers/clk/uniphier/clk-uniphier-core.c | 12 ++++++++++++ drivers/clk/uniphier/clk-uniphier-sys.c | 28 ++++++++++++++++++++++++++++ drivers/clk/uniphier/clk-uniphier.h | 5 +++++ 3 files changed, 45 insertions(+) diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c index 12380236d7ab..0a947e757d13 100644 --- a/drivers/clk/uniphier/clk-uniphier-core.c +++ b/drivers/clk/uniphier/clk-uniphier-core.c @@ -132,6 +132,10 @@ static const struct of_device_id uniphier_clk_match[] = { .compatible = "socionext,uniphier-pxs3-clock", .data = uniphier_pxs3_sys_clk_data, }, + { + .compatible = "socionext,uniphier-nx1-clock", + .data = uniphier_nx1_sys_clk_data, + }, /* Media I/O clock, SD clock */ { .compatible = "socionext,uniphier-ld4-mio-clock", @@ -165,6 +169,10 @@ static const struct of_device_id uniphier_clk_match[] = { .compatible = "socionext,uniphier-pxs3-sd-clock", .data = uniphier_pro5_sd_clk_data, }, + { + .compatible = "socionext,uniphier-nx1-sd-clock", + .data = uniphier_pro5_sd_clk_data, + }, /* Peripheral clock */ { .compatible = "socionext,uniphier-ld4-peri-clock", @@ -198,6 +206,10 @@ static const struct of_device_id uniphier_clk_match[] = { .compatible = "socionext,uniphier-pxs3-peri-clock", .data = uniphier_pro4_peri_clk_data, }, + { + .compatible = "socionext,uniphier-nx1-peri-clock", + .data = uniphier_pro4_peri_clk_data, + }, { /* sentinel */ } }; diff --git a/drivers/clk/uniphier/clk-uniphier-sys.c b/drivers/clk/uniphier/clk-uniphier-sys.c index 0ec28ebc39c2..e8bf85cd2d30 100644 --- a/drivers/clk/uniphier/clk-uniphier-sys.c +++ b/drivers/clk/uniphier/clk-uniphier-sys.c @@ -20,6 +20,10 @@ UNIPHIER_CLK_FACTOR("sd-200m", -1, "spll", 1, 10), \ UNIPHIER_CLK_FACTOR("sd-133m", -1, "spll", 1, 15) +#define UNIPHIER_NX1_SYS_CLK_SD \ + UNIPHIER_CLK_FACTOR("sd-200m", -1, "spll", 1, 4), \ + UNIPHIER_CLK_FACTOR("sd-133m", -1, "spll", 1, 6) + #define UNIPHIER_LD4_SYS_CLK_NAND(idx) \ UNIPHIER_CLK_FACTOR("nand-50m", -1, "spll", 1, 32), \ UNIPHIER_CLK_GATE("nand", (idx), "nand-50m", 0x2104, 2) @@ -302,3 +306,27 @@ const struct uniphier_clk_data uniphier_pxs3_sys_clk_data[] = { "spll/4", "spll/8", "s2pll/4", "s2pll/8"), { /* sentinel */ } }; + +const struct uniphier_clk_data uniphier_nx1_sys_clk_data[] = { + UNIPHIER_CLK_FACTOR("cpll", -1, "ref", 100, 1), /* ARM: 2500 MHz */ + UNIPHIER_CLK_FACTOR("spll", -1, "ref", 32, 1), /* 800 MHz */ + UNIPHIER_CLK_FACTOR("uart", 0, "spll", 1, 6), + UNIPHIER_CLK_FACTOR("i2c", 1, "spll", 1, 16), + UNIPHIER_NX1_SYS_CLK_SD, + UNIPHIER_CLK_GATE("emmc", 4, NULL, 0x2108, 8), + UNIPHIER_CLK_GATE("ether", 6, NULL, 0x210c, 0), + UNIPHIER_CLK_GATE("usb30-0", 12, NULL, 0x210c, 16), /* =GIO */ + UNIPHIER_CLK_GATE("usb30-1", 13, NULL, 0x210c, 20), /* =GIO1P */ + UNIPHIER_CLK_GATE("usb30-hsphy0", 16, NULL, 0x210c, 24), + UNIPHIER_CLK_GATE("usb30-ssphy0", 17, NULL, 0x210c, 25), + UNIPHIER_CLK_GATE("usb30-ssphy1", 18, NULL, 0x210c, 26), + UNIPHIER_CLK_GATE("pcie", 24, NULL, 0x210c, 8), + UNIPHIER_CLK_GATE("voc", 52, NULL, 0x2110, 0), + UNIPHIER_CLK_GATE("hdmitx", 58, NULL, 0x2110, 8), + /* CPU gears */ + UNIPHIER_CLK_DIV5("cpll", 2, 4, 8, 16, 32), + UNIPHIER_CLK_CPUGEAR("cpu-ca53", 33, 0x8080, 0xf, 5, + "cpll/2", "cpll/4", "cpll/8", "cpll/16", + "cpll/32"), + { /* sentinel */ } +}; diff --git a/drivers/clk/uniphier/clk-uniphier.h b/drivers/clk/uniphier/clk-uniphier.h index 9e30362e55e1..c54fb7895889 100644 --- a/drivers/clk/uniphier/clk-uniphier.h +++ b/drivers/clk/uniphier/clk-uniphier.h @@ -119,6 +119,10 @@ struct uniphier_clk_data { UNIPHIER_CLK_DIV2(parent, div0, div1), \ UNIPHIER_CLK_DIV2(parent, div2, div3) +#define UNIPHIER_CLK_DIV5(parent, div0, div1, div2, div3, div4) \ + UNIPHIER_CLK_DIV4(parent, div0, div1, div2, div3), \ + UNIPHIER_CLK_DIV(parent, div4) + struct clk_hw *uniphier_clk_register_cpugear(struct device *dev, struct regmap *regmap, const char *name, @@ -146,6 +150,7 @@ extern const struct uniphier_clk_data uniphier_pxs2_sys_clk_data[]; extern const struct uniphier_clk_data uniphier_ld11_sys_clk_data[]; extern const struct uniphier_clk_data uniphier_ld20_sys_clk_data[]; extern const struct uniphier_clk_data uniphier_pxs3_sys_clk_data[]; +extern const struct uniphier_clk_data uniphier_nx1_sys_clk_data[]; extern const struct uniphier_clk_data uniphier_ld4_mio_clk_data[]; extern const struct uniphier_clk_data uniphier_pro5_sd_clk_data[]; extern const struct uniphier_clk_data uniphier_ld4_peri_clk_data[]; -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v3 3/5] clk: uniphier: Add NX1 clock support 2021-10-12 0:53 ` [PATCH v3 3/5] clk: uniphier: Add NX1 clock support Kunihiko Hayashi @ 2021-11-02 21:37 ` Stephen Boyd 0 siblings, 0 replies; 13+ messages in thread From: Stephen Boyd @ 2021-11-02 21:37 UTC (permalink / raw) To: Kunihiko Hayashi, Masami Hiramatsu, Michael Turquette, Rob Herring Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi Quoting Kunihiko Hayashi (2021-10-11 17:53:53) > Add basic clock data for UniPhier NX1 SoC. > This includes PLL and clock division data for cpufreq support. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- Applied to clk-next _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 4/5] dt-bindings: clock: uniphier: Add clock binding for SoC-glue 2021-10-12 0:53 [PATCH v3 0/5] clk: uniphier: Introduce some clock features and NX1 support Kunihiko Hayashi ` (2 preceding siblings ...) 2021-10-12 0:53 ` [PATCH v3 3/5] clk: uniphier: Add NX1 clock support Kunihiko Hayashi @ 2021-10-12 0:53 ` Kunihiko Hayashi 2021-10-18 19:06 ` Rob Herring 2021-11-02 21:37 ` Stephen Boyd 2021-10-12 0:53 ` [PATCH v3 5/5] clk: uniphier: Add SoC-glue clock source selector support for Pro4 Kunihiko Hayashi 4 siblings, 2 replies; 13+ messages in thread From: Kunihiko Hayashi @ 2021-10-12 0:53 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd, Rob Herring, Masami Hiramatsu Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi Update binding document for clocks implemented in SoC-glue. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml b/Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml index ee8d16a8019e..9a0cc7341630 100644 --- a/Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml +++ b/Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml @@ -46,6 +46,9 @@ properties: - socionext,uniphier-ld20-peri-clock - socionext,uniphier-pxs3-peri-clock - socionext,uniphier-nx1-peri-clock + - description: SoC-glue clock + enum: + - socionext,uniphier-pro4-sg-clock "#clock-cells": const: 1 -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v3 4/5] dt-bindings: clock: uniphier: Add clock binding for SoC-glue 2021-10-12 0:53 ` [PATCH v3 4/5] dt-bindings: clock: uniphier: Add clock binding for SoC-glue Kunihiko Hayashi @ 2021-10-18 19:06 ` Rob Herring 2021-11-02 21:37 ` Stephen Boyd 1 sibling, 0 replies; 13+ messages in thread From: Rob Herring @ 2021-10-18 19:06 UTC (permalink / raw) To: Kunihiko Hayashi Cc: Stephen Boyd, Rob Herring, linux-arm-kernel, devicetree, linux-kernel, Masami Hiramatsu, linux-clk, Michael Turquette On Tue, 12 Oct 2021 09:53:54 +0900, Kunihiko Hayashi wrote: > Update binding document for clocks implemented in SoC-glue. > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- > Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml | 3 +++ > 1 file changed, 3 insertions(+) > Acked-by: Rob Herring <robh@kernel.org> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 4/5] dt-bindings: clock: uniphier: Add clock binding for SoC-glue 2021-10-12 0:53 ` [PATCH v3 4/5] dt-bindings: clock: uniphier: Add clock binding for SoC-glue Kunihiko Hayashi 2021-10-18 19:06 ` Rob Herring @ 2021-11-02 21:37 ` Stephen Boyd 1 sibling, 0 replies; 13+ messages in thread From: Stephen Boyd @ 2021-11-02 21:37 UTC (permalink / raw) To: Kunihiko Hayashi, Masami Hiramatsu, Michael Turquette, Rob Herring Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi Quoting Kunihiko Hayashi (2021-10-11 17:53:54) > Update binding document for clocks implemented in SoC-glue. > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- Applied to clk-next _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 5/5] clk: uniphier: Add SoC-glue clock source selector support for Pro4 2021-10-12 0:53 [PATCH v3 0/5] clk: uniphier: Introduce some clock features and NX1 support Kunihiko Hayashi ` (3 preceding siblings ...) 2021-10-12 0:53 ` [PATCH v3 4/5] dt-bindings: clock: uniphier: Add clock binding for SoC-glue Kunihiko Hayashi @ 2021-10-12 0:53 ` Kunihiko Hayashi 2021-11-02 21:37 ` Stephen Boyd 4 siblings, 1 reply; 13+ messages in thread From: Kunihiko Hayashi @ 2021-10-12 0:53 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd, Rob Herring, Masami Hiramatsu Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi Add SoC-glue clock source selector for ahci controller on UniPhier SoCs. Currently this supports Pro4 only. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- drivers/clk/uniphier/clk-uniphier-core.c | 5 +++++ drivers/clk/uniphier/clk-uniphier-sys.c | 17 +++++++++++++++++ drivers/clk/uniphier/clk-uniphier.h | 1 + 3 files changed, 23 insertions(+) diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c index 0a947e757d13..46c66fac48e6 100644 --- a/drivers/clk/uniphier/clk-uniphier-core.c +++ b/drivers/clk/uniphier/clk-uniphier-core.c @@ -210,6 +210,11 @@ static const struct of_device_id uniphier_clk_match[] = { .compatible = "socionext,uniphier-nx1-peri-clock", .data = uniphier_pro4_peri_clk_data, }, + /* SoC-glue clock */ + { + .compatible = "socionext,uniphier-pro4-sg-clock", + .data = uniphier_pro4_sg_clk_data, + }, { /* sentinel */ } }; diff --git a/drivers/clk/uniphier/clk-uniphier-sys.c b/drivers/clk/uniphier/clk-uniphier-sys.c index e8bf85cd2d30..0180470b24db 100644 --- a/drivers/clk/uniphier/clk-uniphier-sys.c +++ b/drivers/clk/uniphier/clk-uniphier-sys.c @@ -330,3 +330,20 @@ const struct uniphier_clk_data uniphier_nx1_sys_clk_data[] = { "cpll/32"), { /* sentinel */ } }; + +const struct uniphier_clk_data uniphier_pro4_sg_clk_data[] = { + UNIPHIER_CLK_DIV("gpll", 4), + { + .name = "sata-ref", + .type = UNIPHIER_CLK_TYPE_MUX, + .idx = 0, + .data.mux = { + .parent_names = { "gpll/4", "ref", }, + .num_parents = 2, + .reg = 0x1a28, + .masks = { 0x1, 0x1, }, + .vals = { 0x0, 0x1, }, + }, + }, + { /* sentinel */ } +}; diff --git a/drivers/clk/uniphier/clk-uniphier.h b/drivers/clk/uniphier/clk-uniphier.h index c54fb7895889..dea0c7829aee 100644 --- a/drivers/clk/uniphier/clk-uniphier.h +++ b/drivers/clk/uniphier/clk-uniphier.h @@ -155,5 +155,6 @@ extern const struct uniphier_clk_data uniphier_ld4_mio_clk_data[]; extern const struct uniphier_clk_data uniphier_pro5_sd_clk_data[]; extern const struct uniphier_clk_data uniphier_ld4_peri_clk_data[]; extern const struct uniphier_clk_data uniphier_pro4_peri_clk_data[]; +extern const struct uniphier_clk_data uniphier_pro4_sg_clk_data[]; #endif /* __CLK_UNIPHIER_H__ */ -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v3 5/5] clk: uniphier: Add SoC-glue clock source selector support for Pro4 2021-10-12 0:53 ` [PATCH v3 5/5] clk: uniphier: Add SoC-glue clock source selector support for Pro4 Kunihiko Hayashi @ 2021-11-02 21:37 ` Stephen Boyd 0 siblings, 0 replies; 13+ messages in thread From: Stephen Boyd @ 2021-11-02 21:37 UTC (permalink / raw) To: Kunihiko Hayashi, Masami Hiramatsu, Michael Turquette, Rob Herring Cc: linux-clk, devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi Quoting Kunihiko Hayashi (2021-10-11 17:53:55) > Add SoC-glue clock source selector for ahci controller on UniPhier SoCs. > Currently this supports Pro4 only. > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- Applied to clk-next _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-11-02 21:39 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-10-12 0:53 [PATCH v3 0/5] clk: uniphier: Introduce some clock features and NX1 support Kunihiko Hayashi 2021-10-12 0:53 ` [PATCH v3 1/5] clk: uniphier: Add audio system and video input clock control for PXs3 Kunihiko Hayashi 2021-11-02 21:37 ` Stephen Boyd 2021-10-12 0:53 ` [PATCH v3 2/5] dt-bindings: clock: uniphier: Add NX1 clock binding Kunihiko Hayashi 2021-10-18 19:06 ` Rob Herring 2021-11-02 21:37 ` Stephen Boyd 2021-10-12 0:53 ` [PATCH v3 3/5] clk: uniphier: Add NX1 clock support Kunihiko Hayashi 2021-11-02 21:37 ` Stephen Boyd 2021-10-12 0:53 ` [PATCH v3 4/5] dt-bindings: clock: uniphier: Add clock binding for SoC-glue Kunihiko Hayashi 2021-10-18 19:06 ` Rob Herring 2021-11-02 21:37 ` Stephen Boyd 2021-10-12 0:53 ` [PATCH v3 5/5] clk: uniphier: Add SoC-glue clock source selector support for Pro4 Kunihiko Hayashi 2021-11-02 21:37 ` Stephen Boyd
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).