| Message ID | 1357891289-23500-10-git-send-email-pgaikwad@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/11/2013 01:01 AM, Prashant Gaikwad wrote: > With device tree support added for Tegra clocks look up is done from > device tree, remove unused TEGRA_CLK_DUPLICATE()s. Cc'ing in the drivers/clk maintainer as an FYI and for Acks; this patch needs to go through the Tegra tree due to dependencies. > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> > --- > drivers/clk/tegra/clk-tegra30.c | 70 --------------------------------------- > 1 files changed, 0 insertions(+), 70 deletions(-) > > diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c > index 987312c..6d1ff86 100644 > --- a/drivers/clk/tegra/clk-tegra30.c > +++ b/drivers/clk/tegra/clk-tegra30.c > @@ -1642,41 +1642,6 @@ static void __init tegra30_periph_clk_init(void) > clk_register_clkdev(clk, "emc", NULL); > clks[emc] = clk; > > - /* i2c1-fast */ > - clk = clk_register_fixed_factor(NULL, "i2c1-fast", "pll_p_out3", > - CLK_SET_RATE_PARENT, 1, 1); > - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.0"); > - > - /* i2c2-fast */ > - clk = clk_register_fixed_factor(NULL, "i2c2-fast", "pll_p_out3", > - CLK_SET_RATE_PARENT, 1, 1); > - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.1"); > - > - /* i2c3-fast */ > - clk = clk_register_fixed_factor(NULL, "i2c3-fast", "pll_p_out3", > - CLK_SET_RATE_PARENT, 1, 1); > - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.2"); > - > - /* i2c4-fast */ > - clk = clk_register_fixed_factor(NULL, "i2c4-fast", "pll_p_out3", > - CLK_SET_RATE_PARENT, 1, 1); > - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.3"); > - > - /* i2c5-fast */ > - clk = clk_register_fixed_factor(NULL, "i2c5-fast", "pll_p_out3", > - CLK_SET_RATE_PARENT, 1, 1); > - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.5"); > - > - /* dsi1-fixed */ > - clk = clk_register_fixed_factor(NULL, "dsi1-fixed", "pll_p_out3", > - CLK_SET_RATE_PARENT, 1, 1); > - clk_register_clkdev(clk, "dsi-fixed", "tegradc.0"); > - > - /* dsi2-fixed */ > - clk = clk_register_fixed_factor(NULL, "dsi2-fixed", "pll_p_out3", > - CLK_SET_RATE_PARENT, 1, 1); > - clk_register_clkdev(clk, "dsi-fixed", "tegradc.1"); > - > for (i = 0; i < ARRAY_SIZE(tegra_periph_clk_list); i++) { > data = &tegra_periph_clk_list[i]; > clk = tegra_clk_periph(data->name, data->parent_names, > @@ -1935,19 +1900,9 @@ static __initdata struct tegra_clk_init_table init_table[] = { > * table under two names. > */ > static struct tegra_clk_duplicate tegra_clk_duplicates[] = { > - TEGRA_CLK_DUPLICATE(uarta, "serial8250.0", NULL), > - TEGRA_CLK_DUPLICATE(uartb, "serial8250.1", NULL), > - TEGRA_CLK_DUPLICATE(uartc, "serial8250.2", NULL), > - TEGRA_CLK_DUPLICATE(uartd, "serial8250.3", NULL), > - TEGRA_CLK_DUPLICATE(uarte, "serial8250.4", NULL), > TEGRA_CLK_DUPLICATE(usbd, "utmip-pad", NULL), > TEGRA_CLK_DUPLICATE(usbd, "tegra-ehci.0", NULL), > TEGRA_CLK_DUPLICATE(usbd, "tegra-otg", NULL), > - TEGRA_CLK_DUPLICATE(pll_p, "tegradc.0", "parent"), > - TEGRA_CLK_DUPLICATE(pll_p, "tegradc.1", "parent"), > - TEGRA_CLK_DUPLICATE(pll_d2_out0, "hdmi", "parent"), > - TEGRA_CLK_DUPLICATE(dsib, "tegradc.0", "dsib"), > - TEGRA_CLK_DUPLICATE(dsia, "tegradc.1", "dsia"), > TEGRA_CLK_DUPLICATE(bsev, "tegra-avp", "bsev"), > TEGRA_CLK_DUPLICATE(bsev, "nvavp", "bsev"), > TEGRA_CLK_DUPLICATE(vde, "tegra-aes", "vde"), > @@ -1956,33 +1911,8 @@ static struct tegra_clk_duplicate tegra_clk_duplicates[] = { > TEGRA_CLK_DUPLICATE(cml1, "tegra_sata_cml", NULL), > TEGRA_CLK_DUPLICATE(cml0, "tegra_pcie", "cml"), > TEGRA_CLK_DUPLICATE(pciex, "tegra_pcie", "pciex"), > - TEGRA_CLK_DUPLICATE(i2c1, "tegra-i2c-slave.0", NULL), > - TEGRA_CLK_DUPLICATE(i2c2, "tegra-i2c-slave.1", NULL), > - TEGRA_CLK_DUPLICATE(i2c3, "tegra-i2c-slave.2", NULL), > - TEGRA_CLK_DUPLICATE(i2c4, "tegra-i2c-slave.3", NULL), > - TEGRA_CLK_DUPLICATE(i2c5, "tegra-i2c-slave.4", NULL), > - TEGRA_CLK_DUPLICATE(sbc1, "spi_slave_tegra.0", NULL), > - TEGRA_CLK_DUPLICATE(sbc2, "spi_slave_tegra.1", NULL), > - TEGRA_CLK_DUPLICATE(sbc3, "spi_slave_tegra.2", NULL), > - TEGRA_CLK_DUPLICATE(sbc4, "spi_slave_tegra.3", NULL), > - TEGRA_CLK_DUPLICATE(sbc5, "spi_slave_tegra.4", NULL), > - TEGRA_CLK_DUPLICATE(sbc6, "spi_slave_tegra.5", NULL), > TEGRA_CLK_DUPLICATE(twd, "smp_twd", NULL), > TEGRA_CLK_DUPLICATE(vcp, "nvavp", "vcp"), > - TEGRA_CLK_DUPLICATE(i2s0, NULL, "i2s0"), > - TEGRA_CLK_DUPLICATE(i2s1, NULL, "i2s1"), > - TEGRA_CLK_DUPLICATE(i2s2, NULL, "i2s2"), > - TEGRA_CLK_DUPLICATE(i2s3, NULL, "i2s3"), > - TEGRA_CLK_DUPLICATE(i2s4, NULL, "i2s4"), > - TEGRA_CLK_DUPLICATE(dam0, NULL, "dam0"), > - TEGRA_CLK_DUPLICATE(dam1, NULL, "dam1"), > - TEGRA_CLK_DUPLICATE(dam2, NULL, "dam2"), > - TEGRA_CLK_DUPLICATE(spdif_in, NULL, "spdif_in"), > - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.0", "fast-clk"), > - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.1", "fast-clk"), > - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.2", "fast-clk"), > - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.3", "fast-clk"), > - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.4", "fast-clk"), > TEGRA_CLK_DUPLICATE(clk_max, NULL, NULL), /* MUST be the last entry */ > }; > >
Quoting Stephen Warren (2013-01-11 13:01:20) > On 01/11/2013 01:01 AM, Prashant Gaikwad wrote: > > With device tree support added for Tegra clocks look up is done from > > device tree, remove unused TEGRA_CLK_DUPLICATE()s. > > Cc'ing in the drivers/clk maintainer as an FYI and for Acks; this patch > needs to go through the Tegra tree due to dependencies. > Acked-by: Mike Turquette <mturquette@linaro.org> > > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> > > --- > > drivers/clk/tegra/clk-tegra30.c | 70 --------------------------------------- > > 1 files changed, 0 insertions(+), 70 deletions(-) > > > > diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c > > index 987312c..6d1ff86 100644 > > --- a/drivers/clk/tegra/clk-tegra30.c > > +++ b/drivers/clk/tegra/clk-tegra30.c > > @@ -1642,41 +1642,6 @@ static void __init tegra30_periph_clk_init(void) > > clk_register_clkdev(clk, "emc", NULL); > > clks[emc] = clk; > > > > - /* i2c1-fast */ > > - clk = clk_register_fixed_factor(NULL, "i2c1-fast", "pll_p_out3", > > - CLK_SET_RATE_PARENT, 1, 1); > > - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.0"); > > - > > - /* i2c2-fast */ > > - clk = clk_register_fixed_factor(NULL, "i2c2-fast", "pll_p_out3", > > - CLK_SET_RATE_PARENT, 1, 1); > > - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.1"); > > - > > - /* i2c3-fast */ > > - clk = clk_register_fixed_factor(NULL, "i2c3-fast", "pll_p_out3", > > - CLK_SET_RATE_PARENT, 1, 1); > > - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.2"); > > - > > - /* i2c4-fast */ > > - clk = clk_register_fixed_factor(NULL, "i2c4-fast", "pll_p_out3", > > - CLK_SET_RATE_PARENT, 1, 1); > > - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.3"); > > - > > - /* i2c5-fast */ > > - clk = clk_register_fixed_factor(NULL, "i2c5-fast", "pll_p_out3", > > - CLK_SET_RATE_PARENT, 1, 1); > > - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.5"); > > - > > - /* dsi1-fixed */ > > - clk = clk_register_fixed_factor(NULL, "dsi1-fixed", "pll_p_out3", > > - CLK_SET_RATE_PARENT, 1, 1); > > - clk_register_clkdev(clk, "dsi-fixed", "tegradc.0"); > > - > > - /* dsi2-fixed */ > > - clk = clk_register_fixed_factor(NULL, "dsi2-fixed", "pll_p_out3", > > - CLK_SET_RATE_PARENT, 1, 1); > > - clk_register_clkdev(clk, "dsi-fixed", "tegradc.1"); > > - > > for (i = 0; i < ARRAY_SIZE(tegra_periph_clk_list); i++) { > > data = &tegra_periph_clk_list[i]; > > clk = tegra_clk_periph(data->name, data->parent_names, > > @@ -1935,19 +1900,9 @@ static __initdata struct tegra_clk_init_table init_table[] = { > > * table under two names. > > */ > > static struct tegra_clk_duplicate tegra_clk_duplicates[] = { > > - TEGRA_CLK_DUPLICATE(uarta, "serial8250.0", NULL), > > - TEGRA_CLK_DUPLICATE(uartb, "serial8250.1", NULL), > > - TEGRA_CLK_DUPLICATE(uartc, "serial8250.2", NULL), > > - TEGRA_CLK_DUPLICATE(uartd, "serial8250.3", NULL), > > - TEGRA_CLK_DUPLICATE(uarte, "serial8250.4", NULL), > > TEGRA_CLK_DUPLICATE(usbd, "utmip-pad", NULL), > > TEGRA_CLK_DUPLICATE(usbd, "tegra-ehci.0", NULL), > > TEGRA_CLK_DUPLICATE(usbd, "tegra-otg", NULL), > > - TEGRA_CLK_DUPLICATE(pll_p, "tegradc.0", "parent"), > > - TEGRA_CLK_DUPLICATE(pll_p, "tegradc.1", "parent"), > > - TEGRA_CLK_DUPLICATE(pll_d2_out0, "hdmi", "parent"), > > - TEGRA_CLK_DUPLICATE(dsib, "tegradc.0", "dsib"), > > - TEGRA_CLK_DUPLICATE(dsia, "tegradc.1", "dsia"), > > TEGRA_CLK_DUPLICATE(bsev, "tegra-avp", "bsev"), > > TEGRA_CLK_DUPLICATE(bsev, "nvavp", "bsev"), > > TEGRA_CLK_DUPLICATE(vde, "tegra-aes", "vde"), > > @@ -1956,33 +1911,8 @@ static struct tegra_clk_duplicate tegra_clk_duplicates[] = { > > TEGRA_CLK_DUPLICATE(cml1, "tegra_sata_cml", NULL), > > TEGRA_CLK_DUPLICATE(cml0, "tegra_pcie", "cml"), > > TEGRA_CLK_DUPLICATE(pciex, "tegra_pcie", "pciex"), > > - TEGRA_CLK_DUPLICATE(i2c1, "tegra-i2c-slave.0", NULL), > > - TEGRA_CLK_DUPLICATE(i2c2, "tegra-i2c-slave.1", NULL), > > - TEGRA_CLK_DUPLICATE(i2c3, "tegra-i2c-slave.2", NULL), > > - TEGRA_CLK_DUPLICATE(i2c4, "tegra-i2c-slave.3", NULL), > > - TEGRA_CLK_DUPLICATE(i2c5, "tegra-i2c-slave.4", NULL), > > - TEGRA_CLK_DUPLICATE(sbc1, "spi_slave_tegra.0", NULL), > > - TEGRA_CLK_DUPLICATE(sbc2, "spi_slave_tegra.1", NULL), > > - TEGRA_CLK_DUPLICATE(sbc3, "spi_slave_tegra.2", NULL), > > - TEGRA_CLK_DUPLICATE(sbc4, "spi_slave_tegra.3", NULL), > > - TEGRA_CLK_DUPLICATE(sbc5, "spi_slave_tegra.4", NULL), > > - TEGRA_CLK_DUPLICATE(sbc6, "spi_slave_tegra.5", NULL), > > TEGRA_CLK_DUPLICATE(twd, "smp_twd", NULL), > > TEGRA_CLK_DUPLICATE(vcp, "nvavp", "vcp"), > > - TEGRA_CLK_DUPLICATE(i2s0, NULL, "i2s0"), > > - TEGRA_CLK_DUPLICATE(i2s1, NULL, "i2s1"), > > - TEGRA_CLK_DUPLICATE(i2s2, NULL, "i2s2"), > > - TEGRA_CLK_DUPLICATE(i2s3, NULL, "i2s3"), > > - TEGRA_CLK_DUPLICATE(i2s4, NULL, "i2s4"), > > - TEGRA_CLK_DUPLICATE(dam0, NULL, "dam0"), > > - TEGRA_CLK_DUPLICATE(dam1, NULL, "dam1"), > > - TEGRA_CLK_DUPLICATE(dam2, NULL, "dam2"), > > - TEGRA_CLK_DUPLICATE(spdif_in, NULL, "spdif_in"), > > - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.0", "fast-clk"), > > - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.1", "fast-clk"), > > - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.2", "fast-clk"), > > - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.3", "fast-clk"), > > - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.4", "fast-clk"), > > TEGRA_CLK_DUPLICATE(clk_max, NULL, NULL), /* MUST be the last entry */ > > }; > > > >
diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c index 987312c..6d1ff86 100644 --- a/drivers/clk/tegra/clk-tegra30.c +++ b/drivers/clk/tegra/clk-tegra30.c @@ -1642,41 +1642,6 @@ static void __init tegra30_periph_clk_init(void) clk_register_clkdev(clk, "emc", NULL); clks[emc] = clk; - /* i2c1-fast */ - clk = clk_register_fixed_factor(NULL, "i2c1-fast", "pll_p_out3", - CLK_SET_RATE_PARENT, 1, 1); - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.0"); - - /* i2c2-fast */ - clk = clk_register_fixed_factor(NULL, "i2c2-fast", "pll_p_out3", - CLK_SET_RATE_PARENT, 1, 1); - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.1"); - - /* i2c3-fast */ - clk = clk_register_fixed_factor(NULL, "i2c3-fast", "pll_p_out3", - CLK_SET_RATE_PARENT, 1, 1); - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.2"); - - /* i2c4-fast */ - clk = clk_register_fixed_factor(NULL, "i2c4-fast", "pll_p_out3", - CLK_SET_RATE_PARENT, 1, 1); - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.3"); - - /* i2c5-fast */ - clk = clk_register_fixed_factor(NULL, "i2c5-fast", "pll_p_out3", - CLK_SET_RATE_PARENT, 1, 1); - clk_register_clkdev(clk, "fast-clk", "tegra-i2c.5"); - - /* dsi1-fixed */ - clk = clk_register_fixed_factor(NULL, "dsi1-fixed", "pll_p_out3", - CLK_SET_RATE_PARENT, 1, 1); - clk_register_clkdev(clk, "dsi-fixed", "tegradc.0"); - - /* dsi2-fixed */ - clk = clk_register_fixed_factor(NULL, "dsi2-fixed", "pll_p_out3", - CLK_SET_RATE_PARENT, 1, 1); - clk_register_clkdev(clk, "dsi-fixed", "tegradc.1"); - for (i = 0; i < ARRAY_SIZE(tegra_periph_clk_list); i++) { data = &tegra_periph_clk_list[i]; clk = tegra_clk_periph(data->name, data->parent_names, @@ -1935,19 +1900,9 @@ static __initdata struct tegra_clk_init_table init_table[] = { * table under two names. */ static struct tegra_clk_duplicate tegra_clk_duplicates[] = { - TEGRA_CLK_DUPLICATE(uarta, "serial8250.0", NULL), - TEGRA_CLK_DUPLICATE(uartb, "serial8250.1", NULL), - TEGRA_CLK_DUPLICATE(uartc, "serial8250.2", NULL), - TEGRA_CLK_DUPLICATE(uartd, "serial8250.3", NULL), - TEGRA_CLK_DUPLICATE(uarte, "serial8250.4", NULL), TEGRA_CLK_DUPLICATE(usbd, "utmip-pad", NULL), TEGRA_CLK_DUPLICATE(usbd, "tegra-ehci.0", NULL), TEGRA_CLK_DUPLICATE(usbd, "tegra-otg", NULL), - TEGRA_CLK_DUPLICATE(pll_p, "tegradc.0", "parent"), - TEGRA_CLK_DUPLICATE(pll_p, "tegradc.1", "parent"), - TEGRA_CLK_DUPLICATE(pll_d2_out0, "hdmi", "parent"), - TEGRA_CLK_DUPLICATE(dsib, "tegradc.0", "dsib"), - TEGRA_CLK_DUPLICATE(dsia, "tegradc.1", "dsia"), TEGRA_CLK_DUPLICATE(bsev, "tegra-avp", "bsev"), TEGRA_CLK_DUPLICATE(bsev, "nvavp", "bsev"), TEGRA_CLK_DUPLICATE(vde, "tegra-aes", "vde"), @@ -1956,33 +1911,8 @@ static struct tegra_clk_duplicate tegra_clk_duplicates[] = { TEGRA_CLK_DUPLICATE(cml1, "tegra_sata_cml", NULL), TEGRA_CLK_DUPLICATE(cml0, "tegra_pcie", "cml"), TEGRA_CLK_DUPLICATE(pciex, "tegra_pcie", "pciex"), - TEGRA_CLK_DUPLICATE(i2c1, "tegra-i2c-slave.0", NULL), - TEGRA_CLK_DUPLICATE(i2c2, "tegra-i2c-slave.1", NULL), - TEGRA_CLK_DUPLICATE(i2c3, "tegra-i2c-slave.2", NULL), - TEGRA_CLK_DUPLICATE(i2c4, "tegra-i2c-slave.3", NULL), - TEGRA_CLK_DUPLICATE(i2c5, "tegra-i2c-slave.4", NULL), - TEGRA_CLK_DUPLICATE(sbc1, "spi_slave_tegra.0", NULL), - TEGRA_CLK_DUPLICATE(sbc2, "spi_slave_tegra.1", NULL), - TEGRA_CLK_DUPLICATE(sbc3, "spi_slave_tegra.2", NULL), - TEGRA_CLK_DUPLICATE(sbc4, "spi_slave_tegra.3", NULL), - TEGRA_CLK_DUPLICATE(sbc5, "spi_slave_tegra.4", NULL), - TEGRA_CLK_DUPLICATE(sbc6, "spi_slave_tegra.5", NULL), TEGRA_CLK_DUPLICATE(twd, "smp_twd", NULL), TEGRA_CLK_DUPLICATE(vcp, "nvavp", "vcp"), - TEGRA_CLK_DUPLICATE(i2s0, NULL, "i2s0"), - TEGRA_CLK_DUPLICATE(i2s1, NULL, "i2s1"), - TEGRA_CLK_DUPLICATE(i2s2, NULL, "i2s2"), - TEGRA_CLK_DUPLICATE(i2s3, NULL, "i2s3"), - TEGRA_CLK_DUPLICATE(i2s4, NULL, "i2s4"), - TEGRA_CLK_DUPLICATE(dam0, NULL, "dam0"), - TEGRA_CLK_DUPLICATE(dam1, NULL, "dam1"), - TEGRA_CLK_DUPLICATE(dam2, NULL, "dam2"), - TEGRA_CLK_DUPLICATE(spdif_in, NULL, "spdif_in"), - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.0", "fast-clk"), - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.1", "fast-clk"), - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.2", "fast-clk"), - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.3", "fast-clk"), - TEGRA_CLK_DUPLICATE(pll_p_out3, "tegra-i2c.4", "fast-clk"), TEGRA_CLK_DUPLICATE(clk_max, NULL, NULL), /* MUST be the last entry */ };
With device tree support added for Tegra clocks look up is done from device tree, remove unused TEGRA_CLK_DUPLICATE()s. Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> --- drivers/clk/tegra/clk-tegra30.c | 70 --------------------------------------- 1 files changed, 0 insertions(+), 70 deletions(-)