From: Padma Venkat <padma.kvr@gmail.com>
To: Padmavathi Venna <padma.v@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, sbkim73@samsung.com,
ben-linux@fluff.org, kgene.kim@samsung.com, olofj@google.com,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: Re: [PATCH V3 2/5] ARM: S5PC100: Add I2S clkdev support
Date: Fri, 23 Nov 2012 16:45:46 +0530 [thread overview]
Message-ID: <CAAgF-BfKX5wmBdUzi_ijeOX_d6M9GNuSkHcTCkqrmw2YWnZTHA@mail.gmail.com> (raw)
In-Reply-To: <1352177317-16395-3-git-send-email-padma.v@samsung.com>
cc'ing Mark Brown.
On Tue, Nov 6, 2012 at 10:18 AM, Padmavathi Venna <padma.v@samsung.com> wrote:
> I2S controller has an internal mux for RCLK source clk. The list
> of source clk names were passed through platform data in non-dt case.
> Register the existing RCLK source clocks with clkdev using generic
> connection id. This is required as part of adding DT support
> for I2S controller driver.
>
> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
> ---
> arch/arm/mach-s5pc100/clock.c | 48 +++++++++++++++++++++++--------------
> arch/arm/mach-s5pc100/dev-audio.c | 16 ------------
> 2 files changed, 30 insertions(+), 34 deletions(-)
>
> diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c
> index 9262197..a206dc3 100644
> --- a/arch/arm/mach-s5pc100/clock.c
> +++ b/arch/arm/mach-s5pc100/clock.c
> @@ -606,24 +606,6 @@ static struct clk init_clocks_off[] = {
> .enable = s5pc100_d1_4_ctrl,
> .ctrlbit = (1 << 13),
> }, {
> - .name = "iis",
> - .devname = "samsung-i2s.0",
> - .parent = &clk_div_pclkd1.clk,
> - .enable = s5pc100_d1_5_ctrl,
> - .ctrlbit = (1 << 0),
> - }, {
> - .name = "iis",
> - .devname = "samsung-i2s.1",
> - .parent = &clk_div_pclkd1.clk,
> - .enable = s5pc100_d1_5_ctrl,
> - .ctrlbit = (1 << 1),
> - }, {
> - .name = "iis",
> - .devname = "samsung-i2s.2",
> - .parent = &clk_div_pclkd1.clk,
> - .enable = s5pc100_d1_5_ctrl,
> - .ctrlbit = (1 << 2),
> - }, {
> .name = "ac97",
> .parent = &clk_div_pclkd1.clk,
> .enable = s5pc100_d1_5_ctrl,
> @@ -724,6 +706,30 @@ static struct clk clk_48m_spi2 = {
> .ctrlbit = (1 << 9),
> };
>
> +static struct clk clk_i2s0 = {
> + .name = "iis",
> + .devname = "samsung-i2s.0",
> + .parent = &clk_div_pclkd1.clk,
> + .enable = s5pc100_d1_5_ctrl,
> + .ctrlbit = (1 << 0),
> +};
> +
> +static struct clk clk_i2s1 = {
> + .name = "iis",
> + .devname = "samsung-i2s.1",
> + .parent = &clk_div_pclkd1.clk,
> + .enable = s5pc100_d1_5_ctrl,
> + .ctrlbit = (1 << 1),
> +};
> +
> +static struct clk clk_i2s2 = {
> + .name = "iis",
> + .devname = "samsung-i2s.2",
> + .parent = &clk_div_pclkd1.clk,
> + .enable = s5pc100_d1_5_ctrl,
> + .ctrlbit = (1 << 2),
> +};
> +
> static struct clk clk_vclk54m = {
> .name = "vclk_54m",
> .rate = 54000000,
> @@ -1154,6 +1160,9 @@ static struct clk *clk_cdev[] = {
> &clk_48m_spi0,
> &clk_48m_spi1,
> &clk_48m_spi2,
> + &clk_i2s0,
> + &clk_i2s1,
> + &clk_i2s2,
> };
>
> static struct clksrc_clk *clksrc_cdev[] = {
> @@ -1321,6 +1330,9 @@ static struct clk_lookup s5pc100_clk_lookup[] = {
> CLKDEV_INIT("s5pc100-spi.1", "spi_busclk2", &clk_sclk_spi1.clk),
> CLKDEV_INIT("s5pc100-spi.2", "spi_busclk1", &clk_48m_spi2),
> CLKDEV_INIT("s5pc100-spi.2", "spi_busclk2", &clk_sclk_spi2.clk),
> + CLKDEV_INIT("samsung-i2s.0", "i2s_opclk0", &clk_i2s0),
> + CLKDEV_INIT("samsung-i2s.1", "i2s_opclk0", &clk_i2s1),
> + CLKDEV_INIT("samsung-i2s.2", "i2s_opclk0", &clk_i2s2),
> };
>
> void __init s5pc100_register_clocks(void)
> diff --git a/arch/arm/mach-s5pc100/dev-audio.c b/arch/arm/mach-s5pc100/dev-audio.c
> index 1cc252c..46f488b 100644
> --- a/arch/arm/mach-s5pc100/dev-audio.c
> +++ b/arch/arm/mach-s5pc100/dev-audio.c
> @@ -39,18 +39,12 @@ static int s5pc100_cfg_i2s(struct platform_device *pdev)
> return 0;
> }
>
> -static const char *rclksrc_v5[] = {
> - [0] = "iis",
> - [1] = "i2sclkd2",
> -};
> -
> static struct s3c_audio_pdata i2sv5_pdata = {
> .cfg_gpio = s5pc100_cfg_i2s,
> .type = {
> .i2s = {
> .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
> | QUIRK_NEED_RSTCLR,
> - .src_clk = rclksrc_v5,
> },
> },
> };
> @@ -72,18 +66,8 @@ struct platform_device s5pc100_device_iis0 = {
> },
> };
>
> -static const char *rclksrc_v3[] = {
> - [0] = "iis",
> - [1] = "sclk_audio",
> -};
> -
> static struct s3c_audio_pdata i2sv3_pdata = {
> .cfg_gpio = s5pc100_cfg_i2s,
> - .type = {
> - .i2s = {
> - .src_clk = rclksrc_v3,
> - },
> - },
> };
>
> static struct resource s5pc100_iis1_resource[] = {
> --
> 1.7.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: padma.kvr@gmail.com (Padma Venkat)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V3 2/5] ARM: S5PC100: Add I2S clkdev support
Date: Fri, 23 Nov 2012 16:45:46 +0530 [thread overview]
Message-ID: <CAAgF-BfKX5wmBdUzi_ijeOX_d6M9GNuSkHcTCkqrmw2YWnZTHA@mail.gmail.com> (raw)
In-Reply-To: <1352177317-16395-3-git-send-email-padma.v@samsung.com>
cc'ing Mark Brown.
On Tue, Nov 6, 2012 at 10:18 AM, Padmavathi Venna <padma.v@samsung.com> wrote:
> I2S controller has an internal mux for RCLK source clk. The list
> of source clk names were passed through platform data in non-dt case.
> Register the existing RCLK source clocks with clkdev using generic
> connection id. This is required as part of adding DT support
> for I2S controller driver.
>
> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
> ---
> arch/arm/mach-s5pc100/clock.c | 48 +++++++++++++++++++++++--------------
> arch/arm/mach-s5pc100/dev-audio.c | 16 ------------
> 2 files changed, 30 insertions(+), 34 deletions(-)
>
> diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c
> index 9262197..a206dc3 100644
> --- a/arch/arm/mach-s5pc100/clock.c
> +++ b/arch/arm/mach-s5pc100/clock.c
> @@ -606,24 +606,6 @@ static struct clk init_clocks_off[] = {
> .enable = s5pc100_d1_4_ctrl,
> .ctrlbit = (1 << 13),
> }, {
> - .name = "iis",
> - .devname = "samsung-i2s.0",
> - .parent = &clk_div_pclkd1.clk,
> - .enable = s5pc100_d1_5_ctrl,
> - .ctrlbit = (1 << 0),
> - }, {
> - .name = "iis",
> - .devname = "samsung-i2s.1",
> - .parent = &clk_div_pclkd1.clk,
> - .enable = s5pc100_d1_5_ctrl,
> - .ctrlbit = (1 << 1),
> - }, {
> - .name = "iis",
> - .devname = "samsung-i2s.2",
> - .parent = &clk_div_pclkd1.clk,
> - .enable = s5pc100_d1_5_ctrl,
> - .ctrlbit = (1 << 2),
> - }, {
> .name = "ac97",
> .parent = &clk_div_pclkd1.clk,
> .enable = s5pc100_d1_5_ctrl,
> @@ -724,6 +706,30 @@ static struct clk clk_48m_spi2 = {
> .ctrlbit = (1 << 9),
> };
>
> +static struct clk clk_i2s0 = {
> + .name = "iis",
> + .devname = "samsung-i2s.0",
> + .parent = &clk_div_pclkd1.clk,
> + .enable = s5pc100_d1_5_ctrl,
> + .ctrlbit = (1 << 0),
> +};
> +
> +static struct clk clk_i2s1 = {
> + .name = "iis",
> + .devname = "samsung-i2s.1",
> + .parent = &clk_div_pclkd1.clk,
> + .enable = s5pc100_d1_5_ctrl,
> + .ctrlbit = (1 << 1),
> +};
> +
> +static struct clk clk_i2s2 = {
> + .name = "iis",
> + .devname = "samsung-i2s.2",
> + .parent = &clk_div_pclkd1.clk,
> + .enable = s5pc100_d1_5_ctrl,
> + .ctrlbit = (1 << 2),
> +};
> +
> static struct clk clk_vclk54m = {
> .name = "vclk_54m",
> .rate = 54000000,
> @@ -1154,6 +1160,9 @@ static struct clk *clk_cdev[] = {
> &clk_48m_spi0,
> &clk_48m_spi1,
> &clk_48m_spi2,
> + &clk_i2s0,
> + &clk_i2s1,
> + &clk_i2s2,
> };
>
> static struct clksrc_clk *clksrc_cdev[] = {
> @@ -1321,6 +1330,9 @@ static struct clk_lookup s5pc100_clk_lookup[] = {
> CLKDEV_INIT("s5pc100-spi.1", "spi_busclk2", &clk_sclk_spi1.clk),
> CLKDEV_INIT("s5pc100-spi.2", "spi_busclk1", &clk_48m_spi2),
> CLKDEV_INIT("s5pc100-spi.2", "spi_busclk2", &clk_sclk_spi2.clk),
> + CLKDEV_INIT("samsung-i2s.0", "i2s_opclk0", &clk_i2s0),
> + CLKDEV_INIT("samsung-i2s.1", "i2s_opclk0", &clk_i2s1),
> + CLKDEV_INIT("samsung-i2s.2", "i2s_opclk0", &clk_i2s2),
> };
>
> void __init s5pc100_register_clocks(void)
> diff --git a/arch/arm/mach-s5pc100/dev-audio.c b/arch/arm/mach-s5pc100/dev-audio.c
> index 1cc252c..46f488b 100644
> --- a/arch/arm/mach-s5pc100/dev-audio.c
> +++ b/arch/arm/mach-s5pc100/dev-audio.c
> @@ -39,18 +39,12 @@ static int s5pc100_cfg_i2s(struct platform_device *pdev)
> return 0;
> }
>
> -static const char *rclksrc_v5[] = {
> - [0] = "iis",
> - [1] = "i2sclkd2",
> -};
> -
> static struct s3c_audio_pdata i2sv5_pdata = {
> .cfg_gpio = s5pc100_cfg_i2s,
> .type = {
> .i2s = {
> .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
> | QUIRK_NEED_RSTCLR,
> - .src_clk = rclksrc_v5,
> },
> },
> };
> @@ -72,18 +66,8 @@ struct platform_device s5pc100_device_iis0 = {
> },
> };
>
> -static const char *rclksrc_v3[] = {
> - [0] = "iis",
> - [1] = "sclk_audio",
> -};
> -
> static struct s3c_audio_pdata i2sv3_pdata = {
> .cfg_gpio = s5pc100_cfg_i2s,
> - .type = {
> - .i2s = {
> - .src_clk = rclksrc_v3,
> - },
> - },
> };
>
> static struct resource s5pc100_iis1_resource[] = {
> --
> 1.7.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2012-11-23 11:15 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-06 4:48 [PATCH V3 0/5] Avoid passing clks through platform data Padmavathi Venna
2012-11-06 4:48 ` Padmavathi Venna
2012-11-06 4:48 ` [PATCH V3 1/5] ARM: S3C64XX: Add I2S clkdev support Padmavathi Venna
2012-11-06 4:48 ` Padmavathi Venna
2012-11-23 11:15 ` Padma Venkat
2012-11-23 11:15 ` Padma Venkat
2012-11-06 4:48 ` [PATCH V3 2/5] ARM: S5PC100: " Padmavathi Venna
2012-11-06 4:48 ` Padmavathi Venna
2012-11-23 11:15 ` Padma Venkat [this message]
2012-11-23 11:15 ` Padma Venkat
2012-11-06 4:48 ` [PATCH V3 3/5] ARM: S5P64x0: " Padmavathi Venna
2012-11-06 4:48 ` Padmavathi Venna
2012-11-23 11:16 ` Padma Venkat
2012-11-23 11:16 ` Padma Venkat
2012-11-06 4:48 ` [PATCH V3 4/5] ARM: S5PV210: Avoid passing the clks through platform data Padmavathi Venna
2012-11-06 4:48 ` Padmavathi Venna
2012-11-23 11:17 ` Padma Venkat
2012-11-23 11:17 ` Padma Venkat
2012-11-06 4:48 ` [PATCH V3 5/5] ARM: Exynos: " Padmavathi Venna
2012-11-06 4:48 ` Padmavathi Venna
2012-11-23 11:18 ` Padma Venkat
2012-11-23 11:18 ` Padma Venkat
2012-11-23 9:27 ` [PATCH V3 0/5] Avoid passing " Sangbeom Kim
2012-11-23 9:27 ` Sangbeom Kim
2012-11-24 2:10 ` Kukjin Kim
2012-11-24 2:10 ` Kukjin Kim
2012-11-23 11:10 ` Padma Venkat
2012-11-23 11:10 ` Padma Venkat
2012-11-23 11:51 ` Mark Brown
2012-11-23 11:51 ` Mark Brown
2012-11-24 2:10 ` Kukjin Kim
2012-11-24 2:10 ` Kukjin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAAgF-BfKX5wmBdUzi_ijeOX_d6M9GNuSkHcTCkqrmw2YWnZTHA@mail.gmail.com \
--to=padma.kvr@gmail.com \
--cc=ben-linux@fluff.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=olofj@google.com \
--cc=padma.v@samsung.com \
--cc=sbkim73@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.