Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fb24b81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of... 

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
  dell-laptop: Toggle the unsupported hardware killswitch
  thinkpad_acpi: Always report scancodes for hotkeys
  acer-wmi: Fix capitalisation of GUID
  platform/x86: ideapad-laptop depends on INPUT
  platform: x86: acer-wmi: world-writable sysfs threeg file
  platform: x86: asus_acpi: world-writable procfs files
  platform: x86: tc1100-wmi: world-writable sysfs wireless and jogdial files
  platform-drivers: x86: pmic: Use request_irq instead of chained handler
  platform-drivers: x86: pmic: Use irq_chip buslock mechanism
  platform-drivers: x86: Convert pmic to new irq_chip functions
  platform-drivers: x86: pmic: Fix up bogus irq hackery
parents 99273ac4 a3d77411

drivers/platform/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ config SONYPI_COMPAT 
config IDEAPAD_LAPTOP

	tristate "Lenovo IdeaPad Laptop Extras"

	depends on ACPI

	depends on RFKILL

	depends on RFKILL && INPUT

	select INPUT_SPARSEKMAP

	help

	  This is a driver for the rfkill switches on Lenovo IdeaPad netbooks.

drivers/platform/x86/acer-wmi.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ MODULE_LICENSE("GPL"); 
 */

#define AMW0_GUID1		"67C3371D-95A3-4C37-BB61-DD47B491DAAB"

#define AMW0_GUID2		"431F16ED-0C2B-444C-B267-27DEB140CF9C"

#define WMID_GUID1		"6AF4F258-B401-42fd-BE91-3D4AC2D7C0D3"

#define WMID_GUID1		"6AF4F258-B401-42FD-BE91-3D4AC2D7C0D3"

#define WMID_GUID2		"95764E09-FB56-4e83-B31A-37761F60994A"

#define WMID_GUID3		"61EF69EA-865C-4BC3-A502-A0DEBA0CB531"
@@ -1280,7 +1280,7 @@ static ssize_t set_bool_threeg(struct device *dev, 
			return -EINVAL;

	return count;

}

