Skip to contentSkip to conversation

Enable clock controllers on MSM

PATCH New Stephen Boyd 1 participant 7 messages Oct 28, 2013

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

cover Enable clock controllers on MSM

This patchset enables the clock controller hardware on some DT based MSM devices. It also hooks up the 8974 SoC's serial device to the clock controller so that we can get a serial console.

This patchset is based on Rohit's 8974 patches[1] and my follow up dts update patches[2]. For it to be fully functional you'll also need to apply the MSM clock driver patches[3] or wait for them to land in linux-next.

Stephen Boyd (6):
ARM: dts: msm: Add MSM8960 GCC DT node
ARM: dts: msm: Add MSM8960 MMCC DT node
ARM: dts: msm: Add clock entries for MSM8960 uart device
ARM: dts: msm: Add MSM8974 GCC node
ARM: dts: msm: Add MSM8974 serial device node
ARM: msm_defconfig: Enable MSM clock drivers

 arch/arm/boot/dts/qcom-msm8960-cdp.dts | 18 ++++++++++++++++++
 arch/arm/boot/dts/qcom-msm8974.dtsi    | 17 +++++++++++++++++
 arch/arm/configs/msm_defconfig         |  3 +++
 3 files changed, 38 insertions(+)

[1] https://lkml.org/lkml/2013/10/17/520
[2] https://lkml.org/lkml/2013/10/18/406
[3] http://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg06742.html

Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#1 lore raw

PATCH 1/6 ARM: dts: msm: Add MSM8960 GCC DT node

Add the necessary DT node to probe the global clock controller on MSM8960 devices.

---
 arch/arm/boot/dts/qcom-msm8960-cdp.dts | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/boot/dts/qcom-msm8960-cdp.dts +7 -0
index 93e8789..7234253 100644
@@ -53,6 +53,13 @@
 		reg = <0x800000 0x4000>;
 	};
 
+	gcc: clock-controller at 900000 {
+		compatible = "qcom,gcc-8960", "qcom,gcc";
+		#clock-cells = <1>;
+		#reset-cells = <1>;
+		reg = <0x900000 0x4000>;
+	};
+
 	kpss at 2088000 {
 		compatible = "qcom,kpss";
 		reg = <0x02088000 0x1000
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#2 lore raw

PATCH 2/6 ARM: dts: msm: Add MSM8960 MMCC DT node

In reply to Stephen Boyd

Add the necessary DT node to probe the multimedia clock controller on MSM8960 devices.

---
 arch/arm/boot/dts/qcom-msm8960-cdp.dts | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/boot/dts/qcom-msm8960-cdp.dts +7 -0
index 7234253..cf8ecc5 100644
@@ -60,6 +60,13 @@
 		reg = <0x900000 0x4000>;
 	};
 
+	clock-controller at 4000000 {
+		compatible = "qcom,mmcc-8960", "qcom,mmcc";
+		reg = <0x4000000 0x1000>;
+		#clock-cells = <1>;
+		#reset-cells = <1>;
+	};
+
 	kpss at 2088000 {
 		compatible = "qcom,kpss";
 		reg = <0x02088000 0x1000
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#3 lore raw

PATCH 3/6 ARM: dts: msm: Add clock entries for MSM8960 uart device

In reply to Stephen Boyd

Hook up the clock controller to the msm8960 uart device so the uart device can be probed.

---
 arch/arm/boot/dts/qcom-msm8960-cdp.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/qcom-msm8960-cdp.dts +4 -0
index cf8ecc5..faef5b9 100644
@@ -2,6 +2,8 @@
 
 /include/ "skeleton.dtsi"
 
+#include <dt-bindings/clk/msm-gcc-8960.h>
+
 / {
 	model = "Qualcomm MSM8960 CDP";
 	compatible = "qcom,msm8960-cdp", "qcom,msm8960";
@@ -78,6 +80,8 @@
 		reg = <0x16440000 0x1000>,
 		      <0x16400000 0x1000>;
 		interrupts = <0 154 0x0>;
+		clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>;
+		clock-names = "core", "iface";
 	};
 
 	qcom,ssbi at 500000 {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#4 lore raw

PATCH 4/6 ARM: dts: msm: Add MSM8974 GCC node

In reply to Stephen Boyd

Add the necessary DT node to probe the global clock controller on MSM8974 devices.

---
 arch/arm/boot/dts/qcom-msm8974.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/qcom-msm8974.dtsi +8 -0
index 6ac9496..c013037 100644
@@ -93,5 +93,13 @@
 			compatible = "qcom,pshold";
 			reg = <0xfc4ab000 0x4>;
 		};
+
+		gcc: clock-controller at fc400000 {
+			compatible = "qcom,gcc-8974", "qcom,gcc";
+			#clock-cells = <1>;
+			#reset-cells = <1>;
+			reg = <0xfc400000 0x4000>;
+		};
+
 	};
 };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#5 lore raw

PATCH 5/6 ARM: dts: msm: Add MSM8974 serial device node

In reply to Stephen Boyd

Describe the uart device used for the serial console on MSM8974 based platforms.

---
 arch/arm/boot/dts/qcom-msm8974.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/boot/dts/qcom-msm8974.dtsi +9 -0
index c013037..152879d 100644
@@ -2,6 +2,8 @@
 
 #include "skeleton.dtsi"
 
+#include <dt-bindings/clk/msm-gcc-8974.h>
+
 / {
 	model = "Qualcomm MSM8974";
 	compatible = "qcom,msm8974";
@@ -101,5 +103,12 @@
 			reg = <0xfc400000 0x4000>;
 		};
 
+		serial at f991e000 {
+			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
+			reg = <0xf991e000 0x1000>;
+			interrupts = <0 108 0x0>;
+			clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
+			clock-names = "core", "iface";
+		};
 	};
 };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#6 lore raw

PATCH 6/6 ARM: msm_defconfig: Enable MSM clock drivers

In reply to Stephen Boyd
---
 arch/arm/configs/msm_defconfig | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/configs/msm_defconfig +3 -0
index c5698b7..44c1657 100644
@@ -117,6 +117,9 @@ CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_NEW_LEDS=y
 CONFIG_RTC_CLASS=y
 CONFIG_STAGING=y
+CONFIG_COMMON_CLK_MSM=y
+CONFIG_MSM_MMCC_8960=y
+CONFIG_MSM_GCC_8974=y
 CONFIG_MSM_IOMMU=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation