* [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma @ 2012-01-05 3:11 Richard Zhao 2012-01-05 3:11 ` [PATCH 2/2] arm/imx6q: add cko1 clock Richard Zhao 2012-01-05 9:42 ` [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma Shawn Guo 0 siblings, 2 replies; 6+ messages in thread From: Richard Zhao @ 2012-01-05 3:11 UTC (permalink / raw) To: linux-arm-kernel sdma device names var when use device tree. So we just check whether it includes "sdma" substring. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> --- arch/arm/plat-mxc/include/mach/dma.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h index 233d0a5..1b90803 100644 --- a/arch/arm/plat-mxc/include/mach/dma.h +++ b/arch/arm/plat-mxc/include/mach/dma.h @@ -60,8 +60,7 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan) static inline int imx_dma_is_general_purpose(struct dma_chan *chan) { - return !strcmp(dev_name(chan->device->dev), "imx31-sdma") || - !strcmp(dev_name(chan->device->dev), "imx35-sdma") || + return strstr(dev_name(chan->device->dev), "sdma") || !strcmp(dev_name(chan->device->dev), "imx-dma"); } -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] arm/imx6q: add cko1 clock 2012-01-05 3:11 [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma Richard Zhao @ 2012-01-05 3:11 ` Richard Zhao 2012-01-05 13:53 ` Shawn Guo 2012-01-05 9:42 ` [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma Shawn Guo 1 sibling, 1 reply; 6+ messages in thread From: Richard Zhao @ 2012-01-05 3:11 UTC (permalink / raw) To: linux-arm-kernel imx6q-sabrelite board use it as audio codec clock. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> --- arch/arm/mach-imx/clock-imx6q.c | 74 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-imx/clock-imx6q.c b/arch/arm/mach-imx/clock-imx6q.c index 039a7ab..c8623b5 100644 --- a/arch/arm/mach-imx/clock-imx6q.c +++ b/arch/arm/mach-imx/clock-imx6q.c @@ -329,6 +329,12 @@ #define BM_CLPCR_MASK_SCU_IDLE (0x1 << 26) #define BM_CLPCR_MASK_L2CC_IDLE (0x1 << 27) +#define BP_CCOSR_CKO1_EN 7 +#define BP_CCOSR_CKO1_PODF 4 +#define BM_CCOSR_CKO1_PODF (0x7 << 4) +#define BP_CCOSR_CKO1_SEL 0 +#define BM_CCOSR_CKO1_SEL (0xf << 0) + #define FREQ_480M 480000000 #define FREQ_528M 528000000 #define FREQ_594M 594000000 @@ -393,6 +399,7 @@ static struct clk ipu1_di1_clk; static struct clk ipu2_di0_clk; static struct clk ipu2_di1_clk; static struct clk enfc_clk; +static struct clk cko1_clk; static struct clk dummy_clk = {}; static unsigned long external_high_reference; @@ -928,6 +935,24 @@ static void _clk_disable(struct clk *clk) writel_relaxed(reg, clk->enable_reg); } +static int _clk_enable_1b(struct clk *clk) +{ + u32 reg; + reg = readl_relaxed(clk->enable_reg); + reg |= 0x1 << clk->enable_shift; + writel_relaxed(reg, clk->enable_reg); + + return 0; +} + +static void _clk_disable_1b(struct clk *clk) +{ + u32 reg; + reg = readl_relaxed(clk->enable_reg); + reg &= ~(0x1 << clk->enable_shift); + writel_relaxed(reg, clk->enable_reg); +} + struct divider { struct clk *clk; void __iomem *reg; @@ -973,6 +998,7 @@ DEF_CLK_DIV1(ipu2_di0_pre_div, &ipu2_di0_pre_clk, CSCDR2, IPU2_DI0_PRE); DEF_CLK_DIV1(ipu2_di1_pre_div, &ipu2_di1_pre_clk, CSCDR2, IPU2_DI1_PRE); DEF_CLK_DIV1(ipu1_div, &ipu1_clk, CSCDR3, IPU1_HSP); DEF_CLK_DIV1(ipu2_div, &ipu2_clk, CSCDR3, IPU2_HSP); +DEF_CLK_DIV1(cko1_div, &cko1_clk, CCOSR, CKO1); #define DEF_CLK_DIV2(d, c, r, b) \ static struct divider d = { \ @@ -1028,6 +1054,7 @@ static struct divider *dividers[] = { &enfc_div, &spdif_div, &asrc_serial_div, + &cko1_div, }; static unsigned long ldb_di_clk_get_rate(struct clk *clk) @@ -1615,6 +1642,32 @@ DEF_IPU_DI_MUX(CSCDR2, 2, 1); DEF_IPU_MUX(1); DEF_IPU_MUX(2); +static struct multiplexer cko1_mux = { + .clk = &cko1_clk, + .reg = CCOSR, + .bp = BP_CCOSR_CKO1_SEL, + .bm = BM_CCOSR_CKO1_SEL, + .parents = { + &pll3_usb_otg, + &pll2_bus, + &pll1_sys, + &pll5_video, + &dummy_clk, + &axi_clk, + &enfc_clk, + &ipu1_di0_clk, + &ipu1_di1_clk, + &ipu2_di0_clk, + &ipu2_di1_clk, + &ahb_clk, + &ipg_clk, + &ipg_perclk, + &ckil_clk, + &pll4_audio, + NULL + }, +}; + static struct multiplexer *multiplexers[] = { &axi_mux, &periph_mux, @@ -1657,6 +1710,7 @@ static struct multiplexer *multiplexers[] = { &ipu2_di1_mux, &ipu1_mux, &ipu2_mux, + &cko1_mux, }; static int _clk_set_parent(struct clk *clk, struct clk *parent) @@ -1680,7 +1734,7 @@ static int _clk_set_parent(struct clk *clk, struct clk *parent) break; i++; } - if (!m->parents[i]) + if (!m->parents[i] || m->parents[i] == &dummy_clk) return -EINVAL; val = readl_relaxed(m->reg); @@ -1735,6 +1789,20 @@ DEF_NG_CLK(asrc_serial_clk, &pll3_usb_otg); .secondary = s, \ } +#define DEF_CLK_1B(name, er, es, p, s) \ + static struct clk name = { \ + .enable_reg = er, \ + .enable_shift = es, \ + .enable = _clk_enable_1b, \ + .disable = _clk_disable_1b, \ + .get_rate = _clk_get_rate, \ + .set_rate = _clk_set_rate, \ + .round_rate = _clk_round_rate, \ + .set_parent = _clk_set_parent, \ + .parent = p, \ + .secondary = s, \ + } + DEF_CLK(aips_tz1_clk, CCGR0, CG0, &ahb_clk, NULL); DEF_CLK(aips_tz2_clk, CCGR0, CG1, &ahb_clk, NULL); DEF_CLK(apbh_dma_clk, CCGR0, CG2, &ahb_clk, NULL); @@ -1801,6 +1869,7 @@ DEF_CLK(usdhc4_clk, CCGR6, CG4, &pll2_pfd_400m, NULL); DEF_CLK(emi_slow_clk, CCGR6, CG5, &axi_clk, NULL); DEF_CLK(vdo_axi_clk, CCGR6, CG6, &axi_clk, NULL); DEF_CLK(vpu_clk, CCGR6, CG7, &axi_clk, NULL); +DEF_CLK_1B(cko1_clk, CCOSR, BP_CCOSR_CKO1_EN, &pll2_bus, NULL); static int pcie_clk_enable(struct clk *clk) { @@ -1911,6 +1980,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "gpmi_io_clk", gpmi_io_clk), _REGISTER_CLOCK(NULL, "usboh3_clk", usboh3_clk), _REGISTER_CLOCK(NULL, "sata_clk", sata_clk), + _REGISTER_CLOCK(NULL, "clko_clk", cko1_clk), }; int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode) @@ -2020,6 +2090,8 @@ int __init mx6q_clocks_init(void) clk_set_rate(&usdhc3_clk, 49500000); clk_set_rate(&usdhc4_clk, 49500000); + clk_set_parent(&cko1_clk, &ahb_clk); + np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt"); base = of_iomap(np, 0); WARN_ON(!base); -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] arm/imx6q: add cko1 clock 2012-01-05 3:11 ` [PATCH 2/2] arm/imx6q: add cko1 clock Richard Zhao @ 2012-01-05 13:53 ` Shawn Guo 2012-01-05 14:24 ` Richard Zhao 0 siblings, 1 reply; 6+ messages in thread From: Shawn Guo @ 2012-01-05 13:53 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 05, 2012 at 11:11:14AM +0800, Richard Zhao wrote: > imx6q-sabrelite board use it as audio codec clock. > > Signed-off-by: Richard Zhao <richard.zhao@linaro.org> > --- > arch/arm/mach-imx/clock-imx6q.c | 74 ++++++++++++++++++++++++++++++++++++++- > 1 files changed, 73 insertions(+), 1 deletions(-) > It mostly looks good. A couple of comments below though: * Again, use "ARM: imx6q: ..." for patch subject in this case. * To reflect the CKO hardware hierarchy, we should probably have 3 clks there, cko_clk, cko1_clk and cko2_clk, and have cko_clk be the parent of the later two, as cko1_cko2_sel bit was designed for this. [...] > @@ -1680,7 +1734,7 @@ static int _clk_set_parent(struct clk *clk, struct clk *parent) > break; > i++; > } > - if (!m->parents[i]) > + if (!m->parents[i] || m->parents[i] == &dummy_clk) Is this change necessarily included in this patch? Regards, Shawn > return -EINVAL; > > val = readl_relaxed(m->reg); ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] arm/imx6q: add cko1 clock 2012-01-05 13:53 ` Shawn Guo @ 2012-01-05 14:24 ` Richard Zhao 0 siblings, 0 replies; 6+ messages in thread From: Richard Zhao @ 2012-01-05 14:24 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 05, 2012 at 09:53:13PM +0800, Shawn Guo wrote: > On Thu, Jan 05, 2012 at 11:11:14AM +0800, Richard Zhao wrote: > > imx6q-sabrelite board use it as audio codec clock. > > > > Signed-off-by: Richard Zhao <richard.zhao@linaro.org> > > --- > > arch/arm/mach-imx/clock-imx6q.c | 74 ++++++++++++++++++++++++++++++++++++++- > > 1 files changed, 73 insertions(+), 1 deletions(-) > > > It mostly looks good. A couple of comments below though: > > * Again, use "ARM: imx6q: ..." for patch subject in this case. ok > > * To reflect the CKO hardware hierarchy, we should probably have 3 clks > there, cko_clk, cko1_clk and cko2_clk, and have cko_clk be the parent > of the later two, as cko1_cko2_sel bit was designed for this. The origin idea is to only add clocks I used. cko1_cko2_sel is default zero, so I didn't add cko2. It's fine if you need all cko1/cko2. > > [...] > > > @@ -1680,7 +1734,7 @@ static int _clk_set_parent(struct clk *clk, struct clk *parent) > > break; > > i++; > > } > > - if (!m->parents[i]) > > + if (!m->parents[i] || m->parents[i] == &dummy_clk) > > Is this change necessarily included in this patch? Yes. cko clocks always may have many parents. Some of them we never use. So there's a hole in the parents array. For cko1, we don't have video_27M_clk_root. Thanks Richard > > Regards, > Shawn > > > return -EINVAL; > > > > val = readl_relaxed(m->reg); > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma 2012-01-05 3:11 [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma Richard Zhao 2012-01-05 3:11 ` [PATCH 2/2] arm/imx6q: add cko1 clock Richard Zhao @ 2012-01-05 9:42 ` Shawn Guo 2012-01-05 14:31 ` Richard Zhao 1 sibling, 1 reply; 6+ messages in thread From: Shawn Guo @ 2012-01-05 9:42 UTC (permalink / raw) To: linux-arm-kernel The arm-soc maintainers are requiring patch subject be like ARM: <platform>: ... In this case, it's "ARM: mxc: ..." On Thu, Jan 05, 2012 at 11:11:13AM +0800, Richard Zhao wrote: > sdma device names var when use device tree. I think this needs some level rewording. For given SoC, the name is fixed, and the name may vary from SoC to SoC, whether or not it's device tree case. Other than that, it looks good to me. Regards, Shawn > So we just check > whether it includes "sdma" substring. > > Signed-off-by: Richard Zhao <richard.zhao@linaro.org> > --- > arch/arm/plat-mxc/include/mach/dma.h | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h > index 233d0a5..1b90803 100644 > --- a/arch/arm/plat-mxc/include/mach/dma.h > +++ b/arch/arm/plat-mxc/include/mach/dma.h > @@ -60,8 +60,7 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan) > > static inline int imx_dma_is_general_purpose(struct dma_chan *chan) > { > - return !strcmp(dev_name(chan->device->dev), "imx31-sdma") || > - !strcmp(dev_name(chan->device->dev), "imx35-sdma") || > + return strstr(dev_name(chan->device->dev), "sdma") || > !strcmp(dev_name(chan->device->dev), "imx-dma"); > } > > -- > 1.7.5.4 > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma 2012-01-05 9:42 ` [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma Shawn Guo @ 2012-01-05 14:31 ` Richard Zhao 0 siblings, 0 replies; 6+ messages in thread From: Richard Zhao @ 2012-01-05 14:31 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 05, 2012 at 05:42:38PM +0800, Shawn Guo wrote: > The arm-soc maintainers are requiring patch subject be like > > ARM: <platform>: ... > > In this case, it's "ARM: mxc: ..." ok > > On Thu, Jan 05, 2012 at 11:11:13AM +0800, Richard Zhao wrote: > > sdma device names var when use device tree. > > I think this needs some level rewording. For given SoC, the name is > fixed, and the name may vary from SoC to SoC, whether or not it's > device tree case. Checking substring "sdma" cover the both cases, if we make the rule that sdma node name must be "sdma at xxxxx". Maybe we can also check compatible? > > Other than that, it looks good to me. Thanks Richard > > Regards, > Shawn > > > So we just check > > whether it includes "sdma" substring. > > > > Signed-off-by: Richard Zhao <richard.zhao@linaro.org> > > --- > > arch/arm/plat-mxc/include/mach/dma.h | 3 +-- > > 1 files changed, 1 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h > > index 233d0a5..1b90803 100644 > > --- a/arch/arm/plat-mxc/include/mach/dma.h > > +++ b/arch/arm/plat-mxc/include/mach/dma.h > > @@ -60,8 +60,7 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan) > > > > static inline int imx_dma_is_general_purpose(struct dma_chan *chan) > > { > > - return !strcmp(dev_name(chan->device->dev), "imx31-sdma") || > > - !strcmp(dev_name(chan->device->dev), "imx35-sdma") || > > + return strstr(dev_name(chan->device->dev), "sdma") || > > !strcmp(dev_name(chan->device->dev), "imx-dma"); > > } > > > > -- > > 1.7.5.4 > > > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-01-05 14:31 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-01-05 3:11 [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma Richard Zhao 2012-01-05 3:11 ` [PATCH 2/2] arm/imx6q: add cko1 clock Richard Zhao 2012-01-05 13:53 ` Shawn Guo 2012-01-05 14:24 ` Richard Zhao 2012-01-05 9:42 ` [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma Shawn Guo 2012-01-05 14:31 ` Richard Zhao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).