omap: pandora: board file updates for .33
Subsystems (3)
PATCH 1/1 omap: pandora: board file updates for .33
Pandora board file updates:
- change keycodes of game buttons
it was decided not to use ABXY layout by the developers.
- drop i2c bus 3 speed to 100kHz
this is needed for battery monitoring chip to work reliably.
- drop pandora_lcd platform_device
the older DSS driver was never functional on l-o or mainline kernels due to missing panel driver, so remove unneeded pandora_lcd platform_device. This also removes last OMAP_TAG from the board file. LCD support will be added for DSS2 driver.
---
I can split this if needed, but I thought single patch might be easier to handle.
arch/arm/mach-omap2/board-omap3pandora.c | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-)
arch/arm/mach-omap2/board-omap3pandora.c +5 -16
@@ -98,10 +98,10 @@ static struct gpio_keys_button pandora_gpio_keys[] = {GPIO_BUTTON_LOW (103 ,KEY_DOWN ,"down" ),GPIO_BUTTON_LOW (96 ,KEY_LEFT ,"left" ),GPIO_BUTTON_LOW (98 ,KEY_RIGHT ,"right" ), -GPIO_BUTTON_LOW (111 ,BTN_A ,"a" ), -GPIO_BUTTON_LOW (106 ,BTN_B ,"b" ), -GPIO_BUTTON_LOW (109 ,BTN_X ,"x" ), -GPIO_BUTTON_LOW (101 ,BTN_Y ,"y" ), +GPIO_BUTTON_LOW (109 ,KEY_KP1 ,"game 1" ), +GPIO_BUTTON_LOW (111 ,KEY_KP2 ,"game 2" ), +GPIO_BUTTON_LOW (106 ,KEY_KP3 ,"game 3" ), +GPIO_BUTTON_LOW (101 ,KEY_KP4 ,"game 4" ),GPIO_BUTTON_LOW (102 ,BTN_TL ,"l" ),GPIO_BUTTON_LOW (97 ,BTN_TL2 ,"l2" ), GPIO_BUTTON_LOW(105, BTN_TR, "r"),
@@ -315,7 +315,7 @@ static int __init omap3pandora_i2c_init(void)omap_register_i2c_bus (1 ,2600 , omap3pandora_i2c_boardinfo,ARRAY_SIZE (omap3pandora_i2c_boardinfo));/* i2c2 pins are not connected */ -omap_register_i2c_bus (3 ,400 ,NULL ,0 ); +omap_register_i2c_bus (3 ,100 ,NULL ,0 );return 0 ; }
@@ -368,17 +368,7 @@ static struct spi_board_info omap3pandora_spi_board_info[] __initdata = { } }; -static struct platform_device omap3pandora_lcd_device = { - .name ="pandora_lcd" , - .id =-1 , -}; - -static struct omap_lcd_config omap3pandora_lcd_config__initdata = { - .ctrl_name ="internal" , -}; -static struct omap_board_config_kernel omap3pandora_config[]__initdata = { - {OMAP_TAG_LCD , &omap3pandora_lcd_config }, };static void __init omap3pandora_init_irq (void )
@@ -392,7 +382,6 @@ static void __init omap3pandora_init_irq(void) }static struct platform_device *omap3pandora_devices[]__initdata = { - &omap3pandora_lcd_device, &pandora_leds_gpio, &pandora_keys_gpio, };
Signature · 1 line
1.6.3.3
Hi,
arch/arm/mach-omap2/board-omap3pandora.c static struct spi_board_info omap3pandora_spi_board_info[] __initdata = { · line 372
Quoted 3 lines · Grazvydas Ignotas
static struct
omap_board_config_kernelomap3pandora_config[]__initdata= {arch/arm/mach-omap2/board-omap3pandora.c +0
-1- { OMAP_TAG_LCD, &omap3pandora_lcd_config }, };
if you don't have any omap_board_config_kernel, couldn't you remove this structure altogether ?
Signature · 1 line
balbi
Quoted 9 lines · Felipe Balbi
Hi,
Quoted 3 lines · Grazvydas Ignotas
static struct
omap_board_config_kernelomap3pandora_config[]__initdata= {
- {OMAP_TAG_LCD,&omap3pandora_lcd_config},
};if you don't have any
omap_board_config_kernel, couldn't you remove this structure altogether ?
All boards (except a few) tend to keep it even if it's empty for some reason, although that doesn't seem to be required. Updated patch attached.
Quoted 5 lines
--
balbi
From eb33f0fb440fb738b01a076ef1102664ed49b6cd Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <[email protected]>
Date: Sat, 5 Dec 2009 20:22:16 +0200
Subject: [PATCH] omap: pandora: board file updates for .33
Pandora board file updates:
- change keycodes of game buttons
it was decided not to use ABXY layout by the developers.
- drop i2c bus 3 speed to 100kHz
this is needed for battery monitoring chip to work reliably.
- drop pandora_lcd platform_device
the older DSS driver was never functional on l-o or mainline kernels due to missing panel driver, so remove unneeded pandora_lcd platform_device. This also removes last OMAP_TAG from the board file.
--- arch/arm/mach-omap2/board-omap3pandora.c | 26 +++++--------------------- 1 files changed, 5 insertions(+), 21 deletions(-)
arch/arm/mach-omap2/board-omap3pandora.c +5 -21
@@ -98,10 +98,10 @@ static struct gpio_keys_button pandora_gpio_keys[] = {GPIO_BUTTON_LOW (103 ,KEY_DOWN ,"down" ),GPIO_BUTTON_LOW (96 ,KEY_LEFT ,"left" ),GPIO_BUTTON_LOW (98 ,KEY_RIGHT ,"right" ), -GPIO_BUTTON_LOW (111 ,BTN_A ,"a" ), -GPIO_BUTTON_LOW (106 ,BTN_B ,"b" ), -GPIO_BUTTON_LOW (109 ,BTN_X ,"x" ), -GPIO_BUTTON_LOW (101 ,BTN_Y ,"y" ), +GPIO_BUTTON_LOW (109 ,KEY_KP1 ,"game 1" ), +GPIO_BUTTON_LOW (111 ,KEY_KP2 ,"game 2" ), +GPIO_BUTTON_LOW (106 ,KEY_KP3 ,"game 3" ), +GPIO_BUTTON_LOW (101 ,KEY_KP4 ,"game 4" ),GPIO_BUTTON_LOW (102 ,BTN_TL ,"l" ),GPIO_BUTTON_LOW (97 ,BTN_TL2 ,"l2" ), GPIO_BUTTON_LOW(105, BTN_TR, "r"),
@@ -315,7 +315,7 @@ static int __init omap3pandora_i2c_init(void)omap_register_i2c_bus (1 ,2600 , omap3pandora_i2c_boardinfo,ARRAY_SIZE (omap3pandora_i2c_boardinfo));/* i2c2 pins are not connected */ -omap_register_i2c_bus (3 ,400 ,NULL ,0 ); +omap_register_i2c_bus (3 ,100 ,NULL ,0 );return 0 ; }
@@ -368,23 +368,8 @@ static struct spi_board_info omap3pandora_spi_board_info[] __initdata = { } }; -static struct platform_device omap3pandora_lcd_device = { - .name ="pandora_lcd" , - .id =-1 , -}; - -static struct omap_lcd_config omap3pandora_lcd_config__initdata = { - .ctrl_name ="internal" , -}; - -static struct omap_board_config_kernel omap3pandora_config[]__initdata = { - {OMAP_TAG_LCD , &omap3pandora_lcd_config }, -}; -static void __init omap3pandora_init_irq (void ) { - omap_board_config = omap3pandora_config; - omap_board_config_size =ARRAY_SIZE (omap3pandora_config);omap2_init_common_hw (mt46h32m32lf6_sdrc_params, mt46h32m32lf6_sdrc_params);omap_init_irq ();
@@ -392,7 +377,6 @@ static void __init omap3pandora_init_irq(void) }static struct platform_device *omap3pandora_devices[]__initdata = { - &omap3pandora_lcd_device, &pandora_leds_gpio, &pandora_keys_gpio, };
Signature · 1 line
1.6.3.3