Add support for QCOM GDSCs
v4 cover Add support for QCOM GDSCs
GDSCs (Global Distributed Switch Controllers) control switches that supply power to an on-chip power domain and hence can be programmed in SW to safely power collapse and restore power to the respective PDs. They are part of a considerable number of recent QCOM SoCs (This series adds support for msm8974, msm8916 and apq8084 devices) and are part of the Clock control block.
The series implements support for GDSC using the genpd framework modelling these as SW controllable power domains.
* Patch 3/8 has a dependency on 8916 GCC support series [1]
* Client drivers which plan to use GDSC can refer to Documentation/devicetree/bindings/power/power_domain.txt to know how to hook up the power domain for the device through DT
* Runtime PM specific documentation can be found in Documentation/power/runtime_pm.txt
Changes since v3:
* static inline'd gdsc_register/unregister stubs
* error check fixes in gdsc_register
* dropped oxili_gdsc for 8916 as its broken and needs additional WA's not part of this series
* split dts and driver changes into seperate patches
* Updated and included Stephanes patch to add gdscs to apq8084 mmcc in the series
Changes since v2:
* gdsc_unregister added
* gdsc_register/unregister introduced in patch 1/6
Changes since v1:
* added err checks for regmap apis
* added gdsc_register() in gdsc.c
[1] https://lkml.org/lkml/2015/3/18/408
Rajendra Nayak (4):
clk: qcom: gdsc: Prepare common clk probe to register gdscs
clk: qcom: gdsc: Add GDSCs in msm8916 GCC
clk: qcom: gdsc: Add GDSCs in apq8084 GCC
arm: dts: qcom: Add #power-domain-cells property
Stephane Viau (1):
clk: qcom: gdsc: Add GDSCs in apq8084 MMCC
Stephen Boyd (3):
clk: qcom: Add support for GDSCs
clk: qcom: gdsc: Add GDSCs in msm8974 GCC
clk: qcom: gdsc: Add GDSCs in msm8974 MMCC
arch/arm/boot/dts/qcom-apq8084.dtsi | 1 + arch/arm/boot/dts/qcom-msm8974.dtsi | 2 + drivers/clk/qcom/Kconfig | 10 ++ drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/common.c | 16 ++- drivers/clk/qcom/common.h | 2 + drivers/clk/qcom/gcc-apq8084.c | 38 ++++++ drivers/clk/qcom/gcc-msm8916.c | 38 ++++++ drivers/clk/qcom/gcc-msm8974.c | 14 +++ drivers/clk/qcom/gdsc.c | 167 ++++++++++++++++++++++++++ drivers/clk/qcom/gdsc.h | 45 +++++++ drivers/clk/qcom/mmcc-apq8084.c | 56 ++++++++- drivers/clk/qcom/mmcc-msm8974.c | 54 +++++++++ include/dt-bindings/clock/qcom,gcc-apq8084.h | 6 + include/dt-bindings/clock/qcom,gcc-msm8916.h | 8 ++ include/dt-bindings/clock/qcom,gcc-msm8974.h | 3 + include/dt-bindings/clock/qcom,mmcc-apq8084.h | 8 ++ include/dt-bindings/clock/qcom,mmcc-msm8974.h | 8 ++ 18 files changed, 475 insertions(+), 2 deletions(-) create mode 100644 drivers/clk/qcom/gdsc.c create mode 100644 drivers/clk/qcom/gdsc.h
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v4 1/8 clk: qcom: Add support for GDSCs
From: Stephen Boyd <[email protected]>
GDSCs (Global Distributed Switch Controllers) are responsible for safely collapsing and restoring power to peripherals in the SoC. These are best modelled as power domains using genpd and given the registers are scattered throughout the clock controller register space, its best to have the support added through the clock driver.
--- drivers/clk/qcom/Kconfig | 5 ++ drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/gdsc.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/qcom/gdsc.h | 45 +++++++++++++ 4 files changed, 218 insertions(+) create mode 100644 drivers/clk/qcom/gdsc.c create mode 100644 drivers/clk/qcom/gdsc.h
drivers/clk/qcom/Kconfig +5 -0
@@ -38,6 +38,11 @@ config IPQ_LCC_806X Say Y if you want to use audio devices such as i2s, pcm, S/PDIF, etc. +config QCOM_GDSC + bool + select PM_GENERIC_DOMAINS if PM + depends on COMMON_CLK_QCOM + config MSM_GCC_8660 tristate "MSM8660 Global Clock Controller" depends on COMMON_CLK_QCOM
drivers/clk/qcom/Makefile +1 -0
@@ -9,6 +9,7 @@ clk-qcom-y += clk-branch.o clk-qcom-y += clk-regmap-divider.o clk-qcom-y += clk-regmap-mux.o clk-qcom-y += reset.o +clk-qcom-$(CONFIG_QCOM_GDSC) += gdsc.o obj-$(CONFIG_APQ_GCC_8084) += gcc-apq8084.o obj-$(CONFIG_APQ_MMCC_8084) += mmcc-apq8084.o
drivers/clk/qcom/gdsc.c new file +167 -0
167 lines not on this page · raw message
drivers/clk/qcom/gdsc.h new file +45 -0
45 lines not on this page · raw message
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v4 2/8 clk: qcom: gdsc: Prepare common clk probe to register gdscs
In reply to Rajendra NayakThe common clk probe registers a clk provider and a reset controller. Update it to register a genpd provider using the gdsc data provided by each platform.
--- drivers/clk/qcom/common.c | 16 +++++++++++++++- drivers/clk/qcom/common.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/clk/qcom/common.c +15 -1
@@ -21,6 +21,7 @@#include "clk-rcg.h" #include "clk-regmap.h" #include "reset.h" +#include "gdsc.h" struct qcom_cc {struct qcom_reset_controller reset;
@@ -125,8 +126,20 @@ int qcom_cc_really_probe(struct platform_device *pdev, ret =reset_controller_register (&reset->rcdev);if (ret) -of_clk_del_provider (dev->of_node); + goto err_reset; +if (desc->gdscs && desc->num_gdscs) { + ret =gdsc_register (dev, desc->gdscs, desc->num_gdscs, regmap); +if (ret) + goto err_pd; + } + +return 0 ; +err_pd: +dev_err (dev,"Failed to register power domains\n" ); +reset_controller_unregister (&reset->rcdev); +err_reset: +of_clk_del_provider (dev->of_node);return ret; }EXPORT_SYMBOL_GPL (qcom_cc_really_probe);
@@ -145,6 +158,7 @@ EXPORT_SYMBOL_GPL(qcom_cc_probe);void qcom_cc_remove (struct platform_device *pdev) { +gdsc_unregister (&pdev->dev);of_clk_del_provider (pdev->dev.of_node);reset_controller_unregister (platform_get_drvdata (pdev)); }
drivers/clk/qcom/common.h +2 -0
@@ -27,6 +27,8 @@ struct qcom_cc_desc {size_t num_clks;const struct qcom_reset_map *resets;size_t num_resets; +struct gdsc **gdscs; +size_t num_gdscs; }; extern const struct freq_tbl *qcom_find_freq(const struct freq_tbl *f,
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v4 3/8 clk: qcom: gdsc: Add GDSCs in msm8916 GCC
In reply to Rajendra NayakAdd all data for the GDSCs which are part of msm8916 GCC block.
--- drivers/clk/qcom/Kconfig | 1 + drivers/clk/qcom/gcc-msm8916.c | 38 ++++++++++++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-msm8916.h | 8 ++++++ 3 files changed, 47 insertions(+)
drivers/clk/qcom/Kconfig +1 -0
@@ -53,6 +53,7 @@ config MSM_GCC_8660 config MSM_GCC_8916 tristate "MSM8916 Global Clock Controller" + select QCOM_GDSC depends on COMMON_CLK_QCOM help Support for the global clock controller on msm8916 devices.
drivers/clk/qcom/gcc-msm8916.c +38 -0
@@ -31,6 +31,7 @@#include "clk-rcg.h" #include "clk-branch.h" #include "reset.h" +#include "gdsc.h" enum {P_XO ,
@@ -2574,6 +2575,34 @@ static struct clk_branch gcc_venus0_vcodec0_clk = { }, }; +static struct gdsc venus_gdsc = { + .gdscr =0x4c018 , + .pd = { + .name ="venus" , + }, +}; + +static struct gdsc mdss_gdsc = { + .gdscr =0x4d078 , + .pd = { + .name ="mdss" , + }, +}; + +static struct gdsc jpeg_gdsc = { + .gdscr =0x5701c , + .pd = { + .name ="jpeg" , + }, +}; + +static struct gdsc vfe_gdsc = { + .gdscr =0x58034 , + .pd = { + .name ="vfe" , + }, +}; +static struct clk_regmap *gcc_msm8916_clocks[] = { [GPLL0 ] = &gpll0.clkr, [GPLL0_VOTE ] = &gpll0_vote,
@@ -2715,6 +2744,13 @@ static struct clk_regmap *gcc_msm8916_clocks[] = { [GCC_VENUS0_VCODEC0_CLK] = &gcc_venus0_vcodec0_clk.clkr, }; +static struct gdsc *gcc_msm8916_gdscs[] = { + [VENUS_GDSC ] = &venus_gdsc, + [MDSS_GDSC ] = &mdss_gdsc, + [JPEG_GDSC ] = &jpeg_gdsc, + [VFE_GDSC ] = &vfe_gdsc, +}; +static const struct qcom_reset_map gcc_msm8916_resets[] = { [GCC_BLSP1_BCR ] = {0x01000 }, [GCC_BLSP1_QUP1_BCR ] = {0x02000 },
@@ -2822,6 +2858,8 @@ static const struct qcom_cc_desc gcc_msm8916_desc = { .num_clks = ARRAY_SIZE(gcc_msm8916_clocks), .resets = gcc_msm8916_resets, .num_resets = ARRAY_SIZE(gcc_msm8916_resets), + .gdscs = gcc_msm8916_gdscs, + .num_gdscs = ARRAY_SIZE(gcc_msm8916_gdscs), };static const struct of_device_id gcc_msm8916_match_table[] = {
include/dt-bindings/clock/qcom,gcc-msm8916.h +8 -0
@@ -153,4 +153,12 @@#define GCC_VENUS0_AXI_CLK 136#define GCC_VENUS0_VCODEC0_CLK 137 +/* Indexes for GDSCs */ +#define BIMC_GDSC 0 +#define VENUS_GDSC 1 +#define MDSS_GDSC 2 +#define JPEG_GDSC 3 +#define VFE_GDSC 4 +#define OXILI_GDSC 5 +#endif
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v4 4/8 clk: qcom: gdsc: Add GDSCs in msm8974 GCC
In reply to Rajendra NayakFrom: Stephen Boyd <[email protected]>
Theres just one GDSC as part of the msm8974 GCC block.
--- drivers/clk/qcom/Kconfig | 1 + drivers/clk/qcom/gcc-msm8974.c | 14 ++++++++++++++ include/dt-bindings/clock/qcom,gcc-msm8974.h | 3 +++ 3 files changed, 18 insertions(+)
drivers/clk/qcom/Kconfig +1 -0
@@ -88,6 +88,7 @@ config MSM_MMCC_8960 config MSM_GCC_8974 tristate "MSM8974 Global Clock Controller" + select QCOM_GDSC depends on COMMON_CLK_QCOM help Support for the global clock controller on msm8974 devices.
drivers/clk/qcom/gcc-msm8974.c +14 -0
@@ -31,6 +31,7 @@#include "clk-rcg.h" #include "clk-branch.h" #include "reset.h" +#include "gdsc.h" enum {P_XO ,
@@ -2434,6 +2435,13 @@ static struct clk_branch gcc_usb_hsic_system_clk = { }, }; +static struct gdsc usb_hs_hsic_gdsc = { + .gdscr =0x404 , + .pd = { + .name ="usb_hs_hsic" , + }, +}; +static struct clk_regmap *gcc_msm8974_clocks[] = { [GPLL0 ] = &gpll0.clkr, [GPLL0_VOTE ] = &gpll0_vote,
@@ -2663,6 +2671,10 @@ static const struct qcom_reset_map gcc_msm8974_resets[] = { [GCC_VENUS_RESTART] = { 0x1740 }, }; +static struct gdsc *gcc_msm8974_gdscs[] = { + [USB_HS_HSIC_GDSC ] = &usb_hs_hsic_gdsc, +}; +static const struct regmap_config gcc_msm8974_regmap_config = { .reg_bits =32 , .reg_stride =4 ,
@@ -2677,6 +2689,8 @@ static const struct qcom_cc_desc gcc_msm8974_desc = { .num_clks = ARRAY_SIZE(gcc_msm8974_clocks), .resets = gcc_msm8974_resets, .num_resets = ARRAY_SIZE(gcc_msm8974_resets), + .gdscs = gcc_msm8974_gdscs, + .num_gdscs = ARRAY_SIZE(gcc_msm8974_gdscs), };static const struct of_device_id gcc_msm8974_match_table[] = {
include/dt-bindings/clock/qcom,gcc-msm8974.h +3 -0
@@ -321,4 +321,7 @@#define GCC_SDCC1_CDCCAL_SLEEP_CLK 304#define GCC_SDCC1_CDCCAL_FF_CLK 305 +/* gdscs */ +#define USB_HS_HSIC_GDSC 0 +#endif
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v4 5/8 clk: qcom: gdsc: Add GDSCs in msm8974 MMCC
In reply to Rajendra NayakFrom: Stephen Boyd <[email protected]>
Add the GDSC instances that exist as part of msm8974 MMCC block
--- drivers/clk/qcom/Kconfig | 1 + drivers/clk/qcom/mmcc-msm8974.c | 54 +++++++++++++++++++++++++++ include/dt-bindings/clock/qcom,mmcc-msm8974.h | 8 ++++ 3 files changed, 63 insertions(+)
drivers/clk/qcom/Kconfig +1 -0
@@ -98,6 +98,7 @@ config MSM_GCC_8974 config MSM_MMCC_8974 tristate "MSM8974 Multimedia Clock Controller" select MSM_GCC_8974 + select QCOM_GDSC depends on COMMON_CLK_QCOM help Support for the multimedia clock controller on msm8974 devices.
drivers/clk/qcom/mmcc-msm8974.c +54 -0
78 lines not on this page · raw message
include/dt-bindings/clock/qcom,mmcc-msm8974.h +8 -0
@@ -158,4 +158,12 @@#define SPDM_RM_AXI 141#define SPDM_RM_OCMEMNOC 142 +/* gdscs */ +#define VENUS0_GDSC 0 +#define MDSS_GDSC 1 +#define CAMSS_JPEG_GDSC 2 +#define CAMSS_VFE_GDSC 3 +#define OXILI_GDSC 4 +#define OXILICX_GDSC 5 +#endif
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v4 6/8 clk: qcom: gdsc: Add GDSCs in apq8084 GCC
In reply to Rajendra NayakAdd the GDSC instances that exist as part of apq8084 GCC block
--- drivers/clk/qcom/Kconfig | 1 + drivers/clk/qcom/gcc-apq8084.c | 38 ++++++++++++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-apq8084.h | 6 +++++ 3 files changed, 45 insertions(+)
drivers/clk/qcom/Kconfig +1 -0
@@ -6,6 +6,7 @@ config COMMON_CLK_QCOM config APQ_GCC_8084 tristate "APQ8084 Global Clock Controller" + select QCOM_GDSC depends on COMMON_CLK_QCOM help Support for the global clock controller on apq8084 devices.
drivers/clk/qcom/gcc-apq8084.c +38 -0
@@ -31,6 +31,7 @@#include "clk-rcg.h" #include "clk-branch.h" #include "reset.h" +#include "gdsc.h" enum {P_XO ,
@@ -3259,6 +3260,34 @@ static struct clk_branch gcc_usb_hsic_system_clk = { }, }; +static struct gdsc usb_hs_hsic_gdsc = { + .gdscr =0x404 , + .pd = { + .name ="usb_hs_hsic" , + }, +}; + +static struct gdsc pcie0_gdsc = { + .gdscr =0x1ac4 , + .pd = { + .name ="pcie0" , + }, +}; + +static struct gdsc pcie1_gdsc = { + .gdscr =0x1b44 , + .pd = { + .name ="pcie1" , + }, +}; + +static struct gdsc usb30_gdsc = { + .gdscr =0x1e84 , + .pd = { + .name ="usb30" , + }, +}; +static struct clk_regmap *gcc_apq8084_clocks[] = { [GPLL0 ] = &gpll0.clkr, [GPLL0_VOTE ] = &gpll0_vote,
@@ -3452,6 +3481,13 @@ static struct clk_regmap *gcc_apq8084_clocks[] = { [GCC_USB_HSIC_SYSTEM_CLK] = &gcc_usb_hsic_system_clk.clkr, }; +static struct gdsc *gcc_apq8084_gdscs[] = { + [USB_HS_HSIC_GDSC ] = &usb_hs_hsic_gdsc, + [PCIE0_GDSC ] = &pcie0_gdsc, + [PCIE1_GDSC ] = &pcie1_gdsc, + [USB30_GDSC ] = &usb30_gdsc, +}; +static const struct qcom_reset_map gcc_apq8084_resets[] = { [GCC_SYSTEM_NOC_BCR ] = {0x0100 }, [GCC_CONFIG_NOC_BCR ] = {0x0140 },
@@ -3560,6 +3596,8 @@ static const struct qcom_cc_desc gcc_apq8084_desc = { .num_clks = ARRAY_SIZE(gcc_apq8084_clocks), .resets = gcc_apq8084_resets, .num_resets = ARRAY_SIZE(gcc_apq8084_resets), + .gdscs = gcc_apq8084_gdscs, + .num_gdscs = ARRAY_SIZE(gcc_apq8084_gdscs), };static const struct of_device_id gcc_apq8084_match_table[] = {
include/dt-bindings/clock/qcom,gcc-apq8084.h +6 -0
@@ -348,4 +348,10 @@#define GCC_PCIE_1_PIPE_CLK 331#define GCC_PCIE_1_SLV_AXI_CLK 332 +/* gdscs */ +#define USB_HS_HSIC_GDSC 0 +#define PCIE0_GDSC 1 +#define PCIE1_GDSC 2 +#define USB30_GDSC 3 +#endif
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v4 7/8 clk: qcom: gdsc: Add GDSCs in apq8084 MMCC
In reply to Rajendra NayakFrom: Stephane Viau <[email protected]>
Add the GDSC instances that exist as part of apq8084 MMCC block.
--- drivers/clk/qcom/Kconfig | 1 + drivers/clk/qcom/mmcc-apq8084.c | 56 ++++++++++++++++++++++++++- include/dt-bindings/clock/qcom,mmcc-apq8084.h | 8 ++++ 3 files changed, 64 insertions(+), 1 deletion(-)
drivers/clk/qcom/Kconfig +1 -0
@@ -16,6 +16,7 @@ config APQ_GCC_8084 config APQ_MMCC_8084 tristate "APQ8084 Multimedia Clock Controller" select APQ_GCC_8084 + select QCOM_GDSC depends on COMMON_CLK_QCOM help Support for the multimedia clock controller on apq8084 devices.
drivers/clk/qcom/mmcc-apq8084.c +55 -1
84 lines not on this page · raw message
include/dt-bindings/clock/qcom,mmcc-apq8084.h +8 -0
@@ -180,4 +180,12 @@#define VPU_SLEEP_CLK 163#define VPU_VDP_CLK 164 +/* GDSCs */ +#define VENUS0_GDSC 0 +#define MDSS_GDSC 1 +#define CAMSS_JPEG_GDSC 2 +#define CAMSS_VFE_GDSC 3 +#define OXILI_GDSC 4 +#define OXILICX_GDSC 5 +#endif
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v4 8/8 arm: dts: qcom: Add #power-domain-cells property
In reply to Rajendra Nayakmsm8974 has gcc and mmcc nodes, and apq8084 has a gcc node which implement gdsc powerdomains. Add the #power-domain-cells property to them.
--- arch/arm/boot/dts/qcom-apq8084.dtsi | 1 + arch/arm/boot/dts/qcom-msm8974.dtsi | 2 ++ 2 files changed, 3 insertions(+)
arch/arm/boot/dts/qcom-apq8084.dtsi +1 -0
@@ -183,6 +183,7 @@ compatible = "qcom,gcc-apq8084"; #clock-cells = <1>; #reset-cells = <1>; + #power-domain-cells = <1>; reg = <0xfc400000 0x4000>; };
arch/arm/boot/dts/qcom-msm8974.dtsi +2 -0
@@ -179,6 +179,7 @@ compatible = "qcom,gcc-msm8974"; #clock-cells = <1>; #reset-cells = <1>; + #power-domain-cells = <1>; reg = <0xfc400000 0x4000>; };
@@ -186,6 +187,7 @@ compatible = "qcom,mmcc-msm8974"; #clock-cells = <1>; #reset-cells = <1>; + #power-domain-cells = <1>; reg = <0xfd8c0000 0x6000>; };
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation