diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /arch/mips/jz4740/board-qi_lb60.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'arch/mips/jz4740/board-qi_lb60.c')
-rw-r--r-- | arch/mips/jz4740/board-qi_lb60.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c index 43d964d3628..c3b04be3fb2 100644 --- a/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c | |||
@@ -140,7 +140,6 @@ static void qi_lb60_nand_ident(struct platform_device *pdev, | |||
140 | static struct jz_nand_platform_data qi_lb60_nand_pdata = { | 140 | static struct jz_nand_platform_data qi_lb60_nand_pdata = { |
141 | .ident_callback = qi_lb60_nand_ident, | 141 | .ident_callback = qi_lb60_nand_ident, |
142 | .busy_gpio = 94, | 142 | .busy_gpio = 94, |
143 | .banks = { 1 }, | ||
144 | }; | 143 | }; |
145 | 144 | ||
146 | /* Keyboard*/ | 145 | /* Keyboard*/ |
@@ -419,11 +418,6 @@ static struct platform_device qi_lb60_charger_device = { | |||
419 | }, | 418 | }, |
420 | }; | 419 | }; |
421 | 420 | ||
422 | /* audio */ | ||
423 | static struct platform_device qi_lb60_audio_device = { | ||
424 | .name = "qi-lb60-audio", | ||
425 | .id = -1, | ||
426 | }; | ||
427 | 421 | ||
428 | static struct platform_device *jz_platform_devices[] __initdata = { | 422 | static struct platform_device *jz_platform_devices[] __initdata = { |
429 | &jz4740_udc_device, | 423 | &jz4740_udc_device, |
@@ -437,11 +431,9 @@ static struct platform_device *jz_platform_devices[] __initdata = { | |||
437 | &jz4740_codec_device, | 431 | &jz4740_codec_device, |
438 | &jz4740_rtc_device, | 432 | &jz4740_rtc_device, |
439 | &jz4740_adc_device, | 433 | &jz4740_adc_device, |
440 | &jz4740_pwm_device, | ||
441 | &qi_lb60_gpio_keys, | 434 | &qi_lb60_gpio_keys, |
442 | &qi_lb60_pwm_beeper, | 435 | &qi_lb60_pwm_beeper, |
443 | &qi_lb60_charger_device, | 436 | &qi_lb60_charger_device, |
444 | &qi_lb60_audio_device, | ||
445 | }; | 437 | }; |
446 | 438 | ||
447 | static void __init board_gpio_setup(void) | 439 | static void __init board_gpio_setup(void) |
@@ -496,7 +488,7 @@ static int __init qi_lb60_board_setup(void) | |||
496 | board_gpio_setup(); | 488 | board_gpio_setup(); |
497 | 489 | ||
498 | if (qi_lb60_init_platform_devices()) | 490 | if (qi_lb60_init_platform_devices()) |
499 | panic("Failed to initialize platform devices"); | 491 | panic("Failed to initialize platform devices\n"); |
500 | 492 | ||
501 | return 0; | 493 | return 0; |
502 | } | 494 | } |