mfd: add codec resource into 88pm860x driver
Subsystems (3)
PATCH 1/5 mfd: add codec resource into 88pm860x driver
Add codec IRQ resources that are used in 88pm860x codec driver.
--- drivers/mfd/88pm860x-core.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-)
drivers/mfd/88pm860x-core.c +44 -0
@@ -158,6 +158,43 @@ static struct mfd_cell onkey_devs[] = { }, }; +static struct resource codec_resources[] = { + { +/* Headset microphone insertion or removal */ + .name ="micin" , + .start =PM8607_IRQ_MICIN , + .end =PM8607_IRQ_MICIN , + .flags =IORESOURCE_IRQ , + }, { +/* Hook-switch press or release */ + .name ="hook" , + .start =PM8607_IRQ_HOOK , + .end =PM8607_IRQ_HOOK , + .flags =IORESOURCE_IRQ , + }, { +/* Headset insertion or removal */ + .name ="headset" , + .start =PM8607_IRQ_HEADSET , + .end =PM8607_IRQ_HEADSET , + .flags =IORESOURCE_IRQ , + }, { +/* Audio short */ + .name ="audio-short" , + .start =PM8607_IRQ_AUDIO_SHORT , + .end =PM8607_IRQ_AUDIO_SHORT , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct mfd_cell codec_devs[] = { + { + .name ="88pm860x-codec" , + .num_resources =ARRAY_SIZE (codec_resources), + .resources = &codec_resources[0 ], + .id =-1 , + }, +}; +static struct resource regulator_resources[] = {PM8607_REG_RESOURCE (BUCK1 ,BUCK1 ),PM8607_REG_RESOURCE (BUCK2 ,BUCK2 ),
@@ -687,6 +724,13 @@ static void __devinit device_8607_init(struct pm860x_chip *chip, goto out_dev; } + ret =mfd_add_devices (chip->dev,0 , &codec_devs[0 ], +ARRAY_SIZE (codec_devs), + &codec_resources[0 ],0 ); +if (ret <0 ) { +dev_err (chip->dev,"Failed to add codec subdev\n" ); + goto out_dev; + }return ; out_dev:mfd_remove_devices (chip->dev);
Signature · 1 line
1.5.6.5
PATCH 2/5 leds: remove auto blink in 88pm860x
88pm860x supports auto-blink LED in hardware. It messed with timer trigger. Now disable the auto-blink function.
--- drivers/leds/leds-88pm860x.c | 119 +++++++++-------------------------------- 1 files changed, 26 insertions(+), 93 deletions(-)
drivers/leds/leds-88pm860x.c +26 -93
@@ -24,26 +24,17 @@#define LED_CURRENT_MASK (0x07 << 5)#define LED_BLINK_ON_MASK (0x07) -#define LED_BLINK_PERIOD_MASK (0x0F << 3)#define LED_BLINK_MASK (0x7F)#define LED_BLINK_ON (x) ((x & 0x7) * 66 + 66) -#define LED_BLINK_PERIOD (x) ((x & 0xF) * 530 + 930)#define LED_BLINK_ON_MIN LED_BLINK_ON(0)#define LED_BLINK_ON_MAX LED_BLINK_ON(0x7) -#define LED_BLINK_PERIOD_MIN LED_BLINK_PERIOD(0) -#define LED_BLINK_PERIOD_MAX LED_BLINK_PERIOD(0xE) +#define LED_ON_CONTINUOUS (0x0F << 3)#define LED_TO_ON (x) ((x - 66) / 66) -#define LED_TO_PERIOD (x) ((x - 930) / 530)#define LED1_BLINK_EN (1 << 1)#define LED2_BLINK_EN (1 << 2) -enum { -SET_BRIGHTNESS , -SET_BLINK , -}; -struct pm860x_led {struct led_classdev cdev;struct i2c_client *i2c;
@@ -54,8 +45,6 @@ struct pm860x_led {int port;int iset; -int command; -int offset;unsigned char brightness;unsigned char current_brightness;
@@ -95,10 +84,12 @@ static inline int __blink_off(int port)case PM8606_LED1_GREEN :case PM8606_LED1_BLUE : ret =PM8606_RGB1A ; +break ;case PM8606_LED2_RED :case PM8606_LED2_GREEN :case PM8606_LED2_BLUE : ret =PM8606_RGB2A ; +break ; }return ret; }
@@ -122,60 +113,35 @@ static inline int __blink_ctl_mask(int port)return ret; } -static int __led_set (struct pm860x_led *led,int command) +static void pm860x_led_work (struct work_struct *work) { -struct pm860x_chip *chip = led->chip; -int mask, ret; +struct pm860x_led *led; +struct pm860x_chip *chip; +int mask; + + led = container_of(work, struct pm860x_led, work); + chip = led->chip;mutex_lock (&led->lock); -switch (command) { -case SET_BRIGHTNESS : -if ((led->current_brightness ==0 ) && led->brightness) { -if (led->iset) { - ret =pm860x_set_bits (led->i2c, led->offset, -LED_CURRENT_MASK , led->iset); -if (ret <0 ) - goto out; - } - }else if (led->brightness ==0 ) { - ret =pm860x_set_bits (led->i2c, led->offset, -LED_CURRENT_MASK ,0 ); -if (ret <0 ) - goto out; +if ((led->current_brightness ==0 ) && led->brightness) { +if (led->iset) { +pm860x_set_bits (led->i2c,__led_off (led->port), +LED_CURRENT_MASK , led->iset); } - ret =pm860x_set_bits (led->i2c, led->offset,LED_PWM_MASK , - led->brightness); -if (ret <0 ) - goto out; - led->current_brightness = led->brightness; -dev_dbg (chip->dev,"Update LED. (reg:%d, brightness:%d)\n" , - led->offset, led->brightness); -break ; -case SET_BLINK : - ret =pm860x_set_bits (led->i2c, led->offset, -LED_BLINK_MASK , led->blink_data); -if (ret <0 ) - goto out; - mask =__blink_ctl_mask (led->port); - ret =pm860x_set_bits (led->i2c,PM8606_WLED3B , mask, mask); -if (ret <0 ) - goto out; -dev_dbg (chip->dev,"LED blink delay on:%dms, delay off:%dms\n" , - led->blink_on, led->blink_off); -break ; +pm860x_set_bits (led->i2c,PM8606_WLED3B , mask, mask); + }else if (led->brightness ==0 ) { +pm860x_set_bits (led->i2c,__led_off (led->port), +LED_CURRENT_MASK ,0 ); + mask =__blink_ctl_mask (led->port); +pm860x_set_bits (led->i2c,PM8606_WLED3B , mask,0 ); } -out: +pm860x_set_bits (led->i2c,__led_off (led->port),LED_PWM_MASK , + led->brightness); + led->current_brightness = led->brightness; +dev_dbg (chip->dev,"Update LED. (reg:%d, brightness:%d)\n" , +__led_off (led->port), led->brightness);mutex_unlock (&led->lock); -return 0 ; -} - -static void pm860x_led_work (struct work_struct *work) -{ -struct pm860x_led *led; - - led = container_of(work, struct pm860x_led, work); -__led_set (led, led->command); } static void pm860x_led_set(struct led_classdev *cdev,
@@ -183,42 +149,10 @@ static void pm860x_led_set(struct led_classdev *cdev, { struct pm860x_led *data = container_of(cdev, struct pm860x_led, cdev); - data->offset =__led_off (data->port); data->brightness = value >>3 ; - data->command =SET_BRIGHTNESS ;schedule_work (&data->work); } -static int pm860x_led_blink (struct led_classdev *cdev, -unsigned long *delay_on, -unsigned long *delay_off) -{ - struct pm860x_led *data = container_of(cdev, struct pm860x_led, cdev); -int period, on; - - on = *delay_on; -if ((on <LED_BLINK_ON_MIN ) || (on >LED_BLINK_ON_MAX )) -return -EINVAL ; - - on =LED_TO_ON (on); - on =LED_BLINK_ON (on); - - period = on + *delay_off; -if ((period <LED_BLINK_PERIOD_MIN ) || (period >LED_BLINK_PERIOD_MAX )) -return -EINVAL ; - period =LED_TO_PERIOD (period); - period =LED_BLINK_PERIOD (period); - - data->offset =__blink_off (data->port); - data->blink_on = on; - data->blink_off = period - data->blink_on; - data->blink_data = (period <<3 ) | data->blink_on; - data->command =SET_BLINK ; -schedule_work (&data->work); - -return 0 ; -} -static int __check_device (struct pm860x_led_pdata *pdata,char *name) {struct pm860x_led_pdata *p = pdata;
@@ -257,7 +191,7 @@ static int pm860x_led_probe(struct platform_device *pdev) pm860x_pdata = pdev->dev.parent->platform_data; pdata = pm860x_pdata->led; }else { -dev_err (&pdev->dev,"missing platform data\n" ); +dev_err (&pdev->dev,"No platform data!\n" );return -EINVAL ; }
@@ -279,7 +213,6 @@ static int pm860x_led_probe(struct platform_device *pdev) data->current_brightness =0 ; data->cdev.name = data->name; data->cdev.brightness_set = pm860x_led_set; - data->cdev.blink_set = pm860x_led_blink;mutex_init (&data->lock);INIT_WORK (&data->work, pm860x_led_work);
Signature · 1 line
1.5.6.5
PATCH 3/5 mfd: update chip id of 88pm8607
Chipid of 88pm8607 is 0x40 or 0x50.
--- drivers/mfd/88pm860x-core.c | 7 +++++-- include/linux/mfd/88pm860x.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/mfd/88pm860x-core.c +5 -2
@@ -645,10 +645,13 @@ static void __devinit device_8607_init(struct pm860x_chip *chip,dev_err (chip->dev,"Failed to read CHIP ID: %d\n" , ret); goto out; } -if ((ret &PM8607_VERSION_MASK ) ==PM8607_VERSION ) +switch (ret &PM8607_VERSION_MASK ) { +case 0x40 : +case 0x50 :dev_info (chip->dev,"Marvell 88PM8607 (ID: %02x) detected\n" , ret); -else { +break ; +default :dev_err (chip->dev,"Failed to detect Marvell 88PM8607. " "Chip ID: %02x\n" , ret); goto out;
include/linux/mfd/88pm860x.h +1 -1
@@ -138,7 +138,7 @@ enum { PM8607_ID_RG_MAX, }; -#define PM8607_VERSION (0x40)/* 8607 chip ID */ +/* 8607 chip ID is 0x40 or 0x50 */ #define PM8607_VERSION_MASK (0xF0)/* 8607 chip ID mask */ /* Interrupt Registers */
Signature · 1 line
1.5.6.5
PATCH 4/5 input: monitor both onkey up and down event
Remove original 3-second ONKEY event. Detect ONKEY changing event directly. So both UP and DOWN event of ONKEY in max8925 are monitered.
--- drivers/input/misc/max8925_onkey.c | 72 +++++++++++++++++++++++++++--------- drivers/mfd/max8925-core.c | 11 ++++- 2 files changed, 62 insertions(+), 21 deletions(-)
drivers/input/misc/max8925_onkey.c +54 -18
@@ -27,27 +27,37 @@#include <linux/mfd/max8925.h> #include <linux/slab.h> +#define SW_INPUT (1 << 7)/* 0/1 -- up/down */ #define HARDRESET_EN (1 << 7)#define PWREN_EN (1 << 7)struct max8925_onkey_info {struct input_dev *idev;struct i2c_client *i2c; -int irq; +struct device *dev; +int irq[2 ]; };/* -* MAX8925 gives us an interrupt when ONKEY is held for 3 seconds. +* MAX8925 gives us an interrupt when ONKEY is pressed or released. * max8925_set_bits() operates I2C bus and may sleep. So implement * it in thread IRQ handler. */ static irqreturn_t max8925_onkey_handler (int irq,void *data) {struct max8925_onkey_info *info = data; - -input_report_key (info->idev,KEY_POWER ,1 ); +int ret, event; + + ret =max8925_reg_read (info->i2c,MAX8925_ON_OFF_STATUS ); +if (ret &SW_INPUT ) + event =1 ; +else + event =0 ; +input_report_key (info->idev,KEY_POWER , event);input_sync (info->idev); +dev_dbg (info->dev,"onkey event:%d\n" , event); +/* Enable hardreset to halt if system isn't shutdown on time */ max8925_set_bits (info->i2c,MAX8925_SYSENSEL ,HARDRESET_EN ,HARDRESET_EN );
@@ -59,14 +69,42 @@ static int __devinit max8925_onkey_probe(struct platform_device *pdev) {struct max8925_chip *chip =dev_get_drvdata (pdev->dev.parent);struct max8925_onkey_info *info; -int error; +int irq[2 ], error; + + irq[0 ] =platform_get_irq (pdev,0 ); +if (irq[0 ] <0 ) { +dev_err (&pdev->dev,"No IRQ resource!\n" ); +return -EINVAL ; + } + irq[1 ] =platform_get_irq (pdev,1 ); +if (irq[1 ] <0 ) { +dev_err (&pdev->dev,"No IRQ resource!\n" ); +return -EINVAL ; + } info =kzalloc (sizeof (struct max8925_onkey_info ),GFP_KERNEL );if (!info)return -ENOMEM ; info->i2c = chip->i2c; - info->irq = chip->irq_base +MAX8925_IRQ_GPM_SW_3SEC ; + info->dev = &pdev->dev; + irq[0 ] += chip->irq_base; + irq[1 ] += chip->irq_base; + + error =request_threaded_irq (irq[0 ],NULL , max8925_onkey_handler, +IRQF_ONESHOT ,"onkey-down" , info); +if (error <0 ) { +dev_err (chip->dev,"Failed to request IRQ: #%d: %d\n" , + irq[0 ], error); + goto out; + } + error =request_threaded_irq (irq[1 ],NULL , max8925_onkey_handler, +IRQF_ONESHOT ,"onkey-up" , info); +if (error <0 ) { +dev_err (chip->dev,"Failed to request IRQ: #%d: %d\n" , + irq[1 ], error); + goto out_irq; + } info->idev =input_allocate_device ();if (!info->idev) {
@@ -79,32 +117,29 @@ static int __devinit max8925_onkey_probe(struct platform_device *pdev) info->idev->phys ="max8925_on/input0" ; info->idev->id.bustype =BUS_I2C ; info->idev->dev.parent = &pdev->dev; + info->irq[0 ] = irq[0 ]; + info->irq[1 ] = irq[1 ]; info->idev->evbit[0 ] =BIT_MASK (EV_KEY ); info->idev->keybit[BIT_WORD (KEY_POWER )] =BIT_MASK (KEY_POWER ); - error =request_threaded_irq (info->irq,NULL , max8925_onkey_handler, -IRQF_ONESHOT ,"onkey" , info); -if (error <0 ) { -dev_err (chip->dev,"Failed to request IRQ: #%d: %d\n" , - info->irq, error); - goto out_irq; - } error =input_register_device (info->idev);if (error) {dev_err (chip->dev,"Can't register input device: %d\n" , error); - goto out; + goto out_reg; }platform_set_drvdata (pdev, info);return 0 ; -out: -free_irq (info->irq, info); -out_irq: +out_reg:input_free_device (info->idev); out_input: +free_irq (info->irq[1 ], info); +out_irq: +free_irq (info->irq[0 ], info); +out:kfree (info);return error; }
@@ -113,7 +148,8 @@ static int __devexit max8925_onkey_remove(struct platform_device *pdev) {struct max8925_onkey_info *info =platform_get_drvdata (pdev); -free_irq (info->irq, info); +free_irq (info->irq[0 ], info); +free_irq (info->irq[1 ], info);input_unregister_device (info->idev);kfree (info);
drivers/mfd/max8925-core.c +8 -3
@@ -93,8 +93,13 @@ static struct mfd_cell rtc_devs[] = {static struct resource onkey_resources[] = { { .name ="max8925-onkey" , - .start =MAX8925_IRQ_GPM_SW_3SEC , - .end =MAX8925_IRQ_GPM_SW_3SEC , + .start =MAX8925_IRQ_GPM_SW_R , + .end =MAX8925_IRQ_GPM_SW_R , + .flags =IORESOURCE_IRQ , + }, { + .name ="max8925-onkey" , + .start =MAX8925_IRQ_GPM_SW_F , + .end =MAX8925_IRQ_GPM_SW_F , .flags =IORESOURCE_IRQ , }, };
@@ -102,7 +107,7 @@ static struct resource onkey_resources[] = {static struct mfd_cell onkey_devs[] = { { .name ="max8925-onkey" , - .num_resources =1 , + .num_resources =2 , .resources = &onkey_resources[0 ], .id =-1 , },
Signature · 1 line
1.5.6.5
PATCH 5/5 mfd: fix max8925 irq control bit incorrect setting
From: Kevin Liu <[email protected]>
In max8925_irq_sync_unlock(), irq control bit is set at the same time. Zero means enabling irq, and one means disabling irq.
The original code is:
irq_chg[0] &= irq_data->enable;
It should be changed to:
irq_chg[0] &= ~irq_data->enable;
Otherwise, irq control bit is mess.
--- drivers/mfd/max8925-core.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
drivers/mfd/max8925-core.c +7 -6
@@ -434,24 +434,25 @@ static void max8925_irq_sync_unlock(unsigned int irq) irq_tsc = cache_tsc;for (i =0 ; i <ARRAY_SIZE (max8925_irqs); i++) { irq_data = &max8925_irqs[i]; +/* 1 -- disable, 0 -- enable */ switch (irq_data->mask_reg) {case MAX8925_CHG_IRQ1_MASK : - irq_chg[0 ] &= irq_data->enable; + irq_chg[0 ] &= ~irq_data->enable;break ;case MAX8925_CHG_IRQ2_MASK : - irq_chg[1 ] &= irq_data->enable; + irq_chg[1 ] &= ~irq_data->enable;break ;case MAX8925_ON_OFF_IRQ1_MASK : - irq_on[0 ] &= irq_data->enable; + irq_on[0 ] &= ~irq_data->enable;break ;case MAX8925_ON_OFF_IRQ2_MASK : - irq_on[1 ] &= irq_data->enable; + irq_on[1 ] &= ~irq_data->enable;break ;case MAX8925_RTC_IRQ_MASK : - irq_rtc &= irq_data->enable; + irq_rtc &= ~irq_data->enable;break ;case MAX8925_TSC_IRQ_MASK : - irq_tsc &= irq_data->enable; + irq_tsc &= ~irq_data->enable;break ;default :dev_err (chip->dev,"wrong IRQ\n" );
Signature · 1 line
1.5.6.5
PATCH 5/5 mfd: fix max8925 irq control bit incorrect setting
Hi Haojian,
Quoted 5 lines · Haojian Zhuang
From: Kevin Liu <[email protected]>
In
max8925_irq_sync_unlock(), irq control bit is set at the same time. Zero means enabling irq, and one means disabling irq.
Quoted 7 lines
The original code is:
irq_chg[0] &= irq_data->enable;It should be changed to:
irq_chg[0] &= ~irq_data->enable;Otherwise, irq control bit is mess.
Ok, patch applied as well, thanks.
I am going to send this one for 2.6.36 inclusion.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
PATCH 3/5 mfd: update chip id of 88pm8607
In reply to Haojian ZhuangHi Haojian,
Quoted 1 line · Haojian Zhuang
Chipid of 88pm8607 is
0x40or0x50.
Patch applied, many thanks.
Cheers,
Samuel.
Quoted 44 lines
Signed-off-by Haojian Zhuang <[email protected]>Cc Samuel Ortiz <[email protected]>Cc Samuel Ortiz <[email protected]>--- drivers/mfd/88pm860x-core.c | 7 +++++-- include/linux/mfd/88pm860x.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)drivers/mfd/88pm860x-core.c +5
-2@@ -645,10 +645,13 @@ static void __devinit device_8607_init(struct pm860x_chip *chip,dev_err (chip->dev,"Failed to read CHIP ID: %d\n" , ret); goto out; } -if ((ret &PM8607_VERSION_MASK ) ==PM8607_VERSION ) +switch (ret &PM8607_VERSION_MASK ) { +case 0x40 : +case 0x50 :dev_info (chip->dev,"Marvell 88PM8607 (ID: %02x) detected\n" , ret); -else { +break ; +default :dev_err (chip->dev,"Failed to detect Marvell 88PM8607. " "Chip ID: %02x\n" , ret); goto out;include/linux/mfd/88pm860x.h +1
-1@@ -138,7 +138,7 @@ enum { PM8607_ID_RG_MAX, }; -#define PM8607_VERSION (0x40)/* 8607 chip ID */ +/* 8607 chip ID is 0x40 or 0x50 */ #define PM8607_VERSION_MASK (0xF0)/* 8607 chip ID mask */ /* Interrupt Registers */ Signature · 1 line
1.5.6.5
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/