diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-21 15:46:42 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-21 15:46:42 +0200 |
commit | 34ce3ae0c34c9e4eaac50fdd11bb9702a5647701 (patch) | |
tree | 3ec9455364fce4e1a506ea6a2e9e0f2d8f2fe916 /recipes-kernel/linux/linux-3.0 | |
parent | af058e57f1f7d20c389e3e8ef14a998b66e28d56 (diff) | |
download | meta-ti-34ce3ae0c34c9e4eaac50fdd11bb9702a5647701.tar.gz |
linux 3.0: add support for RTC on zippy/zippy2 boards
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-kernel/linux/linux-3.0')
3 files changed, 38 insertions, 11 deletions
diff --git a/recipes-kernel/linux/linux-3.0/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch b/recipes-kernel/linux/linux-3.0/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch index ff914dc8..6c6d5db8 100644 --- a/recipes-kernel/linux/linux-3.0/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch +++ b/recipes-kernel/linux/linux-3.0/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From fa563f291feaed45803ae17db71514928a17a6a6 Mon Sep 17 00:00:00 2001 | 1 | From 29084109008dda4700a14865ffdba4901fb3e361 Mon Sep 17 00:00:00 2001 |
2 | From: Fernandes, Joel A <joelagnel@ti.com> | 2 | From: Fernandes, Joel A <joelagnel@ti.com> |
3 | Date: Tue, 7 Jun 2011 15:54:45 -0500 | 3 | Date: Tue, 7 Jun 2011 15:54:45 -0500 |
4 | Subject: [PATCH 1/3] OMAP3: beagle: add support for beagleboard xM revision C | 4 | Subject: [PATCH 1/3] OMAP3: beagle: add support for beagleboard xM revision C |
diff --git a/recipes-kernel/linux/linux-3.0/beagle/0002-UNFINISHED-OMAP3-beagle-add-support-for-expansionboa.patch b/recipes-kernel/linux/linux-3.0/beagle/0002-UNFINISHED-OMAP3-beagle-add-support-for-expansionboa.patch index 6e8a33e9..d9281afd 100644 --- a/recipes-kernel/linux/linux-3.0/beagle/0002-UNFINISHED-OMAP3-beagle-add-support-for-expansionboa.patch +++ b/recipes-kernel/linux/linux-3.0/beagle/0002-UNFINISHED-OMAP3-beagle-add-support-for-expansionboa.patch | |||
@@ -1,15 +1,15 @@ | |||
1 | From 04557e8b744e8e6f8ab8b7c4fc715cecd585f2ab Mon Sep 17 00:00:00 2001 | 1 | From e5e3655c165de9507d2020d5eae4c5589c7a3dad Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Thu, 21 Jul 2011 14:29:42 +0200 | 3 | Date: Thu, 21 Jul 2011 14:29:42 +0200 |
4 | Subject: [PATCH 2/3] UNFINISHED: OMAP3: beagle: add support for expansionboards | 4 | Subject: [PATCH 2/3] UNFINISHED: OMAP3: beagle: add support for expansionboards |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
8 | arch/arm/mach-omap2/board-omap3beagle.c | 246 +++++++++++++++++++++++++++++++ | 8 | arch/arm/mach-omap2/board-omap3beagle.c | 266 +++++++++++++++++++++++++++++++ |
9 | 1 files changed, 246 insertions(+), 0 deletions(-) | 9 | 1 files changed, 266 insertions(+), 0 deletions(-) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c | 11 | diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c |
12 | index 32f5f89..e542df0 100644 | 12 | index 32f5f89..f26a9a8 100644 |
13 | --- a/arch/arm/mach-omap2/board-omap3beagle.c | 13 | --- a/arch/arm/mach-omap2/board-omap3beagle.c |
14 | +++ b/arch/arm/mach-omap2/board-omap3beagle.c | 14 | +++ b/arch/arm/mach-omap2/board-omap3beagle.c |
15 | @@ -21,6 +21,7 @@ | 15 | @@ -21,6 +21,7 @@ |
@@ -217,7 +217,27 @@ index 32f5f89..e542df0 100644 | |||
217 | 217 | ||
218 | /* | 218 | /* |
219 | * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active | 219 | * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active |
220 | @@ -479,6 +655,15 @@ static struct omap_board_mux board_mux[] __initdata = { | 220 | @@ -375,6 +551,19 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { |
221 | }, | ||
222 | }; | ||
223 | |||
224 | +#if defined(CONFIG_RTC_DRV_DS1307) || \ | ||
225 | + defined(CONFIG_RTC_DRV_DS1307_MODULE) | ||
226 | + | ||
227 | +static struct i2c_board_info __initdata beagle_i2c2_zippy[] = { | ||
228 | + { | ||
229 | + I2C_BOARD_INFO("eeprom", 0x50), | ||
230 | + I2C_BOARD_INFO("ds1307", 0x68), | ||
231 | + }, | ||
232 | +}; | ||
233 | +#else | ||
234 | +static struct i2c_board_info __initdata beagle_i2c2_zippy[] = {}; | ||
235 | +#endif | ||
236 | + | ||
237 | static int __init omap3_beagle_i2c_init(void) | ||
238 | { | ||
239 | omap3_pmic_get_config(&beagle_twldata, | ||
240 | @@ -479,6 +668,15 @@ static struct omap_board_mux board_mux[] __initdata = { | ||
221 | }; | 241 | }; |
222 | #endif | 242 | #endif |
223 | 243 | ||
@@ -233,7 +253,7 @@ index 32f5f89..e542df0 100644 | |||
233 | static void __init beagle_opp_init(void) | 253 | static void __init beagle_opp_init(void) |
234 | { | 254 | { |
235 | int r = 0; | 255 | int r = 0; |
236 | @@ -542,6 +727,65 @@ static void __init omap3_beagle_init(void) | 256 | @@ -542,6 +740,72 @@ static void __init omap3_beagle_init(void) |
237 | /* REVISIT leave DVI powered down until it's needed ... */ | 257 | /* REVISIT leave DVI powered down until it's needed ... */ |
238 | gpio_request_one(170, GPIOF_OUT_INIT_HIGH, "DVI_nPD"); | 258 | gpio_request_one(170, GPIOF_OUT_INIT_HIGH, "DVI_nPD"); |
239 | 259 | ||
@@ -244,6 +264,10 @@ index 32f5f89..e542df0 100644 | |||
244 | + printk(KERN_INFO "Beagle expansionboard: assigning GPIO 141 and 162 to MMC1\n"); | 264 | + printk(KERN_INFO "Beagle expansionboard: assigning GPIO 141 and 162 to MMC1\n"); |
245 | + mmc[1].gpio_wp = 141; | 265 | + mmc[1].gpio_wp = 141; |
246 | + mmc[1].gpio_cd = 162; | 266 | + mmc[1].gpio_cd = 162; |
267 | + printk(KERN_INFO "Beagle expansionboard: registering I2C2 for zippy board\n"); | ||
268 | + omap_register_i2c_bus(2, 400, beagle_i2c2_zippy, | ||
269 | + ARRAY_SIZE(beagle_i2c2_zippy)); | ||
270 | + | ||
247 | + } | 271 | + } |
248 | + | 272 | + |
249 | + if(!strcmp(expansionboard_name, "zippy2")) | 273 | + if(!strcmp(expansionboard_name, "zippy2")) |
@@ -253,6 +277,9 @@ index 32f5f89..e542df0 100644 | |||
253 | + printk(KERN_INFO "Beagle expansionboard: assigning GPIO 141 and 162 to MMC1\n"); | 277 | + printk(KERN_INFO "Beagle expansionboard: assigning GPIO 141 and 162 to MMC1\n"); |
254 | + mmc[1].gpio_wp = 141; | 278 | + mmc[1].gpio_wp = 141; |
255 | + mmc[1].gpio_cd = 162; | 279 | + mmc[1].gpio_cd = 162; |
280 | + printk(KERN_INFO "Beagle expansionboard: registering I2C2 for zippy2 board\n"); | ||
281 | + omap_register_i2c_bus(2, 400, beagle_i2c2_zippy, | ||
282 | + ARRAY_SIZE(beagle_i2c2_zippy)); | ||
256 | + } | 283 | + } |
257 | + | 284 | + |
258 | + if(!strcmp(expansionboard_name, "trainer")) | 285 | + if(!strcmp(expansionboard_name, "trainer")) |
@@ -299,7 +326,7 @@ index 32f5f89..e542df0 100644 | |||
299 | usb_musb_init(NULL); | 326 | usb_musb_init(NULL); |
300 | usbhs_init(&usbhs_bdata); | 327 | usbhs_init(&usbhs_bdata); |
301 | omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions, | 328 | omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions, |
302 | @@ -558,6 +802,8 @@ static void __init omap3_beagle_init(void) | 329 | @@ -558,6 +822,8 @@ static void __init omap3_beagle_init(void) |
303 | beagle_opp_init(); | 330 | beagle_opp_init(); |
304 | } | 331 | } |
305 | 332 | ||
diff --git a/recipes-kernel/linux/linux-3.0/beagle/0003-HACK-OMAP3-beagle-switch-to-GPTIMER1.patch b/recipes-kernel/linux/linux-3.0/beagle/0003-HACK-OMAP3-beagle-switch-to-GPTIMER1.patch index 7ef020b3..aa941cd3 100644 --- a/recipes-kernel/linux/linux-3.0/beagle/0003-HACK-OMAP3-beagle-switch-to-GPTIMER1.patch +++ b/recipes-kernel/linux/linux-3.0/beagle/0003-HACK-OMAP3-beagle-switch-to-GPTIMER1.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dcdb487041d64eab8369b477311553f3c9fc9157 Mon Sep 17 00:00:00 2001 | 1 | From 20aef531f5693b91f38220e49efff5c258b2e70d Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Thu, 21 Jul 2011 12:59:20 +0200 | 3 | Date: Thu, 21 Jul 2011 12:59:20 +0200 |
4 | Subject: [PATCH 3/3] HACK: OMAP3: beagle: switch to GPTIMER1 | 4 | Subject: [PATCH 3/3] HACK: OMAP3: beagle: switch to GPTIMER1 |
@@ -11,10 +11,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
11 | 1 files changed, 1 insertions(+), 1 deletions(-) | 11 | 1 files changed, 1 insertions(+), 1 deletions(-) |
12 | 12 | ||
13 | diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c | 13 | diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c |
14 | index e542df0..f4b01a9 100644 | 14 | index f26a9a8..a04f5a0 100644 |
15 | --- a/arch/arm/mach-omap2/board-omap3beagle.c | 15 | --- a/arch/arm/mach-omap2/board-omap3beagle.c |
16 | +++ b/arch/arm/mach-omap2/board-omap3beagle.c | 16 | +++ b/arch/arm/mach-omap2/board-omap3beagle.c |
17 | @@ -812,5 +812,5 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") | 17 | @@ -832,5 +832,5 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") |
18 | .init_early = omap3_beagle_init_early, | 18 | .init_early = omap3_beagle_init_early, |
19 | .init_irq = omap3_beagle_init_irq, | 19 | .init_irq = omap3_beagle_init_irq, |
20 | .init_machine = omap3_beagle_init, | 20 | .init_machine = omap3_beagle_init, |