MSM8998 Multimedia Clock Controller
Subsystems (5)
v3 cover MSM8998 Multimedia Clock Controller
The multimedia clock controller (mmcc) is the main clock controller for the multimedia subsystem and is required to enable things like display and camera.
v3:
-Rebase onto linux-next to get the final version of the clk parent rewrite series
-Moved the bindings header to the bindings patch per Rob
-Made xo manditory for GCC to work around the lack of clk orphan probe defer to avoid the uart console glitch
v2:
-Rebased on the "Rewrite clk parent handling" series and updated to the clk init mechanisms introduced there.
-Marked XO clk as CLK_IGNORE_UNUSED to avoid the concern about the XO going away "incorrectly" during late init
-Corrected the name of the XO clock to "xo"
-Dropped the fake XO clock in GCC to prevent a namespace conflict -Fully enumerated the external clocks (DSI PLLs, etc) in the DT binding -Cleaned up the weird newlines in the added DT node
-Added DT header file to msm8998 DT for future clients
Jeffrey Hugo (6):
dt-bindings: clock: Document external clocks for MSM8998 gcc
arm64: dts: msm8998: Add xo clock to gcc node
clk: qcom: smd: Add XO clock for MSM8998
dt-bindings: clock: Add support for the MSM8998 mmcc
clk: qcom: Add MSM8998 Multimedia Clock Controller (MMCC) driver
arm64: dts: qcom: msm8998: Add mmcc node
.../devicetree/bindings/clock/qcom,gcc.txt | 10 + .../devicetree/bindings/clock/qcom,mmcc.txt | 21 + arch/arm64/boot/dts/qcom/msm8998.dtsi | 16 + drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/clk-smd-rpm.c | 24 +- drivers/clk/qcom/gcc-msm8998.c | 29 +- drivers/clk/qcom/mmcc-msm8998.c | 2915 +++++++++++++++++ include/dt-bindings/clock/qcom,mmcc-msm8998.h | 210 ++ 9 files changed, 3214 insertions(+), 21 deletions(-) create mode 100644 drivers/clk/qcom/mmcc-msm8998.c create mode 100644 include/dt-bindings/clock/qcom,mmcc-msm8998.h
Signature · 1 line
2.17.1
PATCH v3 1/6 dt-bindings: clock: Document external clocks for MSM8998 gcc
The global clock controller on MSM8998 can consume a number of external clocks. Document them.
--- Documentation/devicetree/bindings/clock/qcom,gcc.txt | 10 ++++++++++ 1 file changed, 10 insertions(+)
Documentation/devicetree/bindings/clock/qcom,gcc.txt +10 -0
@@ -28,6 +28,16 @@ Required properties : - #clock-cells : shall contain 1 - #reset-cells : shall contain 1 +For MSM8998 only: + - clocks: a list of phandles and clock-specifier pairs, + one for each entry in clock-names. + - clock-names: "xo" (required) + "usb3_pipe" (optional) + "ufs_rx_symbol0" (optional) + "ufs_rx_symbol1" (optional) + "ufs_tx_symbol0" (optional) + "pcie0_pipe" (optional) + Optional properties : - #power-domain-cells : shall contain 1 - Qualcomm TSENS (thermal sensor device) on some devices can
Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 1/6] dt-bindings: clock: Document external clocks for MSM8998 gcc
Quoted 15 lines · Jeffrey Hugo
The global clock controller on MSM8998 can consume a number of external clocks. Document them.
Signed-off-by Jeffrey Hugo <[email protected]>--- Documentation/devicetree/bindings/clock/qcom,gcc.txt | 10 ++++++++++ 1 file changed, 10 insertions(+)Documentation/devicetree/bindings/clock/qcom,gcc.txt +0
-0@@ -28,6 +28,16 @@ Required properties : - #clock-cells : shall contain 1 - #reset-cells : shall contain 1
Documentation/devicetree/bindings/clock/qcom,gcc.txt Required properties : · line 39
Quoted 10 lines
Documentation/devicetree/bindings/clock/qcom,gcc.txt +9
-0+For MSM8998 only: + - clocks: a list of phandles and clock-specifier pairs, + one for each entry in clock-names. + - clock-names: "xo" (required) + "usb3_pipe" (optional) + "ufs_rx_symbol0" (optional) + "ufs_rx_symbol1" (optional) + "ufs_tx_symbol0" (optional) + "pcie0_pipe" (optional)
The optional clocks here comes from hardware blocks that in turn depends on the gcc, so we would need to resolve them lazily (in contrast to xo).
We typically don't list these in DT, but if this is close to the complete list of incoming clocks then I like the explicitness of it.
Regards,
Bjorn
Quoted 9 lines
Documentation/devicetree/bindings/clock/qcom,gcc.txt +1
-0+ Optional properties : - #power-domain-cells : shall contain 1 - Qualcomm TSENS (thermal sensor device) on some devices canSignature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 1/6] dt-bindings: clock: Document external clocks for MSM8998 gcc
Quoted 31 lines · Bjorn Andersson
Quoted 15 lines · Jeffrey Hugo
The global clock controller on MSM8998 can consume a number of external clocks. Document them.
Signed-off-by Jeffrey Hugo <[email protected]>--- Documentation/devicetree/bindings/clock/qcom,gcc.txt | 10 ++++++++++ 1 file changed, 10 insertions(+)Documentation/devicetree/bindings/clock/qcom,gcc.txt +0
-0@@ -28,6 +28,16 @@ Required properties : - #clock-cells : shall contain 1 - #reset-cells : shall contain 1Documentation/devicetree/bindings/clock/qcom,gcc.txt Required properties : · line 39
Quoted 10 lines
Documentation/devicetree/bindings/clock/qcom,gcc.txt +9
-0+For MSM8998 only: + - clocks: a list of phandles and clock-specifier pairs, + one for each entry in clock-names. + - clock-names: "xo" (required) + "usb3_pipe" (optional) + "ufs_rx_symbol0" (optional) + "ufs_rx_symbol1" (optional) + "ufs_tx_symbol0" (optional) + "pcie0_pipe" (optional)The optional clocks here comes from hardware blocks that in turn depends on the gcc, so we would need to resolve them lazily (in contrast to xo).
Quoted 2 lines
We typically don't list these in DT, but if this is close to the complete list of incoming clocks then I like the explicitness of it.
I reviewed the hardware documentation, and this is a complete list, except for some "aud_ref_clk" which I can't tell exactly where it comes from, and I see no use for it. As near as I can tell, this list should cover all the needs going forward.
Quoted 15 lines
Reviewed-by Bjorn Andersson <[email protected]>Regards,
BjornQuoted 9 lines
Documentation/devicetree/bindings/clock/qcom,gcc.txt +1
-0+ Optional properties : - #power-domain-cells : shall contain 1 - Qualcomm TSENS (thermal sensor device) on some devices canSignature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Signature · 4 lines
Jeffrey Hugo Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 1/6] dt-bindings: clock: Document external clocks for MSM8998 gcc
In reply to Jeffrey HugoQuoted 8 lines · Jeffrey Hugo
The global clock controller on MSM8998 can consume a number of external clocks. Document them.
Signed-off-by Jeffrey Hugo <[email protected]>--- Documentation/devicetree/bindings/clock/qcom,gcc.txt | 10 ++++++++++ 1 file changed, 10 insertions(+)
PATCH v3 2/6 arm64: dts: msm8998: Add xo clock to gcc node
In reply to Jeffrey HugoGCC is a consumer of the xo clock. Add a reference to the clock supplier to the gcc node.
--- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/msm8998.dtsi +2 -0
@@ -709,6 +709,8 @@ #reset-cells = <1>; #power-domain-cells = <1>; reg = <0x100000 0xb0000>; + clock-names = "xo"; + clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>; }; tlmm: pinctrl@3400000 {
Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 2/6] arm64: dts: msm8998: Add xo clock to gcc node
Quoted 4 lines · Jeffrey Hugo
GCC is a consumer of the xo clock. Add a reference to the clock supplier to the gcc node.
Signed-off-by Jeffrey Hugo <[email protected]>
(Although I prefer clock-names following clocks)
Regards,
Bjorn
Quoted 22 lines
--- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 ++ 1 file changed, 2 insertions(+)arch/arm64/boot/dts/qcom/msm8998.dtsi +2
-0@@ -709,6 +709,8 @@ #reset-cells = <1>; #power-domain-cells = <1>; reg = <0x100000 0xb0000>; + clock-names = "xo"; + clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>; }; tlmm: pinctrl@3400000 {Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 2/6] arm64: dts: msm8998: Add xo clock to gcc node
Quoted 10 lines · Bjorn Andersson
Quoted 4 lines · Jeffrey Hugo
GCC is a consumer of the xo clock. Add a reference to the clock supplier to the gcc node.
Signed-off-by Jeffrey Hugo <[email protected]>Reviewed-by Bjorn Andersson <[email protected]>(Although I prefer clock-names following clocks)
Huh, I didn't even realize I did that until you pointed it out. Feel free to adjust when you apply, or if there is another spin I'll fix it.
Quoted 26 lines
Regards,
BjornQuoted 22 lines
--- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 ++ 1 file changed, 2 insertions(+)arch/arm64/boot/dts/qcom/msm8998.dtsi +2
-0@@ -709,6 +709,8 @@ #reset-cells = <1>; #power-domain-cells = <1>; reg = <0x100000 0xb0000>; + clock-names = "xo"; + clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>; }; tlmm: pinctrl@3400000 {Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Signature · 4 lines
Jeffrey Hugo Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v3 3/6 clk: qcom: smd: Add XO clock for MSM8998
In reply to Jeffrey HugoThe XO clock generally feeds into other clock controllers as the parent for a lot of clock generators.
Drop the "fake" XO clock in GCC now that it is redundant can will cause a namespace conflict.
--- drivers/clk/qcom/clk-smd-rpm.c | 24 ++++++++++++++++++++---- drivers/clk/qcom/gcc-msm8998.c | 29 ++++++++++++----------------- 2 files changed, 32 insertions(+), 21 deletions(-)
drivers/clk/qcom/clk-smd-rpm.c +20 -4
@@ -68,7 +68,7 @@ }#define __DEFINE_CLK_SMD_RPM_BRANCH (_platform, _name, _active, type, r_id, \ - stat_id, r, key) \ + stat_id, r, key, ignore_unused) \ static struct clk_smd_rpm _platform##_##_active; \ static struct clk_smd_rpm _platform##_##_name = { \ .rpm_res_type = (type), \
@@ -83,6 +83,7 @@ .name = #_name, \ .parent_names = (const char *[]){ "xo_board" }, \ .num_parents = 1, \ + .flags = (ignore_unused) ? CLK_IGNORE_UNUSED : 0, \ }, \ }; \ static struct clk_smd_rpm _platform##_##_active = { \
@@ -99,6 +100,7 @@ .name = #_active, \ .parent_names = (const char *[]){ "xo_board" }, \ .num_parents = 1, \ + .flags = (ignore_unused) ? CLK_IGNORE_UNUSED : 0, \ }, \ }
@@ -108,7 +110,17 @@#define DEFINE_CLK_SMD_RPM_BRANCH (_platform, _name, _active, type, r_id, r) \ __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, \ - r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE) + r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE, false) + +/* +* Intended for XO clock where we don't want it turned off during late init +* if we don't have a consumer by then, but can turn it off later for deep +* sleep +*/ +#define DEFINE_CLK_SMD_RPM_BRANCH_SKIP_UNUSED (_platform, _name, _active, type,\ + r_id, r) \ + __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, \ + r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE, true)#define DEFINE_CLK_SMD_RPM_QDSS (_platform, _name, _active, type, r_id) \ __DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id, \
@@ -117,12 +129,12 @@#define DEFINE_CLK_SMD_RPM_XO_BUFFER (_platform, _name, _active, r_id) \ __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, \ QCOM_SMD_RPM_CLK_BUF_A, r_id, 0, 1000, \ - QCOM_RPM_KEY_SOFTWARE_ENABLE) + QCOM_RPM_KEY_SOFTWARE_ENABLE, false)#define DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL (_platform, _name, _active, r_id) \ __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, \ QCOM_SMD_RPM_CLK_BUF_A, r_id, 0, 1000, \ - QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY) + QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY, false)#define to_clk_smd_rpm (_hw) container_of(_hw, struct clk_smd_rpm, hw)
@@ -656,6 +668,8 @@ static int clk_smd_rpm_enable_scaling(struct qcom_smd_rpm *rpm) };/* msm8998 */ +DEFINE_CLK_SMD_RPM_BRANCH_SKIP_UNUSED (msm8998, xo, xo_a,QCOM_SMD_RPM_MISC_CLK , +0 ,19200000 );DEFINE_CLK_SMD_RPM (msm8998, snoc_clk, snoc_a_clk,QCOM_SMD_RPM_BUS_CLK ,1 );DEFINE_CLK_SMD_RPM (msm8998, cnoc_clk, cnoc_a_clk,QCOM_SMD_RPM_BUS_CLK ,2 );DEFINE_CLK_SMD_RPM (msm8998, ce1_clk, ce1_a_clk,QCOM_SMD_RPM_CE_CLK ,0 );
@@ -678,6 +692,8 @@ static int clk_smd_rpm_enable_scaling(struct qcom_smd_rpm *rpm)DEFINE_CLK_SMD_RPM_XO_BUFFER (msm8998, rf_clk3, rf_clk3_a,6 );DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL (msm8998, rf_clk3_pin, rf_clk3_a_pin,6 );static struct clk_smd_rpm *msm8998_clks[] = { + [RPM_SMD_XO_CLK_SRC ] = &msm8998_xo, + [RPM_SMD_XO_A_CLK_SRC ] = &msm8998_xo_a, [RPM_SMD_SNOC_CLK ] = &msm8998_snoc_clk, [RPM_SMD_SNOC_A_CLK ] = &msm8998_snoc_a_clk, [RPM_SMD_CNOC_CLK ] = &msm8998_cnoc_clk,
drivers/clk/qcom/gcc-msm8998.c +12 -17
@@ -11,6 +11,7 @@#include <linux/of.h> #include <linux/of_device.h> #include <linux/clk-provider.h> +#include <linux/clk.h> #include <linux/regmap.h> #include <linux/reset-controller.h>
@@ -117,17 +118,6 @@ enum { "core_bi_pll_test_se", }; -static struct clk_fixed_factor xo = { - .mult =1 , - .div =1 , - .hw.init = &(struct clk_init_data ){ - .name ="xo" , - .parent_names = (const char *[]){"xo_board" }, - .num_parents =1 , - .ops = &clk_fixed_factor_ops, - }, -}; -static struct pll_vco fabia_vco[] = { {250000000 ,2000000000 ,0 }, {125000000 ,1000000000 ,1 },
@@ -2959,10 +2949,6 @@ enum { .fast_io = true, }; -static struct clk_hw *gcc_msm8998_hws[] = { - &xo.hw, -}; -static const struct qcom_cc_desc gcc_msm8998_desc = { .config = &gcc_msm8998_regmap_config, .clks = gcc_msm8998_clocks,
@@ -2971,14 +2957,23 @@ enum { .num_resets = ARRAY_SIZE(gcc_msm8998_resets), .gdscs = gcc_msm8998_gdscs, .num_gdscs = ARRAY_SIZE(gcc_msm8998_gdscs), - .clk_hws = gcc_msm8998_hws, - .num_clk_hws = ARRAY_SIZE(gcc_msm8998_hws), };static int gcc_msm8998_probe (struct platform_device *pdev) {struct regmap *regmap;int ret; +struct clk *xo; + +/* +* We must have a valid XO to continue, otherwise having a missing +* parent on a system critical clock like the uart core clock can +* result in strange bugs. +*/ + xo =clk_get (&pdev->dev,"xo" ); +if (IS_ERR (xo)) +return PTR_ERR (xo); +clk_put (xo); regmap =qcom_cc_map (pdev, &gcc_msm8998_desc);if (IS_ERR (regmap))
Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 3/6] clk: qcom: smd: Add XO clock for MSM8998
Quoted 17 lines · Jeffrey Hugo
The XO clock generally feeds into other clock controllers as the parent for a lot of clock generators.
Drop the "fake" XO clock in GCC now that it is redundant can will cause a namespace conflict.
Signed-off-by Jeffrey Hugo <[email protected]>--- drivers/clk/qcom/clk-smd-rpm.c | 24 ++++++++++++++++++++---- drivers/clk/qcom/gcc-msm8998.c | 29 ++++++++++++----------------- 2 files changed, 32 insertions(+), 21 deletions(-)drivers/clk/qcom/clk-smd-rpm.c +0
-0
drivers/clk/qcom/clk-smd-rpm.c line 71
Quoted 5 lines
drivers/clk/qcom/clk-smd-rpm.c +1
-1@@ -68,7 +68,7 @@ }#define __DEFINE_CLK_SMD_RPM_BRANCH (_platform, _name, _active, type, r_id, \ - stat_id, r, key) \ + stat_id, r, key, ignore_unused) \
I expect that we can revert the ignore_unused part once we have a proper way to deal with resource handover.
Regards,
Bjorn
Quoted 143 lines
drivers/clk/qcom/clk-smd-rpm.c +19
-3static struct clk_smd_rpm _platform##_##_active; \ static struct clk_smd_rpm _platform##_##_name = { \ .rpm_res_type = (type), \@@ -83,6 +83,7 @@ .name = #_name, \ .parent_names = (const char *[]){ "xo_board" }, \ .num_parents = 1, \ + .flags = (ignore_unused) ? CLK_IGNORE_UNUSED : 0, \ }, \ }; \ static struct clk_smd_rpm _platform##_##_active = { \@@ -99,6 +100,7 @@ .name = #_active, \ .parent_names = (const char *[]){ "xo_board" }, \ .num_parents = 1, \ + .flags = (ignore_unused) ? CLK_IGNORE_UNUSED : 0, \ }, \ }@@ -108,7 +110,17 @@#define DEFINE_CLK_SMD_RPM_BRANCH (_platform, _name, _active, type, r_id, r) \ __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, \ - r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE) + r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE, false) + +/* +* Intended for XO clock where we don't want it turned off during late init +* if we don't have a consumer by then, but can turn it off later for deep +* sleep +*/ +#define DEFINE_CLK_SMD_RPM_BRANCH_SKIP_UNUSED (_platform, _name, _active, type,\ + r_id, r) \ + __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, \ + r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE, true)#define DEFINE_CLK_SMD_RPM_QDSS (_platform, _name, _active, type, r_id) \ __DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id, \@@ -117,12 +129,12 @@#define DEFINE_CLK_SMD_RPM_XO_BUFFER (_platform, _name, _active, r_id) \ __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, \ QCOM_SMD_RPM_CLK_BUF_A, r_id, 0, 1000, \ - QCOM_RPM_KEY_SOFTWARE_ENABLE) + QCOM_RPM_KEY_SOFTWARE_ENABLE, false)#define DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL (_platform, _name, _active, r_id) \ __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, \ QCOM_SMD_RPM_CLK_BUF_A, r_id, 0, 1000, \ - QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY) + QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY, false)#define to_clk_smd_rpm (_hw) container_of(_hw, struct clk_smd_rpm, hw)@@ -656,6 +668,8 @@ static int clk_smd_rpm_enable_scaling(struct qcom_smd_rpm *rpm) };/* msm8998 */ +DEFINE_CLK_SMD_RPM_BRANCH_SKIP_UNUSED (msm8998, xo, xo_a,QCOM_SMD_RPM_MISC_CLK , +0 ,19200000 );DEFINE_CLK_SMD_RPM (msm8998, snoc_clk, snoc_a_clk,QCOM_SMD_RPM_BUS_CLK ,1 );DEFINE_CLK_SMD_RPM (msm8998, cnoc_clk, cnoc_a_clk,QCOM_SMD_RPM_BUS_CLK ,2 );DEFINE_CLK_SMD_RPM (msm8998, ce1_clk, ce1_a_clk,QCOM_SMD_RPM_CE_CLK ,0 );@@ -678,6 +692,8 @@ static int clk_smd_rpm_enable_scaling(struct qcom_smd_rpm *rpm)DEFINE_CLK_SMD_RPM_XO_BUFFER (msm8998, rf_clk3, rf_clk3_a,6 );DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL (msm8998, rf_clk3_pin, rf_clk3_a_pin,6 );static struct clk_smd_rpm *msm8998_clks[] = { + [RPM_SMD_XO_CLK_SRC ] = &msm8998_xo, + [RPM_SMD_XO_A_CLK_SRC ] = &msm8998_xo_a, [RPM_SMD_SNOC_CLK ] = &msm8998_snoc_clk, [RPM_SMD_SNOC_A_CLK ] = &msm8998_snoc_a_clk, [RPM_SMD_CNOC_CLK ] = &msm8998_cnoc_clk,drivers/clk/qcom/gcc-msm8998.c +12
-17@@ -11,6 +11,7 @@#include <linux/of.h> #include <linux/of_device.h> #include <linux/clk-provider.h> +#include <linux/clk.h> #include <linux/regmap.h> #include <linux/reset-controller.h> @@ -117,17 +118,6 @@ enum { "core_bi_pll_test_se", }; -static struct clk_fixed_factor xo = { - .mult =1 , - .div =1 , - .hw.init = &(struct clk_init_data ){ - .name ="xo" , - .parent_names = (const char *[]){"xo_board" }, - .num_parents =1 , - .ops = &clk_fixed_factor_ops, - }, -}; -static struct pll_vco fabia_vco[] = { {250000000 ,2000000000 ,0 }, {125000000 ,1000000000 ,1 },@@ -2959,10 +2949,6 @@ enum { .fast_io = true, }; -static struct clk_hw *gcc_msm8998_hws[] = { - &xo.hw, -}; -static const struct qcom_cc_desc gcc_msm8998_desc = { .config = &gcc_msm8998_regmap_config, .clks = gcc_msm8998_clocks,@@ -2971,14 +2957,23 @@ enum { .num_resets = ARRAY_SIZE(gcc_msm8998_resets), .gdscs = gcc_msm8998_gdscs, .num_gdscs = ARRAY_SIZE(gcc_msm8998_gdscs), - .clk_hws = gcc_msm8998_hws, - .num_clk_hws = ARRAY_SIZE(gcc_msm8998_hws), };static int gcc_msm8998_probe (struct platform_device *pdev) {struct regmap *regmap;int ret; +struct clk *xo; + +/* +* We must have a valid XO to continue, otherwise having a missing +* parent on a system critical clock like the uart core clock can +* result in strange bugs. +*/ + xo =clk_get (&pdev->dev,"xo" ); +if (IS_ERR (xo)) +return PTR_ERR (xo); +clk_put (xo); regmap =qcom_cc_map (pdev, &gcc_msm8998_desc);if (IS_ERR (regmap))Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v3 4/6 dt-bindings: clock: Add support for the MSM8998 mmcc
In reply to Jeffrey HugoDocument the multimedia clock controller found on MSM8998.
--- .../devicetree/bindings/clock/qcom,mmcc.txt | 21 +++ include/dt-bindings/clock/qcom,mmcc-msm8998.h | 210 +++++++++++++++++++++ 2 files changed, 231 insertions(+) create mode 100644 include/dt-bindings/clock/qcom,mmcc-msm8998.h
Documentation/devicetree/bindings/clock/qcom,mmcc.txt +21 -0
@@ -10,11 +10,32 @@ Required properties : "qcom,mmcc-msm8960" "qcom,mmcc-msm8974" "qcom,mmcc-msm8996" + "qcom,mmcc-msm8998" - reg : shall contain base register location and length - #clock-cells : shall contain 1 - #reset-cells : shall contain 1 +For MSM8998 only: + - clocks: a list of phandles and clock-specifier pairs, + one for each entry in clock-names. + - clock-names: "xo" for the xo clock. + "gpll0" for the global pll 0 clock. + "dsi0dsi" for the dsi0 pll dsi clock (required if dsi is + enabled, optional otherwise). + "dsi0byte" for the dsi0 pll byte clock (required if dsi + is enabled, optional otherwise). + "dsi1dsi" for the dsi1 pll dsi clock (required if dsi is + enabled, optional otherwise). + "dsi1byte" for the dsi1 pll byte clock (required if dsi + is enabled, optional otherwise). + "hdmipll" for the hdmi pll clock (required if hdmi is + enabled, optional otherwise). + "dpvco" for the displayport pll vco clock (required if + dp is enabled, optional otherwise). + "dplink" for the displayport pll link clock (required if + dp is enabled, optional otherwise). + Optional properties : - #power-domain-cells : shall contain 1
include/dt-bindings/clock/qcom,mmcc-msm8998.h new file +210 -0
210 lines not on this page · raw message
Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 4/6] dt-bindings: clock: Add support for the MSM8998 mmcc
Quoted 4 lines · Jeffrey Hugo
Document the multimedia clock controller found on MSM8998.
Signed-off-by Jeffrey Hugo <[email protected]>Reviewed-by Rob Herring <[email protected]>
Quoted 264 lines
--- .../devicetree/bindings/clock/qcom,mmcc.txt | 21 +++ include/dt-bindings/clock/qcom,mmcc-msm8998.h | 210 +++++++++++++++++++++ 2 files changed, 231 insertions(+) create mode 100644 include/dt-bindings/clock/qcom,mmcc-msm8998.hDocumentation/devicetree/bindings/clock/qcom,mmcc.txt +21
-0@@ -10,11 +10,32 @@ Required properties : "qcom,mmcc-msm8960" "qcom,mmcc-msm8974" "qcom,mmcc-msm8996" + "qcom,mmcc-msm8998" - reg : shall contain base register location and length - #clock-cells : shall contain 1 - #reset-cells : shall contain 1 +For MSM8998 only: + - clocks: a list of phandles and clock-specifier pairs, + one for each entry in clock-names. + - clock-names: "xo" for the xo clock. + "gpll0" for the global pll 0 clock. + "dsi0dsi" for the dsi0 pll dsi clock (required if dsi is + enabled, optional otherwise). + "dsi0byte" for the dsi0 pll byte clock (required if dsi + is enabled, optional otherwise). + "dsi1dsi" for the dsi1 pll dsi clock (required if dsi is + enabled, optional otherwise). + "dsi1byte" for the dsi1 pll byte clock (required if dsi + is enabled, optional otherwise). + "hdmipll" for the hdmi pll clock (required if hdmi is + enabled, optional otherwise). + "dpvco" for the displayport pll vco clock (required if + dp is enabled, optional otherwise). + "dplink" for the displayport pll link clock (required if + dp is enabled, optional otherwise). + Optional properties : - #power-domain-cells : shall contain 1include/dt-bindings/clock/qcom,mmcc-msm8998.h new file +210
-0@@ -0,0 +1,210 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2019, The Linux Foundation. All rights reserved. +*/ + +#ifndef _DT_BINDINGS_CLK_MSM_MMCC_8998_H +#define _DT_BINDINGS_CLK_MSM_MMCC_8998_H + +#define MMPLL0 0 +#define MMPLL0_OUT_EVEN 1 +#define MMPLL1 2 +#define MMPLL1_OUT_EVEN 3 +#define MMPLL3 4 +#define MMPLL3_OUT_EVEN 5 +#define MMPLL4 6 +#define MMPLL4_OUT_EVEN 7 +#define MMPLL5 8 +#define MMPLL5_OUT_EVEN 9 +#define MMPLL6 10 +#define MMPLL6_OUT_EVEN 11 +#define MMPLL7 12 +#define MMPLL7_OUT_EVEN 13 +#define MMPLL10 14 +#define MMPLL10_OUT_EVEN 15 +#define BYTE0_CLK_SRC 16 +#define BYTE1_CLK_SRC 17 +#define CCI_CLK_SRC 18 +#define CPP_CLK_SRC 19 +#define CSI0_CLK_SRC 20 +#define CSI1_CLK_SRC 21 +#define CSI2_CLK_SRC 22 +#define CSI3_CLK_SRC 23 +#define CSIPHY_CLK_SRC 24 +#define CSI0PHYTIMER_CLK_SRC 25 +#define CSI1PHYTIMER_CLK_SRC 26 +#define CSI2PHYTIMER_CLK_SRC 27 +#define DP_AUX_CLK_SRC 28 +#define DP_CRYPTO_CLK_SRC 29 +#define DP_LINK_CLK_SRC 30 +#define DP_PIXEL_CLK_SRC 31 +#define ESC0_CLK_SRC 32 +#define ESC1_CLK_SRC 33 +#define EXTPCLK_CLK_SRC 34 +#define FD_CORE_CLK_SRC 35 +#define HDMI_CLK_SRC 36 +#define JPEG0_CLK_SRC 37 +#define MAXI_CLK_SRC 38 +#define MCLK0_CLK_SRC 39 +#define MCLK1_CLK_SRC 40 +#define MCLK2_CLK_SRC 41 +#define MCLK3_CLK_SRC 42 +#define MDP_CLK_SRC 43 +#define VSYNC_CLK_SRC 44 +#define AHB_CLK_SRC 45 +#define AXI_CLK_SRC 46 +#define PCLK0_CLK_SRC 47 +#define PCLK1_CLK_SRC 48 +#define ROT_CLK_SRC 49 +#define VIDEO_CORE_CLK_SRC 50 +#define VIDEO_SUBCORE0_CLK_SRC 51 +#define VIDEO_SUBCORE1_CLK_SRC 52 +#define VFE0_CLK_SRC 53 +#define VFE1_CLK_SRC 54 +#define MISC_AHB_CLK 55 +#define VIDEO_CORE_CLK 56 +#define VIDEO_AHB_CLK 57 +#define VIDEO_AXI_CLK 58 +#define VIDEO_MAXI_CLK 59 +#define VIDEO_SUBCORE0_CLK 60 +#define VIDEO_SUBCORE1_CLK 61 +#define MDSS_AHB_CLK 62 +#define MDSS_HDMI_DP_AHB_CLK 63 +#define MDSS_AXI_CLK 64 +#define MDSS_PCLK0_CLK 65 +#define MDSS_PCLK1_CLK 66 +#define MDSS_MDP_CLK 67 +#define MDSS_MDP_LUT_CLK 68 +#define MDSS_EXTPCLK_CLK 69 +#define MDSS_VSYNC_CLK 70 +#define MDSS_HDMI_CLK 71 +#define MDSS_BYTE0_CLK 72 +#define MDSS_BYTE1_CLK 73 +#define MDSS_ESC0_CLK 74 +#define MDSS_ESC1_CLK 75 +#define MDSS_ROT_CLK 76 +#define MDSS_DP_LINK_CLK 77 +#define MDSS_DP_LINK_INTF_CLK 78 +#define MDSS_DP_CRYPTO_CLK 79 +#define MDSS_DP_PIXEL_CLK 80 +#define MDSS_DP_AUX_CLK 81 +#define MDSS_BYTE0_INTF_CLK 82 +#define MDSS_BYTE1_INTF_CLK 83 +#define CAMSS_CSI0PHYTIMER_CLK 84 +#define CAMSS_CSI1PHYTIMER_CLK 85 +#define CAMSS_CSI2PHYTIMER_CLK 86 +#define CAMSS_CSI0_CLK 87 +#define CAMSS_CSI0_AHB_CLK 88 +#define CAMSS_CSI0RDI_CLK 89 +#define CAMSS_CSI0PIX_CLK 90 +#define CAMSS_CSI1_CLK 91 +#define CAMSS_CSI1_AHB_CLK 92 +#define CAMSS_CSI1RDI_CLK 93 +#define CAMSS_CSI1PIX_CLK 94 +#define CAMSS_CSI2_CLK 95 +#define CAMSS_CSI2_AHB_CLK 96 +#define CAMSS_CSI2RDI_CLK 97 +#define CAMSS_CSI2PIX_CLK 98 +#define CAMSS_CSI3_CLK 99 +#define CAMSS_CSI3_AHB_CLK 100 +#define CAMSS_CSI3RDI_CLK 101 +#define CAMSS_CSI3PIX_CLK 102 +#define CAMSS_ISPIF_AHB_CLK 103 +#define CAMSS_CCI_CLK 104 +#define CAMSS_CCI_AHB_CLK 105 +#define CAMSS_MCLK0_CLK 106 +#define CAMSS_MCLK1_CLK 107 +#define CAMSS_MCLK2_CLK 108 +#define CAMSS_MCLK3_CLK 109 +#define CAMSS_TOP_AHB_CLK 110 +#define CAMSS_AHB_CLK 111 +#define CAMSS_MICRO_AHB_CLK 112 +#define CAMSS_JPEG0_CLK 113 +#define CAMSS_JPEG_AHB_CLK 114 +#define CAMSS_JPEG_AXI_CLK 115 +#define CAMSS_VFE0_AHB_CLK 116 +#define CAMSS_VFE1_AHB_CLK 117 +#define CAMSS_VFE0_CLK 118 +#define CAMSS_VFE1_CLK 119 +#define CAMSS_CPP_CLK 120 +#define CAMSS_CPP_AHB_CLK 121 +#define CAMSS_VFE_VBIF_AHB_CLK 122 +#define CAMSS_VFE_VBIF_AXI_CLK 123 +#define CAMSS_CPP_AXI_CLK 124 +#define CAMSS_CPP_VBIF_AHB_CLK 125 +#define CAMSS_CSI_VFE0_CLK 126 +#define CAMSS_CSI_VFE1_CLK 127 +#define CAMSS_VFE0_STREAM_CLK 128 +#define CAMSS_VFE1_STREAM_CLK 129 +#define CAMSS_CPHY_CSID0_CLK 130 +#define CAMSS_CPHY_CSID1_CLK 131 +#define CAMSS_CPHY_CSID2_CLK 132 +#define CAMSS_CPHY_CSID3_CLK 133 +#define CAMSS_CSIPHY0_CLK 134 +#define CAMSS_CSIPHY1_CLK 135 +#define CAMSS_CSIPHY2_CLK 136 +#define FD_CORE_CLK 137 +#define FD_CORE_UAR_CLK 138 +#define FD_AHB_CLK 139 +#define MNOC_AHB_CLK 140 +#define BIMC_SMMU_AHB_CLK 141 +#define BIMC_SMMU_AXI_CLK 142 +#define MNOC_MAXI_CLK 143 +#define VMEM_MAXI_CLK 144 +#define VMEM_AHB_CLK 145 + +#define SPDM_BCR 0 +#define SPDM_RM_BCR 1 +#define MISC_BCR 2 +#define VIDEO_TOP_BCR 3 +#define THROTTLE_VIDEO_BCR 4 +#define MDSS_BCR 5 +#define THROTTLE_MDSS_BCR 6 +#define CAMSS_PHY0_BCR 7 +#define CAMSS_PHY1_BCR 8 +#define CAMSS_PHY2_BCR 9 +#define CAMSS_CSI0_BCR 10 +#define CAMSS_CSI0RDI_BCR 11 +#define CAMSS_CSI0PIX_BCR 12 +#define CAMSS_CSI1_BCR 13 +#define CAMSS_CSI1RDI_BCR 14 +#define CAMSS_CSI1PIX_BCR 15 +#define CAMSS_CSI2_BCR 16 +#define CAMSS_CSI2RDI_BCR 17 +#define CAMSS_CSI2PIX_BCR 18 +#define CAMSS_CSI3_BCR 19 +#define CAMSS_CSI3RDI_BCR 20 +#define CAMSS_CSI3PIX_BCR 21 +#define CAMSS_ISPIF_BCR 22 +#define CAMSS_CCI_BCR 23 +#define CAMSS_TOP_BCR 24 +#define CAMSS_AHB_BCR 25 +#define CAMSS_MICRO_BCR 26 +#define CAMSS_JPEG_BCR 27 +#define CAMSS_VFE0_BCR 28 +#define CAMSS_VFE1_BCR 29 +#define CAMSS_VFE_VBIF_BCR 30 +#define CAMSS_CPP_TOP_BCR 31 +#define CAMSS_CPP_BCR 32 +#define CAMSS_CSI_VFE0_BCR 33 +#define CAMSS_CSI_VFE1_BCR 34 +#define CAMSS_FD_BCR 35 +#define THROTTLE_CAMSS_BCR 36 +#define MNOCAHB_BCR 37 +#define MNOCAXI_BCR 38 +#define BMIC_SMMU_BCR 39 +#define MNOC_MAXI_BCR 40 +#define VMEM_BCR 41 +#define BTO_BCR 42 + +#define VIDEO_TOP_GDSC 1 +#define VIDEO_SUBCORE0_GDSC 2 +#define VIDEO_SUBCORE1_GDSC 3 +#define MDSS_GDSC 4 +#define CAMSS_TOP_GDSC 5 +#define CAMSS_VFE0_GDSC 6 +#define CAMSS_VFE1_GDSC 7 +#define CAMSS_CPP_GDSC 8 +#define BIMC_SMMU_GDSC 9 + +#endif Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v3 5/6 clk: qcom: Add MSM8998 Multimedia Clock Controller (MMCC) driver
In reply to Jeffrey HugoAdd a driver for the multimedia clock controller found on MSM8998 based devices. This should allow most multimedia device drivers to probe and control their clocks.
--- drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/mmcc-msm8998.c | 2915 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 2925 insertions(+) create mode 100644 drivers/clk/qcom/mmcc-msm8998.c
drivers/clk/qcom/Kconfig +9 -0
@@ -221,6 +221,15 @@ config MSM_GCC_8998 Say Y if you want to use peripheral devices such as UART, SPI, i2c, USB, UFS, SD/eMMC, PCIe, etc. +config MSM_MMCC_8998 + tristate "MSM8998 Multimedia Clock Controller" + select MSM_GCC_8998 + select QCOM_GDSC + help + Support for the multimedia clock controller on msm8998 devices. + Say Y if you want to support multimedia devices such as display, + graphics, video encode/decode, camera, etc. + config QCS_GCC_404 tristate "QCS404 Global Clock Controller" help
drivers/clk/qcom/Makefile +1 -0
@@ -36,6 +36,7 @@ obj-$(CONFIG_MSM_GCC_8998) += gcc-msm8998.o obj-$(CONFIG_MSM_MMCC_8960) += mmcc-msm8960.o obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8974.o obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm8996.o +obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm8998.o obj-$(CONFIG_QCOM_A53PLL) += a53-pll.o obj-$(CONFIG_QCOM_CLK_APCS_MSM8916) += apcs-msm8916.o obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o
drivers/clk/qcom/mmcc-msm8998.c new file +2915 -0
2,915 lines not on this page · raw message
Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 5/6] clk: qcom: Add MSM8998 Multimedia Clock Controller (MMCC) driver
drivers/clk/qcom/mmcc-msm8998.c line 2896
Quoted 10 lines · Jeffrey Hugo
drivers/clk/qcom/mmcc-msm8998.c new file +10
-0+static const struct of_device_id mmcc_msm8998_match_table[] = { + { .compatible ="qcom,mmcc-msm8998" }, + { } +}; +MODULE_DEVICE_TABLE (of, mmcc_msm8998_match_table); + +static int mmcc_msm8998_probe (struct platform_device *pdev) +{ +struct regmap *regmap; +
Don't you want to wait for "xo" here as well?
Quoted 6 lines
drivers/clk/qcom/mmcc-msm8998.c new file +6
-0+ regmap =qcom_cc_map (pdev, &mmcc_msm8998_desc); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); + +return qcom_cc_really_probe (pdev, &mmcc_msm8998_desc, regmap); +}
[..]
drivers/clk/qcom/mmcc-msm8998.c line 2915
Quoted 3 lines
drivers/clk/qcom/mmcc-msm8998.c new file +3
-0+MODULE_DESCRIPTION ("QCOM MMCC MSM8998 Driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("platform:mmcc-msm8998" );
MODULE_DEVICE_TABLE() will provide the alias for module auto loading, so drop this.
Regards,
Bjorn
Re: [PATCH v3 5/6] clk: qcom: Add MSM8998 Multimedia Clock Controller (MMCC) driver
Quoted 13 lines · Bjorn Andersson
drivers/clk/qcom/mmcc-msm8998.c line 2896
Quoted 10 lines · Jeffrey Hugo
drivers/clk/qcom/mmcc-msm8998.c new file +10
-0+static const struct of_device_id mmcc_msm8998_match_table[] = { + { .compatible ="qcom,mmcc-msm8998" }, + { } +}; +MODULE_DEVICE_TABLE (of, mmcc_msm8998_match_table); + +static int mmcc_msm8998_probe (struct platform_device *pdev) +{ +struct regmap *regmap; +Don't you want to wait for "xo" here as well?
No, I don't want to. As far as I recall, Stephen would like to make a clear divide between clock providers, and clock consumers. Since we have the uart issue in gcc, and gcc is pretty critical to the entire SoC, it seems like there is a reason (not sure I'd call it "good") to wait for xo there.
Here, I'm less confident in the reasoning. mmcc is not really critical to the SoC, and everything it services is "optional". If you have a headless system with no display output, you won't even need it. On system where there is a display, I expect the realistic driver ordering to be that everything which consumes a mmcc clock to come up well after xo is available.
In short, seems like a bit of a kludge to maybe avoid an issue which doesn't seem like would happen.
Quoted 8 lines
Quoted 7 lines
drivers/clk/qcom/mmcc-msm8998.c new file +6
-0+ regmap =qcom_cc_map (pdev, &mmcc_msm8998_desc); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); + +return qcom_cc_really_probe (pdev, &mmcc_msm8998_desc, regmap); +}[..]
Quoted 6 lines
drivers/clk/qcom/mmcc-msm8998.c line 2915
Quoted 3 lines
drivers/clk/qcom/mmcc-msm8998.c new file +3
-0+MODULE_DESCRIPTION ("QCOM MMCC MSM8998 Driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("platform:mmcc-msm8998" );
MODULE_DEVICE_TABLE()will provide the alias for module auto loading, so drop this.
Huh. I did not know that. Will put on the list to fixup.
Quoted 4 lines
Regards,
Bjorn
Signature · 4 lines
Jeffrey Hugo Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Bjorn Andersson
Reviewed-byRe: [PATCH v3 5/6] clk: qcom: Add MSM8998 Multimedia Clock Controller (MMCC) driver
Quoted 27 lines · Jeffrey Hugo
Quoted 13 lines · Bjorn Andersson
drivers/clk/qcom/mmcc-msm8998.c line 2896
Quoted 10 lines · Jeffrey Hugo
drivers/clk/qcom/mmcc-msm8998.c new file +10
-0+static const struct of_device_id mmcc_msm8998_match_table[] = { + { .compatible ="qcom,mmcc-msm8998" }, + { } +}; +MODULE_DEVICE_TABLE (of, mmcc_msm8998_match_table); + +static int mmcc_msm8998_probe (struct platform_device *pdev) +{ +struct regmap *regmap; +Don't you want to wait for "xo" here as well?
No, I don't want to. As far as I recall, Stephen would like to make a clear divide between clock providers, and clock consumers. Since we have the uart issue in gcc, and gcc is pretty critical to the entire SoC, it seems like there is a reason (not sure I'd call it "good") to wait for xo there.
Here, I'm less confident in the reasoning. mmcc is not really critical to the SoC, and everything it services is "optional". If you have a headless system with no display output, you won't even need it. On system where there is a display, I expect the realistic driver ordering to be that everything which consumes a mmcc clock to come up well after xo is available.
Quoted 3 lines
In short, seems like a bit of a kludge to maybe avoid an issue which doesn't seem like would happen.
Okay, cool.
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
drivers/clk/qcom/mmcc-msm8998.c new file +6
-0+ regmap =qcom_cc_map (pdev, &mmcc_msm8998_desc); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); + +return qcom_cc_really_probe (pdev, &mmcc_msm8998_desc, regmap); +}[..]
Quoted 9 lines
Quoted 6 lines
drivers/clk/qcom/mmcc-msm8998.c line 2915
Quoted 3 lines
drivers/clk/qcom/mmcc-msm8998.c new file +3
-0+MODULE_DESCRIPTION ("QCOM MMCC MSM8998 Driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("platform:mmcc-msm8998" );
MODULE_DEVICE_TABLE()will provide the alias for module auto loading, so drop this.Huh. I did not know that. Will put on the list to fixup.
With this dropped (and your objection above) I think the patch looks good.
Regards,
Bjorn
Quoted 12 lines
Quoted 4 lines
Regards,
BjornSignature · 5 lines
Jeffrey Hugo Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v3 6/6 arm64: dts: qcom: msm8998: Add mmcc node
In reply to Jeffrey HugoAdd MSM8998 Multimedia Clock Controller DT node.
--- arch/arm64/boot/dts/qcom/msm8998.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm64/boot/dts/qcom/msm8998.dtsi +14 -0
@@ -3,6 +3,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/qcom,gcc-msm8998.h> +#include <dt-bindings/clock/qcom,mmcc-msm8998.h> #include <dt-bindings/clock/qcom,rpmcc.h> #include <dt-bindings/gpio/gpio.h>
@@ -1066,6 +1067,19 @@ status = "disabled"; }; + mmcc: clock-controller@c8c0000 { + compatible = "qcom,mmcc-msm8998"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + reg = <0x0c8c0000 0x40000>; + + clock-names = "xo", + "gpll0"; + clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, + <&gcc GPLL0_OUT_MAIN>; + }; + timer@17920000 { #address-cells = <1>; #size-cells = <1>;
Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 6/6] arm64: dts: qcom: msm8998: Add mmcc node
Quoted 3 lines · Jeffrey Hugo
Add MSM8998 Multimedia Clock Controller DT node.
Signed-off-by Jeffrey Hugo <[email protected]>
(But same comment as earlier wrt clocks vs clock-names ordering)
Regards,
Bjorn
Quoted 41 lines
--- arch/arm64/boot/dts/qcom/msm8998.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+)arch/arm64/boot/dts/qcom/msm8998.dtsi +14
-0@@ -3,6 +3,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/qcom,gcc-msm8998.h> +#include <dt-bindings/clock/qcom,mmcc-msm8998.h> #include <dt-bindings/clock/qcom,rpmcc.h> #include <dt-bindings/gpio/gpio.h>@@ -1066,6 +1067,19 @@ status = "disabled"; }; + mmcc: clock-controller@c8c0000 { + compatible = "qcom,mmcc-msm8998"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + reg = <0x0c8c0000 0x40000>; + + clock-names = "xo", + "gpll0"; + clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, + <&gcc GPLL0_OUT_MAIN>; + }; + timer@17920000 { #address-cells = <1>; #size-cells = <1>;Signature · 3 lines
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.