Add DISPCC driver for SM6115
v2 cover Add DISPCC driver for SM6115
This patch series introduce support for SM6115 display clock controller, this driver is based on QCM2290 one.
Changes since v1
================
1. Changed bindings file names to Vendor,SoC-IP format.
2. Changed include in dispcc-sm6115 to reflect name change of bindings.
Adam Skladowski (2):
dt-bindings: clock: add QCOM SM6115 display clock bindings
clk: qcom: Add display clock controller driver for SM6115
.../bindings/clock/qcom,sm6115-dispcc.yaml | 88 +++ drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/dispcc-sm6115.c | 615 ++++++++++++++++++ .../dt-bindings/clock/qcom,sm6115-dispcc.h | 36 + 5 files changed, 749 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml create mode 100644 drivers/clk/qcom/dispcc-sm6115.c create mode 100644 include/dt-bindings/clock/qcom,sm6115-dispcc.h
Signature · 1 line
2.25.1
PATCH v2 1/2 dt-bindings: clock: add QCOM SM6115 display clock bindings
Add device tree bindings for display clock controller for Qualcomm Technology Inc's SM6115 SoC.
--- .../bindings/clock/qcom,sm6115-dispcc.yaml | 88 +++++++++++++++++++ .../dt-bindings/clock/qcom,sm6115-dispcc.h | 36 ++++++++ 2 files changed, 124 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml create mode 100644 include/dt-bindings/clock/qcom,sm6115-dispcc.h
Documentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml new file +88 -0
@@ -0,0 +1,88 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/qcom,sm6115-dispcc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Display Clock Controller Binding for SM6115 + +maintainers: + - Bjorn Andersson <[email protected]> + +description: | + Qualcomm display clock control module which supports the clocks and + power domains on SM6115. + + See also: + dt-bindings/clock/qcom,sm6115-dispcc.h + +properties: + compatible: + enum: + - qcom,sm6115-dispcc + + clocks: + items: + - description: Board XO source + - description: Byte clock from DSI PHY0 + - description: Pixel clock from DSI PHY0 + - description: GPLL0 clock from GCC + - description: GPLL0 div clock from GCC + - description: Board sleep clock + + clock-names: + items: + - const: bi_tcxo + - const: dsi0_phy_pll_out_byteclk + - const: dsi0_phy_pll_out_dsiclk + - const: gcc_disp_gpll0_clk_src + - const: gcc_disp_gpll0_div_clk_src + - const: sleep_clk + + '#clock-cells': + const: 1 + + '#reset-cells': + const: 1 + + '#power-domain-cells': + const: 1 + + reg: + maxItems: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - '#clock-cells' + - '#reset-cells' + - '#power-domain-cells' + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,rpmcc.h> + #include <dt-bindings/clock/qcom,gcc-sm6115.h> + clock-controller@5f00000 { + compatible = "qcom,sm6115-dispcc"; + reg = <0x5f00000 0x20000>; + clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, + <&dsi0_phy 0>, + <&dsi0_phy 1>, + <&gcc GCC_DISP_GPLL0_CLK_SRC>, + <&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>, + <&sleep_clk>; + clock-names = "bi_tcxo", + "dsi0_phy_pll_out_byteclk", + "dsi0_phy_pll_out_dsiclk", + "gcc_disp_gpll0_clk_src", + "gcc_disp_gpll0_div_clk_src", + "sleep_clk"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; +...
include/dt-bindings/clock/qcom,sm6115-dispcc.h new file +36 -0
@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* +* Copyright (c) 2022, The Linux Foundation. All rights reserved. +*/ + +#ifndef _DT_BINDINGS_CLK_QCOM_DISP_CC_SM6115_H +#define _DT_BINDINGS_CLK_QCOM_DISP_CC_SM6115_H + +/* DISP_CC clocks */ +#define DISP_CC_PLL0 0 +#define DISP_CC_PLL0_OUT_MAIN 1 +#define DISP_CC_MDSS_AHB_CLK 2 +#define DISP_CC_MDSS_AHB_CLK_SRC 3 +#define DISP_CC_MDSS_BYTE0_CLK 4 +#define DISP_CC_MDSS_BYTE0_CLK_SRC 5 +#define DISP_CC_MDSS_BYTE0_DIV_CLK_SRC 6 +#define DISP_CC_MDSS_BYTE0_INTF_CLK 7 +#define DISP_CC_MDSS_ESC0_CLK 8 +#define DISP_CC_MDSS_ESC0_CLK_SRC 9 +#define DISP_CC_MDSS_MDP_CLK 10 +#define DISP_CC_MDSS_MDP_CLK_SRC 11 +#define DISP_CC_MDSS_MDP_LUT_CLK 12 +#define DISP_CC_MDSS_NON_GDSC_AHB_CLK 13 +#define DISP_CC_MDSS_PCLK0_CLK 14 +#define DISP_CC_MDSS_PCLK0_CLK_SRC 15 +#define DISP_CC_MDSS_ROT_CLK 16 +#define DISP_CC_MDSS_ROT_CLK_SRC 17 +#define DISP_CC_MDSS_VSYNC_CLK 18 +#define DISP_CC_MDSS_VSYNC_CLK_SRC 19 +#define DISP_CC_SLEEP_CLK 20 +#define DISP_CC_SLEEP_CLK_SRC 21 + +/* DISP_CC GDSCR */ +#define MDSS_GDSC 0 + +#endif
Signature · 1 line
2.25.1
Rob Herring
maintainerRe: [PATCH v2 1/2] dt-bindings: clock: add QCOM SM6115 display clock bindings
Quoted 17 lines · Adam Skladowski
Add device tree bindings for display clock controller for Qualcomm Technology Inc's SM6115 SoC.
Signed-off-by Adam Skladowski <[email protected]>--- .../bindings/clock/qcom,sm6115-dispcc.yaml | 88 +++++++++++++++++++ .../dt-bindings/clock/qcom,sm6115-dispcc.h | 36 ++++++++ 2 files changed, 124 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml create mode 100644 include/dt-bindings/clock/qcom,sm6115-dispcc.hDocumentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml new file +0
-0
Documentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml line 10
Quoted 10 lines
Documentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml new file +10
-0@@ -0,0 +1,88 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/qcom,sm6115-dispcc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Display Clock Controller Binding for SM6115 + +maintainers: + - Bjorn Andersson <[email protected]>
As of today, bouncing...
Otherwise, looks fine.
Quoted 124 lines
Documentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml new file +78
-0+ +description: | + Qualcomm display clock control module which supports the clocks and + power domains on SM6115. + + See also: + dt-bindings/clock/qcom,sm6115-dispcc.h + +properties: + compatible: + enum: + - qcom,sm6115-dispcc + + clocks: + items: + - description: Board XO source + - description: Byte clock from DSI PHY0 + - description: Pixel clock from DSI PHY0 + - description: GPLL0 clock from GCC + - description: GPLL0 div clock from GCC + - description: Board sleep clock + + clock-names: + items: + - const: bi_tcxo + - const: dsi0_phy_pll_out_byteclk + - const: dsi0_phy_pll_out_dsiclk + - const: gcc_disp_gpll0_clk_src + - const: gcc_disp_gpll0_div_clk_src + - const: sleep_clk + + '#clock-cells': + const: 1 + + '#reset-cells': + const: 1 + + '#power-domain-cells': + const: 1 + + reg: + maxItems: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - '#clock-cells' + - '#reset-cells' + - '#power-domain-cells' + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,rpmcc.h> + #include <dt-bindings/clock/qcom,gcc-sm6115.h> + clock-controller@5f00000 { + compatible = "qcom,sm6115-dispcc"; + reg = <0x5f00000 0x20000>; + clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, + <&dsi0_phy 0>, + <&dsi0_phy 1>, + <&gcc GCC_DISP_GPLL0_CLK_SRC>, + <&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>, + <&sleep_clk>; + clock-names = "bi_tcxo", + "dsi0_phy_pll_out_byteclk", + "dsi0_phy_pll_out_dsiclk", + "gcc_disp_gpll0_clk_src", + "gcc_disp_gpll0_div_clk_src", + "sleep_clk"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; +...include/dt-bindings/clock/qcom,sm6115-dispcc.h new file +36
-0@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* +* Copyright (c) 2022, The Linux Foundation. All rights reserved. +*/ + +#ifndef _DT_BINDINGS_CLK_QCOM_DISP_CC_SM6115_H +#define _DT_BINDINGS_CLK_QCOM_DISP_CC_SM6115_H + +/* DISP_CC clocks */ +#define DISP_CC_PLL0 0 +#define DISP_CC_PLL0_OUT_MAIN 1 +#define DISP_CC_MDSS_AHB_CLK 2 +#define DISP_CC_MDSS_AHB_CLK_SRC 3 +#define DISP_CC_MDSS_BYTE0_CLK 4 +#define DISP_CC_MDSS_BYTE0_CLK_SRC 5 +#define DISP_CC_MDSS_BYTE0_DIV_CLK_SRC 6 +#define DISP_CC_MDSS_BYTE0_INTF_CLK 7 +#define DISP_CC_MDSS_ESC0_CLK 8 +#define DISP_CC_MDSS_ESC0_CLK_SRC 9 +#define DISP_CC_MDSS_MDP_CLK 10 +#define DISP_CC_MDSS_MDP_CLK_SRC 11 +#define DISP_CC_MDSS_MDP_LUT_CLK 12 +#define DISP_CC_MDSS_NON_GDSC_AHB_CLK 13 +#define DISP_CC_MDSS_PCLK0_CLK 14 +#define DISP_CC_MDSS_PCLK0_CLK_SRC 15 +#define DISP_CC_MDSS_ROT_CLK 16 +#define DISP_CC_MDSS_ROT_CLK_SRC 17 +#define DISP_CC_MDSS_VSYNC_CLK 18 +#define DISP_CC_MDSS_VSYNC_CLK_SRC 19 +#define DISP_CC_SLEEP_CLK 20 +#define DISP_CC_SLEEP_CLK_SRC 21 + +/* DISP_CC GDSCR */ +#define MDSS_GDSC 0 + +#endif Signature · 1 line
2.25.1
PATCH v2 2/2 clk: qcom: Add display clock controller driver for SM6115
In reply to Adam SkladowskiAdd support for the display clock controller found in SM6115/SM4250 based devices. This clock controller feeds the Multimedia Display SubSystem (MDSS).
This driver is based upon one submitted for QCM2290.
--- drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/dispcc-sm6115.c | 615 +++++++++++++++++++++++++++++++ 3 files changed, 625 insertions(+) create mode 100644 drivers/clk/qcom/dispcc-sm6115.c
drivers/clk/qcom/Kconfig +9 -0
@@ -616,6 +616,15 @@ config SM_CAMCC_8450 Support for the camera clock controller on SM8450 devices. Say Y if you want to support camera devices and camera functionality. +config SM_DISPCC_6115 + tristate "SM6115 Display Clock Controller" + depends on SM_GCC_6115 + help + Support for the display clock controller on Qualcomm Technologies, Inc + SM6115/SM4250 devices. + Say Y if you want to support display devices and functionality such as + splash screen + config SM_DISPCC_6125 tristate "SM6125 Display Clock Controller" depends on SM_GCC_6125
drivers/clk/qcom/Makefile +1 -0
@@ -90,6 +90,7 @@ obj-$(CONFIG_SDX_GCC_55) += gcc-sdx55.o obj-$(CONFIG_SDX_GCC_65) += gcc-sdx65.o obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o obj-$(CONFIG_SM_CAMCC_8450) += camcc-sm8450.o +obj-$(CONFIG_SM_DISPCC_6115) += dispcc-sm6115.o obj-$(CONFIG_SM_DISPCC_6125) += dispcc-sm6125.o obj-$(CONFIG_SM_DISPCC_6350) += dispcc-sm6350.o obj-$(CONFIG_SM_DISPCC_8250) += dispcc-sm8250.o
drivers/clk/qcom/dispcc-sm6115.c new file +615 -0
615 lines not on this page · raw message
Signature · 1 line
2.25.1
Bjorn Andersson
maintainerRe: [PATCH v2 2/2] clk: qcom: Add display clock controller driver for SM6115
Quoted 100 lines · Adam Skladowski
Add support for the display clock controller found in SM6115/SM4250 based devices. This clock controller feeds the Multimedia Display SubSystem (MDSS).
This driver is based upon one submitted for QCM2290.Signed-off-by Adam Skladowski <[email protected]>--- drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/dispcc-sm6115.c | 615 +++++++++++++++++++++++++++++++ 3 files changed, 625 insertions(+) create mode 100644 drivers/clk/qcom/dispcc-sm6115.cdrivers/clk/qcom/Kconfig +9
-0@@ -616,6 +616,15 @@ config SM_CAMCC_8450 Support for the camera clock controller on SM8450 devices. Say Y if you want to support camera devices and camera functionality. +config SM_DISPCC_6115 + tristate "SM6115 Display Clock Controller" + depends on SM_GCC_6115 + help + Support for the display clock controller on Qualcomm Technologies, Inc + SM6115/SM4250 devices. + Say Y if you want to support display devices and functionality such as + splash screen + config SM_DISPCC_6125 tristate "SM6125 Display Clock Controller" depends on SM_GCC_6125drivers/clk/qcom/Makefile +1
-0@@ -90,6 +90,7 @@ obj-$(CONFIG_SDX_GCC_55) += gcc-sdx55.o obj-$(CONFIG_SDX_GCC_65) += gcc-sdx65.o obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o obj-$(CONFIG_SM_CAMCC_8450) += camcc-sm8450.o +obj-$(CONFIG_SM_DISPCC_6115) += dispcc-sm6115.o obj-$(CONFIG_SM_DISPCC_6125) += dispcc-sm6125.o obj-$(CONFIG_SM_DISPCC_6350) += dispcc-sm6350.o obj-$(CONFIG_SM_DISPCC_8250) += dispcc-sm8250.odrivers/clk/qcom/dispcc-sm6115.c new file +49
-0@@ -0,0 +1,615 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Based on dispcc-qcm2290.c +* Copyright (c) 2020, The Linux Foundation. All rights reserved. +* Copyright (c) 2021, Linaro Ltd. +*/ + +#include <linux/err.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/regmap.h> + +#include <dt-bindings/clock/qcom,sm6115-dispcc.h> + +#include "clk-alpha-pll.h" +#include "clk-branch.h" +#include "clk-rcg.h" +#include "clk-regmap.h" +#include "clk-regmap-divider.h" +#include "common.h" +#include "gdsc.h" + +enum { +P_BI_TCXO , +P_DISP_CC_PLL0_OUT_MAIN , +P_DSI0_PHY_PLL_OUT_BYTECLK , +P_DSI0_PHY_PLL_OUT_DSICLK , +P_DSI1_PHY_PLL_OUT_DSICLK , +P_GPLL0_OUT_MAIN , +P_SLEEP_CLK , +}; + +static const struct pll_vco spark_vco[] = { + {500000000 ,1000000000 ,2 }, +}; + +/* 768MHz configuration */ +static const struct alpha_pll_config disp_cc_pll0_config = { + .l =0x28 , + .alpha =0x0 , + .alpha_en_mask =BIT (24 ), + .vco_val =0x2 <<20 , + .vco_mask =GENMASK (21 ,20 ), + .main_output_mask =BIT (0 ), + .config_ctl_val =0x4001055B , +}; +
drivers/clk/qcom/dispcc-sm6115.c line 59
Quoted 10 lines
drivers/clk/qcom/dispcc-sm6115.c new file +10
-0+static struct clk_alpha_pll disp_cc_pll0 = { + .offset =0x0 , + .vco_table = spark_vco, + .num_vco =ARRAY_SIZE (spark_vco), + .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT ], + .clkr = { + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_pll0" , + .parent_data = &(const struct clk_parent_data ){ + .fw_name ="bi_tcxo" ,
It's recently been decided that we would like to avoid using fw_name in new Qualcomm clock bindings/drivers. Can you please rework this to use .index instead?
As done in e.g.:
https://lore.kernel.org/all/[email protected]/
Also for bi_tcxo, I'd prefer if you break that out to its own definition that you can reuse.
Quoted 6 lines
drivers/clk/qcom/dispcc-sm6115.c new file +6
-0+ }, + .num_parents = 1, + .ops = &clk_alpha_pll_ops, + }, + }, +};
[..]
drivers/clk/qcom/dispcc-sm6115.c line 606
Quoted 5 lines
drivers/clk/qcom/dispcc-sm6115.c new file +5
-0+static int __init disp_cc_sm6115_init (void ) +{ +return platform_driver_register (&disp_cc_sm6115_driver); +} +subsys_initcall (disp_cc_sm6115_init);
module_platform_driver() should be sufficient, and is slightly cleaner.
drivers/clk/qcom/dispcc-sm6115.c line 614
Quoted 8 lines
drivers/clk/qcom/dispcc-sm6115.c new file +8
-0+ +static void __exit disp_cc_sm6115_exit(void) +{ +platform_driver_unregister (&disp_cc_sm6115_driver); +} +module_exit (disp_cc_sm6115_exit); + +MODULE_DESCRIPTION ("QTI DISP_CC sm6115 Driver" );
"Qualcomm SM6115 Display Clock controller"?
Quoted 1 line
+MODULE_LICENSE("GPL v2");
As reported by checkpatch, this should simply be "GPL".
Regards,
Bjorn
Quoted 3 lines
Signature · 1 line
2.25.1