clk: sunxi: Unify sun4i apb1 clock
Subsystems (4)
cover clk: sunxi: Unify sun4i apb1 clock
(resent with linux-arm-kernel CCed)
Hi everyone,
This series unifies the apb1 clock driver for sun4i, which was previously split into apb1-mux and apb1. This also fixes the apb2 clock on sun6i/sun8i, which we now have documents for.
The first 2 patches were done by Emilio.
Patch 1 unifies the apb1-mux and apb1 clock drivers using a factors clock.
Patch 2 unifies said clocks in the dtsi.
Patch 3 switches the compatibles for apb2 clock on sun6i/sun8i to the unified sun4i apb1 clock.
Patch 4 gets rid of the incorrect and now unused sun6i apb2 clock driver.
Cheers
ChenYu
Chen-Yu Tsai (2):
ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks.
clk: sunxi: Removed unused/incorrect sun6i-a31-apb2-clk driver
Emilio L?pez (2):
clk: sunxi: unify APB1 clock
ARM: dts: sunxi: unify APB1 clock
Documentation/devicetree/bindings/clock/sunxi.txt | 2 -- arch/arm/boot/dts/sun4i-a10.dtsi | 12 ++---------- arch/arm/boot/dts/sun5i-a10s.dtsi | 12 ++---------- arch/arm/boot/dts/sun5i-a13.dtsi | 12 ++---------- arch/arm/boot/dts/sun6i-a31.dtsi | 12 ++---------- arch/arm/boot/dts/sun7i-a20.dtsi | 12 ++---------- arch/arm/boot/dts/sun8i-a23.dtsi | 12 ++---------- drivers/clk/sunxi/clk-sunxi.c | 14 ++------------ 8 files changed, 14 insertions(+), 74 deletions(-)
Signature · 1 line
2.1.1
PATCH RESEND 1/4 clk: sunxi: unify APB1 clock
From: Emilio L?pez <[email protected]>
This commit unifies the APB1 mux with the APB1 clock, using the new factors infrastructure.
--- Documentation/devicetree/bindings/clock/sunxi.txt | 1 - drivers/clk/sunxi/clk-sunxi.c | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/clock/sunxi.txt +0 -1
@@ -45,7 +45,6 @@ Required properties: "allwinner,sun9i-a80-apb0-gates-clk" - for the APB0 gates on A80 "allwinner,sun4i-a10-apb1-clk" - for the APB1 clock "allwinner,sun9i-a80-apb1-clk" - for the APB1 bus clock on A80 - "allwinner,sun4i-a10-apb1-mux-clk" - for the APB1 clock muxing "allwinner,sun4i-a10-apb1-gates-clk" - for the APB1 gates on A10 "allwinner,sun5i-a13-apb1-gates-clk" - for the APB1 gates on A13 "allwinner,sun5i-a10s-apb1-gates-clk" - for the APB1 gates on A10s
drivers/clk/sunxi/clk-sunxi.c +2 -5
@@ -507,6 +507,8 @@ static const struct factors_data sun6i_a31_pll6_data __initconst = { };static const struct factors_data sun4i_apb1_data__initconst = { + .mux =24 , + .muxmask =BIT (1 ) |BIT (0 ), .table = &sun4i_apb1_config, .getter = sun4i_get_apb1_factors, };
@@ -545,10 +547,6 @@ static const struct mux_data sun6i_a31_ahb1_mux_data __initconst = { .shift = 12, }; -static const struct mux_data sun4i_apb1_mux_data__initconst = { - .shift =24 , -}; -static void __init sunxi_mux_clk_setup (struct device_node *node,struct mux_data *data) {
@@ -1109,7 +1107,6 @@ static const struct of_device_id clk_divs_match[] __initconst = {/* Matches for mux clocks */ static const struct of_device_id clk_mux_match[]__initconst = { {.compatible ="allwinner,sun4i-a10-cpu-clk" , .data = &sun4i_cpu_mux_data,}, - {.compatible ="allwinner,sun4i-a10-apb1-mux-clk" , .data = &sun4i_apb1_mux_data,}, {.compatible ="allwinner,sun6i-a31-ahb1-mux-clk" , .data = &sun6i_a31_ahb1_mux_data,}, {} };
Signature · 1 line
2.1.1
PATCH RESEND 2/4 ARM: dts: sunxi: unify APB1 clock
In reply to Chen-Yu TsaiFrom: Emilio L?pez <[email protected]>
With the new factors infrastructure in place, we can unify apb1 and apb1_mux as a single clock now.
--- arch/arm/boot/dts/sun4i-a10.dtsi | 12 ++---------- arch/arm/boot/dts/sun5i-a10s.dtsi | 12 ++---------- arch/arm/boot/dts/sun5i-a13.dtsi | 12 ++---------- arch/arm/boot/dts/sun7i-a20.dtsi | 12 ++---------- 4 files changed, 8 insertions(+), 40 deletions(-)
arch/arm/boot/dts/sun4i-a10.dtsi +2 -10
@@ -174,19 +174,11 @@ "apb0_ir1", "apb0_keypad"; }; - apb1_mux: apb1_mux at 01c20058 { - #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-apb1-mux-clk"; - reg = <0x01c20058 0x4>; - clocks = <&osc24M>, <&pll6 1>, <&osc32k>; - clock-output-names = "apb1_mux"; - }; - - apb1: apb1 at 01c20058 { + apb1: clk at 01c20058 { #clock-cells = <0>; compatible = "allwinner,sun4i-a10-apb1-clk"; reg = <0x01c20058 0x4>; - clocks = <&apb1_mux>; + clocks = <&osc24M>, <&pll6 1>, <&osc32k>; clock-output-names = "apb1"; };
arch/arm/boot/dts/sun5i-a10s.dtsi +2 -10
@@ -162,19 +162,11 @@ "apb0_ir", "apb0_keypad"; }; - apb1_mux: apb1_mux at 01c20058 { - #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-apb1-mux-clk"; - reg = <0x01c20058 0x4>; - clocks = <&osc24M>, <&pll6 1>, <&osc32k>; - clock-output-names = "apb1_mux"; - }; - - apb1: apb1 at 01c20058 { + apb1: clk at 01c20058 { #clock-cells = <0>; compatible = "allwinner,sun4i-a10-apb1-clk"; reg = <0x01c20058 0x4>; - clocks = <&apb1_mux>; + clocks = <&osc24M>, <&pll6 1>, <&osc32k>; clock-output-names = "apb1"; };
arch/arm/boot/dts/sun5i-a13.dtsi +2 -10
@@ -161,19 +161,11 @@ clock-output-names = "apb0_codec", "apb0_pio", "apb0_ir"; }; - apb1_mux: apb1_mux at 01c20058 { - #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-apb1-mux-clk"; - reg = <0x01c20058 0x4>; - clocks = <&osc24M>, <&pll6 1>, <&osc32k>; - clock-output-names = "apb1_mux"; - }; - - apb1: apb1 at 01c20058 { + apb1: clk at 01c20058 { #clock-cells = <0>; compatible = "allwinner,sun4i-a10-apb1-clk"; reg = <0x01c20058 0x4>; - clocks = <&apb1_mux>; + clocks = <&osc24M>, <&pll6 1>, <&osc32k>; clock-output-names = "apb1"; };
arch/arm/boot/dts/sun7i-a20.dtsi +2 -10
@@ -222,19 +222,11 @@ "apb0_iis2", "apb0_keypad"; }; - apb1_mux: apb1_mux at 01c20058 { - #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-apb1-mux-clk"; - reg = <0x01c20058 0x4>; - clocks = <&osc24M>, <&pll6 1>, <&osc32k>; - clock-output-names = "apb1_mux"; - }; - - apb1: apb1 at 01c20058 { + apb1: clk at 01c20058 { #clock-cells = <0>; compatible = "allwinner,sun4i-a10-apb1-clk"; reg = <0x01c20058 0x4>; - clocks = <&apb1_mux>; + clocks = <&osc24M>, <&pll6 1>, <&osc32k>; clock-output-names = "apb1"; };
Signature · 1 line
2.1.1
PATCH RESEND 2/4 ARM: dts: sunxi: unify APB1 clock
Quoted 8 lines · Chen-Yu Tsai
From: Emilio L?pez <[email protected]>
With the new factors infrastructure in place, we can unify apb1 and
apb1_muxas a single clock now.Signed-off-by Emilio L?pez <[email protected]>[wens at csie.org: Change apb1 node label to "apb1"; reword commit title]Signed-off-by Chen-Yu Tsai <[email protected]>
Boot breakage in arm-soc/for-next on sun4i-a10-cubieboard and sun7i-a20-cubieboard2[1] was bisected down to this patch[1].
Reverting $SUBJECT on top of arm-soc gets things booting again.
Kevin
[1] http://status.armcloud.us/boot/?cubie
[2]e883d67285e9267c73f8d2b9d32aa9e712ad00a4 is the first bad commit commit e883d67285e9267c73f8d2b9d32aa9e712ad00a4
Author: Emilio L?pez <[email protected]> Date: Thu Nov 6 11:40:30 2014 +0800
ARM: dts: sunxi: unify APB1 clock
With the new factors infrastructure in place, we can unify apb1 and apb1_mux as a single clock now.
[wens at csie.org: Change apb1 node label to "apb1"; reword commit title]
:040000 040000 ab2fd24827d8610215cfd517106f38f359e39f86 1d836ee4f4a2ff442d7d38829f87b72c32152bcc M arch
bisect run success
PATCH RESEND 2/4 ARM: dts: sunxi: unify APB1 clock
Quoted 7 lines · Kevin Hilman
Quoted 5 lines · Chen-Yu Tsai
From: Emilio L?pez <[email protected]>
With the new factors infrastructure in place, we can unify apb1 and
apb1_muxas a single clock now.
Quoted 8 lines
Quoted 3 lines
Signed-off-by Emilio L?pez <[email protected]>[wens at csie.org: Change apb1 node label to "apb1"; reword commit title]Signed-off-by Chen-Yu Tsai <[email protected]>Boot breakage in arm-soc/for-next on sun4i-a10-cubieboard and sun7i-a20-cubieboard2[1] was bisected down to this patch[1].
Reverting $SUBJECT on top of arm-soc gets things booting again.
I guess this is because arm-soc's doesn't have linux-next's 93746e70be83a3f113134a16065957b324af50f7
Which also explains why linux-next still boots.
Maxime
Signature · 10 lines
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: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141121/260f3bd9/attachment.sig>
PATCH RESEND 2/4 ARM: dts: sunxi: unify APB1 clock
In reply to Kevin HilmanQuoted 7 lines · On Thursday 20 November 2014 14:04:01 Kevin Hilman wrote:
Quoted 5 lines · Chen-Yu Tsai
From: Emilio L?pez <[email protected]>
With the new factors infrastructure in place, we can unify apb1 and
apb1_muxas a single clock now.
Quoted 9 lines
Quoted 3 lines
Signed-off-by Emilio L?pez <[email protected]>[wens at csie.org: Change apb1 node label to "apb1"; reword commit title]Signed-off-by Chen-Yu Tsai <[email protected]>Boot breakage in arm-soc/for-next on sun4i-a10-cubieboard and sun7i-a20-cubieboard2[1] was bisected down to this patch[1].
Reverting $SUBJECT on top of arm-soc gets things booting again.
As this looks like it was intended as a cleanup without functional changes, I would go ahead and revert it in next/dt.
Any objections?
Arnd
PATCH RESEND 2/4 ARM: dts: sunxi: unify APB1 clock
Quoted 15 lines · Arnd Bergmann
Quoted 14 lines · On Thursday 20 November 2014 14:04:01 Kevin Hilman wrote:
Quoted 8 lines · Chen-Yu Tsai
From: Emilio L?pez <[email protected]>
With the new factors infrastructure in place, we can unify apb1 and
apb1_muxas a single clock now.Signed-off-by Emilio L?pez <[email protected]>[wens at csie.org: Change apb1 node label to "apb1"; reword commit title]Signed-off-by Chen-Yu Tsai <[email protected]>Boot breakage in arm-soc/for-next on sun4i-a10-cubieboard and sun7i-a20-cubieboard2[1] was bisected down to this patch[1].
Quoted 7 lines
Quoted 2 lines
Reverting $SUBJECT on top of arm-soc gets things booting again.
As this looks like it was intended as a cleanup without functional changes, I would go ahead and revert it in next/dt.
Any objections?
Yeah, you'd break linux-next as well doing so, as the clock driver now requires this from the DT.
I can merge it through the clock tree though if you prefer it that way.
Maxime
Signature · 10 lines
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: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141121/47207e47/attachment.sig>
PATCH RESEND 2/4 ARM: dts: sunxi: unify APB1 clock
Quoted 22 lines · On Friday 21 November 2014 15:29:03 Maxime Ripard wrote:
Quoted 21 lines · Arnd Bergmann
Quoted 7 lines · On Thursday 20 November 2014 14:04:01 Kevin Hilman wrote:
Quoted 5 lines · Chen-Yu Tsai
From: Emilio L?pez <[email protected]>
With the new factors infrastructure in place, we can unify apb1 and
apb1_muxas a single clock now.Quoted 9 lines
Quoted 3 lines
Signed-off-by Emilio L?pez <[email protected]>[wens at csie.org: Change apb1 node label to "apb1"; reword commit title]Signed-off-by Chen-Yu Tsai <[email protected]>Boot breakage in arm-soc/for-next on sun4i-a10-cubieboard and sun7i-a20-cubieboard2[1] was bisected down to this patch[1].
Reverting $SUBJECT on top of arm-soc gets things booting again.
As this looks like it was intended as a cleanup without functional changes, I would go ahead and revert it in next/dt.
Quoted 7 lines
Quoted 1 line
Any objections?
Yeah, you'd break linux-next as well doing so, as the clock driver now requires this from the DT.
I can merge it through the clock tree though if you prefer it that way.
Do you know why this commit breaks booting then?
Arnd
PATCH RESEND 2/4 ARM: dts: sunxi: unify APB1 clock
Quoted 25 lines · On Friday 21 November 2014 15:35:57 Arnd Bergmann wrote:
Quoted 24 lines · On Friday 21 November 2014 15:29:03 Maxime Ripard wrote:
Quoted 22 lines · Arnd Bergmann
Quoted 7 lines · On Thursday 20 November 2014 14:04:01 Kevin Hilman wrote:
Quoted 5 lines · Chen-Yu Tsai
From: Emilio L?pez <[email protected]>
With the new factors infrastructure in place, we can unify apb1 and
apb1_muxas a single clock now.Quoted 9 lines
Quoted 3 lines
Signed-off-by Emilio L?pez <[email protected]>[wens at csie.org: Change apb1 node label to "apb1"; reword commit title]Signed-off-by Chen-Yu Tsai <[email protected]>Boot breakage in arm-soc/for-next on sun4i-a10-cubieboard and sun7i-a20-cubieboard2[1] was bisected down to this patch[1].
Reverting $SUBJECT on top of arm-soc gets things booting again.
As this looks like it was intended as a cleanup without functional changes, I would go ahead and revert it in next/dt.
Any objections?
Quoted 8 lines
Quoted 5 lines
Yeah, you'd break linux-next as well doing so, as the clock driver now requires this from the DT.
I can merge it through the clock tree though if you prefer it that way.
Do you know why this commit breaks booting then?
I have now reverted the entire branch, to get things working again.
Please send a new pull request once you have a version that you have actually tested.
Arnd
PATCH RESEND 2/4 ARM: dts: sunxi: unify APB1 clock
Arnd,
Quoted 32 lines · Arnd Bergmann
Quoted 31 lines · On Friday 21 November 2014 15:35:57 Arnd Bergmann wrote:
Quoted 29 lines · On Friday 21 November 2014 15:29:03 Maxime Ripard wrote:
Quoted 15 lines · Arnd Bergmann
Quoted 14 lines · On Thursday 20 November 2014 14:04:01 Kevin Hilman wrote:
Quoted 8 lines · Chen-Yu Tsai
From: Emilio L?pez <[email protected]>
With the new factors infrastructure in place, we can unify apb1 and
apb1_muxas a single clock now.Signed-off-by Emilio L?pez <[email protected]>[wens at csie.org: Change apb1 node label to "apb1"; reword commit title]Signed-off-by Chen-Yu Tsai <[email protected]>Boot breakage in arm-soc/for-next on sun4i-a10-cubieboard and sun7i-a20-cubieboard2[1] was bisected down to this patch[1].
Quoted 7 lines
Quoted 2 lines
Reverting $SUBJECT on top of arm-soc gets things booting again.
As this looks like it was intended as a cleanup without functional changes, I would go ahead and revert it in next/dt.
Any objections?
Yeah, you'd break linux-next as well doing so, as the clock driver now requires this from the DT.
I can merge it through the clock tree though if you prefer it that way.
Quoted 7 lines
Quoted 2 lines
Do you know why this commit breaks booting then?
I have now reverted the entire branch, to get things working again.
Please send a new pull request once you have a version that you have actually tested.
This was tested and working. And again, the linux-next proves it.
I know very well why it doesn't work, and it's actually expected: some clock was refactored, the DT needed to be changed, only half of it was merged through arm-soc.
It really is just because one part got through arm-soc, the other through the clock tree, nothing more.
Maxime
Signature · 10 lines
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: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141122/c90a5c94/attachment.sig>
PATCH RESEND 2/4 ARM: dts: sunxi: unify APB1 clock
Quoted 43 lines · Maxime Ripard
Arnd,
Quoted 32 lines · Arnd Bergmann
Quoted 31 lines · On Friday 21 November 2014 15:35:57 Arnd Bergmann wrote:
Quoted 29 lines · On Friday 21 November 2014 15:29:03 Maxime Ripard wrote:
Quoted 15 lines · Arnd Bergmann
Quoted 14 lines · On Thursday 20 November 2014 14:04:01 Kevin Hilman wrote:
Quoted 8 lines · Chen-Yu Tsai
From: Emilio L?pez <[email protected]>
With the new factors infrastructure in place, we can unify apb1 and
apb1_muxas a single clock now.Signed-off-by Emilio L?pez <[email protected]>[wens at csie.org: Change apb1 node label to "apb1"; reword commit title]Signed-off-by Chen-Yu Tsai <[email protected]>Boot breakage in arm-soc/for-next on sun4i-a10-cubieboard and sun7i-a20-cubieboard2[1] was bisected down to this patch[1].
Quoted 7 lines
Quoted 2 lines
Reverting $SUBJECT on top of arm-soc gets things booting again.
As this looks like it was intended as a cleanup without functional changes, I would go ahead and revert it in next/dt.
Any objections?
Yeah, you'd break linux-next as well doing so, as the clock driver now requires this from the DT.
I can merge it through the clock tree though if you prefer it that way.
Quoted 7 lines
Quoted 2 lines
Do you know why this commit breaks booting then?
I have now reverted the entire branch, to get things working again.
Please send a new pull request once you have a version that you have actually tested.
Quoted 8 lines
This was tested and working. And again, the linux-next proves it.
I know very well why it doesn't work, and it's actually expected: some clock was refactored, the DT needed to be changed, only half of it was merged through arm-soc.
It really is just because one part got through arm-soc, the other through the clock tree, nothing more.
Which branch (already in linux-next) would be needed in arm-soc/for-next to resolve the dependency?
Kevin
PATCH RESEND 2/4 ARM: dts: sunxi: unify APB1 clock
Hi Kevin,
Quoted 51 lines · Kevin Hilman
Quoted 49 lines · Maxime Ripard
Arnd,
Quoted 32 lines · Arnd Bergmann
Quoted 31 lines · On Friday 21 November 2014 15:35:57 Arnd Bergmann wrote:
Quoted 29 lines · On Friday 21 November 2014 15:29:03 Maxime Ripard wrote:
Quoted 15 lines · Arnd Bergmann
Quoted 14 lines · On Thursday 20 November 2014 14:04:01 Kevin Hilman wrote:
Quoted 8 lines · Chen-Yu Tsai
From: Emilio L?pez <[email protected]>
With the new factors infrastructure in place, we can unify apb1 and
apb1_muxas a single clock now.Signed-off-by Emilio L?pez <[email protected]>[wens at csie.org: Change apb1 node label to "apb1"; reword commit title]Signed-off-by Chen-Yu Tsai <[email protected]>Boot breakage in arm-soc/for-next on sun4i-a10-cubieboard and sun7i-a20-cubieboard2[1] was bisected down to this patch[1].
Quoted 7 lines
Quoted 2 lines
Reverting $SUBJECT on top of arm-soc gets things booting again.
As this looks like it was intended as a cleanup without functional changes, I would go ahead and revert it in next/dt.
Any objections?
Yeah, you'd break linux-next as well doing so, as the clock driver now requires this from the DT.
I can merge it through the clock tree though if you prefer it that way.
Quoted 7 lines
Quoted 2 lines
Do you know why this commit breaks booting then?
I have now reverted the entire branch, to get things working again.
Please send a new pull request once you have a version that you have actually tested.
This was tested and working. And again, the linux-next proves it.
I know very well why it doesn't work, and it's actually expected: some clock was refactored, the DT needed to be changed, only half of it was merged through arm-soc.
Quoted 5 lines
Quoted 2 lines
It really is just because one part got through arm-soc, the other through the clock tree, nothing more.
Which branch (already in linux-next) would be needed in arm-soc/for-next to resolve the dependency?
It used to be part of the sunxi/for-next branch I maintain, but the part that would solve it has not been picked up by Mike.
You can drop this pull request anyway, I just sent a new one dropping this patch, which will go through the clock tree.
Maxime
Signature · 10 lines
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: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141124/a7687bdb/attachment-0001.sig>
PATCH RESEND 3/4 ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks.
In reply to Chen-Yu TsaiThe apb2 clocks are actually the same as apb1 clocks on the other sunxi platforms, hence compatible with "allwinner,sun4i-a10-apb1-clk".
Update the dtsi to use the new unified apb1 clk.
--- arch/arm/boot/dts/sun6i-a31.dtsi | 12 ++---------- arch/arm/boot/dts/sun8i-a23.dtsi | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-)
arch/arm/boot/dts/sun6i-a31.dtsi +2 -10
@@ -217,19 +217,11 @@ "apb1_daudio1"; }; - apb2_mux: apb2_mux at 01c20058 { + apb2: clk at 01c20058 { #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-apb1-mux-clk"; + compatible = "allwinner,sun4i-a10-apb1-clk"; reg = <0x01c20058 0x4>; clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; - clock-output-names = "apb2_mux"; - }; - - apb2: apb2 at 01c20058 { - #clock-cells = <0>; - compatible = "allwinner,sun6i-a31-apb2-div-clk"; - reg = <0x01c20058 0x4>; - clocks = <&apb2_mux>; clock-output-names = "apb2"; };
arch/arm/boot/dts/sun8i-a23.dtsi +2 -10
@@ -189,19 +189,11 @@ "apb1_daudio0", "apb1_daudio1"; }; - apb2_mux: apb2_mux_clk at 01c20058 { + apb2: clk at 01c20058 { #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-apb1-mux-clk"; + compatible = "allwinner,sun4i-a10-apb1-clk"; reg = <0x01c20058 0x4>; clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; - clock-output-names = "apb2_mux"; - }; - - apb2: apb2_clk at 01c20058 { - #clock-cells = <0>; - compatible = "allwinner,sun6i-a31-apb2-div-clk"; - reg = <0x01c20058 0x4>; - clocks = <&apb2_mux>; clock-output-names = "apb2"; };
Signature · 1 line
2.1.1
PATCH RESEND 4/4 clk: sunxi: Removed unused/incorrect sun6i-a31-apb2-clk driver
In reply to Chen-Yu TsaiThis driver does not match the hardware, which is actually compatible to sun4i-a10-apb1-clk. Since we've switch to the correct one, drop this driver.
--- Documentation/devicetree/bindings/clock/sunxi.txt | 1 - drivers/clk/sunxi/clk-sunxi.c | 7 ------- 2 files changed, 8 deletions(-)
Documentation/devicetree/bindings/clock/sunxi.txt +0 -1
@@ -52,7 +52,6 @@ Required properties: "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,sun9i-a80-apb1-gates-clk" - for the APB1 gates on A80 - "allwinner,sun6i-a31-apb2-div-clk" - for the APB2 gates on A31 "allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31 "allwinner,sun8i-a23-apb2-gates-clk" - for the APB2 gates on A23 "allwinner,sun5i-a13-mbus-clk" - for the MBUS clock on A13
drivers/clk/sunxi/clk-sunxi.c +0 -7
@@ -632,12 +632,6 @@ static const struct div_data sun4i_apb0_data __initconst = { .table = sun4i_apb0_table, }; -static const struct div_data sun6i_a31_apb2_div_data__initconst = { - .shift =0 , - .pow =0 , - .width =4 , -}; -static void __init sunxi_divider_clk_setup (struct device_node *node,struct div_data *data) {
@@ -1093,7 +1087,6 @@ static const struct of_device_id clk_div_match[] __initconst = { {.compatible = "allwinner,sun8i-a23-axi-clk", .data = &sun8i_a23_axi_data,}, {.compatible = "allwinner,sun4i-a10-ahb-clk", .data = &sun4i_ahb_data,}, {.compatible = "allwinner,sun4i-a10-apb0-clk", .data = &sun4i_apb0_data,}, - {.compatible = "allwinner,sun6i-a31-apb2-div-clk", .data = &sun6i_a31_apb2_div_data,}, {} };
Signature · 1 line
2.1.1
cover clk: sunxi: Unify sun4i apb1 clock
In reply to Chen-Yu TsaiQuoted 13 lines · Chen-Yu Tsai
(resent with linux-arm-kernel CCed)
Hi everyone,
This series unifies the apb1 clock driver for sun4i, which was previously split into apb1-mux and apb1. This also fixes the apb2 clock on sun6i/sun8i, which we now have documents for.
The first 2 patches were done by Emilio.
Patch 1 unifies the apb1-mux and apb1 clock drivers using a factors clock.
Quoted 7 lines
Patch 2 unifies said clocks in the dtsi.
Patch 3 switches the compatibles for apb2 clock on sun6i/sun8i to the unified sun4i apb1 clock.
Patch 4 gets rid of the incorrect and now unused sun6i apb2 clock driver.
Merged all the patches, thanks!
Maxime
Signature · 10 lines
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: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141111/51eabbf6/attachment.sig>
cover clk: sunxi: Unify sun4i apb1 clock
Quoted 16 lines · Maxime Ripard
Quoted 15 lines · Chen-Yu Tsai
(resent with linux-arm-kernel CCed)
Hi everyone,
This series unifies the apb1 clock driver for sun4i, which was previously split into apb1-mux and apb1. This also fixes the apb2 clock on sun6i/sun8i, which we now have documents for.
The first 2 patches were done by Emilio.
Patch 1 unifies the apb1-mux and apb1 clock drivers using a factors clock.
Patch 2 unifies said clocks in the dtsi.
Quoted 7 lines
Quoted 5 lines
Patch 3 switches the compatibles for apb2 clock on sun6i/sun8i to the unified sun4i apb1 clock.
Patch 4 gets rid of the incorrect and now unused sun6i apb2 clock driver.
Merged all the patches, thanks!
Thanks! I'll send out sun6i ahb1 unification v3 later.
ChenYu