Some sx1 cleanups
Subsystems (4)
Hi!
This should bring sx1 patches little closer to mainline's coding style.... It would be nice to see them applied. I was pretty careful not to break anything, but these are only compile-tested (did not figure out how to produce working kernel, yet).
Signed-off-by Pavel Machek <[email protected]>
arch/arm/mach-omap1/board-sx1.c +119 -144
@@ -5,9 +5,8 @@* * Support for the Siemens SX1 mobile phone. * -* Original version : Vovan888-at-gmail com -* -* Maintainters : Vovan888, Sergge +* Original version: Vladimir Ananiev (vovan888 at gmail com) +* Maintainters: Vovan888, Sergge * oslik.ru * * This program is free software; you can redistribute it and/or modify
@@ -41,21 +40,9 @@ #include <asm/arch/board.h>#include <asm/arch/common.h> #include <asm/arch/mcbsp.h> #include <asm/arch/omap-alsa.h> -//#include <asm/hardware/clock.h> #include <asm/arch/keypad.h> -//---------------------------------------------------------------------------------- -#define OMAP_I2C_DEBUG 0 - -#if (OMAP_I2C_DEBUG >0 ) -#define DBG(format, args...) printk(KERN_ERR "%s(): " format, __FUNCTION__, ## args); -#define DBG_IRQ(format, args...) printk(KERN_ERR "%s(): " format, __FUNCTION__, ## args); -#else -#define DBG(format, args...) -#define DBG_IRQ(format, args...) -#endif - -int i2c_write_byte (u8 devaddr,u8 regoffset,u8 value) +int i2c_write_byte (u8 devaddr,u8 regoffset,u8 value) {struct i2c_adapter *adap;int err;
@@ -69,9 +56,8 @@ int i2c_write_byte (u8 devaddr, u8 regof msg->flags =0 ; msg->len =2 ; msg->buf = data; - data[0 ] = regoffset;// register num - data[1 ] = value;// register data -// printk("Sofia write: %x %x\n", reg, val); + data[0 ] = regoffset;/* register num */ + data[1 ] = value;/* register data */ err =i2c_transfer (adap, msg,1 );if (err >=0 )return 0 ;
@@ -80,7 +66,7 @@ int i2c_write_byte (u8 devaddr, u8 regof/* Read from I2C device */ -int i2c_read_byte (u8 devaddr,u8 regoffset,u8 * value) +int i2c_read_byte (u8 devaddr,u8 regoffset,u8 *value) {struct i2c_adapter *adap;int err;
@@ -95,8 +81,7 @@ int i2c_read_byte (u8 devaddr, u8 regoff msg->flags =0 ; msg->len =1 ; msg->buf = data; - data[0 ] = regoffset;// register num -// printk("Sofia write: %x %x\n", reg, val); + data[0 ] = regoffset;/* register num */ err =i2c_transfer (adap, msg,1 ); msg->addr = devaddr;/* I2C address */
@@ -106,73 +91,85 @@ int i2c_read_byte (u8 devaddr, u8 regoff err =i2c_transfer (adap, msg,1 ); *value = data[0 ]; -DBG ("I2C: Read data is %x\n" , (u8) * data);if (err >=0 )return 0 ;return err; } -// set keylight intensity -int sx1_setkeylight (u8 keylight ) + +/* set intensity of keyboard backlight */ +int sx1_setkeylight (u8 keylight) { -if ( keylight >SOFIA_MAX_LIGHT_VAL ) +if (keylight >SOFIA_MAX_LIGHT_VAL ) keylight =SOFIA_MAX_LIGHT_VAL ; -return i2c_write_byte (SOFIA_I2C_ADDR ,SOFIA_KEYLIGHT_REG , keylight ); +return i2c_write_byte (SOFIA_I2C_ADDR ,SOFIA_KEYLIGHT_REG , keylight); } -// get current keylight intensity -int sx1_getkeylight (u8 * keylight ) + +/* get current intensity of keyboard backlight */ +int sx1_getkeylight (u8 *keylight) { -return i2c_read_byte (SOFIA_I2C_ADDR ,SOFIA_KEYLIGHT_REG , keylight ); +return i2c_read_byte (SOFIA_I2C_ADDR ,SOFIA_KEYLIGHT_REG , keylight); } -// set LCD backlight intensity -int sx1_setbacklight (u8 backlight ) + +/* set LCD backlight intensity */ +int sx1_setbacklight (u8 backlight) { -if ( backlight >SOFIA_MAX_LIGHT_VAL ) +if (backlight >SOFIA_MAX_LIGHT_VAL ) backlight =SOFIA_MAX_LIGHT_VAL ; -return i2c_write_byte (SOFIA_I2C_ADDR ,SOFIA_BACKLIGHT_REG , backlight ); +return i2c_write_byte (SOFIA_I2C_ADDR ,SOFIA_BACKLIGHT_REG , backlight); } -// get current LCD backlight intensity -int sx1_getbacklight (u8 * backlight ) + +/* get current LCD backlight intensity */ +int sx1_getbacklight (u8 *backlight) { -return i2c_read_byte (SOFIA_I2C_ADDR ,SOFIA_BACKLIGHT_REG , backlight ); +return i2c_read_byte (SOFIA_I2C_ADDR ,SOFIA_BACKLIGHT_REG , backlight); } -// set LCD backlight power on/off -int sx1_setmmipower (u8 onoff ) + +/* set LCD backlight power on/off */ +int sx1_setmmipower (u8 onoff) {int err;u8 dat =0 ; -if ( (err =i2c_read_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , &dat )) <0 ) + + err =i2c_read_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , &dat); +if (err <0 )return err; -if ( onoff ) +if (onoff) dat |=SOFIA_MMILIGHT_POWER ;else dat &= ~SOFIA_MMILIGHT_POWER ; -return i2c_write_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , dat ); +return i2c_write_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , dat ); } -// set MMC power on/off -int sx1_setmmcpower (u8 onoff ) + +/* set MMC power on/off */ +int sx1_setmmcpower (u8 onoff) {int err;u8 dat =0 ; -if ( (err =i2c_read_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , &dat )) <0 ) + + err =i2c_read_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , &dat); +if (err <0 )return err; -if ( onoff ) +if (onoff) dat |=SOFIA_MMC_POWER ;else dat &= ~SOFIA_MMC_POWER ; -return i2c_write_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , dat ); +return i2c_write_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , dat); } -// set USB power on/off -int sx1_setusbpower (u8 onoff ) + +/* set USB power on/off */ +int sx1_setusbpower (u8 onoff) {int err;u8 dat =0 ; -if ( (err =i2c_read_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , &dat )) <0 ) + + err =i2c_read_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , &dat); +if (err <0 )return err; -if ( onoff ) +if (onoff) dat |=SOFIA_USB_POWER ;else dat &= ~SOFIA_USB_POWER ; -return i2c_write_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , dat ); +return i2c_write_byte (SOFIA_I2C_ADDR ,SOFIA_POWER1_REG , dat); }
@@ -184,37 +181,37 @@ EXPORT_SYMBOL(sx1_setmmipower);EXPORT_SYMBOL (sx1_setmmcpower);EXPORT_SYMBOL (sx1_setusbpower); -//---------------------------------------------------------------------------------- +/* ------------------------------------------------------------------------- */ static int sx1_keymap[] = { -KEY (5 ,3 ,GROUP_0 |117 ),// camera Qt::Key_F17 -KEY (0 ,4 ,GROUP_0 |114 ),// voice memo Qt::Key_F14 -KEY (1 ,4 ,GROUP_2 |114 ),// voice memo -KEY (2 ,4 ,GROUP_3 |114 ),// voice memo -KEY (0 ,0 ,GROUP_1 |KEY_F12 ),// red button Qt::Key_Hangup +KEY (5 ,3 ,GROUP_0 |117 ),/* camera Qt::Key_F17 */ +KEY (0 ,4 ,GROUP_0 |114 ),/* voice memo Qt::Key_F14 */ +KEY (1 ,4 ,GROUP_2 |114 ),/* voice memo */ +KEY (2 ,4 ,GROUP_3 |114 ),/* voice memo */ +KEY (0 ,0 ,GROUP_1 |KEY_F12 ),/* red button Qt::Key_Hangup */ KEY (4 ,3 ,GROUP_1 |KEY_LEFT ),KEY (2 ,3 ,GROUP_1 |KEY_DOWN ),KEY (1 ,3 ,GROUP_1 |KEY_RIGHT ),KEY (0 ,3 ,GROUP_1 |KEY_UP ), -KEY (3 ,3 ,GROUP_1 |KEY_POWER ),//joystick press or Qt::Key_Select +KEY (3 ,3 ,GROUP_1 |KEY_POWER ),/* joystick press or Qt::Key_Select */ KEY (5 ,0 ,GROUP_1 |KEY_1 ),KEY (4 ,0 ,GROUP_1 |KEY_2 ),KEY (3 ,0 ,GROUP_1 |KEY_3 ),KEY (3 ,4 ,GROUP_1 |KEY_4 ),KEY (4 ,4 ,GROUP_1 |KEY_5 ), -KEY (5 ,4 ,GROUP_1 |KEY_KPASTERISK ),// * +KEY (5 ,4 ,GROUP_1 |KEY_KPASTERISK ),/* * */ KEY (4 ,1 ,GROUP_1 |KEY_6 ),KEY (5 ,1 ,GROUP_1 |KEY_7 ),KEY (3 ,1 ,GROUP_1 |KEY_8 ),KEY (3 ,2 ,GROUP_1 |KEY_9 ),KEY (5 ,2 ,GROUP_1 |KEY_0 ), -KEY (4 ,2 ,GROUP_1 |113 ),// # F13 Toggle input method Qt::Key_F13 -KEY (0 ,1 ,GROUP_1 |KEY_F11 ),// green button Qt::Key_Call -KEY (1 ,2 ,GROUP_1 |KEY_YEN ),// left soft Qt::Key_Context1 -KEY (2 ,2 ,GROUP_1 |KEY_F8 ),// right soft Qt::Key_Back -KEY (2 ,1 ,GROUP_1 |KEY_LEFTSHIFT ),//shift -KEY (1 ,1 ,GROUP_1 |KEY_BACKSPACE ),// C (clear) -KEY (0 ,2 ,GROUP_1 |KEY_F7 ),// menu Qt::Key_Menu +KEY (4 ,2 ,GROUP_1 |113 ),/* # F13 Toggle input method Qt::Key_F13 */ +KEY (0 ,1 ,GROUP_1 |KEY_F11 ),/* green button Qt::Key_Call */ +KEY (1 ,2 ,GROUP_1 |KEY_YEN ),/* left soft Qt::Key_Context1 */ +KEY (2 ,2 ,GROUP_1 |KEY_F8 ),/* right soft Qt::Key_Back */ +KEY (2 ,1 ,GROUP_1 |KEY_LEFTSHIFT ),/* shift */ +KEY (1 ,1 ,GROUP_1 |KEY_BACKSPACE ),/* C (clear) */ +KEY (0 ,2 ,GROUP_1 |KEY_F7 ),/* menu Qt::Key_Menu */ 0 };
@@ -286,62 +283,41 @@ static struct omap_mcbsp_reg_cfg mcbsp_r .srgr1 = FWID(15), .srgr2 = GSYNC | CLKSP | FSGM | FPER(31), -// .pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP, - .pcr0 = CLKXP | CLKRP, // mcbsp: slave + .pcr0 = CLKXP | CLKRP, /* mcbsp: slave */ }; +/* Playback interface - McBSP1 */ static struct omap_mcbsp_reg_cfg mcbsp1_regs = { -// SPCR2=30 - .spcr2 =XINTM (3 ), -// SPCR1=30 - .spcr1 =RINTM (3 ), -// RCR2=00 - .rcr2 =0 , -// RCR1=140 - .rcr1 =RFRLEN1 (1 ) |RWDLEN1 (OMAP_MCBSP_WORD_16 ), -// XCR2 = 0 - .xcr2 =0 , -// XCR1 = 140 - .xcr1 =XFRLEN1 (1 ) |XWDLEN1 (OMAP_MCBSP_WORD_16 ), -// SRGR1=0f0c - .srgr1 =FWID (15 ) |CLKGDV (12 ), -// SRGR2=101f - .srgr2 =FSGM |FPER (31 ), -// PCR0=0f0f - .pcr0 =FSXM |FSRM |CLKXM |CLKRM |FSXP |FSRP |CLKXP |CLKRP , + .spcr2 =XINTM (3 ),/* SPCR2=30 */ + .spcr1 =RINTM (3 ),/* SPCR1=30 */ + .rcr2 =0 ,/* RCR2 =00 */ + .rcr1 =RFRLEN1 (1 ) |RWDLEN1 (OMAP_MCBSP_WORD_16 ),/* RCR1=140 */ + .xcr2 =0 ,/* XCR2 = 0 */ + .xcr1 =XFRLEN1 (1 ) |XWDLEN1 (OMAP_MCBSP_WORD_16 ),/* XCR1 = 140 */ + .srgr1 =FWID (15 ) |CLKGDV (12 ),/* SRGR1=0f0c */ + .srgr2 =FSGM |FPER (31 ),/* SRGR2=101f */ + .pcr0 =FSXM |FSRM |CLKXM |CLKRM |FSXP |FSRP |CLKXP |CLKRP , +/* PCR0 =0f0f */ }; -/* TODO PCM interface - McBSP2 */ + +/* TODO: PCM interface - McBSP2 */ static struct omap_mcbsp_reg_cfg mcbsp2_regs = { -// SPCR2=F1 - .spcr2 =FRST |GRST |XRST |XINTM (3 ), -// SPCR1=30 - .spcr1 =RINTM (3 ) |RRST , -// RCR2=00 - .rcr2 =0 , -// RCR1=140 - .rcr1 =RFRLEN1 (1 ) |RWDLEN1 (OMAP_MCBSP_WORD_16 ), -// XCR2 = 0 - .xcr2 =0 , -// XCR1 = 140 - .xcr1 =XFRLEN1 (1 ) |XWDLEN1 (OMAP_MCBSP_WORD_16 ), -// SRGR1=0f0c - .srgr1 =FWID (15 ) |CLKGDV (12 ), -// SRGR2=101f - .srgr2 =FSGM |FPER (31 ), -// PCR0=0f0f + .spcr2 =FRST |GRST |XRST |XINTM (3 ),/* SPCR2=F1 */ + .spcr1 =RINTM (3 ) |RRST ,/* SPCR1=30 */ + .rcr2 =0 ,/* RCR2 =00 */ + .rcr1 =RFRLEN1 (1 ) |RWDLEN1 (OMAP_MCBSP_WORD_16 ),/* RCR1 = 140 */ + .xcr2 =0 ,/* XCR2 = 0 */ + .xcr1 =XFRLEN1 (1 ) |XWDLEN1 (OMAP_MCBSP_WORD_16 ),/* XCR1 = 140 */ + .srgr1 =FWID (15 ) |CLKGDV (12 ),/* SRGR1=0f0c */ + .srgr2 =FSGM |FPER (31 ),/* SRGR2=101f */ .pcr0 =FSXM |FSRM |CLKXM |CLKRM |FSXP |FSRP |CLKXP |CLKRP , -//.pcr0 = CLKXP | CLKRP, /* mcbsp: slave */ +/* PCR0=0f0f */ +/* mcbsp: slave */ };static struct omap_alsa_codec_config sx1_alsa_config = { .name ="SX1 EGold" , .mcbsp_regs_alsa = &mcbsp1_regs, - .codec_configure_dev =NULL ,// tsc2101_configure, - .codec_set_samplerate =NULL ,// tsc2101_set_samplerate, - .codec_clock_setup =NULL ,// tsc2101_clock_setup, - .codec_clock_on =NULL ,// tsc2101_clock_on, - .codec_clock_off =NULL ,// tsc2101_clock_off, - .get_default_samplerate =NULL ,// tsc2101_get_default_samplerate, };static struct platform_device sx1_mcbsp1_device = {
@@ -352,7 +328,7 @@ static struct platform_device sx1_mcbsp1 }, }; -/*-------------------------------------------------------------------------------------*/ +/* ------------------------------------------------------------------------ */ static struct mtd_partition sx1_partitions[] = {/* bootloader (U-Boot, etc) in first sector */ {
@@ -375,13 +351,6 @@ static struct mtd_partition sx1_partitio .size = SZ_2M - 2 * SZ_128K, .mask_flags = 0 }, -/* rest of flash1 is a file system */ -/* { -.name = "rootfs", -.offset = MTDPART_OFS_APPEND, -.size = SZ_8M - SZ_2M - 2 * SZ_128K, -.mask_flags = 0 -},*/ /* file system */ { .name = "filesystem",
@@ -397,12 +366,16 @@ static struct flash_platform_data sx1_fl .parts = sx1_partitions, .nr_parts = ARRAY_SIZE(sx1_partitions), }; -// MTD flash at 01800000 - new flashes + +/* MTD flash at 01800000 - new flashes */ static struct resource sx1_flash_resource = { +#ifndef CONFIG_SX1_OLD_FLASH .start =OMAP_CS0_PHYS , .end =OMAP_CS0_PHYS +SZ_32M -1 , -/* .start = OMAP_CS0_PHYS + SZ_16M + SZ_8M, -.end = OMAP_CS0_PHYS + SZ_16M + SZ_8M + SZ_8M - 1, */ +#else + .start =OMAP_CS0_PHYS +SZ_16M +SZ_8M , + .end =OMAP_CS0_PHYS +SZ_16M +SZ_8M +SZ_8M -1 , +#endif .flags =IORESOURCE_MEM , };
@@ -415,7 +388,8 @@ static struct platform_device sx1_flash_ .num_resources = 1, .resource = &sx1_flash_resource, }; -/*-------------------------------------------------------------------------------------*/ + +/* -------------------------------------------------------------------- */ static struct omap_usb_config sx1_usb_config__initdata = { .otg =0 , .register_dev =1 ,
@@ -425,7 +399,8 @@ static struct omap_usb_config sx1_usb_co .pins[1] = 0, .pins[2] = 0, }; -/*-------------------------------------------------------------------------------------*/ + +/* -------------------------------------------------------------------- */ static struct omap_mmc_config sx1_mmc_config__initdata = { .mmc [0 ] = { .enabled =1 ,
@@ -440,17 +415,17 @@ static struct platform_device sx1_lcd_de .name = "lcd_sx1", .id = -1, }; -/*-------------------------------------------------------------------------------------*/ + +/* -------------------------------------------------------------------- */ static struct platform_device *sx1_devices[]__initdata = { &sx1_flash_device, &sx1_kp_device, &sx1_lcd_device, &sx1_mcbsp1_device, -// &h2_irda_device, }; -/*-------------------------------------------------------------------------------------*/ + +/* -------------------------------------------------------------------- */ static struct omap_lcd_config sx1_lcd_config__initdata = { -/* .panel_name = "sx1", */ .ctrl_name ="internal" , };
@@ -465,7 +440,8 @@ static struct omap_board_config_kernel s { OMAP_TAG_LCD, &sx1_lcd_config }, { OMAP_TAG_UART, &sx1_uart_config }, }; -/*-------------------------------------------------------------------------------------*/ + +/* -------------------------------------------------------------------- */ static void __init omap_sx1_init (void ) {platform_add_devices (sx1_devices,ARRAY_SIZE (sx1_devices));
@@ -474,28 +450,27 @@ static void __init omap_sx1_init(void) omap_board_config_size =ARRAY_SIZE (sx1_config);omap_serial_init (); -// turn on USB -/* sx1_setusbpower(1); cant do it here `cause i2c is not ready*/ -omap_request_gpio (1 );// A_IRDA_OFF -omap_request_gpio (11 );// A_SWITCH -omap_request_gpio (15 );// A_USB_ON -omap_set_gpio_direction (1 ,0 );// gpio1 -> output -omap_set_gpio_direction (11 ,0 );// gpio11 -> output -omap_set_gpio_direction (15 ,0 );// gpio15 -> output -// set GPIO data -omap_set_gpio_dataout (1 ,1 );//A_IRDA_OFF = 1 -omap_set_gpio_dataout (11 ,0 );//A_SWITCH = 0 -omap_set_gpio_dataout (15 ,0 );//A_USB_ON = 0 +/* turn on USB; sx1_setusbpower(1); cant do it here, because +i2c is not ready. */ +omap_request_gpio (1 );/* A_IRDA_OFF */ +omap_request_gpio (11 );/* A_SWITCH */ +omap_request_gpio (15 );/* A_USB_ON */ +omap_set_gpio_direction (1 ,0 );/* Set all to output */ +omap_set_gpio_direction (11 ,0 ); +omap_set_gpio_direction (15 ,0 ); +omap_set_gpio_dataout (1 ,1 );/* A_IRDA_OFF = 1 */ +omap_set_gpio_dataout (11 ,0 );/* A_SWITCH = 0 */ +omap_set_gpio_dataout (15 ,0 );/* A_USB_ON = 0 */ } -/*-------------------------------------------------------------------------------------*/ + +/* -------------------------------------------------------------------- */ static void __init omap_sx1_init_irq (void ) {omap1_init_common_hw ();omap_init_irq ();omap_gpio_init (); } -/*-------------------------------------------------------------------------------------*/ static void __init omap_sx1_map_io (void ) {
drivers/video/omap/lcd_sx1.c +128 -149
367 lines not on this page · raw message
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html