| Message ID | 1432192376-6712-6-git-send-email-jamesjj.liao@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 21, 2015 at 03:12:56PM +0800, James Liao wrote: > Add REF2USB_TX clock support into MT8173 APMIXEDSYS. This clock > is needed by USB 3.0. > > + > +static struct clk *mtk_clk_register_ref2usb_tx(const char *name, > + void __iomem *reg) > +{ > + struct mtk_ref2usb_tx *tx; > + struct clk_init_data init = {}; > + struct clk *clk; > + const char *parent_name = "clk26m"; > + > + tx = kzalloc(sizeof(*tx), GFP_KERNEL); > + if (!tx) > + return ERR_PTR(-ENOMEM); > + > + tx->base_addr = reg; > + tx->hw.init = &init; > + > + init.name = name; > + init.ops = &mtk_ref2usb_tx_ops; > + init.parent_names = &parent_name; > + init.num_parents = 1; > + > + clk = clk_register(NULL, &tx->hw); > + > + if (IS_ERR(clk)) { > + pr_err("Failed to register clk %s: %ld\n", name, PTR_ERR(clk)); > + kfree(tx); > + } > + > + return clk; > +} > + > +static void __init mtk_clk_register_apmixedsys_special(struct device_node *node, > + struct clk_onecell_data *clk_data) > +{ > + void __iomem *base; > + struct clk *clk; > + > + base = of_iomap(node, 0); > + if (!base) { > + pr_err("%s(): ioremap failed\n", __func__); > + return; > + } > + > + clk = mtk_clk_register_ref2usb_tx("ref2usb_tx", base + 0x8); The function seems to be for one special clock only. Why do you pass the name to it? They will never be called with another name, right? Sascha
Hi Sascha, On Tue, 2015-05-26 at 10:05 +0200, Sascha Hauer wrote: > On Thu, May 21, 2015 at 03:12:56PM +0800, James Liao wrote: > > +static void __init mtk_clk_register_apmixedsys_special(struct device_node *node, > > + struct clk_onecell_data *clk_data) > > +{ > > + void __iomem *base; > > + struct clk *clk; > > + > > + base = of_iomap(node, 0); > > + if (!base) { > > + pr_err("%s(): ioremap failed\n", __func__); > > + return; > > + } > > + > > + clk = mtk_clk_register_ref2usb_tx("ref2usb_tx", base + 0x8); > > The function seems to be for one special clock only. Why do you pass the > name to it? They will never be called with another name, right? This function decides clock name and associates clock ID for special clocks. In fact there may be another "special clocks" need to add into apmixedsys. I think it's a better way to group clock names and clock IDs in the same function for maintenance. Best regards, James
On Tue, May 26, 2015 at 05:11:15PM +0800, James Liao wrote: > Hi Sascha, > > On Tue, 2015-05-26 at 10:05 +0200, Sascha Hauer wrote: > > On Thu, May 21, 2015 at 03:12:56PM +0800, James Liao wrote: > > > +static void __init mtk_clk_register_apmixedsys_special(struct device_node *node, > > > + struct clk_onecell_data *clk_data) > > > +{ > > > + void __iomem *base; > > > + struct clk *clk; > > > + > > > + base = of_iomap(node, 0); > > > + if (!base) { > > > + pr_err("%s(): ioremap failed\n", __func__); > > > + return; > > > + } > > > + > > > + clk = mtk_clk_register_ref2usb_tx("ref2usb_tx", base + 0x8); > > > > The function seems to be for one special clock only. Why do you pass the > > name to it? They will never be called with another name, right? > > This function decides clock name and associates clock ID for special > clocks. In fact there may be another "special clocks" need to add into > apmixedsys. I think it's a better way to group clock names and clock IDs > in the same function for maintenance. How can a function with ref2usb_tx in its name ever register a clock with another name? Then it seems the function name is wrong. Sascha
Hi Sascha, On Tue, 2015-05-26 at 11:41 +0200, Sascha Hauer wrote: > On Tue, May 26, 2015 at 05:11:15PM +0800, James Liao wrote: > > On Tue, 2015-05-26 at 10:05 +0200, Sascha Hauer wrote: > > > On Thu, May 21, 2015 at 03:12:56PM +0800, James Liao wrote: > > > > +static void __init mtk_clk_register_apmixedsys_special(struct device_node *node, > > > > + struct clk_onecell_data *clk_data) > > > > +{ > > > > + void __iomem *base; > > > > + struct clk *clk; > > > > + > > > > + base = of_iomap(node, 0); > > > > + if (!base) { > > > > + pr_err("%s(): ioremap failed\n", __func__); > > > > + return; > > > > + } > > > > + > > > > + clk = mtk_clk_register_ref2usb_tx("ref2usb_tx", base + 0x8); > > > > > > The function seems to be for one special clock only. Why do you pass the > > > name to it? They will never be called with another name, right? > > > > This function decides clock name and associates clock ID for special > > clocks. In fact there may be another "special clocks" need to add into > > apmixedsys. I think it's a better way to group clock names and clock IDs > > in the same function for maintenance. > > How can a function with ref2usb_tx in its name ever register a clock > with another name? Then it seems the function name is wrong. I mean mtk_clk_register_apmixedsys_special() decides the clock names and clock ID bindings. mtk_clk_register_ref2usb_tx() is only used by ref2usb_tx clock. Other special clocks will not share the implementation with ref2usb_tx. But we can set names and clock IDs for different special clocks in the same function (mtk_clk_register_apmixedsys_special()) to avoid inconsistence naming. Best regards, James
diff --git a/drivers/clk/mediatek/clk-mt8173.c b/drivers/clk/mediatek/clk-mt8173.c index e2f40ba..105844f 100644 --- a/drivers/clk/mediatek/clk-mt8173.c +++ b/drivers/clk/mediatek/clk-mt8173.c @@ -12,6 +12,7 @@ * GNU General Public License for more details. */ +#include <linux/delay.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/slab.h> @@ -978,6 +979,118 @@ static void __init mtk_pericfg_init(struct device_node *node) } CLK_OF_DECLARE(mtk_pericfg, "mediatek,mt8173-pericfg", mtk_pericfg_init); +#define REF2USB_TX_EN BIT(0) +#define REF2USB_TX_LPF_EN BIT(1) +#define REF2USB_TX_OUT_EN BIT(2) +#define REF2USB_EN_MASK (REF2USB_TX_EN | REF2USB_TX_LPF_EN | \ + REF2USB_TX_OUT_EN) + +struct mtk_ref2usb_tx { + struct clk_hw hw; + void __iomem *base_addr; +}; + +static inline struct mtk_ref2usb_tx *to_mtk_ref2usb_tx(struct clk_hw *hw) +{ + return container_of(hw, struct mtk_ref2usb_tx, hw); +} + +static int mtk_ref2usb_tx_is_prepared(struct clk_hw *hw) +{ + struct mtk_ref2usb_tx *tx = to_mtk_ref2usb_tx(hw); + + return (readl(tx->base_addr) & REF2USB_EN_MASK) == REF2USB_EN_MASK; +} + +static int mtk_ref2usb_tx_prepare(struct clk_hw *hw) +{ + struct mtk_ref2usb_tx *tx = to_mtk_ref2usb_tx(hw); + u32 val; + + val = readl(tx->base_addr); + + val |= REF2USB_TX_EN; + writel(val, tx->base_addr); + udelay(100); + + val |= REF2USB_TX_LPF_EN; + writel(val, tx->base_addr); + + val |= REF2USB_TX_OUT_EN; + writel(val, tx->base_addr); + + return 0; +} + +static void mtk_ref2usb_tx_unprepare(struct clk_hw *hw) +{ + struct mtk_ref2usb_tx *tx = to_mtk_ref2usb_tx(hw); + u32 val; + + val = readl(tx->base_addr); + val &= ~REF2USB_EN_MASK; + writel(val, tx->base_addr); +} + +static const struct clk_ops mtk_ref2usb_tx_ops = { + .is_prepared = mtk_ref2usb_tx_is_prepared, + .prepare = mtk_ref2usb_tx_prepare, + .unprepare = mtk_ref2usb_tx_unprepare, +}; + +static struct clk *mtk_clk_register_ref2usb_tx(const char *name, + void __iomem *reg) +{ + struct mtk_ref2usb_tx *tx; + struct clk_init_data init = {}; + struct clk *clk; + const char *parent_name = "clk26m"; + + tx = kzalloc(sizeof(*tx), GFP_KERNEL); + if (!tx) + return ERR_PTR(-ENOMEM); + + tx->base_addr = reg; + tx->hw.init = &init; + + init.name = name; + init.ops = &mtk_ref2usb_tx_ops; + init.parent_names = &parent_name; + init.num_parents = 1; + + clk = clk_register(NULL, &tx->hw); + + if (IS_ERR(clk)) { + pr_err("Failed to register clk %s: %ld\n", name, PTR_ERR(clk)); + kfree(tx); + } + + return clk; +} + +static void __init mtk_clk_register_apmixedsys_special(struct device_node *node, + struct clk_onecell_data *clk_data) +{ + void __iomem *base; + struct clk *clk; + + base = of_iomap(node, 0); + if (!base) { + pr_err("%s(): ioremap failed\n", __func__); + return; + } + + clk = mtk_clk_register_ref2usb_tx("ref2usb_tx", base + 0x8); + + if (IS_ERR(clk)) { + pr_err("Failed to register clk ref2usb_tx: %ld\n", + PTR_ERR(clk)); + return; + } + + clk_data->clks[CLK_APMIXED_REF2USB_TX] = clk; +} + #define MT8173_PLL_FMAX (3000UL * MHZ) #define CON0_MT8173_RST_BAR BIT(24) @@ -1020,12 +1133,19 @@ static const struct mtk_pll_data plls[] = { static void __init mtk_apmixedsys_init(struct device_node *node) { struct clk_onecell_data *clk_data; + int r; mt8173_pll_clk_data = clk_data = mtk_alloc_clk_data(CLK_APMIXED_NR_CLK); if (!clk_data) return; mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data); + mtk_clk_register_apmixedsys_special(node, clk_data); + + r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data); + if (r) + pr_err("%s(): could not register clock provider: %d\n", + __func__, r); mtk_clk_enable_critical(); } diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c index 44409e9..813f0c7 100644 --- a/drivers/clk/mediatek/clk-pll.c +++ b/drivers/clk/mediatek/clk-pll.c @@ -302,7 +302,7 @@ void __init mtk_clk_register_plls(struct device_node *node, const struct mtk_pll_data *plls, int num_plls, struct clk_onecell_data *clk_data) { void __iomem *base; - int r, i; + int i; struct clk *clk; base = of_iomap(node, 0); @@ -324,9 +324,4 @@ void __init mtk_clk_register_plls(struct device_node *node, clk_data->clks[pll->id] = clk; } - - r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data); - if (r) - pr_err("%s(): could not register clock provider: %d\n", - __func__, r); } diff --git a/include/dt-bindings/clock/mt8173-clk.h b/include/dt-bindings/clock/mt8173-clk.h index 94977e6..7b7c555 100644 --- a/include/dt-bindings/clock/mt8173-clk.h +++ b/include/dt-bindings/clock/mt8173-clk.h @@ -158,8 +158,8 @@ /* APMIXED_SYS */ -#define CLK_APMIXED_ARMCA15PLL 1 -#define CLK_APMIXED_ARMCA7PLL 2 +#define CLK_APMIXED_ARMCA15PLL 1 +#define CLK_APMIXED_ARMCA7PLL 2 #define CLK_APMIXED_MAINPLL 3 #define CLK_APMIXED_UNIVPLL 4 #define CLK_APMIXED_MMPLL 5 @@ -172,7 +172,8 @@ #define CLK_APMIXED_APLL2 12 #define CLK_APMIXED_LVDSPLL 13 #define CLK_APMIXED_MSDCPLL2 14 -#define CLK_APMIXED_NR_CLK 15 +#define CLK_APMIXED_REF2USB_TX 15 +#define CLK_APMIXED_NR_CLK 16 /* INFRA_SYS */
Add REF2USB_TX clock support into MT8173 APMIXEDSYS. This clock is needed by USB 3.0. Signed-off-by: James Liao <jamesjj.liao@mediatek.com> --- drivers/clk/mediatek/clk-mt8173.c | 120 +++++++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-pll.c | 7 +- include/dt-bindings/clock/mt8173-clk.h | 7 +- 3 files changed, 125 insertions(+), 9 deletions(-)