diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 12 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/hwa742.h | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 8780ca666398..e70fc7c66bbb 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
@@ -33,9 +33,11 @@ | |||
33 | #include <mach/common.h> | 33 | #include <mach/common.h> |
34 | #include <mach/dsp_common.h> | 34 | #include <mach/dsp_common.h> |
35 | #include <mach/omapfb.h> | 35 | #include <mach/omapfb.h> |
36 | #include <mach/hwa742.h> | ||
36 | #include <mach/lcd_mipid.h> | 37 | #include <mach/lcd_mipid.h> |
37 | #include <mach/mmc.h> | 38 | #include <mach/mmc.h> |
38 | #include <mach/usb.h> | 39 | #include <mach/usb.h> |
40 | #include <mach/clock.h> | ||
39 | 41 | ||
40 | #define ADS7846_PENDOWN_GPIO 15 | 42 | #define ADS7846_PENDOWN_GPIO 15 |
41 | 43 | ||
@@ -163,6 +165,15 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = { | |||
163 | }, | 165 | }, |
164 | }; | 166 | }; |
165 | 167 | ||
168 | static struct hwa742_platform_data nokia770_hwa742_platform_data = { | ||
169 | .te_connected = 1, | ||
170 | }; | ||
171 | |||
172 | static void hwa742_dev_init(void) | ||
173 | { | ||
174 | clk_add_alias("hwa_sys_ck", NULL, "bclk", NULL); | ||
175 | omapfb_set_ctrl_platform_data(&nokia770_hwa742_platform_data); | ||
176 | } | ||
166 | 177 | ||
167 | /* assume no Mini-AB port */ | 178 | /* assume no Mini-AB port */ |
168 | 179 | ||
@@ -371,6 +382,7 @@ static void __init omap_nokia770_init(void) | |||
371 | omap_serial_init(); | 382 | omap_serial_init(); |
372 | omap_register_i2c_bus(1, 100, NULL, 0); | 383 | omap_register_i2c_bus(1, 100, NULL, 0); |
373 | omap_dsp_init(); | 384 | omap_dsp_init(); |
385 | hwa742_dev_init(); | ||
374 | ads7846_dev_init(); | 386 | ads7846_dev_init(); |
375 | mipid_dev_init(); | 387 | mipid_dev_init(); |
376 | omap_usb_init(&nokia770_usb_config); | 388 | omap_usb_init(&nokia770_usb_config); |
diff --git a/arch/arm/plat-omap/include/mach/hwa742.h b/arch/arm/plat-omap/include/mach/hwa742.h index 577f492f2d3c..886248d32b49 100644 --- a/arch/arm/plat-omap/include/mach/hwa742.h +++ b/arch/arm/plat-omap/include/mach/hwa742.h | |||
@@ -2,10 +2,6 @@ | |||
2 | #define _HWA742_H | 2 | #define _HWA742_H |
3 | 3 | ||
4 | struct hwa742_platform_data { | 4 | struct hwa742_platform_data { |
5 | void (*power_up)(struct device *dev); | ||
6 | void (*power_down)(struct device *dev); | ||
7 | unsigned long (*get_clock_rate)(struct device *dev); | ||
8 | |||
9 | unsigned te_connected:1; | 5 | unsigned te_connected:1; |
10 | }; | 6 | }; |
11 | 7 | ||