diff mbox

[v3,3/5] ARM: dts: sun7i: external clock outputs

Message ID 1388543450-16741-4-git-send-email-wens@csie.org (mailing list archive)
State New, archived
Headers show

Commit Message

Chen-Yu Tsai Jan. 1, 2014, 2:30 a.m. UTC
This commit adds the two external clock outputs available on A20 to
its device tree. A dummy fixed factor clock is also added to serve as
the first input of the clock outputs, which according to AW's A20 user
manual, is the 24MHz oscillator divided by 750.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun7i-a20.dtsi | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

Comments

Maxime Ripard Jan. 1, 2014, 11:10 p.m. UTC | #1
Hi,

On Wed, Jan 01, 2014 at 10:30:48AM +0800, Chen-Yu Tsai wrote:
> This commit adds the two external clock outputs available on A20 to
> its device tree. A dummy fixed factor clock is also added to serve as
> the first input of the clock outputs, which according to AW's A20 user
> manual, is the 24MHz oscillator divided by 750.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>

I'm ok with this patch, but I'll let Emilio and Mike give their
opinion on the driver before merging it.

Maxime
Chen-Yu Tsai Jan. 2, 2014, 2:41 a.m. UTC | #2
Hi,

On Thu, Jan 2, 2014 at 7:10 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi,
>
> On Wed, Jan 01, 2014 at 10:30:48AM +0800, Chen-Yu Tsai wrote:
>> This commit adds the two external clock outputs available on A20 to
>> its device tree. A dummy fixed factor clock is also added to serve as
>> the first input of the clock outputs, which according to AW's A20 user
>> manual, is the 24MHz oscillator divided by 750.
>>
>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>
> I'm ok with this patch, but I'll let Emilio and Mike give their
> opinion on the driver before merging it.

The driver has not changed since v1.
Mike merged it via Emilio's pull request.

Or are you referring to the DT part?


Cheers,
ChenYu
Maxime Ripard Jan. 2, 2014, 8:11 a.m. UTC | #3
On Thu, Jan 02, 2014 at 10:41:23AM +0800, Chen-Yu Tsai wrote:
> Hi,
> 
> On Thu, Jan 2, 2014 at 7:10 AM, Maxime Ripard
> > On Wed, Jan 01, 2014 at 10:30:48AM +0800, Chen-Yu Tsai wrote:
> >> This commit adds the two external clock outputs available on A20 to
> >> its device tree. A dummy fixed factor clock is also added to serve as
> >> the first input of the clock outputs, which according to AW's A20 user
> >> manual, is the 24MHz oscillator divided by 750.
> >>
> >> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> >
> > I'm ok with this patch, but I'll let Emilio and Mike give their
> > opinion on the driver before merging it.
> 
> The driver has not changed since v1.
> Mike merged it via Emilio's pull request.

Ah, right, I forgot about this.

I just merged this patch as well.

Thanks!
Maxime
diff mbox

Patch

diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index c0fb390..e192c99 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -303,6 +303,34 @@ 
 			clocks = <&osc24M>, <&pll6 2>, <&pll5 1>;
 			clock-output-names = "mbus";
 		};
+
+		/*
+		 * Dummy clock used by output clocks
+		 */
+		osc24M_32k: clk@1 {
+			#clock-cells = <0>;
+			compatible = "fixed-factor-clock";
+			clock-div = <750>;
+			clock-mult = <1>;
+			clocks = <&osc24M>;
+			clock-output-names = "osc24M_32k";
+		};
+
+		clk_out_a: clk@01c201f0 {
+			#clock-cells = <0>;
+			compatible = "allwinner,sun7i-a20-out-clk";
+			reg = <0x01c201f0 0x4>;
+			clocks = <&osc24M_32k>, <&osc32k>, <&osc24M>;
+			clock-output-names = "clk_out_a";
+		};
+
+		clk_out_b: clk@01c201f4 {
+			#clock-cells = <0>;
+			compatible = "allwinner,sun7i-a20-out-clk";
+			reg = <0x01c201f4 0x4>;
+			clocks = <&osc24M_32k>, <&osc32k>, <&osc24M>;
+			clock-output-names = "clk_out_b";
+		};
 	};
 
 	soc@01c00000 {