Skip to contentSkip to conversation

clk: sun8i: Add MBUS support

PATCH New Chen-Yu Tsai 2 participants 6 messages Sep 16, 2014 – Sep 27, 2014

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v3 cover clk: sun8i: Add MBUS support

Hi,

This is v3 of my sun8i MBUS clock series.

This series depends on Maxime's "clk: sunxi: Improve MMC clocks support" series, specifically the patches that change the factor clocks and move out mod0 and mbus. Ideally this series should also be merged after my "clk: sun6i: Unify AHB1 clock and fix rate calculation" for the PLL6 corrections, but I don't think it would cause any issues if it didn't.

Patch 1 adds the sun8i specific MBUS clock driver.

Patch 2 adds proper PLL6 and MBUS clock nodes to the DT, with a dummy PLL5 clock node as a parent to MBUS.

Changes since v2:
- Fixed multi-line comment style

Changes since v1:
- Added commit message to patch 1
- Moved sun8i-mbus clk to separate file

Cheers
ChenYu

Chen-Yu Tsai (2):
clk: sunxi: Add sun8i MBUS clock support
ARM: dts: sun8i: Add PLL6 and MBUS clock nodes

 Documentation/devicetree/bindings/clock/sunxi.txt |  1 +
 arch/arm/boot/dts/sun8i-a23.dtsi                  | 29 ++++++++-
 drivers/clk/sunxi/Makefile                        |  1 +
 drivers/clk/sunxi/clk-sun8i-mbus.c                | 78 +++++++++++++++++++++++
 4 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 drivers/clk/sunxi/clk-sun8i-mbus.c
Signature · 1 line
2.1.0
#1 lore raw

PATCH v3 1/2 clk: sunxi: Add sun8i MBUS clock support

The MBUS clock on sun8i is slightly different from the old mod0 clocks. The divider is 3 bits wider, while also needing a divider table for the higher 4 values, which all set the same divider.

---
 Documentation/devicetree/bindings/clock/sunxi.txt |  1 +
 drivers/clk/sunxi/Makefile                        |  1 +
 drivers/clk/sunxi/clk-sun8i-mbus.c                | 78 +++++++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 drivers/clk/sunxi/clk-sun8i-mbus.c
Documentation/devicetree/bindings/clock/sunxi.txt +1 -0
index 425b109..fb3b7aa 100644
@@ -50,6 +50,7 @@ Required properties:
 	"allwinner,sun4i-a10-mmc-output-clk" - for the MMC output clock on A10
 	"allwinner,sun4i-a10-mmc-sample-clk" - for the MMC sample clock on A10
 	"allwinner,sun4i-a10-mod0-clk" - for the module 0 family of clocks
+	"allwinner,sun8i-a23-mbus-clk" - for the MBUS clock on A23
 	"allwinner,sun7i-a20-out-clk" - for the external output clocks
 	"allwinner,sun7i-a20-gmac-clk" - for the GMAC clock module on A20/A31
 	"allwinner,sun4i-a10-usb-clk" - for usb gates + resets on A10 / A20
drivers/clk/sunxi/Makefile +1 -0
index 833f086..7ddc2b5 100644
@@ -6,6 +6,7 @@ obj-y += clk-sunxi.o clk-factors.o
 obj-y += clk-a10-hosc.o
 obj-y += clk-a20-gmac.o
 obj-y += clk-mod0.o
+obj-y += clk-sun8i-mbus.o
 
 obj-$(CONFIG_MFD_SUN6I_PRCM) += \
 	clk-sun6i-ar100.o clk-sun6i-apb0.o clk-sun6i-apb0-gates.o \
drivers/clk/sunxi/clk-sun8i-mbus.c new file +78 -0

78 lines not on this page · raw message

Signature · 1 line
2.1.0
#2 lore raw

PATCH v3 1/2 clk: sunxi: Add sun8i MBUS clock support

Quoted 5 lines · Chen-Yu Tsai

