Message ID | 1351612897-14923-2-git-send-email-vasanthananthan@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Vasanth Ananthan wrote: > > This patch adds neccessary clock entries for SATA, SATA PHY and > I2C_SATAPHY > > Signed-off-by: Vasanth Ananthan <vasanth.a@samsung.com> > --- > arch/arm/mach-exynos/clock-exynos5.c | 21 ++++++++++++++++++--- > 1 files changed, 18 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach- > exynos/clock-exynos5.c > index c44ca1e..124c54f 100644 > --- a/arch/arm/mach-exynos/clock-exynos5.c > +++ b/arch/arm/mach-exynos/clock-exynos5.c > @@ -651,15 +651,20 @@ static struct clk exynos5_init_clocks_off[] = { > .ctrlbit = (1 << 15), > }, { > .name = "sata", > - .devname = "ahci", > + .devname = "exynos5-sata", > + .parent = &exynos5_clk_aclk_200.clk, > .enable = exynos5_clk_ip_fsys_ctrl, > .ctrlbit = (1 << 6), > }, { > - .name = "sata_phy", > + .name = "sata-phy", > + .devname = "exynos5-sata-phy", > + .parent = &exynos5_clk_aclk_200.clk, > .enable = exynos5_clk_ip_fsys_ctrl, > .ctrlbit = (1 << 24), > }, { > - .name = "sata_phy_i2c", > + .name = "i2c", > + .devname = "exynos5-sata-phy-i2c", > + .parent = &exynos5_clk_aclk_200.clk, > .enable = exynos5_clk_ip_fsys_ctrl, > .ctrlbit = (1 << 25), > }, { > @@ -1226,6 +1231,16 @@ static struct clksrc_clk exynos5_clksrcs[] = { > .reg_div = { .reg = EXYNOS5_CLKDIV_TOP0, .shift = 24, .size > = 3 }, > }, { > .clk = { > + .name = "sclk_sata", > + .devname = "exynos5-sata", > + .enable = exynos5_clksrc_mask_fsys_ctrl, > + .ctrlbit = (1 << 24), > + }, > + .sources = &exynos5_clkset_aclk, > + .reg_src = { .reg = EXYNOS5_CLKSRC_FSYS, .shift = 24, .size > = 1 }, > + .reg_div = { .reg = EXYNOS5_CLKDIV_FSYS0, .shift = 20, .size > = 4 }, > + }, { > + .clk = { > .name = "sclk_gscl_wrap", > .devname = "s5p-mipi-csis.0", > .enable = exynos5_clksrc_mask_gscl_ctrl, > -- > 1.7.4.1 Looks OK to me, need to think again about naming though?, anyway, this can be handled separate from this series. Let me take this into Samsung tree, if any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Kukjin Kim wrote: > > Vasanth Ananthan wrote: > > > > This patch adds neccessary clock entries for SATA, SATA PHY and > > I2C_SATAPHY > > > > Signed-off-by: Vasanth Ananthan <vasanth.a@samsung.com> > > --- > > arch/arm/mach-exynos/clock-exynos5.c | 21 ++++++++++++++++++--- > > 1 files changed, 18 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach- > > exynos/clock-exynos5.c > > index c44ca1e..124c54f 100644 > > --- a/arch/arm/mach-exynos/clock-exynos5.c > > +++ b/arch/arm/mach-exynos/clock-exynos5.c > > @@ -651,15 +651,20 @@ static struct clk exynos5_init_clocks_off[] = { > > .ctrlbit = (1 << 15), > > }, { > > .name = "sata", > > - .devname = "ahci", > > + .devname = "exynos5-sata", > > + .parent = &exynos5_clk_aclk_200.clk, > > .enable = exynos5_clk_ip_fsys_ctrl, > > .ctrlbit = (1 << 6), > > }, { > > - .name = "sata_phy", > > + .name = "sata-phy", > > + .devname = "exynos5-sata-phy", > > + .parent = &exynos5_clk_aclk_200.clk, > > .enable = exynos5_clk_ip_fsys_ctrl, > > .ctrlbit = (1 << 24), > > }, { > > - .name = "sata_phy_i2c", > > + .name = "i2c", > > + .devname = "exynos5-sata-phy-i2c", > > + .parent = &exynos5_clk_aclk_200.clk, > > .enable = exynos5_clk_ip_fsys_ctrl, > > .ctrlbit = (1 << 25), > > }, { > > @@ -1226,6 +1231,16 @@ static struct clksrc_clk exynos5_clksrcs[] = { > > .reg_div = { .reg = EXYNOS5_CLKDIV_TOP0, .shift = 24, .size > > = 3 }, > > }, { > > .clk = { > > + .name = "sclk_sata", > > + .devname = "exynos5-sata", > > + .enable = exynos5_clksrc_mask_fsys_ctrl, > > + .ctrlbit = (1 << 24), > > + }, > > + .sources = &exynos5_clkset_aclk, > > + .reg_src = { .reg = EXYNOS5_CLKSRC_FSYS, .shift = 24, .size > > = 1 }, > > + .reg_div = { .reg = EXYNOS5_CLKDIV_FSYS0, .shift = 20, .size > > = 4 }, > > + }, { > > + .clk = { > > .name = "sclk_gscl_wrap", > > .devname = "s5p-mipi-csis.0", > > .enable = exynos5_clksrc_mask_gscl_ctrl, > > -- > > 1.7.4.1 > > Looks OK to me, need to think again about naming though?, anyway, this can > be handled separate from this series. > > Let me take this into Samsung tree, if any problems, please let me know. > Applied, thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Hi, Missed to include Ben, for I2C patch, including him and copying others. Thanks, Vasanth. On Tue, Oct 30, 2012 at 9:31 PM, Vasanth Ananthan <vasanthananthan@gmail.com> wrote: > This patch adds neccessary clock entries for SATA, SATA PHY and > I2C_SATAPHY > > Signed-off-by: Vasanth Ananthan <vasanth.a@samsung.com> > --- > arch/arm/mach-exynos/clock-exynos5.c | 21 ++++++++++++++++++--- > 1 files changed, 18 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c > index c44ca1e..124c54f 100644 > --- a/arch/arm/mach-exynos/clock-exynos5.c > +++ b/arch/arm/mach-exynos/clock-exynos5.c > @@ -651,15 +651,20 @@ static struct clk exynos5_init_clocks_off[] = { > .ctrlbit = (1 << 15), > }, { > .name = "sata", > - .devname = "ahci", > + .devname = "exynos5-sata", > + .parent = &exynos5_clk_aclk_200.clk, > .enable = exynos5_clk_ip_fsys_ctrl, > .ctrlbit = (1 << 6), > }, { > - .name = "sata_phy", > + .name = "sata-phy", > + .devname = "exynos5-sata-phy", > + .parent = &exynos5_clk_aclk_200.clk, > .enable = exynos5_clk_ip_fsys_ctrl, > .ctrlbit = (1 << 24), > }, { > - .name = "sata_phy_i2c", > + .name = "i2c", > + .devname = "exynos5-sata-phy-i2c", > + .parent = &exynos5_clk_aclk_200.clk, > .enable = exynos5_clk_ip_fsys_ctrl, > .ctrlbit = (1 << 25), > }, { > @@ -1226,6 +1231,16 @@ static struct clksrc_clk exynos5_clksrcs[] = { > .reg_div = { .reg = EXYNOS5_CLKDIV_TOP0, .shift = 24, .size = 3 }, > }, { > .clk = { > + .name = "sclk_sata", > + .devname = "exynos5-sata", > + .enable = exynos5_clksrc_mask_fsys_ctrl, > + .ctrlbit = (1 << 24), > + }, > + .sources = &exynos5_clkset_aclk, > + .reg_src = { .reg = EXYNOS5_CLKSRC_FSYS, .shift = 24, .size = 1 }, > + .reg_div = { .reg = EXYNOS5_CLKDIV_FSYS0, .shift = 20, .size = 4 }, > + }, { > + .clk = { > .name = "sclk_gscl_wrap", > .devname = "s5p-mipi-csis.0", > .enable = exynos5_clksrc_mask_gscl_ctrl, > -- > 1.7.4.1 >
Vasanth Ananthan wrote: > > Hi, > > Missed to include Ben, for I2C patch, including him and copying others. > Vasanth, you didn't my reply? I already applied this 1st and 2nd patches. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. > > On Tue, Oct 30, 2012 at 9:31 PM, Vasanth Ananthan > <vasanthananthan@gmail.com> wrote: > > This patch adds neccessary clock entries for SATA, SATA PHY and > > I2C_SATAPHY > > > > Signed-off-by: Vasanth Ananthan <vasanth.a@samsung.com> > > --- > > arch/arm/mach-exynos/clock-exynos5.c | 21 ++++++++++++++++++--- > > 1 files changed, 18 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach- > exynos/clock-exynos5.c > > index c44ca1e..124c54f 100644 > > --- a/arch/arm/mach-exynos/clock-exynos5.c > > +++ b/arch/arm/mach-exynos/clock-exynos5.c > > @@ -651,15 +651,20 @@ static struct clk exynos5_init_clocks_off[] = { > > .ctrlbit = (1 << 15), > > }, { > > .name = "sata", > > - .devname = "ahci", > > + .devname = "exynos5-sata", > > + .parent = &exynos5_clk_aclk_200.clk, > > .enable = exynos5_clk_ip_fsys_ctrl, > > .ctrlbit = (1 << 6), > > }, { > > - .name = "sata_phy", > > + .name = "sata-phy", > > + .devname = "exynos5-sata-phy", > > + .parent = &exynos5_clk_aclk_200.clk, > > .enable = exynos5_clk_ip_fsys_ctrl, > > .ctrlbit = (1 << 24), > > }, { > > - .name = "sata_phy_i2c", > > + .name = "i2c", > > + .devname = "exynos5-sata-phy-i2c", > > + .parent = &exynos5_clk_aclk_200.clk, > > .enable = exynos5_clk_ip_fsys_ctrl, > > .ctrlbit = (1 << 25), > > }, { > > @@ -1226,6 +1231,16 @@ static struct clksrc_clk exynos5_clksrcs[] = { > > .reg_div = { .reg = EXYNOS5_CLKDIV_TOP0, .shift = 24, .size > = 3 }, > > }, { > > .clk = { > > + .name = "sclk_sata", > > + .devname = "exynos5-sata", > > + .enable = exynos5_clksrc_mask_fsys_ctrl, > > + .ctrlbit = (1 << 24), > > + }, > > + .sources = &exynos5_clkset_aclk, > > + .reg_src = { .reg = EXYNOS5_CLKSRC_FSYS, .shift = 24, .size > = 1 }, > > + .reg_div = { .reg = EXYNOS5_CLKDIV_FSYS0, .shift = > 20, .size = 4 }, > > + }, { > > + .clk = { > > .name = "sclk_gscl_wrap", > > .devname = "s5p-mipi-csis.0", > > .enable = exynos5_clksrc_mask_gscl_ctrl, > > -- > > 1.7.4.1 > > > > > > --
diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c index c44ca1e..124c54f 100644 --- a/arch/arm/mach-exynos/clock-exynos5.c +++ b/arch/arm/mach-exynos/clock-exynos5.c @@ -651,15 +651,20 @@ static struct clk exynos5_init_clocks_off[] = { .ctrlbit = (1 << 15), }, { .name = "sata", - .devname = "ahci", + .devname = "exynos5-sata", + .parent = &exynos5_clk_aclk_200.clk, .enable = exynos5_clk_ip_fsys_ctrl, .ctrlbit = (1 << 6), }, { - .name = "sata_phy", + .name = "sata-phy", + .devname = "exynos5-sata-phy", + .parent = &exynos5_clk_aclk_200.clk, .enable = exynos5_clk_ip_fsys_ctrl, .ctrlbit = (1 << 24), }, { - .name = "sata_phy_i2c", + .name = "i2c", + .devname = "exynos5-sata-phy-i2c", + .parent = &exynos5_clk_aclk_200.clk, .enable = exynos5_clk_ip_fsys_ctrl, .ctrlbit = (1 << 25), }, { @@ -1226,6 +1231,16 @@ static struct clksrc_clk exynos5_clksrcs[] = { .reg_div = { .reg = EXYNOS5_CLKDIV_TOP0, .shift = 24, .size = 3 }, }, { .clk = { + .name = "sclk_sata", + .devname = "exynos5-sata", + .enable = exynos5_clksrc_mask_fsys_ctrl, + .ctrlbit = (1 << 24), + }, + .sources = &exynos5_clkset_aclk, + .reg_src = { .reg = EXYNOS5_CLKSRC_FSYS, .shift = 24, .size = 1 }, + .reg_div = { .reg = EXYNOS5_CLKDIV_FSYS0, .shift = 20, .size = 4 }, + }, { + .clk = { .name = "sclk_gscl_wrap", .devname = "s5p-mipi-csis.0", .enable = exynos5_clksrc_mask_gscl_ctrl,
This patch adds neccessary clock entries for SATA, SATA PHY and I2C_SATAPHY Signed-off-by: Vasanth Ananthan <vasanth.a@samsung.com> --- arch/arm/mach-exynos/clock-exynos5.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-)