From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752874AbbEQLuL (ORCPT ); Sun, 17 May 2015 07:50:11 -0400 Received: from down.free-electrons.com ([37.187.137.238]:34551 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752753AbbEQLuE (ORCPT ); Sun, 17 May 2015 07:50:04 -0400 Date: Fri, 15 May 2015 14:49:34 +0200 From: Maxime Ripard To: Chen-Yu Tsai Cc: Jens Kuske , Emilio =?iso-8859-1?Q?L=F3pez?= , Mike Turquette , Linus Walleij , Rob Herring , devicetree , linux-arm-kernel , linux-kernel , linux-sunxi Subject: Re: [PATCH 2/6] clk: sunxi: Add H3 clocks support Message-ID: <20150515124934.GV4004@lukather> References: <1430904693-1404-1-git-send-email-jenskuske@gmail.com> <1430904693-1404-3-git-send-email-jenskuske@gmail.com> <20150509112718.GT11057@lukather> <554F38FA.2030005@gmail.com> <20150512144428.GL10961@lukather> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="xMJbWctQEcNQiBqK" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --xMJbWctQEcNQiBqK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 14, 2015 at 01:14:25PM +0800, Chen-Yu Tsai wrote: > On Tue, May 12, 2015 at 10:44 PM, Maxime Ripard > wrote: > > Hi, > > > > On Sun, May 10, 2015 at 12:54:50PM +0200, Jens Kuske wrote: > >> On 09/05/15 13:27, Maxime Ripard wrote: > >> > On Wed, May 06, 2015 at 11:31:29AM +0200, Jens Kuske wrote: > >> >> The H3 clock control unit is similar to the those of other sun8i fa= mily > >> >> members like the A23. > >> >> > >> >> The AHB1 gates got split up into AHB1 and AHB2, with AHB2 clock sou= rce > >> >> being muxable between AHB1 and PLL6/2, but still sharing gate regis= ters. > >> >> The documentation isn't totally clear about which devices belong to > >> >> AHB2 now, especially USB EHIC/OHIC, so it is mostly based on Allwin= ner > >> >> kernel source code. > >> >> > >> >> Signed-off-by: Jens Kuske > >> >> --- > >> >> Documentation/devicetree/bindings/clock/sunxi.txt | 7 ++++ > >> >> drivers/clk/sunxi/clk-sunxi.c | 46 +++++++++++= +++++++++++- > >> >> 2 files changed, 52 insertions(+), 1 deletion(-) > >> >> > >> >> diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Do= cumentation/devicetree/bindings/clock/sunxi.txt > >> >> index 4fa11af..4eeb893 100644 > >> >> --- a/Documentation/devicetree/bindings/clock/sunxi.txt > >> >> +++ b/Documentation/devicetree/bindings/clock/sunxi.txt > >> >> @@ -14,6 +14,8 @@ Required properties: > >> >> "allwinner,sun4i-a10-pll5-clk" - for the PLL5 clock > >> >> "allwinner,sun4i-a10-pll6-clk" - for the PLL6 clock > >> >> "allwinner,sun6i-a31-pll6-clk" - for the PLL6 clock on A31 > >> >> + "allwinner,sun8i-h3-pll6-clk" - for the PLL6 clock on H3 > >> >> + "allwinner,sun8i-h3-pll8-clk" - for the PLL8 clock on H3 > >> >> "allwinner,sun9i-a80-gt-clk" - for the GT bus clock on A80 > >> >> "allwinner,sun4i-a10-cpu-clk" - for the CPU multiplexer clock > >> >> "allwinner,sun4i-a10-axi-clk" - for the AXI clock > >> >> @@ -28,8 +30,11 @@ Required properties: > >> >> "allwinner,sun7i-a20-ahb-gates-clk" - for the AHB gates on A20 > >> >> "allwinner,sun6i-a31-ar100-clk" - for the AR100 on A31 > >> >> "allwinner,sun6i-a31-ahb1-clk" - for the AHB1 clock on A31 > >> >> + "allwinner,sun8i-h3-ahb2-clk" - for the AHB2 clock on H3 > >> >> "allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31 > >> >> "allwinner,sun8i-a23-ahb1-gates-clk" - for the AHB1 gates on A23 > >> >> + "allwinner,sun8i-h3-ahb1-gates-clk" - for the AHB1 gates on H3 > >> >> + "allwinner,sun8i-h3-ahb2-gates-clk" - for the AHB2 gates on H3 > >> >> "allwinner,sun9i-a80-ahb0-gates-clk" - for the AHB0 gates on A80 > >> >> "allwinner,sun9i-a80-ahb1-gates-clk" - for the AHB1 gates on A80 > >> >> "allwinner,sun9i-a80-ahb2-gates-clk" - for the AHB2 gates on A80 > >> >> @@ -52,8 +57,10 @@ Required properties: > >> >> "allwinner,sun6i-a31-apb1-gates-clk" - for the APB1 gates on A31 > >> >> "allwinner,sun7i-a20-apb1-gates-clk" - for the APB1 gates on A20 > >> >> "allwinner,sun8i-a23-apb1-gates-clk" - for the APB1 gates on A23 > >> >> + "allwinner,sun8i-h3-apb1-gates-clk" - for the APB1 gates on H3 > >> >> "allwinner,sun9i-a80-apb1-gates-clk" - for the APB1 gates on A80 > >> >> "allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31 > >> >> + "allwinner,sun8i-h3-apb2-gates-clk" - for the APB2 gates on H3 > >> >> "allwinner,sun8i-a23-apb2-gates-clk" - for the APB2 gates on A23 > >> >> "allwinner,sun5i-a13-mbus-clk" - for the MBUS clock on A13 > >> >> "allwinner,sun4i-a10-mmc-clk" - for the MMC clock > >> >> diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-= sunxi.c > >> >> index 7e1e2bd..152a1f7 100644 > >> >> --- a/drivers/clk/sunxi/clk-sunxi.c > >> >> +++ b/drivers/clk/sunxi/clk-sunxi.c > >> >> @@ -727,6 +727,12 @@ static const struct factors_data sun5i_a13_ahb= _data __initconst =3D { > >> >> .getter =3D sun5i_a13_get_ahb_factors, > >> >> }; > >> >> > >> >> +static const struct factors_data sun8i_h3_pll8_data __initconst = =3D { > >> >> + .enable =3D 31, > >> >> + .table =3D &sun6i_a31_pll6_config, > >> >> + .getter =3D sun6i_a31_get_pll6_factors, > >> >> +}; > >> > > >> > This looks like it's just another instance of the A31 pll6. > >> > > >> > In such a case, we don't need to declare a new driver, just reuse the > >> > same compatible. > >> > >> If I reuse pll6 for pll8 I get errors because of the .name =3D "pll6x2" > >> field, already existing clock or something like that. > > > > Damn. You're obviously right... >=20 > I think I have a solution for this. >=20 > The current divs clock setup just passes the factors_data directly to > sunxi_factors_register(). What if it did a copy, read the _correct_ > name from the DT (since it knows the index) and put it in the copy. >=20 > How does that sound? That sounds great, but what name would you take from the DT? The first of clock-output-names? the last one? a random one? >=20 > > Could you add a TODO comment on top then? just so that we know that we > > need to merge this clock with pll6? > > > >> (And pll8 doesn't even have a x2 version) > > > > Judging by the H3 datasheet, it does. > > > >> >> static const struct factors_data sun4i_apb1_data __initconst =3D { > >> >> .mux =3D 24, > >> >> .muxmask =3D BIT(1) | BIT(0), > >> >> @@ -777,6 +783,10 @@ static const struct mux_data sun6i_a31_ahb1_mu= x_data __initconst =3D { > >> >> .shift =3D 12, > >> >> }; > >> >> > >> >> +static const struct mux_data sun8i_h3_ahb2_mux_data __initconst = =3D { > >> >> + .shift =3D 0, > >> >> +}; > >> >> + > >> >> static void __init sunxi_mux_clk_setup(struct device_node *node, > >> >> struct mux_data *data) > >> >> { > >> >> @@ -892,7 +902,7 @@ static void __init sunxi_divider_clk_setup(stru= ct device_node *node, > >> >> * sunxi_gates_clk_setup() - Setup function for leaf gates on cloc= ks > >> >> */ > >> >> > >> >> -#define SUNXI_GATES_MAX_SIZE 64 > >> >> +#define SUNXI_GATES_MAX_SIZE 160 > >> >> > >> >> struct gates_data { > >> >> DECLARE_BITMAP(mask, SUNXI_GATES_MAX_SIZE); > >> >> @@ -926,6 +936,10 @@ static const struct gates_data sun8i_a23_ahb1_= gates_data __initconst =3D { > >> >> .mask =3D {0x25386742, 0x2505111}, > >> >> }; > >> >> > >> >> +static const struct gates_data sun8i_h3_ahb1_gates_data __initcons= t =3D { > >> >> + .mask =3D {0x1fbc6760, 0x00701b39, 0x00000000, 0x00000000, 0x000= 00081}, > >> >> +}; > >> >> + > >> > > >> > Judging from the user manual, there's a few gates in those 0 > >> > registers, is this normal that you don't support them? > >> > >> They are holes for apb1 and apb2. Which is actually pretty ugly. > > > > Ah, right. > > > > So I guess it's completely related to the discussion below. >=20 > If the holes are really big, I guess you could split ahb and apb? It's actually already split. The holes in the ahb1 registers are for the apb clocks. Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com --xMJbWctQEcNQiBqK Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVVeteAAoJEBx+YmzsjxAgzOMQAIKD7w4tY9OcN8wj4WnlwDD8 okQYG8/HsxvKJLsrQ8mlwZCLR//xuPglWW/xPHjqMSHqvHER1iTod0WK9iU/uUJy 5VDLF8rzTGK6gOJ+qN5DPoBHA58SReYd+vJdg2I5jqX87uXu8OIvKyx/6IWjQ/MS OrdKytShxSIsUoqmrzqtGZqRoJUtGYejxGcThUXAB0reMNE2jzL9Onv9fB7IO1D/ 8tv/khMvx3cv7tpK7WOlDf877/Jrgj5ql9sjbzJ8IFTv/YOEcRfevaj+KyZ6PHXQ 5bYI3T+PNyq7Fac8PTojmuZfVP1vzh4oX5JbFDlNHShrBKkACBk0dv2O6/y90avP lUBH4yxlLvkBxvHHMvpoaBypj6OldQ6A4EDUHKnUfh7ImwbBOEhvr1uNvKp3rUs7 ga3viMf6Thi/TRtxwC9ctpfvrqY15FSNVUovL5dePZ14VF9cctuWcQWZhEANmTvu ZueVKP+wNIesjikKFg/xc2a/3c0V/1ZZCQuuGSuLNLBp9OiZZI4Pj9CJ7W2OGisu 5y2nCD6SVXi7LtRmSS67Y1QuJqQ/YeeBTzxpzmB9N6JSn+gqh8HwLbbC1Rdeee9h 0NKaCX277/hdLT0v2zGdfj5+wa+r40nnOzj1N9QvcccEu+gUXxgDKtFpARzIYFj0 eeeOFdSDOqthbAzJk7og =x+rl -----END PGP SIGNATURE----- --xMJbWctQEcNQiBqK-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: Re: [PATCH 2/6] clk: sunxi: Add H3 clocks support Date: Fri, 15 May 2015 14:49:34 +0200 Message-ID: <20150515124934.GV4004@lukather> References: <1430904693-1404-1-git-send-email-jenskuske@gmail.com> <1430904693-1404-3-git-send-email-jenskuske@gmail.com> <20150509112718.GT11057@lukather> <554F38FA.2030005@gmail.com> <20150512144428.GL10961@lukather> Reply-To: maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="xMJbWctQEcNQiBqK" Return-path: Content-Disposition: inline In-Reply-To: List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: Chen-Yu Tsai Cc: Jens Kuske , Emilio =?iso-8859-1?Q?L=F3pez?= , Mike Turquette , Linus Walleij , Rob Herring , devicetree , linux-arm-kernel , linux-kernel , linux-sunxi List-Id: devicetree@vger.kernel.org --xMJbWctQEcNQiBqK Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline On Thu, May 14, 2015 at 01:14:25PM +0800, Chen-Yu Tsai wrote: > On Tue, May 12, 2015 at 10:44 PM, Maxime Ripard > wrote: > > Hi, > > > > On Sun, May 10, 2015 at 12:54:50PM +0200, Jens Kuske wrote: > >> On 09/05/15 13:27, Maxime Ripard wrote: > >> > On Wed, May 06, 2015 at 11:31:29AM +0200, Jens Kuske wrote: > >> >> The H3 clock control unit is similar to the those of other sun8i family > >> >> members like the A23. > >> >> > >> >> The AHB1 gates got split up into AHB1 and AHB2, with AHB2 clock source > >> >> being muxable between AHB1 and PLL6/2, but still sharing gate registers. > >> >> The documentation isn't totally clear about which devices belong to > >> >> AHB2 now, especially USB EHIC/OHIC, so it is mostly based on Allwinner > >> >> kernel source code. > >> >> > >> >> Signed-off-by: Jens Kuske > >> >> --- > >> >> Documentation/devicetree/bindings/clock/sunxi.txt | 7 ++++ > >> >> drivers/clk/sunxi/clk-sunxi.c | 46 ++++++++++++++++++++++- > >> >> 2 files changed, 52 insertions(+), 1 deletion(-) > >> >> > >> >> diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt > >> >> index 4fa11af..4eeb893 100644 > >> >> --- a/Documentation/devicetree/bindings/clock/sunxi.txt > >> >> +++ b/Documentation/devicetree/bindings/clock/sunxi.txt > >> >> @@ -14,6 +14,8 @@ Required properties: > >> >> "allwinner,sun4i-a10-pll5-clk" - for the PLL5 clock > >> >> "allwinner,sun4i-a10-pll6-clk" - for the PLL6 clock > >> >> "allwinner,sun6i-a31-pll6-clk" - for the PLL6 clock on A31 > >> >> + "allwinner,sun8i-h3-pll6-clk" - for the PLL6 clock on H3 > >> >> + "allwinner,sun8i-h3-pll8-clk" - for the PLL8 clock on H3 > >> >> "allwinner,sun9i-a80-gt-clk" - for the GT bus clock on A80 > >> >> "allwinner,sun4i-a10-cpu-clk" - for the CPU multiplexer clock > >> >> "allwinner,sun4i-a10-axi-clk" - for the AXI clock > >> >> @@ -28,8 +30,11 @@ Required properties: > >> >> "allwinner,sun7i-a20-ahb-gates-clk" - for the AHB gates on A20 > >> >> "allwinner,sun6i-a31-ar100-clk" - for the AR100 on A31 > >> >> "allwinner,sun6i-a31-ahb1-clk" - for the AHB1 clock on A31 > >> >> + "allwinner,sun8i-h3-ahb2-clk" - for the AHB2 clock on H3 > >> >> "allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31 > >> >> "allwinner,sun8i-a23-ahb1-gates-clk" - for the AHB1 gates on A23 > >> >> + "allwinner,sun8i-h3-ahb1-gates-clk" - for the AHB1 gates on H3 > >> >> + "allwinner,sun8i-h3-ahb2-gates-clk" - for the AHB2 gates on H3 > >> >> "allwinner,sun9i-a80-ahb0-gates-clk" - for the AHB0 gates on A80 > >> >> "allwinner,sun9i-a80-ahb1-gates-clk" - for the AHB1 gates on A80 > >> >> "allwinner,sun9i-a80-ahb2-gates-clk" - for the AHB2 gates on A80 > >> >> @@ -52,8 +57,10 @@ Required properties: > >> >> "allwinner,sun6i-a31-apb1-gates-clk" - for the APB1 gates on A31 > >> >> "allwinner,sun7i-a20-apb1-gates-clk" - for the APB1 gates on A20 > >> >> "allwinner,sun8i-a23-apb1-gates-clk" - for the APB1 gates on A23 > >> >> + "allwinner,sun8i-h3-apb1-gates-clk" - for the APB1 gates on H3 > >> >> "allwinner,sun9i-a80-apb1-gates-clk" - for the APB1 gates on A80 > >> >> "allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31 > >> >> + "allwinner,sun8i-h3-apb2-gates-clk" - for the APB2 gates on H3 > >> >> "allwinner,sun8i-a23-apb2-gates-clk" - for the APB2 gates on A23 > >> >> "allwinner,sun5i-a13-mbus-clk" - for the MBUS clock on A13 > >> >> "allwinner,sun4i-a10-mmc-clk" - for the MMC clock > >> >> diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c > >> >> index 7e1e2bd..152a1f7 100644 > >> >> --- a/drivers/clk/sunxi/clk-sunxi.c > >> >> +++ b/drivers/clk/sunxi/clk-sunxi.c > >> >> @@ -727,6 +727,12 @@ static const struct factors_data sun5i_a13_ahb_data __initconst = { > >> >> .getter = sun5i_a13_get_ahb_factors, > >> >> }; > >> >> > >> >> +static const struct factors_data sun8i_h3_pll8_data __initconst = { > >> >> + .enable = 31, > >> >> + .table = &sun6i_a31_pll6_config, > >> >> + .getter = sun6i_a31_get_pll6_factors, > >> >> +}; > >> > > >> > This looks like it's just another instance of the A31 pll6. > >> > > >> > In such a case, we don't need to declare a new driver, just reuse the > >> > same compatible. > >> > >> If I reuse pll6 for pll8 I get errors because of the .name = "pll6x2" > >> field, already existing clock or something like that. > > > > Damn. You're obviously right... > > I think I have a solution for this. > > The current divs clock setup just passes the factors_data directly to > sunxi_factors_register(). What if it did a copy, read the _correct_ > name from the DT (since it knows the index) and put it in the copy. > > How does that sound? That sounds great, but what name would you take from the DT? The first of clock-output-names? the last one? a random one? > > > Could you add a TODO comment on top then? just so that we know that we > > need to merge this clock with pll6? > > > >> (And pll8 doesn't even have a x2 version) > > > > Judging by the H3 datasheet, it does. > > > >> >> static const struct factors_data sun4i_apb1_data __initconst = { > >> >> .mux = 24, > >> >> .muxmask = BIT(1) | BIT(0), > >> >> @@ -777,6 +783,10 @@ static const struct mux_data sun6i_a31_ahb1_mux_data __initconst = { > >> >> .shift = 12, > >> >> }; > >> >> > >> >> +static const struct mux_data sun8i_h3_ahb2_mux_data __initconst = { > >> >> + .shift = 0, > >> >> +}; > >> >> + > >> >> static void __init sunxi_mux_clk_setup(struct device_node *node, > >> >> struct mux_data *data) > >> >> { > >> >> @@ -892,7 +902,7 @@ static void __init sunxi_divider_clk_setup(struct device_node *node, > >> >> * sunxi_gates_clk_setup() - Setup function for leaf gates on clocks > >> >> */ > >> >> > >> >> -#define SUNXI_GATES_MAX_SIZE 64 > >> >> +#define SUNXI_GATES_MAX_SIZE 160 > >> >> > >> >> struct gates_data { > >> >> DECLARE_BITMAP(mask, SUNXI_GATES_MAX_SIZE); > >> >> @@ -926,6 +936,10 @@ static const struct gates_data sun8i_a23_ahb1_gates_data __initconst = { > >> >> .mask = {0x25386742, 0x2505111}, > >> >> }; > >> >> > >> >> +static const struct gates_data sun8i_h3_ahb1_gates_data __initconst = { > >> >> + .mask = {0x1fbc6760, 0x00701b39, 0x00000000, 0x00000000, 0x00000081}, > >> >> +}; > >> >> + > >> > > >> > Judging from the user manual, there's a few gates in those 0 > >> > registers, is this normal that you don't support them? > >> > >> They are holes for apb1 and apb2. Which is actually pretty ugly. > > > > Ah, right. > > > > So I guess it's completely related to the discussion below. > > If the holes are really big, I guess you could split ahb and apb? It's actually already split. The holes in the ahb1 registers are for the apb clocks. Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com --xMJbWctQEcNQiBqK-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@free-electrons.com (Maxime Ripard) Date: Fri, 15 May 2015 14:49:34 +0200 Subject: [PATCH 2/6] clk: sunxi: Add H3 clocks support In-Reply-To: References: <1430904693-1404-1-git-send-email-jenskuske@gmail.com> <1430904693-1404-3-git-send-email-jenskuske@gmail.com> <20150509112718.GT11057@lukather> <554F38FA.2030005@gmail.com> <20150512144428.GL10961@lukather> Message-ID: <20150515124934.GV4004@lukather> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, May 14, 2015 at 01:14:25PM +0800, Chen-Yu Tsai wrote: > On Tue, May 12, 2015 at 10:44 PM, Maxime Ripard > wrote: > > Hi, > > > > On Sun, May 10, 2015 at 12:54:50PM +0200, Jens Kuske wrote: > >> On 09/05/15 13:27, Maxime Ripard wrote: > >> > On Wed, May 06, 2015 at 11:31:29AM +0200, Jens Kuske wrote: > >> >> The H3 clock control unit is similar to the those of other sun8i family > >> >> members like the A23. > >> >> > >> >> The AHB1 gates got split up into AHB1 and AHB2, with AHB2 clock source > >> >> being muxable between AHB1 and PLL6/2, but still sharing gate registers. > >> >> The documentation isn't totally clear about which devices belong to > >> >> AHB2 now, especially USB EHIC/OHIC, so it is mostly based on Allwinner > >> >> kernel source code. > >> >> > >> >> Signed-off-by: Jens Kuske > >> >> --- > >> >> Documentation/devicetree/bindings/clock/sunxi.txt | 7 ++++ > >> >> drivers/clk/sunxi/clk-sunxi.c | 46 ++++++++++++++++++++++- > >> >> 2 files changed, 52 insertions(+), 1 deletion(-) > >> >> > >> >> diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt > >> >> index 4fa11af..4eeb893 100644 > >> >> --- a/Documentation/devicetree/bindings/clock/sunxi.txt > >> >> +++ b/Documentation/devicetree/bindings/clock/sunxi.txt > >> >> @@ -14,6 +14,8 @@ Required properties: > >> >> "allwinner,sun4i-a10-pll5-clk" - for the PLL5 clock > >> >> "allwinner,sun4i-a10-pll6-clk" - for the PLL6 clock > >> >> "allwinner,sun6i-a31-pll6-clk" - for the PLL6 clock on A31 > >> >> + "allwinner,sun8i-h3-pll6-clk" - for the PLL6 clock on H3 > >> >> + "allwinner,sun8i-h3-pll8-clk" - for the PLL8 clock on H3 > >> >> "allwinner,sun9i-a80-gt-clk" - for the GT bus clock on A80 > >> >> "allwinner,sun4i-a10-cpu-clk" - for the CPU multiplexer clock > >> >> "allwinner,sun4i-a10-axi-clk" - for the AXI clock > >> >> @@ -28,8 +30,11 @@ Required properties: > >> >> "allwinner,sun7i-a20-ahb-gates-clk" - for the AHB gates on A20 > >> >> "allwinner,sun6i-a31-ar100-clk" - for the AR100 on A31 > >> >> "allwinner,sun6i-a31-ahb1-clk" - for the AHB1 clock on A31 > >> >> + "allwinner,sun8i-h3-ahb2-clk" - for the AHB2 clock on H3 > >> >> "allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31 > >> >> "allwinner,sun8i-a23-ahb1-gates-clk" - for the AHB1 gates on A23 > >> >> + "allwinner,sun8i-h3-ahb1-gates-clk" - for the AHB1 gates on H3 > >> >> + "allwinner,sun8i-h3-ahb2-gates-clk" - for the AHB2 gates on H3 > >> >> "allwinner,sun9i-a80-ahb0-gates-clk" - for the AHB0 gates on A80 > >> >> "allwinner,sun9i-a80-ahb1-gates-clk" - for the AHB1 gates on A80 > >> >> "allwinner,sun9i-a80-ahb2-gates-clk" - for the AHB2 gates on A80 > >> >> @@ -52,8 +57,10 @@ Required properties: > >> >> "allwinner,sun6i-a31-apb1-gates-clk" - for the APB1 gates on A31 > >> >> "allwinner,sun7i-a20-apb1-gates-clk" - for the APB1 gates on A20 > >> >> "allwinner,sun8i-a23-apb1-gates-clk" - for the APB1 gates on A23 > >> >> + "allwinner,sun8i-h3-apb1-gates-clk" - for the APB1 gates on H3 > >> >> "allwinner,sun9i-a80-apb1-gates-clk" - for the APB1 gates on A80 > >> >> "allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31 > >> >> + "allwinner,sun8i-h3-apb2-gates-clk" - for the APB2 gates on H3 > >> >> "allwinner,sun8i-a23-apb2-gates-clk" - for the APB2 gates on A23 > >> >> "allwinner,sun5i-a13-mbus-clk" - for the MBUS clock on A13 > >> >> "allwinner,sun4i-a10-mmc-clk" - for the MMC clock > >> >> diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c > >> >> index 7e1e2bd..152a1f7 100644 > >> >> --- a/drivers/clk/sunxi/clk-sunxi.c > >> >> +++ b/drivers/clk/sunxi/clk-sunxi.c > >> >> @@ -727,6 +727,12 @@ static const struct factors_data sun5i_a13_ahb_data __initconst = { > >> >> .getter = sun5i_a13_get_ahb_factors, > >> >> }; > >> >> > >> >> +static const struct factors_data sun8i_h3_pll8_data __initconst = { > >> >> + .enable = 31, > >> >> + .table = &sun6i_a31_pll6_config, > >> >> + .getter = sun6i_a31_get_pll6_factors, > >> >> +}; > >> > > >> > This looks like it's just another instance of the A31 pll6. > >> > > >> > In such a case, we don't need to declare a new driver, just reuse the > >> > same compatible. > >> > >> If I reuse pll6 for pll8 I get errors because of the .name = "pll6x2" > >> field, already existing clock or something like that. > > > > Damn. You're obviously right... > > I think I have a solution for this. > > The current divs clock setup just passes the factors_data directly to > sunxi_factors_register(). What if it did a copy, read the _correct_ > name from the DT (since it knows the index) and put it in the copy. > > How does that sound? That sounds great, but what name would you take from the DT? The first of clock-output-names? the last one? a random one? > > > Could you add a TODO comment on top then? just so that we know that we > > need to merge this clock with pll6? > > > >> (And pll8 doesn't even have a x2 version) > > > > Judging by the H3 datasheet, it does. > > > >> >> static const struct factors_data sun4i_apb1_data __initconst = { > >> >> .mux = 24, > >> >> .muxmask = BIT(1) | BIT(0), > >> >> @@ -777,6 +783,10 @@ static const struct mux_data sun6i_a31_ahb1_mux_data __initconst = { > >> >> .shift = 12, > >> >> }; > >> >> > >> >> +static const struct mux_data sun8i_h3_ahb2_mux_data __initconst = { > >> >> + .shift = 0, > >> >> +}; > >> >> + > >> >> static void __init sunxi_mux_clk_setup(struct device_node *node, > >> >> struct mux_data *data) > >> >> { > >> >> @@ -892,7 +902,7 @@ static void __init sunxi_divider_clk_setup(struct device_node *node, > >> >> * sunxi_gates_clk_setup() - Setup function for leaf gates on clocks > >> >> */ > >> >> > >> >> -#define SUNXI_GATES_MAX_SIZE 64 > >> >> +#define SUNXI_GATES_MAX_SIZE 160 > >> >> > >> >> struct gates_data { > >> >> DECLARE_BITMAP(mask, SUNXI_GATES_MAX_SIZE); > >> >> @@ -926,6 +936,10 @@ static const struct gates_data sun8i_a23_ahb1_gates_data __initconst = { > >> >> .mask = {0x25386742, 0x2505111}, > >> >> }; > >> >> > >> >> +static const struct gates_data sun8i_h3_ahb1_gates_data __initconst = { > >> >> + .mask = {0x1fbc6760, 0x00701b39, 0x00000000, 0x00000000, 0x00000081}, > >> >> +}; > >> >> + > >> > > >> > Judging from the user manual, there's a few gates in those 0 > >> > registers, is this normal that you don't support them? > >> > >> They are holes for apb1 and apb2. Which is actually pretty ugly. > > > > Ah, right. > > > > So I guess it's completely related to the discussion below. > > If the holes are really big, I guess you could split ahb and apb? It's actually already split. The holes in the ahb1 registers are for the apb clocks. Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: