* [PATCH] ARM: EXYNOS: Fix MSHC clocks instance names
@ 2012-12-14 16:13 Dongjin Kim
2012-12-14 17:35 ` Thomas Abraham
0 siblings, 1 reply; 5+ messages in thread
From: Dongjin Kim @ 2012-12-14 16:13 UTC (permalink / raw)
To: linux-arm-kernel
Replace clock instance name of MSHC controller for BIC and CIU of Exynos4412.
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
---
arch/arm/mach-exynos/clock-exynos4.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c
index efead60..bbcb3de 100644
--- a/arch/arm/mach-exynos/clock-exynos4.c
+++ b/arch/arm/mach-exynos/clock-exynos4.c
@@ -529,7 +529,7 @@ static struct clk exynos4_init_clocks_off[] = {
.enable = exynos4_clk_ip_fsys_ctrl,
.ctrlbit = (1 << 8),
}, {
- .name = "dwmmc",
+ .name = "biu",
.parent = &exynos4_clk_aclk_133.clk,
.enable = exynos4_clk_ip_fsys_ctrl,
.ctrlbit = (1 << 9),
@@ -1134,7 +1134,7 @@ static struct clksrc_clk exynos4_clksrcs[] = {
.reg_div = { .reg = EXYNOS4_CLKDIV_MFC, .shift = 0, .size = 4 },
}, {
.clk = {
- .name = "sclk_dwmmc",
+ .name = "ciu",
.parent = &exynos4_clk_dout_mmc4.clk,
.enable = exynos4_clksrc_mask_fsys_ctrl,
.ctrlbit = (1 << 16),
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] ARM: EXYNOS: Fix MSHC clocks instance names
2012-12-14 16:13 [PATCH] ARM: EXYNOS: Fix MSHC clocks instance names Dongjin Kim
@ 2012-12-14 17:35 ` Thomas Abraham
2012-12-19 3:38 ` Kukjin Kim
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Abraham @ 2012-12-14 17:35 UTC (permalink / raw)
To: linux-arm-kernel
On 14 December 2012 21:43, Dongjin Kim <tobetter@gmail.com> wrote:
> Replace clock instance name of MSHC controller for BIC and CIU of Exynos4412.
>
> Signed-off-by: Dongjin Kim <tobetter@gmail.com>
> ---
> arch/arm/mach-exynos/clock-exynos4.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c
> index efead60..bbcb3de 100644
> --- a/arch/arm/mach-exynos/clock-exynos4.c
> +++ b/arch/arm/mach-exynos/clock-exynos4.c
> @@ -529,7 +529,7 @@ static struct clk exynos4_init_clocks_off[] = {
> .enable = exynos4_clk_ip_fsys_ctrl,
> .ctrlbit = (1 << 8),
> }, {
> - .name = "dwmmc",
> + .name = "biu",
> .parent = &exynos4_clk_aclk_133.clk,
> .enable = exynos4_clk_ip_fsys_ctrl,
> .ctrlbit = (1 << 9),
> @@ -1134,7 +1134,7 @@ static struct clksrc_clk exynos4_clksrcs[] = {
> .reg_div = { .reg = EXYNOS4_CLKDIV_MFC, .shift = 0, .size = 4 },
> }, {
> .clk = {
> - .name = "sclk_dwmmc",
> + .name = "ciu",
> .parent = &exynos4_clk_dout_mmc4.clk,
> .enable = exynos4_clksrc_mask_fsys_ctrl,
> .ctrlbit = (1 << 16),
> --
Acked-by: Thomas Abraham <thomas.abraham@linaro.org>
> 1.7.9.5
>
> --
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] ARM: EXYNOS: Fix MSHC clocks instance names
2012-12-14 17:35 ` Thomas Abraham
@ 2012-12-19 3:38 ` Kukjin Kim
0 siblings, 0 replies; 5+ messages in thread
From: Kukjin Kim @ 2012-12-19 3:38 UTC (permalink / raw)
To: linux-arm-kernel
Thomas Abraham wrote:
>
> On 14 December 2012 21:43, Dongjin Kim <tobetter@gmail.com> wrote:
> > Replace clock instance name of MSHC controller for BIC and CIU of
> Exynos4412.
> >
> > Signed-off-by: Dongjin Kim <tobetter@gmail.com>
> > ---
> > arch/arm/mach-exynos/clock-exynos4.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-
> exynos/clock-exynos4.c
> > index efead60..bbcb3de 100644
> > --- a/arch/arm/mach-exynos/clock-exynos4.c
> > +++ b/arch/arm/mach-exynos/clock-exynos4.c
> > @@ -529,7 +529,7 @@ static struct clk exynos4_init_clocks_off[] = {
> > .enable = exynos4_clk_ip_fsys_ctrl,
> > .ctrlbit = (1 << 8),
> > }, {
> > - .name = "dwmmc",
> > + .name = "biu",
> > .parent = &exynos4_clk_aclk_133.clk,
> > .enable = exynos4_clk_ip_fsys_ctrl,
> > .ctrlbit = (1 << 9),
> > @@ -1134,7 +1134,7 @@ static struct clksrc_clk exynos4_clksrcs[] = {
> > .reg_div = { .reg = EXYNOS4_CLKDIV_MFC, .shift = 0,
.size = 4 },
> > }, {
> > .clk = {
> > - .name = "sclk_dwmmc",
> > + .name = "ciu",
> > .parent = &exynos4_clk_dout_mmc4.clk,
> > .enable = exynos4_clksrc_mask_fsys_ctrl,
> > .ctrlbit = (1 << 16),
> > --
>
> Acked-by: Thomas Abraham <thomas.abraham@linaro.org>
>
Thanks, applied.
- Kukjin
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: EXYNOS: Fix MSHC clocks instance names
@ 2012-12-14 14:59 Dongjin Kim
2012-12-14 16:00 ` Thomas Abraham
0 siblings, 1 reply; 5+ messages in thread
From: Dongjin Kim @ 2012-12-14 14:59 UTC (permalink / raw)
To: linux-arm-kernel
Replace clock instance name of MSHC controller for BIC and CIU of Exynos4412.
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
---
arch/arm/mach-exynos/clock-exynos4.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c
index efead60..ae83011 100644
--- a/arch/arm/mach-exynos/clock-exynos4.c
+++ b/arch/arm/mach-exynos/clock-exynos4.c
@@ -529,8 +529,8 @@ static struct clk exynos4_init_clocks_off[] = {
.enable = exynos4_clk_ip_fsys_ctrl,
.ctrlbit = (1 << 8),
}, {
- .name = "dwmmc",
- .parent = &exynos4_clk_aclk_133.clk,
+ .name = "biu",
+ .parent = &exynos4_clk_aclk_200.clk,
.enable = exynos4_clk_ip_fsys_ctrl,
.ctrlbit = (1 << 9),
}, {
@@ -1132,15 +1132,7 @@ static struct clksrc_clk exynos4_clksrcs[] = {
.sources = &exynos4_clkset_mout_mfc,
.reg_src = { .reg = EXYNOS4_CLKSRC_MFC, .shift = 8, .size = 1 },
.reg_div = { .reg = EXYNOS4_CLKDIV_MFC, .shift = 0, .size = 4 },
- }, {
- .clk = {
- .name = "sclk_dwmmc",
- .parent = &exynos4_clk_dout_mmc4.clk,
- .enable = exynos4_clksrc_mask_fsys_ctrl,
- .ctrlbit = (1 << 16),
- },
- .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS3, .shift = 8, .size = 8 },
- }
+ },
};
static struct clksrc_clk exynos4_clk_sclk_uart0 = {
@@ -1235,6 +1227,16 @@ static struct clksrc_clk exynos4_clk_sclk_mmc3 = {
.reg_div = { .reg = EXYNOS4_CLKDIV_FSYS2, .shift = 24, .size = 8 },
};
+static struct clksrc_clk exynos4_clk_sclk_dwmci = {
+ .clk = {
+ .name = "ciu",
+ .parent = &exynos4_clk_dout_mmc4.clk,
+ .enable = exynos4_clksrc_mask_fsys_ctrl,
+ .ctrlbit = (1 << 16),
+ },
+ .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS3, .shift = 8, .size = 8 },
+};
+
static struct clksrc_clk exynos4_clk_mdout_spi0 = {
.clk = {
.name = "mdout_spi",
@@ -1348,6 +1350,7 @@ static struct clksrc_clk *exynos4_clksrc_cdev[] = {
&exynos4_clk_sclk_mmc1,
&exynos4_clk_sclk_mmc2,
&exynos4_clk_sclk_mmc3,
+ &exynos4_clk_sclk_dwmci,
&exynos4_clk_sclk_spi0,
&exynos4_clk_sclk_spi1,
&exynos4_clk_sclk_spi2,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] ARM: EXYNOS: Fix MSHC clocks instance names
2012-12-14 14:59 Dongjin Kim
@ 2012-12-14 16:00 ` Thomas Abraham
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Abraham @ 2012-12-14 16:00 UTC (permalink / raw)
To: linux-arm-kernel
Hi Dongjin,
On 14 December 2012 20:29, Dongjin Kim <tobetter@gmail.com> wrote:
> Replace clock instance name of MSHC controller for BIC and CIU of Exynos4412.
>
> Signed-off-by: Dongjin Kim <tobetter@gmail.com>
> ---
> arch/arm/mach-exynos/clock-exynos4.c | 25 ++++++++++++++-----------
> 1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c
> index efead60..ae83011 100644
> --- a/arch/arm/mach-exynos/clock-exynos4.c
> +++ b/arch/arm/mach-exynos/clock-exynos4.c
> @@ -529,8 +529,8 @@ static struct clk exynos4_init_clocks_off[] = {
> .enable = exynos4_clk_ip_fsys_ctrl,
> .ctrlbit = (1 << 8),
> }, {
> - .name = "dwmmc",
> - .parent = &exynos4_clk_aclk_133.clk,
> + .name = "biu",
> + .parent = &exynos4_clk_aclk_200.clk,
> .enable = exynos4_clk_ip_fsys_ctrl,
> .ctrlbit = (1 << 9),
> }, {
> @@ -1132,15 +1132,7 @@ static struct clksrc_clk exynos4_clksrcs[] = {
> .sources = &exynos4_clkset_mout_mfc,
> .reg_src = { .reg = EXYNOS4_CLKSRC_MFC, .shift = 8, .size = 1 },
> .reg_div = { .reg = EXYNOS4_CLKDIV_MFC, .shift = 0, .size = 4 },
> - }, {
> - .clk = {
> - .name = "sclk_dwmmc",
> - .parent = &exynos4_clk_dout_mmc4.clk,
> - .enable = exynos4_clksrc_mask_fsys_ctrl,
> - .ctrlbit = (1 << 16),
> - },
> - .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS3, .shift = 8, .size = 8 },
> - }
> + },
> };
>
> static struct clksrc_clk exynos4_clk_sclk_uart0 = {
> @@ -1235,6 +1227,16 @@ static struct clksrc_clk exynos4_clk_sclk_mmc3 = {
> .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS2, .shift = 24, .size = 8 },
> };
>
> +static struct clksrc_clk exynos4_clk_sclk_dwmci = {
> + .clk = {
> + .name = "ciu",
> + .parent = &exynos4_clk_dout_mmc4.clk,
> + .enable = exynos4_clksrc_mask_fsys_ctrl,
> + .ctrlbit = (1 << 16),
> + },
> + .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS3, .shift = 8, .size = 8 },
> +};
> +
It is not required to move the above clock instance out of the
exynos4_clksrcs[] array. Just changing the clock name to 'ciu' is
sufficient. And this will avoid the below change as well.
> static struct clksrc_clk exynos4_clk_mdout_spi0 = {
> .clk = {
> .name = "mdout_spi",
> @@ -1348,6 +1350,7 @@ static struct clksrc_clk *exynos4_clksrc_cdev[] = {
> &exynos4_clk_sclk_mmc1,
> &exynos4_clk_sclk_mmc2,
> &exynos4_clk_sclk_mmc3,
> + &exynos4_clk_sclk_dwmci,
> &exynos4_clk_sclk_spi0,
> &exynos4_clk_sclk_spi1,
> &exynos4_clk_sclk_spi2,
> --
> 1.7.9.5
Thanks,
Thomas.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-12-19 3:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-14 16:13 [PATCH] ARM: EXYNOS: Fix MSHC clocks instance names Dongjin Kim
2012-12-14 17:35 ` Thomas Abraham
2012-12-19 3:38 ` Kukjin Kim
-- strict thread matches above, loose matches on Subject: below --
2012-12-14 14:59 Dongjin Kim
2012-12-14 16:00 ` Thomas Abraham
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).