The MBUS clock on sun8i is slightly different from the old mod0 clocks. The divider is 3 bits wider, while also needing a divider table for the higher 4 values, which all set the same divider.

Applied, 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/20140927/e227f7e0/attachment.sig>
#3 lore raw

PATCH v3 2/2 ARM: dts: sun8i: Add PLL6 and MBUS clock nodes

In reply to Chen-Yu Tsai

Now that the clock driver supports PLL6 and MBUS on sun8i correctly, add the corresponding clock nodes to the dtsi.

---
 arch/arm/boot/dts/sun8i-a23.dtsi | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sun8i-a23.dtsi +27 -2
index fc0d023..c32091e 100644
@@ -74,13 +74,30 @@
 		};
 
 		/* dummy clock until actually implemented */
-		pll6: pll6_clk {
+		pll5: pll5_clk {
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
-			clock-frequency = <600000000>;
+			clock-frequency = <0>;
+			clock-output-names = "pll5";
+		};
+
+		pll6: clk at 01c20028 {
+			#clock-cells = <0>;
+			compatible = "allwinner,sun6i-a31-pll6-clk";
+			reg = <0x01c20028 0x4>;
+			clocks = <&osc24M>;
 			clock-output-names = "pll6";
 		};
 
+		pll6x2: pll6x2_clk {
+			#clock-cells = <0>;
+			compatible = "fixed-factor-clock";
+			clock-div = <1>;
+			clock-mult = <2>;
+			clocks = <&pll6>;
+			clock-output-names = "pll6x2";
+		};
+
 		cpu: cpu_clk at 01c20050 {
 			#clock-cells = <0>;
 			compatible = "allwinner,sun4i-a10-cpu-clk";
@@ -243,6 +260,14 @@
 			clocks = <&mmc2_clk>;
 			clock-output-names = "mmc2_sample";
 		};
+
+		mbus_clk: clk at 01c2015c {
+			#clock-cells = <0>;
+			compatible = "allwinner,sun8i-a23-mbus-clk";
+			reg = <0x01c2015c 0x4>;
+			clocks = <&osc24M>, <&pll6x2>, <&pll5>;
+			clock-output-names = "mbus";
+		};
 	};
 
 	soc at 01c00000 {
Signature · 1 line
2.1.0
#4 lore raw

v3 cover clk: sun8i: Add MBUS support

In reply to Chen-Yu Tsai
Quoted 10 lines · Chen-Yu Tsai

Hi,

This is v3 of my sun8i MBUS clock series.

This series depends on Maxime's "clk: sunxi: Improve MMC clocks support" series, specifically the patches that change the factor clocks and move out mod0 and mbus. Ideally this series should also be merged after my "clk: sun6i: Unify AHB1 clock and fix rate calculation" for the PLL6 corrections, but I don't think it would cause any issues if it didn't.

Quoted 4 lines

Patch 1 adds the sun8i specific MBUS clock driver.

Patch 2 adds proper PLL6 and MBUS clock nodes to the DT, with a dummy PLL5 clock node as a parent to MBUS.

Both patches look fine to me. It can't be merged without the MMC clocks series though, and we're waiting for Mike there.

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/20140917/99540451/attachment-0001.sig>
#5 lore raw

v3 cover clk: sun8i: Add MBUS support

In reply to Chen-Yu Tsai

Hi Chen-Yu,

Quoted 9 lines · Chen-Yu Tsai

Hi,

This is v3 of my sun8i MBUS clock series.

This series depends on Maxime's "clk: sunxi: Improve MMC clocks support" series, specifically the patches that change the factor clocks and move out mod0 and mbus. Ideally this series should also be merged after my "clk: sun6i: Unify AHB1 clock and fix rate calculation" for the PLL6 corrections, but I don't think it would cause any issues if it didn't.

I'll hold off the second patch, since we're still in discussion for the PLL6 part. And since we're very close to the merge window opening, it would have been merged for 3.19 anyway, and we still have plenty of time.

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/20140927/a4f6d458/attachment-0001.sig>