| Message ID | 1482437139-29329-3-git-send-email-zmarkovic@sierrawireless.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | Stephen Boyd |
| Headers | show |
On 12/22, Zoran Markovic wrote: > +static struct clk_branch ebi2_clk = { > + .hwcg_reg = 0x2664, > + .hwcg_bit = 6, > + .halt_reg = 0x2fcc, > + .halt_bit = 23, > + .clkr = { > + .enable_reg = 0x2664, > + .enable_mask = BIT(6)|BIT(4), Some spaces here around | please. > + .hw.init = &(struct clk_init_data){ > + .name = "ebi2_clk", > + .ops = &clk_branch_ops, > + }, > + }, > +}; > + > +static struct clk_branch ebi2_aon_clk = { > + .halt_reg = 0x2fcc, > + .halt_bit = 23, > + .clkr = { > + .enable_reg = 0x2664, > + .enable_mask = BIT(8), > + .hw.init = &(struct clk_init_data){ > + .name = "ebi2_always_on_clk", Maybe just ebi2_aon_clk to keep things simple. > + .ops = &clk_branch_ops, > + }, > + }, > +}; > + > static struct clk_hw *gcc_mdm9615_hws[] = { > &cxo.hw, > }; > diff --git a/include/dt-bindings/clock/qcom,gcc-mdm9615.h b/include/dt-bindings/clock/qcom,gcc-mdm9615.h > index 9ab2c40..57cdca6 100644 > --- a/include/dt-bindings/clock/qcom,gcc-mdm9615.h > +++ b/include/dt-bindings/clock/qcom,gcc-mdm9615.h > @@ -323,5 +323,8 @@ > #define CE3_H_CLK 305 > #define USB_HS1_SYSTEM_CLK_SRC 306 > #define USB_HS1_SYSTEM_CLK 307 > +#define EBI2_CLK 309 Why jump from 307 to 309? > +#define EBI2_AON_CLK 310 > +
diff --git a/drivers/clk/qcom/gcc-mdm9615.c b/drivers/clk/qcom/gcc-mdm9615.c index 581a17f..e9e98b1 100644 --- a/drivers/clk/qcom/gcc-mdm9615.c +++ b/drivers/clk/qcom/gcc-mdm9615.c @@ -1563,6 +1563,34 @@ enum { }, }; +static struct clk_branch ebi2_clk = { + .hwcg_reg = 0x2664, + .hwcg_bit = 6, + .halt_reg = 0x2fcc, + .halt_bit = 23, + .clkr = { + .enable_reg = 0x2664, + .enable_mask = BIT(6)|BIT(4), + .hw.init = &(struct clk_init_data){ + .name = "ebi2_clk", + .ops = &clk_branch_ops, + }, + }, +}; + +static struct clk_branch ebi2_aon_clk = { + .halt_reg = 0x2fcc, + .halt_bit = 23, + .clkr = { + .enable_reg = 0x2664, + .enable_mask = BIT(8), + .hw.init = &(struct clk_init_data){ + .name = "ebi2_always_on_clk", + .ops = &clk_branch_ops, + }, + }, +}; + static struct clk_hw *gcc_mdm9615_hws[] = { &cxo.hw, }; @@ -1637,6 +1665,8 @@ enum { [PMIC_ARB1_H_CLK] = &pmic_arb1_h_clk.clkr, [PMIC_SSBI2_CLK] = &pmic_ssbi2_clk.clkr, [RPM_MSG_RAM_H_CLK] = &rpm_msg_ram_h_clk.clkr, + [EBI2_CLK] = &ebi2_clk.clkr, + [EBI2_AON_CLK] = &ebi2_aon_clk.clkr, }; static const struct qcom_reset_map gcc_mdm9615_resets[] = { diff --git a/include/dt-bindings/clock/qcom,gcc-mdm9615.h b/include/dt-bindings/clock/qcom,gcc-mdm9615.h index 9ab2c40..57cdca6 100644 --- a/include/dt-bindings/clock/qcom,gcc-mdm9615.h +++ b/include/dt-bindings/clock/qcom,gcc-mdm9615.h @@ -323,5 +323,8 @@ #define CE3_H_CLK 305 #define USB_HS1_SYSTEM_CLK_SRC 306 #define USB_HS1_SYSTEM_CLK 307 +#define EBI2_CLK 309 +#define EBI2_AON_CLK 310 + #endif
Add definition of EBI2 clock used by MDM9615 NAND controller. Cc: Andy Gross <andy.gross@linaro.org> Cc: David Brown <david.brown@linaro.org> Cc: Michael Turquette <mturquette@baylibre.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: linux-arm-msm@vger.kernel.org Cc: linux-soc@vger.kernel.org Cc: linux-clk@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: Zoran Markovic <zmarkovic@sierrawireless.com> --- drivers/clk/qcom/gcc-mdm9615.c | 30 ++++++++++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-mdm9615.h | 3 +++ 2 files changed, 33 insertions(+)