diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock34xx.h')
-rw-r--r-- | arch/arm/mach-omap2/clock34xx.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index 7217a0824ec4..a826094d89b5 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h | |||
@@ -1374,7 +1374,7 @@ static struct clk core_96m_fck = { | |||
1374 | 1374 | ||
1375 | static struct clk mmchs3_fck = { | 1375 | static struct clk mmchs3_fck = { |
1376 | .name = "mmchs_fck", | 1376 | .name = "mmchs_fck", |
1377 | .id = 3, | 1377 | .id = 2, |
1378 | .parent = &core_96m_fck, | 1378 | .parent = &core_96m_fck, |
1379 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), | 1379 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), |
1380 | .enable_bit = OMAP3430ES2_EN_MMC3_SHIFT, | 1380 | .enable_bit = OMAP3430ES2_EN_MMC3_SHIFT, |
@@ -1385,7 +1385,7 @@ static struct clk mmchs3_fck = { | |||
1385 | 1385 | ||
1386 | static struct clk mmchs2_fck = { | 1386 | static struct clk mmchs2_fck = { |
1387 | .name = "mmchs_fck", | 1387 | .name = "mmchs_fck", |
1388 | .id = 2, | 1388 | .id = 1, |
1389 | .parent = &core_96m_fck, | 1389 | .parent = &core_96m_fck, |
1390 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), | 1390 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), |
1391 | .enable_bit = OMAP3430_EN_MMC2_SHIFT, | 1391 | .enable_bit = OMAP3430_EN_MMC2_SHIFT, |
@@ -1406,7 +1406,6 @@ static struct clk mspro_fck = { | |||
1406 | 1406 | ||
1407 | static struct clk mmchs1_fck = { | 1407 | static struct clk mmchs1_fck = { |
1408 | .name = "mmchs_fck", | 1408 | .name = "mmchs_fck", |
1409 | .id = 1, | ||
1410 | .parent = &core_96m_fck, | 1409 | .parent = &core_96m_fck, |
1411 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), | 1410 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), |
1412 | .enable_bit = OMAP3430_EN_MMC1_SHIFT, | 1411 | .enable_bit = OMAP3430_EN_MMC1_SHIFT, |
@@ -1722,7 +1721,7 @@ static struct clk usbtll_ick = { | |||
1722 | 1721 | ||
1723 | static struct clk mmchs3_ick = { | 1722 | static struct clk mmchs3_ick = { |
1724 | .name = "mmchs_ick", | 1723 | .name = "mmchs_ick", |
1725 | .id = 3, | 1724 | .id = 2, |
1726 | .parent = &core_l4_ick, | 1725 | .parent = &core_l4_ick, |
1727 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | 1726 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), |
1728 | .enable_bit = OMAP3430ES2_EN_MMC3_SHIFT, | 1727 | .enable_bit = OMAP3430ES2_EN_MMC3_SHIFT, |
@@ -1774,7 +1773,7 @@ static struct clk des2_ick = { | |||
1774 | 1773 | ||
1775 | static struct clk mmchs2_ick = { | 1774 | static struct clk mmchs2_ick = { |
1776 | .name = "mmchs_ick", | 1775 | .name = "mmchs_ick", |
1777 | .id = 2, | 1776 | .id = 1, |
1778 | .parent = &core_l4_ick, | 1777 | .parent = &core_l4_ick, |
1779 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | 1778 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), |
1780 | .enable_bit = OMAP3430_EN_MMC2_SHIFT, | 1779 | .enable_bit = OMAP3430_EN_MMC2_SHIFT, |
@@ -1785,7 +1784,6 @@ static struct clk mmchs2_ick = { | |||
1785 | 1784 | ||
1786 | static struct clk mmchs1_ick = { | 1785 | static struct clk mmchs1_ick = { |
1787 | .name = "mmchs_ick", | 1786 | .name = "mmchs_ick", |
1788 | .id = 1, | ||
1789 | .parent = &core_l4_ick, | 1787 | .parent = &core_l4_ick, |
1790 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | 1788 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), |
1791 | .enable_bit = OMAP3430_EN_MMC1_SHIFT, | 1789 | .enable_bit = OMAP3430_EN_MMC1_SHIFT, |