platform-drivers: x86: pmic: Restore the dropped buslock/unlock
PATCH 1/1 platform-drivers: x86: pmic: Restore the dropped buslock/unlock
When I added the buslock/unlock mechanism to the pmic code in order to get rid of the horrible work queue stuff, stupid me missed to add the new callbacks to the irq_chip. In consequence Andrew removed the unused functions.
Add them back and hook them up proper.
Signed-off-by Thomas Gleixner <[email protected]>
Cc Matthew Garrett <[email protected]>
Cc Andrew Morton <[email protected]>
--- drivers/platform/x86/intel_pmic_gpio.c | 43 +++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-)
drivers/platform/x86/intel_pmic_gpio.c +39 -4
@@ -74,6 +74,19 @@ struct pmic_gpio {u32 trigger_type; }; +static void pmic_program_irqtype (int gpio,int type) +{ +if (type &IRQ_TYPE_EDGE_RISING ) +intel_scu_ipc_update_register (GPIO0 + gpio,0x20 ,0x20 ); +else +intel_scu_ipc_update_register (GPIO0 + gpio,0x00 ,0x20 ); + +if (type &IRQ_TYPE_EDGE_FALLING ) +intel_scu_ipc_update_register (GPIO0 + gpio,0x10 ,0x10 ); +else +intel_scu_ipc_update_register (GPIO0 + gpio,0x00 ,0x10 ); +}; +static int pmic_gpio_direction_input (struct gpio_chip *chip,unsigned offset) {if (offset >8 ) {
@@ -166,16 +179,38 @@ static int pmic_gpio_to_irq(struct gpio_return pg->irq_base + offset; } +static void pmic_bus_lock (struct irq_data *data) +{ +struct pmic_gpio *pg =irq_data_get_irq_chip_data (data); + +mutex_lock (&pg->buslock); +} + +static void pmic_bus_sync_unlock (struct irq_data *data) +{ +struct pmic_gpio *pg =irq_data_get_irq_chip_data (data); + +if (pg->update_type) { +unsigned int gpio = pg->update_type & ~GPIO_UPDATE_TYPE ; + +pmic_program_irqtype (gpio, pg->trigger_type); + pg->update_type =0 ; + } +mutex_unlock (&pg->buslock); +} +/* the gpiointr register is read-clear, so just do nothing. */ static void pmic_irq_unmask (struct irq_data *data) { }static void pmic_irq_mask (struct irq_data *data) { }static struct irq_chip pmic_irqchip = { - .name ="PMIC-GPIO" , - .irq_mask = pmic_irq_mask, - .irq_unmask = pmic_irq_unmask, - .irq_set_type = pmic_irq_type, + .name ="PMIC-GPIO" , + .irq_mask = pmic_irq_mask, + .irq_unmask = pmic_irq_unmask, + .irq_set_type = pmic_irq_type, + .irq_bus_lock = pmic_irq_buslock, + .irq_bus_sync_unlock = pmic_bus_sync_unlock, };static irqreturn_t pmic_irq_handler (int irq,void *data)
On Sat, 12 Mar 2011, Thomas Gleixner wrote:
Sigh. I really need to fix quilt to force refresh before mail. :(
----------->
Subject: platform-drivers: x86: pmic: Restore the dropped buslock/unlock
From: Thomas Gleixner <[email protected]>
Date: Sat, 12 Mar 2011 20:55:19 +0100
When I added the buslock/unlock mechanism to the pmic code in order to get rid of the horrible work queue stuff, stupid me missed to add the new callbacks to the irq_chip.
In consequence Andrew removed the unused functions, but I missed that.
Add them back and hook them up proper.
Signed-off-by Thomas Gleixner <[email protected]>
Cc Matthew Garrett <[email protected]>
Cc Andrew Morton <[email protected]>
--- drivers/platform/x86/intel_pmic_gpio.c | 43 +++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-)
drivers/platform/x86/intel_pmic_gpio.c +39 -4
@@ -74,6 +74,19 @@ struct pmic_gpio {u32 trigger_type; }; +static void pmic_program_irqtype (int gpio,int type) +{ +if (type &IRQ_TYPE_EDGE_RISING ) +intel_scu_ipc_update_register (GPIO0 + gpio,0x20 ,0x20 ); +else +intel_scu_ipc_update_register (GPIO0 + gpio,0x00 ,0x20 ); + +if (type &IRQ_TYPE_EDGE_FALLING ) +intel_scu_ipc_update_register (GPIO0 + gpio,0x10 ,0x10 ); +else +intel_scu_ipc_update_register (GPIO0 + gpio,0x00 ,0x10 ); +}; +static int pmic_gpio_direction_input (struct gpio_chip *chip,unsigned offset) {if (offset >8 ) {
@@ -166,16 +179,38 @@ static int pmic_gpio_to_irq(struct gpio_return pg->irq_base + offset; } +static void pmic_bus_lock (struct irq_data *data) +{ +struct pmic_gpio *pg =irq_data_get_irq_chip_data (data); + +mutex_lock (&pg->buslock); +} + +static void pmic_bus_sync_unlock (struct irq_data *data) +{ +struct pmic_gpio *pg =irq_data_get_irq_chip_data (data); + +if (pg->update_type) { +unsigned int gpio = pg->update_type & ~GPIO_UPDATE_TYPE ; + +pmic_program_irqtype (gpio, pg->trigger_type); + pg->update_type =0 ; + } +mutex_unlock (&pg->buslock); +} +/* the gpiointr register is read-clear, so just do nothing. */ static void pmic_irq_unmask (struct irq_data *data) { }static void pmic_irq_mask (struct irq_data *data) { }static struct irq_chip pmic_irqchip = { - .name ="PMIC-GPIO" , - .irq_mask = pmic_irq_mask, - .irq_unmask = pmic_irq_unmask, - .irq_set_type = pmic_irq_type, + .name ="PMIC-GPIO" , + .irq_mask = pmic_irq_mask, + .irq_unmask = pmic_irq_unmask, + .irq_set_type = pmic_irq_type, + .irq_bus_lock = pmic_bus_lock, + .irq_bus_sync_unlock = pmic_bus_sync_unlock, };static irqreturn_t pmic_irq_handler (int irq,void *data)