Commit 24718800 authored by Paul Walmsley's avatar Paul Walmsley Committed by Tony Lindgren

omap2 clock: fix some clocks incorrectly marked as present on OMAP2430

Several clocks are marked as present on OMAP2430, even though they are
2420-only.  Drop CLOCK_IN_OMAP243X from those clocks' flags.
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 3cb04564
...@@ -742,8 +742,7 @@ static struct clk sys_clkout2 = { ...@@ -742,8 +742,7 @@ static struct clk sys_clkout2 = {
.name = "sys_clkout2", .name = "sys_clkout2",
.parent = &func_54m_ck, .parent = &func_54m_ck,
.rate = 54000000, .rate = 54000000,
.flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | .flags = CLOCK_IN_OMAP242X | CM_SYSCLKOUT_SEL1 | RATE_CKCTL,
CM_SYSCLKOUT_SEL1 | RATE_CKCTL,
.src_offset = OMAP2420_CLKOUT2_SOURCE_SHIFT, .src_offset = OMAP2420_CLKOUT2_SOURCE_SHIFT,
.enable_reg = OMAP24XX_PRCM_CLKOUT_CTRL, .enable_reg = OMAP24XX_PRCM_CLKOUT_CTRL,
.enable_bit = OMAP2420_CLKOUT2_EN_SHIFT, .enable_bit = OMAP2420_CLKOUT2_EN_SHIFT,
...@@ -1740,7 +1739,7 @@ static struct clk i2c2_ick = { ...@@ -1740,7 +1739,7 @@ static struct clk i2c2_ick = {
.name = "i2c_ick", .name = "i2c_ick",
.id = 2, .id = 2,
.parent = &l4_ck, .parent = &l4_ck,
.flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .flags = CLOCK_IN_OMAP242X,
.enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
.enable_bit = OMAP2420_EN_I2C2_SHIFT, .enable_bit = OMAP2420_EN_I2C2_SHIFT,
.recalc = &omap2_followparent_recalc, .recalc = &omap2_followparent_recalc,
...@@ -1750,7 +1749,7 @@ static struct clk i2c2_fck = { ...@@ -1750,7 +1749,7 @@ static struct clk i2c2_fck = {
.name = "i2c_fck", .name = "i2c_fck",
.id = 2, .id = 2,
.parent = &func_12m_ck, .parent = &func_12m_ck,
.flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .flags = CLOCK_IN_OMAP242X,
.enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
.enable_bit = OMAP2420_EN_I2C2_SHIFT, .enable_bit = OMAP2420_EN_I2C2_SHIFT,
.recalc = &omap2_followparent_recalc, .recalc = &omap2_followparent_recalc,
...@@ -1770,7 +1769,7 @@ static struct clk i2c1_ick = { ...@@ -1770,7 +1769,7 @@ static struct clk i2c1_ick = {
.name = "i2c_ick", .name = "i2c_ick",
.id = 1, .id = 1,
.parent = &l4_ck, .parent = &l4_ck,
.flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .flags = CLOCK_IN_OMAP242X,
.enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
.enable_bit = OMAP2420_EN_I2C1_SHIFT, .enable_bit = OMAP2420_EN_I2C1_SHIFT,
.recalc = &omap2_followparent_recalc, .recalc = &omap2_followparent_recalc,
...@@ -1780,7 +1779,7 @@ static struct clk i2c1_fck = { ...@@ -1780,7 +1779,7 @@ static struct clk i2c1_fck = {
.name = "i2c_fck", .name = "i2c_fck",
.id = 1, .id = 1,
.parent = &func_12m_ck, .parent = &func_12m_ck,
.flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .flags = CLOCK_IN_OMAP242X,
.enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
.enable_bit = OMAP2420_EN_I2C1_SHIFT, .enable_bit = OMAP2420_EN_I2C1_SHIFT,
.recalc = &omap2_followparent_recalc, .recalc = &omap2_followparent_recalc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment