| Message ID | 1371024463-303-7-git-send-email-padma.v@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Padmavathi Venna (2013-06-12 01:07:43) > This patch adds enum entries for div_i2s1 and div_i2s2 which are > required for i2s1 and i2s2 controllers. > > Signed-off-by: Padmavathi Venna <padma.v@samsung.com> Looks good. Did you want me to take the clk patches or just gathering Acks? Regards, Mike > --- > drivers/clk/samsung/clk-exynos5250.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c > index 5c97e75..7c68850 100644 > --- a/drivers/clk/samsung/clk-exynos5250.c > +++ b/drivers/clk/samsung/clk-exynos5250.c > @@ -87,6 +87,7 @@ enum exynos5250_clks { > sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_sata, sclk_usb3, > sclk_jpeg, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3, sclk_pwm, > sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1, sclk_spi2, > + div_i2s1, div_i2s2, > > /* gate clocks */ > gscl0 = 256, gscl1, gscl2, gscl3, gscl_wa, gscl_wb, smmu_gscl0, > @@ -291,8 +292,8 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = { > DIV(none, "div_pcm1", "sclk_audio1", DIV_PERIC4, 4, 8), > DIV(none, "div_audio2", "mout_audio2", DIV_PERIC4, 16, 4), > DIV(none, "div_pcm2", "sclk_audio2", DIV_PERIC4, 20, 8), > - DIV(none, "div_i2s1", "sclk_audio1", DIV_PERIC5, 0, 6), > - DIV(none, "div_i2s2", "sclk_audio2", DIV_PERIC5, 8, 6), > + DIV(div_i2s1, "div_i2s1", "sclk_audio1", DIV_PERIC5, 0, 6), > + DIV(div_i2s2, "div_i2s2", "sclk_audio2", DIV_PERIC5, 8, 6), > DIV(sclk_pixel, "div_hdmi_pixel", "sclk_vpll", DIV_DISP1_0, 28, 4), > DIV_A(none, "armclk", "div_arm", DIV_CPU0, 28, 3, "armclk"), > DIV_F(none, "div_mipi1_pre", "div_mipi1", > -- > 1.7.4.4
Hi Mike, On Wed, Jun 12, 2013 at 10:15 PM, Mike Turquette <mturquette@linaro.org> wrote: > Quoting Padmavathi Venna (2013-06-12 01:07:43) >> This patch adds enum entries for div_i2s1 and div_i2s2 which are >> required for i2s1 and i2s2 controllers. >> >> Signed-off-by: Padmavathi Venna <padma.v@samsung.com> > > Looks good. Did you want me to take the clk patches or just gathering > Acks? Please take the patches :). Thanks Padma > > Regards, > Mike > >> --- >> drivers/clk/samsung/clk-exynos5250.c | 5 +++-- >> 1 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c >> index 5c97e75..7c68850 100644 >> --- a/drivers/clk/samsung/clk-exynos5250.c >> +++ b/drivers/clk/samsung/clk-exynos5250.c >> @@ -87,6 +87,7 @@ enum exynos5250_clks { >> sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_sata, sclk_usb3, >> sclk_jpeg, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3, sclk_pwm, >> sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1, sclk_spi2, >> + div_i2s1, div_i2s2, >> >> /* gate clocks */ >> gscl0 = 256, gscl1, gscl2, gscl3, gscl_wa, gscl_wb, smmu_gscl0, >> @@ -291,8 +292,8 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = { >> DIV(none, "div_pcm1", "sclk_audio1", DIV_PERIC4, 4, 8), >> DIV(none, "div_audio2", "mout_audio2", DIV_PERIC4, 16, 4), >> DIV(none, "div_pcm2", "sclk_audio2", DIV_PERIC4, 20, 8), >> - DIV(none, "div_i2s1", "sclk_audio1", DIV_PERIC5, 0, 6), >> - DIV(none, "div_i2s2", "sclk_audio2", DIV_PERIC5, 8, 6), >> + DIV(div_i2s1, "div_i2s1", "sclk_audio1", DIV_PERIC5, 0, 6), >> + DIV(div_i2s2, "div_i2s2", "sclk_audio2", DIV_PERIC5, 8, 6), >> DIV(sclk_pixel, "div_hdmi_pixel", "sclk_vpll", DIV_DISP1_0, 28, 4), >> DIV_A(none, "armclk", "div_arm", DIV_CPU0, 28, 3, "armclk"), >> DIV_F(none, "div_mipi1_pre", "div_mipi1", >> -- >> 1.7.4.4
Hi Mike, On Thu, Jun 13, 2013 at 8:32 AM, Padma Venkat <padma.kvr@gmail.com> wrote: > Hi Mike, > > On Wed, Jun 12, 2013 at 10:15 PM, Mike Turquette <mturquette@linaro.org> wrote: >> Quoting Padmavathi Venna (2013-06-12 01:07:43) >>> This patch adds enum entries for div_i2s1 and div_i2s2 which are >>> required for i2s1 and i2s2 controllers. >>> >>> Signed-off-by: Padmavathi Venna <padma.v@samsung.com> >> >> Looks good. Did you want me to take the clk patches or just gathering >> Acks? > > Please take the patches :). > > Thanks > Padma clk related patches in this set has some dependency on arch side patches because one of the patch replaces all '/include's with '#include's and adds a header file in arch/arm/boot/include/dt-bindings/. So all these patches required to go into one tree. Hi Kukjin, Can you please take all these patches into samsung-tree? Thanks Padma > >> >> Regards, >> Mike >> >>> --- >>> drivers/clk/samsung/clk-exynos5250.c | 5 +++-- >>> 1 files changed, 3 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c >>> index 5c97e75..7c68850 100644 >>> --- a/drivers/clk/samsung/clk-exynos5250.c >>> +++ b/drivers/clk/samsung/clk-exynos5250.c >>> @@ -87,6 +87,7 @@ enum exynos5250_clks { >>> sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_sata, sclk_usb3, >>> sclk_jpeg, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3, sclk_pwm, >>> sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1, sclk_spi2, >>> + div_i2s1, div_i2s2, >>> >>> /* gate clocks */ >>> gscl0 = 256, gscl1, gscl2, gscl3, gscl_wa, gscl_wb, smmu_gscl0, >>> @@ -291,8 +292,8 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = { >>> DIV(none, "div_pcm1", "sclk_audio1", DIV_PERIC4, 4, 8), >>> DIV(none, "div_audio2", "mout_audio2", DIV_PERIC4, 16, 4), >>> DIV(none, "div_pcm2", "sclk_audio2", DIV_PERIC4, 20, 8), >>> - DIV(none, "div_i2s1", "sclk_audio1", DIV_PERIC5, 0, 6), >>> - DIV(none, "div_i2s2", "sclk_audio2", DIV_PERIC5, 8, 6), >>> + DIV(div_i2s1, "div_i2s1", "sclk_audio1", DIV_PERIC5, 0, 6), >>> + DIV(div_i2s2, "div_i2s2", "sclk_audio2", DIV_PERIC5, 8, 6), >>> DIV(sclk_pixel, "div_hdmi_pixel", "sclk_vpll", DIV_DISP1_0, 28, 4), >>> DIV_A(none, "armclk", "div_arm", DIV_CPU0, 28, 3, "armclk"), >>> DIV_F(none, "div_mipi1_pre", "div_mipi1", >>> -- >>> 1.7.4.4
Padma Venkat wrote: > > Hi Mike, > > On Thu, Jun 13, 2013 at 8:32 AM, Padma Venkat <padma.kvr@gmail.com> wrote: > > Hi Mike, > > > > On Wed, Jun 12, 2013 at 10:15 PM, Mike Turquette <mturquette@linaro.org> > wrote: > >> Quoting Padmavathi Venna (2013-06-12 01:07:43) > >>> This patch adds enum entries for div_i2s1 and div_i2s2 which are > >>> required for i2s1 and i2s2 controllers. > >>> > >>> Signed-off-by: Padmavathi Venna <padma.v@samsung.com> > >> > >> Looks good. Did you want me to take the clk patches or just gathering > >> Acks? > > > > Please take the patches :). > > > > Thanks > > Padma > > clk related patches in this set has some dependency on arch side > patches because one of the patch replaces all '/include's with > '#include's and adds a header file in > arch/arm/boot/include/dt-bindings/. So all these patches required to > go into one tree. > > Hi Kukjin, > > Can you please take all these patches into samsung-tree? > Padma, sure, I will. BTW, Mike, according to your reply, I may get your ack on 2nd and 6th clk patches...If any problems, please kindly let me know. Thanks, - Kukjin
Quoting Kukjin Kim (2013-06-17 03:15:27) > Padma Venkat wrote: > > > > Hi Mike, > > > > On Thu, Jun 13, 2013 at 8:32 AM, Padma Venkat <padma.kvr@gmail.com> wrote: > > > Hi Mike, > > > > > > On Wed, Jun 12, 2013 at 10:15 PM, Mike Turquette <mturquette@linaro.org> > > wrote: > > >> Quoting Padmavathi Venna (2013-06-12 01:07:43) > > >>> This patch adds enum entries for div_i2s1 and div_i2s2 which are > > >>> required for i2s1 and i2s2 controllers. > > >>> > > >>> Signed-off-by: Padmavathi Venna <padma.v@samsung.com> > > >> > > >> Looks good. Did you want me to take the clk patches or just gathering > > >> Acks? > > > > > > Please take the patches :). > > > > > > Thanks > > > Padma > > > > clk related patches in this set has some dependency on arch side > > patches because one of the patch replaces all '/include's with > > '#include's and adds a header file in > > arch/arm/boot/include/dt-bindings/. So all these patches required to > > go into one tree. > > > > Hi Kukjin, > > > > Can you please take all these patches into samsung-tree? > > > Padma, sure, I will. > > BTW, Mike, according to your reply, I may get your ack on 2nd and 6th clk > patches...If any problems, please kindly let me know. Fine by me. Regards, Mike > > Thanks, > - Kukjin
diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c index 5c97e75..7c68850 100644 --- a/drivers/clk/samsung/clk-exynos5250.c +++ b/drivers/clk/samsung/clk-exynos5250.c @@ -87,6 +87,7 @@ enum exynos5250_clks { sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_sata, sclk_usb3, sclk_jpeg, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3, sclk_pwm, sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1, sclk_spi2, + div_i2s1, div_i2s2, /* gate clocks */ gscl0 = 256, gscl1, gscl2, gscl3, gscl_wa, gscl_wb, smmu_gscl0, @@ -291,8 +292,8 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = { DIV(none, "div_pcm1", "sclk_audio1", DIV_PERIC4, 4, 8), DIV(none, "div_audio2", "mout_audio2", DIV_PERIC4, 16, 4), DIV(none, "div_pcm2", "sclk_audio2", DIV_PERIC4, 20, 8), - DIV(none, "div_i2s1", "sclk_audio1", DIV_PERIC5, 0, 6), - DIV(none, "div_i2s2", "sclk_audio2", DIV_PERIC5, 8, 6), + DIV(div_i2s1, "div_i2s1", "sclk_audio1", DIV_PERIC5, 0, 6), + DIV(div_i2s2, "div_i2s2", "sclk_audio2", DIV_PERIC5, 8, 6), DIV(sclk_pixel, "div_hdmi_pixel", "sclk_vpll", DIV_DISP1_0, 28, 4), DIV_A(none, "armclk", "div_arm", DIV_CPU0, 28, 3, "armclk"), DIV_F(none, "div_mipi1_pre", "div_mipi1",
This patch adds enum entries for div_i2s1 and div_i2s2 which are required for i2s1 and i2s2 controllers. Signed-off-by: Padmavathi Venna <padma.v@samsung.com> --- drivers/clk/samsung/clk-exynos5250.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)