Commit d77d9597 authored by Linus Torvalds's avatar Linus Torvalds

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:
  thinkpad-acpi fails to load with newer Thinkpad X201s BIOS
  acer-wmi: Fix capitalisation of GUID in module alias
  sony-laptop: keyboard backlight fixes
  sony-laptop: only show the handles sysfs file in debug mode
  samsung-laptop: set backlight type
  staging: samsung-laptop has moved to platform/x86
  samsung-laptop: Samsung R410P backlight driver
  samsung-laptop: add support for N230 model
  platform-drivers: x86: pmic: Restore the dropped buslock/unlock
  sony-laptop: fix early NULL pointer dereference
  msi-laptop: fix config-dependent build error
  eeepc-wmi: add keys found on EeePC 1215T
  asus-wmi: swap input name and phys
  asus-laptop: remove removed features from feature-removal-schedule.txt
parents 0bba0169 b569ab39
...@@ -387,26 +387,6 @@ Who: Tejun Heo <tj@kernel.org> ...@@ -387,26 +387,6 @@ Who: Tejun Heo <tj@kernel.org>
---------------------------- ----------------------------
What: Support for lcd_switch and display_get in asus-laptop driver
When: March 2010
Why: These two features use non-standard interfaces. There are the
only features that really need multiple path to guess what's
the right method name on a specific laptop.
Removing them will allow to remove a lot of code an significantly
clean the drivers.
This will affect the backlight code which won't be able to know
if the backlight is on or off. The platform display file will also be
write only (like the one in eeepc-laptop).
This should'nt affect a lot of user because they usually know
when their display is on or off.
Who: Corentin Chary <corentin.chary@gmail.com>
----------------------------
What: sysfs-class-rfkill state file What: sysfs-class-rfkill state file
When: Feb 2014 When: Feb 2014
Files: net/rfkill/core.c Files: net/rfkill/core.c
......
...@@ -187,7 +187,8 @@ config MSI_LAPTOP ...@@ -187,7 +187,8 @@ config MSI_LAPTOP
depends on ACPI depends on ACPI
depends on BACKLIGHT_CLASS_DEVICE depends on BACKLIGHT_CLASS_DEVICE
depends on RFKILL depends on RFKILL
depends on SERIO_I8042 depends on INPUT && SERIO_I8042
select INPUT_SPARSEKMAP
---help--- ---help---
This is a driver for laptops built by MSI (MICRO-STAR This is a driver for laptops built by MSI (MICRO-STAR
INTERNATIONAL): INTERNATIONAL):
......
...@@ -89,7 +89,7 @@ MODULE_LICENSE("GPL"); ...@@ -89,7 +89,7 @@ MODULE_LICENSE("GPL");
#define ACERWMID_EVENT_GUID "676AA15E-6A47-4D9F-A2CC-1E6D18D14026" #define ACERWMID_EVENT_GUID "676AA15E-6A47-4D9F-A2CC-1E6D18D14026"
MODULE_ALIAS("wmi:67C3371D-95A3-4C37-BB61-DD47B491DAAB"); MODULE_ALIAS("wmi:67C3371D-95A3-4C37-BB61-DD47B491DAAB");
MODULE_ALIAS("wmi:6AF4F258-B401-42Fd-BE91-3D4AC2D7C0D3"); MODULE_ALIAS("wmi:6AF4F258-B401-42FD-BE91-3D4AC2D7C0D3");
MODULE_ALIAS("wmi:676AA15E-6A47-4D9F-A2CC-1E6D18D14026"); MODULE_ALIAS("wmi:676AA15E-6A47-4D9F-A2CC-1E6D18D14026");
enum acer_wmi_event_ids { enum acer_wmi_event_ids {
......
...@@ -201,8 +201,8 @@ static int asus_wmi_input_init(struct asus_wmi *asus) ...@@ -201,8 +201,8 @@ static int asus_wmi_input_init(struct asus_wmi *asus)
if (!asus->inputdev) if (!asus->inputdev)
return -ENOMEM; return -ENOMEM;
asus->inputdev->name = asus->driver->input_phys; asus->inputdev->name = asus->driver->input_name;
asus->inputdev->phys = asus->driver->input_name; asus->inputdev->phys = asus->driver->input_phys;
asus->inputdev->id.bustype = BUS_HOST; asus->inputdev->id.bustype = BUS_HOST;
asus->inputdev->dev.parent = &asus->platform_device->dev; asus->inputdev->dev.parent = &asus->platform_device->dev;
......
...@@ -67,9 +67,11 @@ static const struct key_entry eeepc_wmi_keymap[] = { ...@@ -67,9 +67,11 @@ static const struct key_entry eeepc_wmi_keymap[] = {
{ KE_KEY, 0x82, { KEY_CAMERA } }, { KE_KEY, 0x82, { KEY_CAMERA } },
{ KE_KEY, 0x83, { KEY_CAMERA_ZOOMIN } }, { KE_KEY, 0x83, { KEY_CAMERA_ZOOMIN } },
{ KE_KEY, 0x88, { KEY_WLAN } }, { KE_KEY, 0x88, { KEY_WLAN } },
{ KE_KEY, 0xbd, { KEY_CAMERA } },
{ KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } }, { KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } },
{ KE_KEY, 0xe0, { KEY_PROG1 } }, /* Task Manager */ { KE_KEY, 0xe0, { KEY_PROG1 } }, /* Task Manager */
{ KE_KEY, 0xe1, { KEY_F14 } }, /* Change Resolution */ { KE_KEY, 0xe1, { KEY_F14 } }, /* Change Resolution */
{ KE_KEY, 0xe8, { KEY_SCREENLOCK } },
{ KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } }, { KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } },
{ KE_KEY, 0xeb, { KEY_CAMERA_ZOOMOUT } }, { KE_KEY, 0xeb, { KEY_CAMERA_ZOOMOUT } },
{ KE_KEY, 0xec, { KEY_CAMERA_UP } }, { KE_KEY, 0xec, { KEY_CAMERA_UP } },
......
...@@ -74,6 +74,19 @@ struct pmic_gpio { ...@@ -74,6 +74,19 @@ struct pmic_gpio {
u32 trigger_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 int pmic_gpio_direction_input(struct gpio_chip *chip, unsigned offset) static int pmic_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
{ {
if (offset > 8) { if (offset > 8) {
...@@ -166,16 +179,38 @@ static int pmic_gpio_to_irq(struct gpio_chip *chip, unsigned offset) ...@@ -166,16 +179,38 @@ static int pmic_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
return pg->irq_base + offset; 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. */ /* the gpiointr register is read-clear, so just do nothing. */
static void pmic_irq_unmask(struct irq_data *data) { } static void pmic_irq_unmask(struct irq_data *data) { }
static void pmic_irq_mask(struct irq_data *data) { } static void pmic_irq_mask(struct irq_data *data) { }
static struct irq_chip pmic_irqchip = { static struct irq_chip pmic_irqchip = {
.name = "PMIC-GPIO", .name = "PMIC-GPIO",
.irq_mask = pmic_irq_mask, .irq_mask = pmic_irq_mask,
.irq_unmask = pmic_irq_unmask, .irq_unmask = pmic_irq_unmask,
.irq_set_type = pmic_irq_type, .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) static irqreturn_t pmic_irq_handler(int irq, void *data)
......
...@@ -570,6 +570,16 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = { ...@@ -570,6 +570,16 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
}, },
.callback = dmi_check_cb, .callback = dmi_check_cb,
}, },
{
.ident = "R410 Plus",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR,
"SAMSUNG ELECTRONICS CO., LTD."),
DMI_MATCH(DMI_PRODUCT_NAME, "R410P"),
DMI_MATCH(DMI_BOARD_NAME, "R460"),
},
.callback = dmi_check_cb,
},
{ {
.ident = "R518", .ident = "R518",
.matches = { .matches = {
...@@ -591,12 +601,12 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = { ...@@ -591,12 +601,12 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
.callback = dmi_check_cb, .callback = dmi_check_cb,
}, },
{ {
.ident = "N150/N210/N220", .ident = "N150/N210/N220/N230",
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, DMI_MATCH(DMI_SYS_VENDOR,
"SAMSUNG ELECTRONICS CO., LTD."), "SAMSUNG ELECTRONICS CO., LTD."),
DMI_MATCH(DMI_PRODUCT_NAME, "N150/N210/N220"), DMI_MATCH(DMI_PRODUCT_NAME, "N150/N210/N220/N230"),
DMI_MATCH(DMI_BOARD_NAME, "N150/N210/N220"), DMI_MATCH(DMI_BOARD_NAME, "N150/N210/N220/N230"),
}, },
.callback = dmi_check_cb, .callback = dmi_check_cb,
}, },
...@@ -771,6 +781,7 @@ static int __init samsung_init(void) ...@@ -771,6 +781,7 @@ static int __init samsung_init(void)
/* create a backlight device to talk to this one */ /* create a backlight device to talk to this one */
memset(&props, 0, sizeof(struct backlight_properties)); memset(&props, 0, sizeof(struct backlight_properties));
props.type = BACKLIGHT_PLATFORM;
props.max_brightness = sabi_config->max_brightness; props.max_brightness = sabi_config->max_brightness;
backlight_device = backlight_device_register("samsung", &sdev->dev, backlight_device = backlight_device_register("samsung", &sdev->dev,
NULL, &backlight_ops, NULL, &backlight_ops,
......
...@@ -138,6 +138,8 @@ MODULE_PARM_DESC(kbd_backlight_timeout, ...@@ -138,6 +138,8 @@ MODULE_PARM_DESC(kbd_backlight_timeout,
"1 for 30 seconds, 2 for 60 seconds and 3 to disable timeout " "1 for 30 seconds, 2 for 60 seconds and 3 to disable timeout "
"(default: 0)"); "(default: 0)");
static void sony_nc_kbd_backlight_resume(void);
enum sony_nc_rfkill { enum sony_nc_rfkill {
SONY_WIFI, SONY_WIFI,
SONY_BLUETOOTH, SONY_BLUETOOTH,
...@@ -771,11 +773,6 @@ static int sony_nc_handles_setup(struct platform_device *pd) ...@@ -771,11 +773,6 @@ static int sony_nc_handles_setup(struct platform_device *pd)
if (!handles) if (!handles)
return -ENOMEM; return -ENOMEM;
sysfs_attr_init(&handles->devattr.attr);
handles->devattr.attr.name = "handles";
handles->devattr.attr.mode = S_IRUGO;
handles->devattr.show = sony_nc_handles_show;
for (i = 0; i < ARRAY_SIZE(handles->cap); i++) { for (i = 0; i < ARRAY_SIZE(handles->cap); i++) {
if (!acpi_callsetfunc(sony_nc_acpi_handle, if (!acpi_callsetfunc(sony_nc_acpi_handle,
"SN00", i + 0x20, &result)) { "SN00", i + 0x20, &result)) {
...@@ -785,11 +782,18 @@ static int sony_nc_handles_setup(struct platform_device *pd) ...@@ -785,11 +782,18 @@ static int sony_nc_handles_setup(struct platform_device *pd)
} }
} }
/* allow reading capabilities via sysfs */ if (debug) {
if (device_create_file(&pd->dev, &handles->devattr)) { sysfs_attr_init(&handles->devattr.attr);
kfree(handles); handles->devattr.attr.name = "handles";
handles = NULL; handles->devattr.attr.mode = S_IRUGO;
return -1; handles->devattr.show = sony_nc_handles_show;
/* allow reading capabilities via sysfs */
if (device_create_file(&pd->dev, &handles->devattr)) {
kfree(handles);
handles = NULL;
return -1;
}
} }
return 0; return 0;
...@@ -798,7 +802,8 @@ static int sony_nc_handles_setup(struct platform_device *pd) ...@@ -798,7 +802,8 @@ static int sony_nc_handles_setup(struct platform_device *pd)
static int sony_nc_handles_cleanup(struct platform_device *pd) static int sony_nc_handles_cleanup(struct platform_device *pd)
{ {
if (handles) { if (handles) {
device_remove_file(&pd->dev, &handles->devattr); if (debug)
device_remove_file(&pd->dev, &handles->devattr);
kfree(handles); kfree(handles);
handles = NULL; handles = NULL;
} }
...@@ -808,6 +813,11 @@ static int sony_nc_handles_cleanup(struct platform_device *pd) ...@@ -808,6 +813,11 @@ static int sony_nc_handles_cleanup(struct platform_device *pd)
static int sony_find_snc_handle(int handle) static int sony_find_snc_handle(int handle)
{ {
int i; int i;
/* not initialized yet, return early */
if (!handles)
return -1;
for (i = 0; i < 0x10; i++) { for (i = 0; i < 0x10; i++) {
if (handles->cap[i] == handle) { if (handles->cap[i] == handle) {
dprintk("found handle 0x%.4x (offset: 0x%.2x)\n", dprintk("found handle 0x%.4x (offset: 0x%.2x)\n",
...@@ -1168,6 +1178,9 @@ static int sony_nc_resume(struct acpi_device *device) ...@@ -1168,6 +1178,9 @@ static int sony_nc_resume(struct acpi_device *device)
/* re-read rfkill state */ /* re-read rfkill state */
sony_nc_rfkill_update(); sony_nc_rfkill_update();
/* restore kbd backlight states */
sony_nc_kbd_backlight_resume();
return 0; return 0;
} }
...@@ -1355,6 +1368,7 @@ static void sony_nc_rfkill_setup(struct acpi_device *device) ...@@ -1355,6 +1368,7 @@ static void sony_nc_rfkill_setup(struct acpi_device *device)
#define KBDBL_HANDLER 0x137 #define KBDBL_HANDLER 0x137
#define KBDBL_PRESENT 0xB00 #define KBDBL_PRESENT 0xB00
#define SET_MODE 0xC00 #define SET_MODE 0xC00
#define SET_STATE 0xD00
#define SET_TIMEOUT 0xE00 #define SET_TIMEOUT 0xE00
struct kbd_backlight { struct kbd_backlight {
...@@ -1377,6 +1391,10 @@ static ssize_t __sony_nc_kbd_backlight_mode_set(u8 value) ...@@ -1377,6 +1391,10 @@ static ssize_t __sony_nc_kbd_backlight_mode_set(u8 value)
(value << 0x10) | SET_MODE, &result)) (value << 0x10) | SET_MODE, &result))
return -EIO; return -EIO;
/* Try to turn the light on/off immediately */
sony_call_snc_handle(KBDBL_HANDLER, (value << 0x10) | SET_STATE,
&result);
kbdbl_handle->mode = value; kbdbl_handle->mode = value;
return 0; return 0;
...@@ -1458,7 +1476,7 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd) ...@@ -1458,7 +1476,7 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd)
{ {
int result; int result;
if (sony_call_snc_handle(0x137, KBDBL_PRESENT, &result)) if (sony_call_snc_handle(KBDBL_HANDLER, KBDBL_PRESENT, &result))
return 0; return 0;
if (!(result & 0x02)) if (!(result & 0x02))
return 0; return 0;
...@@ -1501,13 +1519,36 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd) ...@@ -1501,13 +1519,36 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd)
static int sony_nc_kbd_backlight_cleanup(struct platform_device *pd) static int sony_nc_kbd_backlight_cleanup(struct platform_device *pd)
{ {
if (kbdbl_handle) { if (kbdbl_handle) {
int result;
device_remove_file(&pd->dev, &kbdbl_handle->mode_attr); device_remove_file(&pd->dev, &kbdbl_handle->mode_attr);
device_remove_file(&pd->dev, &kbdbl_handle->timeout_attr); device_remove_file(&pd->dev, &kbdbl_handle->timeout_attr);
/* restore the default hw behaviour */
sony_call_snc_handle(KBDBL_HANDLER, 0x1000 | SET_MODE, &result);
sony_call_snc_handle(KBDBL_HANDLER, SET_TIMEOUT, &result);
kfree(kbdbl_handle); kfree(kbdbl_handle);
} }
return 0; return 0;
} }
static void sony_nc_kbd_backlight_resume(void)
{
int ignore = 0;
if (!kbdbl_handle)
return;
if (kbdbl_handle->mode == 0)
sony_call_snc_handle(KBDBL_HANDLER, SET_MODE, &ignore);
if (kbdbl_handle->timeout != 0)
sony_call_snc_handle(KBDBL_HANDLER,
(kbdbl_handle->timeout << 0x10) | SET_TIMEOUT,
&ignore);
}
static void sony_nc_backlight_setup(void) static void sony_nc_backlight_setup(void)
{ {
acpi_handle unused; acpi_handle unused;
......
...@@ -8618,8 +8618,7 @@ static bool __pure __init tpacpi_is_valid_fw_id(const char* const s, ...@@ -8618,8 +8618,7 @@ static bool __pure __init tpacpi_is_valid_fw_id(const char* const s,
tpacpi_is_fw_digit(s[1]) && tpacpi_is_fw_digit(s[1]) &&
s[2] == t && s[3] == 'T' && s[2] == t && s[3] == 'T' &&
tpacpi_is_fw_digit(s[4]) && tpacpi_is_fw_digit(s[4]) &&
tpacpi_is_fw_digit(s[5]) && tpacpi_is_fw_digit(s[5]);
s[6] == 'W' && s[7] == 'W';
} }
/* returns 0 - probe ok, or < 0 - probe error. /* returns 0 - probe ok, or < 0 - probe error.
......
...@@ -131,8 +131,6 @@ source "drivers/staging/wlags49_h2/Kconfig" ...@@ -131,8 +131,6 @@ source "drivers/staging/wlags49_h2/Kconfig"
source "drivers/staging/wlags49_h25/Kconfig" source "drivers/staging/wlags49_h25/Kconfig"
source "drivers/staging/samsung-laptop/Kconfig"
source "drivers/staging/sm7xx/Kconfig" source "drivers/staging/sm7xx/Kconfig"
source "drivers/staging/dt3155v4l/Kconfig" source "drivers/staging/dt3155v4l/Kconfig"
......
...@@ -48,7 +48,6 @@ obj-$(CONFIG_XVMALLOC) += zram/ ...@@ -48,7 +48,6 @@ obj-$(CONFIG_XVMALLOC) += zram/
obj-$(CONFIG_ZCACHE) += zcache/ obj-$(CONFIG_ZCACHE) += zcache/
obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/ obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/ obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
obj-$(CONFIG_SAMSUNG_LAPTOP) += samsung-laptop/
obj-$(CONFIG_FB_SM7XX) += sm7xx/ obj-$(CONFIG_FB_SM7XX) += sm7xx/
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/ obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
obj-$(CONFIG_CRYSTALHD) += crystalhd/ obj-$(CONFIG_CRYSTALHD) += crystalhd/
......
config SAMSUNG_LAPTOP
tristate "Samsung Laptop driver"
default n
depends on RFKILL && BACKLIGHT_CLASS_DEVICE && X86
help
This module implements a driver for the N128 Samsung Laptop
providing control over the Wireless LED and the LCD backlight
To compile this driver as a module, choose
M here: the module will be called samsung-laptop.
obj-$(CONFIG_SAMSUNG_LAPTOP) += samsung-laptop.o
TODO:
- review from other developers
- figure out ACPI video issues
Please send patches to Greg Kroah-Hartman <gregkh@suse.de>
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment