Re: [PATCH v2 3/3] clk: qcom: gcc-msm8998: Add clkref clocks

2018-12-05 Thread Stephen Boyd
Quoting Bjorn Andersson (2018-12-03 10:33:30)
> Add clkref clocks for usb3, hdmi, ufs, pcie, and usb2. They are all
> sourced off CXO_IN, so parent them off "xo" until a proper link to the
> rpmcc can be described in DT.
> 
> Signed-off-by: Bjorn Andersson 
> ---

Applied to clk-next



[PATCH v2 3/3] clk: qcom: gcc-msm8998: Add clkref clocks

2018-12-03 Thread Bjorn Andersson
Add clkref clocks for usb3, hdmi, ufs, pcie, and usb2. They are all
sourced off CXO_IN, so parent them off "xo" until a proper link to the
rpmcc can be described in DT.

Signed-off-by: Bjorn Andersson 
---

Changes since v1:
- None

 drivers/clk/qcom/gcc-msm8998.c   | 75 
 include/dt-bindings/clock/qcom,gcc-msm8998.h |  5 ++
 2 files changed, 80 insertions(+)

diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c
index 792b431f9945..717210f61d27 100644
--- a/drivers/clk/qcom/gcc-msm8998.c
+++ b/drivers/clk/qcom/gcc-msm8998.c
@@ -2515,6 +2515,76 @@ static struct clk_branch gcc_usb_phy_cfg_ahb2phy_clk = {
},
 };
 
+static struct clk_branch gcc_hdmi_clkref_clk = {
+   .halt_reg = 0x88000,
+   .clkr = {
+   .enable_reg = 0x88000,
+   .enable_mask = BIT(0),
+   .hw.init = &(struct clk_init_data){
+   .name = "gcc_hdmi_clkref_clk",
+   .parent_names = (const char *[]){ "xo" },
+   .num_parents = 1,
+   .ops = &clk_branch2_ops,
+   },
+   },
+};
+
+static struct clk_branch gcc_ufs_clkref_clk = {
+   .halt_reg = 0x88004,
+   .clkr = {
+   .enable_reg = 0x88004,
+   .enable_mask = BIT(0),
+   .hw.init = &(struct clk_init_data){
+   .name = "gcc_ufs_clkref_clk",
+   .parent_names = (const char *[]){ "xo" },
+   .num_parents = 1,
+   .ops = &clk_branch2_ops,
+   },
+   },
+};
+
+static struct clk_branch gcc_usb3_clkref_clk = {
+   .halt_reg = 0x88008,
+   .clkr = {
+   .enable_reg = 0x88008,
+   .enable_mask = BIT(0),
+   .hw.init = &(struct clk_init_data){
+   .name = "gcc_usb3_clkref_clk",
+   .parent_names = (const char *[]){ "xo" },
+   .num_parents = 1,
+   .ops = &clk_branch2_ops,
+   },
+   },
+};
+
+static struct clk_branch gcc_pcie_clkref_clk = {
+   .halt_reg = 0x8800c,
+   .clkr = {
+   .enable_reg = 0x8800c,
+   .enable_mask = BIT(0),
+   .hw.init = &(struct clk_init_data){
+   .name = "gcc_pcie_clkref_clk",
+   .parent_names = (const char *[]){ "xo" },
+   .num_parents = 1,
+   .ops = &clk_branch2_ops,
+   },
+   },
+};
+
+static struct clk_branch gcc_rx1_usb2_clkref_clk = {
+   .halt_reg = 0x88014,
+   .clkr = {
+   .enable_reg = 0x88014,
+   .enable_mask = BIT(0),
+   .hw.init = &(struct clk_init_data){
+   .name = "gcc_rx1_usb2_clkref_clk",
+   .parent_names = (const char *[]){ "xo" },
+   .num_parents = 1,
+   .ops = &clk_branch2_ops,
+   },
+   },
+};
+
 static struct gdsc pcie_0_gdsc = {
.gdscr = 0x6b004,
.gds_hw_ctrl = 0x0,
@@ -2705,6 +2775,11 @@ static struct clk_regmap *gcc_msm8998_clocks[] = {
[USB30_MASTER_CLK_SRC] = &usb30_master_clk_src.clkr,
[USB30_MOCK_UTMI_CLK_SRC] = &usb30_mock_utmi_clk_src.clkr,
[USB3_PHY_AUX_CLK_SRC] = &usb3_phy_aux_clk_src.clkr,
+   [GCC_HDMI_CLKREF_CLK] = &gcc_hdmi_clkref_clk.clkr,
+   [GCC_UFS_CLKREF_CLK] = &gcc_ufs_clkref_clk.clkr,
+   [GCC_USB3_CLKREF_CLK] = &gcc_usb3_clkref_clk.clkr,
+   [GCC_PCIE_CLKREF_CLK] = &gcc_pcie_clkref_clk.clkr,
+   [GCC_RX1_USB2_CLKREF_CLK] = &gcc_rx1_usb2_clkref_clk.clkr,
 };
 
 static struct gdsc *gcc_msm8998_gdscs[] = {
diff --git a/include/dt-bindings/clock/qcom,gcc-msm8998.h 
b/include/dt-bindings/clock/qcom,gcc-msm8998.h
index 58a242e656b1..b3448800980a 100644
--- a/include/dt-bindings/clock/qcom,gcc-msm8998.h
+++ b/include/dt-bindings/clock/qcom,gcc-msm8998.h
@@ -180,6 +180,11 @@
 #define USB30_MASTER_CLK_SRC   163
 #define USB30_MOCK_UTMI_CLK_SRC164
 #define USB3_PHY_AUX_CLK_SRC   165
+#define GCC_USB3_CLKREF_CLK166
+#define GCC_HDMI_CLKREF_CLK167
+#define GCC_UFS_CLKREF_CLK 168
+#define GCC_PCIE_CLKREF_CLK169
+#define GCC_RX1_USB2_CLKREF_CLK170
 
 #define PCIE_0_GDSC0
 #define UFS_GDSC   1
-- 
2.18.0