static DEVICE_ATTR(threeg, S_IWUGO | S_IRUGO | S_IWUSR, show_bool_threeg,

static DEVICE_ATTR(threeg, S_IRUGO | S_IWUSR, show_bool_threeg,

	set_bool_threeg);



static ssize_t show_interface(struct device *dev, struct device_attribute *attr,

drivers/platform/x86/asus_acpi.c

+1 −7
Original line number Diff line number Diff line
@@ -1081,14 +1081,8 @@ static int asus_hotk_add_fs(struct acpi_device *device) 
	struct proc_dir_entry *proc;

	mode_t mode;



	/*

	 * If parameter uid or gid is not changed, keep the default setting for

	 * our proc entries (-rw-rw-rw-) else, it means we care about security,

	 * and then set to -rw-rw----

	 */



	if ((asus_uid == 0) && (asus_gid == 0)) {

		mode = S_IFREG | S_IRUGO | S_IWUGO;

		mode = S_IFREG | S_IRUGO | S_IWUSR | S_IWGRP;

	} else {

		mode = S_IFREG | S_IRUSR | S_IRGRP | S_IWUSR | S_IWGRP;

		printk(KERN_WARNING "  asus_uid and asus_gid parameters are "

drivers/platform/x86/dell-laptop.c

+22 −2
Original line number Diff line number Diff line
@@ -290,9 +290,12 @@ static int dell_rfkill_set(void *data, bool blocked) 
	dell_send_request(buffer, 17, 11);



	/* If the hardware switch controls this radio, and the hardware

	   switch is disabled, don't allow changing the software state */

	   switch is disabled, don't allow changing the software state.

	   If the hardware switch is reported as not supported, always

	   fire the SMI to toggle the killswitch. */

	if ((hwswitch_state & BIT(hwswitch_bit)) &&

	    !(buffer->output[1] & BIT(16))) {

	    !(buffer->output[1] & BIT(16)) &&

	    (buffer->output[1] & BIT(0))) {

		ret = -EINVAL;

		goto out;

	}
@@ -398,6 +401,23 @@ static const struct file_operations dell_debugfs_fops = { 


static void dell_update_rfkill(struct work_struct *ignored)

{

	int status;



	get_buffer();

	dell_send_request(buffer, 17, 11);

	status = buffer->output[1];

	release_buffer();



	/* if hardware rfkill is not supported, set it explicitly */

	if (!(status & BIT(0))) {

		if (wifi_rfkill)

			dell_rfkill_set((void *)1, !((status & BIT(17)) >> 17));

		if (bluetooth_rfkill)

			dell_rfkill_set((void *)2, !((status & BIT(18)) >> 18));

		if (wwan_rfkill)

			dell_rfkill_set((void *)3, !((status & BIT(19)) >> 19));

	}



	if (wifi_rfkill)

		dell_rfkill_query(wifi_rfkill, (void *)1);

	if (bluetooth_rfkill)

drivers/platform/x86/intel_pmic_gpio.c

+32 −84
Original line number Diff line number Diff line
@@ -60,69 +60,20 @@ enum pmic_gpio_register { 
#define GPOSW_DOU 0x08

#define GPOSW_RDRV 0x30



#define GPIO_UPDATE_TYPE	0x80000000



#define NUM_GPIO 24



struct pmic_gpio_irq {

	spinlock_t lock;

	u32 trigger[NUM_GPIO];

	u32 dirty;

	struct work_struct work;

};





struct pmic_gpio {

	struct mutex		buslock;

	struct gpio_chip	chip;

	struct pmic_gpio_irq	irqtypes;

	void			*gpiointr;

	int			irq;

	unsigned		irq_base;

	unsigned int		update_type;

	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 void pmic_irqtype_work(struct work_struct *work)

{

	struct pmic_gpio_irq *t =

		container_of(work, struct pmic_gpio_irq, work);

	unsigned long flags;

	int i;

	u16 type;



	spin_lock_irqsave(&t->lock, flags);

	/* As we drop the lock, we may need multiple scans if we race the

	   pmic_irq_type function */

	while (t->dirty) {

		/*

		 *	For each pin that has the dirty bit set send an IPC

		 *	message to configure the hardware via the PMIC

		 */

		for (i = 0; i < NUM_GPIO; i++) {

			if (!(t->dirty & (1 << i)))

				continue;

			t->dirty &= ~(1 << i);

			/* We can't trust the array entry or dirty

			   once the lock is dropped */

			type = t->trigger[i];

			spin_unlock_irqrestore(&t->lock, flags);

			pmic_program_irqtype(i, type);

			spin_lock_irqsave(&t->lock, flags);

		}

	}

	spin_unlock_irqrestore(&t->lock, flags);

}



static int pmic_gpio_direction_input(struct gpio_chip *chip, unsigned offset)

{

	if (offset > 8) {
@@ -190,25 +141,24 @@ static void pmic_gpio_set(struct gpio_chip *chip, unsigned offset, int value) 
			1 << (offset - 16));

}



static int pmic_irq_type(unsigned irq, unsigned type)

/*

 * This is called from genirq with pg->buslock locked and

 * irq_desc->lock held. We can not access the scu bus here, so we

 * store the change and update in the bus_sync_unlock() function below

 */

static int pmic_irq_type(struct irq_data *data, unsigned type)

{

	struct pmic_gpio *pg = get_irq_chip_data(irq);

	u32 gpio = irq - pg->irq_base;

	unsigned long flags;

	struct pmic_gpio *pg = irq_data_get_irq_chip_data(data);

	u32 gpio = data->irq - pg->irq_base;



	if (gpio >= pg->chip.ngpio)

		return -EINVAL;



	spin_lock_irqsave(&pg->irqtypes.lock, flags);

	pg->irqtypes.trigger[gpio] = type;

	pg->irqtypes.dirty |=  (1 << gpio);

	spin_unlock_irqrestore(&pg->irqtypes.lock, flags);

	schedule_work(&pg->irqtypes.work);

	pg->trigger_type = type;

	pg->update_type = gpio | GPIO_UPDATE_TYPE;

	return 0;

}







static int pmic_gpio_to_irq(struct gpio_chip *chip, unsigned offset)

{

	struct pmic_gpio *pg = container_of(chip, struct pmic_gpio, chip);
@@ -217,38 +167,32 @@ static int pmic_gpio_to_irq(struct gpio_chip *chip, unsigned offset) 
}



/* the gpiointr register is read-clear, so just do nothing. */

static void pmic_irq_unmask(unsigned irq)

{

};

static void pmic_irq_unmask(struct irq_data *data) { }



static void pmic_irq_mask(unsigned irq)

{

};

static void pmic_irq_mask(struct irq_data *data) { }



static struct irq_chip pmic_irqchip = {

	.name		= "PMIC-GPIO",

	.mask		= pmic_irq_mask,

	.unmask		= pmic_irq_unmask,

	.set_type	= pmic_irq_type,

	.irq_mask	= pmic_irq_mask,

	.irq_unmask	= pmic_irq_unmask,

	.irq_set_type	= pmic_irq_type,

};



static void pmic_irq_handler(unsigned irq, struct irq_desc *desc)

static irqreturn_t pmic_irq_handler(int irq, void *data)

{

	struct pmic_gpio *pg = (struct pmic_gpio *)get_irq_data(irq);

	struct pmic_gpio *pg = data;

	u8 intsts = *((u8 *)pg->gpiointr + 4);

	int gpio;

	irqreturn_t ret = IRQ_NONE;



	for (gpio = 0; gpio < 8; gpio++) {

		if (intsts & (1 << gpio)) {

			pr_debug("pmic pin %d triggered\n", gpio);

			generic_handle_irq(pg->irq_base + gpio);

			ret = IRQ_HANDLED;

		}

	}



	if (desc->chip->irq_eoi)

		desc->chip->irq_eoi(irq_get_irq_data(irq));

	else

		dev_warn(pg->chip.dev, "missing EOI handler for irq %d\n", irq);

	return ret;

}



static int __devinit platform_pmic_gpio_probe(struct platform_device *pdev)
@@ -297,8 +241,7 @@ static int __devinit platform_pmic_gpio_probe(struct platform_device *pdev) 
	pg->chip.can_sleep = 1;

	pg->chip.dev = dev;



	INIT_WORK(&pg->irqtypes.work, pmic_irqtype_work);

	spin_lock_init(&pg->irqtypes.lock);

	mutex_init(&pg->buslock);



	pg->chip.dev = dev;

	retval = gpiochip_add(&pg->chip);
@@ -306,8 +249,13 @@ static int __devinit platform_pmic_gpio_probe(struct platform_device *pdev) 
		printk(KERN_ERR "%s: Can not add pmic gpio chip.\n", __func__);

		goto err;

	}

	set_irq_data(pg->irq, pg);

	set_irq_chained_handler(pg->irq, pmic_irq_handler);



	retval = request_irq(pg->irq, pmic_irq_handler, 0, "pmic", pg);

	if (retval) {

		printk(KERN_WARNING "pmic: Interrupt request failed\n");

		goto err;

	}



	for (i = 0; i < 8; i++) {

		set_irq_chip_and_handler_name(i + pg->irq_base, &pmic_irqchip,

					handle_simple_irq, "demux");