diff options
Diffstat (limited to 'arch/arm/mach-omap1/clock.c')
-rw-r--r-- | arch/arm/mach-omap1/clock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index c24cc28238f9..d2b00a56393d 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
@@ -69,7 +69,7 @@ struct omap_clk { | |||
69 | } | 69 | } |
70 | 70 | ||
71 | #define CK_310 (1 << 0) | 71 | #define CK_310 (1 << 0) |
72 | #define CK_730 (1 << 1) | 72 | #define CK_7XX (1 << 1) |
73 | #define CK_1510 (1 << 2) | 73 | #define CK_1510 (1 << 2) |
74 | #define CK_16XX (1 << 3) | 74 | #define CK_16XX (1 << 3) |
75 | 75 | ||
@@ -97,7 +97,7 @@ static struct omap_clk omap_clks[] = { | |||
97 | CLK(NULL, "dspxor_ck", &dspxor_ck, CK_16XX | CK_1510 | CK_310), | 97 | CLK(NULL, "dspxor_ck", &dspxor_ck, CK_16XX | CK_1510 | CK_310), |
98 | CLK(NULL, "dsptim_ck", &dsptim_ck, CK_16XX | CK_1510 | CK_310), | 98 | CLK(NULL, "dsptim_ck", &dsptim_ck, CK_16XX | CK_1510 | CK_310), |
99 | /* CK_GEN3 clocks */ | 99 | /* CK_GEN3 clocks */ |
100 | CLK(NULL, "tc_ck", &tc_ck.clk, CK_16XX | CK_1510 | CK_310 | CK_730), | 100 | CLK(NULL, "tc_ck", &tc_ck.clk, CK_16XX | CK_1510 | CK_310 | CK_7XX), |
101 | CLK(NULL, "tipb_ck", &tipb_ck, CK_1510 | CK_310), | 101 | CLK(NULL, "tipb_ck", &tipb_ck, CK_1510 | CK_310), |
102 | CLK(NULL, "l3_ocpi_ck", &l3_ocpi_ck, CK_16XX), | 102 | CLK(NULL, "l3_ocpi_ck", &l3_ocpi_ck, CK_16XX), |
103 | CLK(NULL, "tc1_ck", &tc1_ck, CK_16XX), | 103 | CLK(NULL, "tc1_ck", &tc1_ck, CK_16XX), |
@@ -108,7 +108,7 @@ static struct omap_clk omap_clks[] = { | |||
108 | CLK(NULL, "lb_ck", &lb_ck.clk, CK_1510 | CK_310), | 108 | CLK(NULL, "lb_ck", &lb_ck.clk, CK_1510 | CK_310), |
109 | CLK(NULL, "rhea1_ck", &rhea1_ck, CK_16XX), | 109 | CLK(NULL, "rhea1_ck", &rhea1_ck, CK_16XX), |
110 | CLK(NULL, "rhea2_ck", &rhea2_ck, CK_16XX), | 110 | CLK(NULL, "rhea2_ck", &rhea2_ck, CK_16XX), |
111 | CLK(NULL, "lcd_ck", &lcd_ck_16xx, CK_16XX | CK_730), | 111 | CLK(NULL, "lcd_ck", &lcd_ck_16xx, CK_16XX | CK_7XX), |
112 | CLK(NULL, "lcd_ck", &lcd_ck_1510.clk, CK_1510 | CK_310), | 112 | CLK(NULL, "lcd_ck", &lcd_ck_1510.clk, CK_1510 | CK_310), |
113 | /* ULPD clocks */ | 113 | /* ULPD clocks */ |
114 | CLK(NULL, "uart1_ck", &uart1_1510, CK_1510 | CK_310), | 114 | CLK(NULL, "uart1_ck", &uart1_1510, CK_1510 | CK_310), |
@@ -784,7 +784,7 @@ int __init omap1_clk_init(void) | |||
784 | if (cpu_is_omap1510()) | 784 | if (cpu_is_omap1510()) |
785 | cpu_mask |= CK_1510; | 785 | cpu_mask |= CK_1510; |
786 | if (cpu_is_omap7xx()) | 786 | if (cpu_is_omap7xx()) |
787 | cpu_mask |= CK_730; | 787 | cpu_mask |= CK_7XX; |
788 | if (cpu_is_omap310()) | 788 | if (cpu_is_omap310()) |
789 | cpu_mask |= CK_310; | 789 | cpu_mask |= CK_310; |
790 | 790 | ||