diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-01 11:18:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-01 11:18:53 -0700 |
| commit | 3a77fb7b502249dae88f475595fd61321f921d91 (patch) | |
| tree | 92e2090028bae02b95b31749a829ab3a2b1c0e67 | |
| parent | fcc95329c6d06c407d43e383f64ff0186473867d (diff) | |
| download | patches-3a77fb7b502249dae88f475595fd61321f921d91.tar.gz | |
samsung patches now in Linus's tree
9 files changed, 0 insertions, 407 deletions
diff --git a/platform-brightness-quirk-for-samsung-laptop-driver.patch b/platform-brightness-quirk-for-samsung-laptop-driver.patch deleted file mode 100644 index 59ba50df218eb9..00000000000000 --- a/platform-brightness-quirk-for-samsung-laptop-driver.patch +++ /dev/null @@ -1,105 +0,0 @@ -From jasonbstubbs@gmail.com Thu Sep 1 15:44:36 2011 -Message-ID: <4E576E50.4070500@gmail.com> -Date: Fri, 26 Aug 2011 19:58:40 +1000 -From: Jason Stubbs <jasonbstubbs@gmail.com> -To: Greg KH <greg@kroah.com> -CC: David Herrmann <dh.herrmann@googlemail.com>, platform-driver-x86@vger.kernel.org, <mjg@redhat.com> -Subject: Platform: Brightness quirk for samsung laptop driver - -From: Jason Stubbs <jasonbstubbs@gmail.com> - -On some Samsung laptops the brightness regulation works slightly different. -All SABI commands except for set_brightness work as expected. The behaviour -of set_brightness is as follows: - -- Setting a new brightness will only step one level toward the new brightness - level. For example, setting a level of 5 when the current level is 2 will - result in a brightness level of 3. -- A spurious KEY_BRIGHTNESS_UP or KEY_BRIGHTNESS_DOWN event is also generated - along with the change in brightness. -- Neither of the above two issues occur when changing from/to brightness - level 0. - -This patch adds detection and a non-intrusive workaround for the above issues. - -Signed-off-by: Jason Stubbs <jasonbstubbs@gmail.com> -Tested-by: David Herrmann <dh.herrmann@googlemail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/platform/x86/samsung-laptop.c | 43 ++++++++++++++++++++++++++++++++++ - 1 file changed, 43 insertions(+) - ---- a/drivers/platform/x86/samsung-laptop.c -+++ b/drivers/platform/x86/samsung-laptop.c -@@ -226,6 +226,7 @@ static struct backlight_device *backligh - static struct mutex sabi_mutex; - static struct platform_device *sdev; - static struct rfkill *rfk; -+static bool has_stepping_quirk; - - static int force; - module_param(force, bool, 0); -@@ -382,6 +383,17 @@ static void set_brightness(u8 user_brigh - { - u8 user_level = user_brightness + sabi_config->min_brightness; - -+ if (has_stepping_quirk && user_level != 0) { -+ /* -+ * short circuit if the specified level is what's already set -+ * to prevent the screen from flickering needlessly -+ */ -+ if (user_brightness == read_brightness()) -+ return; -+ -+ sabi_set_command(sabi_config->commands.set_brightness, 0); -+ } -+ - sabi_set_command(sabi_config->commands.set_brightness, user_level); - } - -@@ -390,6 +402,34 @@ static int get_brightness(struct backlig - return (int)read_brightness(); - } - -+static void check_for_stepping_quirk(void) -+{ -+ u8 initial_level = read_brightness(); -+ u8 check_level; -+ -+ /* -+ * Some laptops exhibit the strange behaviour of stepping toward -+ * (rather than setting) the brightness except when changing to/from -+ * brightness level 0. This behaviour is checked for here and worked -+ * around in set_brightness. -+ */ -+ -+ if (initial_level <= 2) -+ check_level = initial_level + 2; -+ else -+ check_level = initial_level - 2; -+ -+ has_stepping_quirk = false; -+ set_brightness(check_level); -+ -+ if (read_brightness() != check_level) { -+ has_stepping_quirk = true; -+ pr_info("enabled workaround for brightness stepping quirk\n"); -+ } -+ -+ set_brightness(initial_level); -+} -+ - static int update_status(struct backlight_device *bd) - { - set_brightness(bd->props.brightness); -@@ -823,6 +863,9 @@ static int __init samsung_init(void) - } - } - -+ /* Check for stepping quirk */ -+ check_for_stepping_quirk(); -+ - /* knock up a platform device to hang stuff off of */ - sdev = platform_device_register_simple("samsung", -1, NULL, 0); - if (IS_ERR(sdev)) diff --git a/platform-fix-error-path-in-samsung-laptop-init.patch b/platform-fix-error-path-in-samsung-laptop-init.patch deleted file mode 100644 index ac288de59f9dea..00000000000000 --- a/platform-fix-error-path-in-samsung-laptop-init.patch +++ /dev/null @@ -1,39 +0,0 @@ -From dh.herrmann@googlemail.com Wed Aug 24 16:09:42 2011 -From: David Herrmann <dh.herrmann@googlemail.com> -To: platform-driver-x86@vger.kernel.org -Cc: gregkh@suse.de, dh.herrmann@googlemail.com, mjg@redhat.com -Subject: Platform: Fix error path in samsung-laptop init -Date: Tue, 23 Aug 2011 13:03:07 +0200 -Message-Id: <1314097387-3665-1-git-send-email-dh.herrmann@googlemail.com> - -From: David Herrmann <dh.herrmann@googlemail.com> - -samsung_init() should not return success if not all devices are initialized. -Otherwise, samsung_exit() will dereference sdev NULL pointers and others. - -Signed-off-by: David Herrmann <dh.herrmann@googlemail.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/platform/x86/samsung-laptop.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/drivers/platform/x86/samsung-laptop.c -+++ b/drivers/platform/x86/samsung-laptop.c -@@ -799,7 +799,7 @@ static int __init samsung_init(void) - sabi_iface = ioremap_nocache(ifaceP, 16); - if (!sabi_iface) { - pr_err("Can't remap %x\n", ifaceP); -- goto exit; -+ goto error_no_signature; - } - if (debug) { - printk(KERN_DEBUG "ifaceP = 0x%08x\n", ifaceP); -@@ -851,7 +851,6 @@ static int __init samsung_init(void) - if (retval) - goto error_file_create; - --exit: - return 0; - - error_file_create: diff --git a/platform-fix-samsung-laptop-dmi-identification-for-n220-model.patch b/platform-fix-samsung-laptop-dmi-identification-for-n220-model.patch deleted file mode 100644 index 9f0b538f665a73..00000000000000 --- a/platform-fix-samsung-laptop-dmi-identification-for-n220-model.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f934ff08872c1c894ef124bca4aeab4f50d641cc Mon Sep 17 00:00:00 2001 -From: Raul Gutierrez Segales <rgs@collabora.co.uk> -Date: Tue, 30 Aug 2011 16:52:01 +0100 -Subject: Platform: fix samsung-laptop DMI identification for N220 model - -From: Raul Gutierrez Segales <rgs@collabora.co.uk> - -This is a follow-up for commit 78a7539b, which didn't cover the -Samsung N220 laptop. With this backlight brightness works nicely -on the N220 netbook. - -Signed-off-by: Raul Gutierrez Segales <rgs@collabora.co.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/platform/x86/samsung-laptop.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/platform/x86/samsung-laptop.c -+++ b/drivers/platform/x86/samsung-laptop.c -@@ -663,6 +663,16 @@ static struct dmi_system_id __initdata s - .callback = dmi_check_cb, - }, - { -+ .ident = "N220", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, -+ "SAMSUNG ELECTRONICS CO., LTD."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "N220"), -+ DMI_MATCH(DMI_BOARD_NAME, "N220"), -+ }, -+ .callback = dmi_check_cb, -+ }, -+ { - .ident = "N150/N210/N220/N230", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, diff --git a/platform-samsung-laptop-dmi-info-for-nc210-nc110.patch b/platform-samsung-laptop-dmi-info-for-nc210-nc110.patch deleted file mode 100644 index 20b7b0db267b32..00000000000000 --- a/platform-samsung-laptop-dmi-info-for-nc210-nc110.patch +++ /dev/null @@ -1,38 +0,0 @@ -From jasonbstubbs@gmail.com Thu Sep 1 15:45:04 2011 -Message-ID: <4E578A42.4080809@gmail.com> -Date: Fri, 26 Aug 2011 21:57:54 +1000 -From: Jason Stubbs <jasonbstubbs@gmail.com> -To: Greg KH <greg@kroah.com> -CC: David Herrmann <dh.herrmann@googlemail.com>, platform-driver-x86@vger.kernel.org, <mjg@redhat.com> -Subject: Platform: Samsung laptop DMI info for NC210/NC110 - -From: Jason Stubbs <jasonbstubbs@gmail.com> - -This patch just adds the DMI info for the samsung laptop driver to work with -the NC210/NC110. It needs the brightness quirk patch for proper support. - -Signed-off-by: Jason Stubbs <jasonbstubbs@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/platform/x86/samsung-laptop.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/platform/x86/samsung-laptop.c -+++ b/drivers/platform/x86/samsung-laptop.c -@@ -755,6 +755,15 @@ static struct dmi_system_id __initdata s - }, - .callback = dmi_check_cb, - }, -+ { -+ .ident = "NC210/NC110", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "NC210/NC110"), -+ DMI_MATCH(DMI_BOARD_NAME, "NC210/NC110"), -+ }, -+ .callback = dmi_check_cb, -+ }, - { }, - }; - MODULE_DEVICE_TABLE(dmi, samsung_dmi_table); diff --git a/platform-samsung_laptop-add-dmi-information-for-samsung-r700-laptops.patch b/platform-samsung_laptop-add-dmi-information-for-samsung-r700-laptops.patch deleted file mode 100644 index 97340038b0bc05..00000000000000 --- a/platform-samsung_laptop-add-dmi-information-for-samsung-r700-laptops.patch +++ /dev/null @@ -1,44 +0,0 @@ -From stefanbeller@googlemail.com Tue May 10 15:35:01 2011 -Date: Wed, 30 Mar 2011 17:58:45 +0200 -Message-ID: <AANLkTin1Uvg=-2zkhMQoCOusu1xrS6TYA0LUom=jp_ZV@mail.gmail.com> -Subject: platform: samsung_laptop: add dmi information for Samsung R700 laptops -From: Stefan Beller <stefanbeller@googlemail.com> -To: gregkh@suse.de - -From: Stefan Beller <stefanbeller@googlemail.com> - -My DMI model is this: ->dmesg |grep DMI -[ 0.000000] DMI present. -[ 0.000000] DMI: SAMSUNG ELECTRONICS CO., LTD. SR700/SR700, BIOS -04SR 02/20/2008 - -adding dmi information of Samsung R700 laptops -This adds the dmi information of Samsungs R700 laptops. - -Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/platform/x86/samsung-laptop.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/platform/x86/samsung-laptop.c -+++ b/drivers/platform/x86/samsung-laptop.c -@@ -641,6 +641,15 @@ static struct dmi_system_id __initdata s - .callback = dmi_check_cb, - }, - { -+ .ident = "R700", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "SR700"), -+ DMI_MATCH(DMI_BOARD_NAME, "SR700"), -+ }, -+ .callback = dmi_check_cb, -+ }, -+ { - .ident = "R530/R730", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), diff --git a/platform-samsung_laptop-add-support-for-x520-machines.patch b/platform-samsung_laptop-add-support-for-x520-machines.patch deleted file mode 100644 index 2be3c5fbe879b8..00000000000000 --- a/platform-samsung_laptop-add-support-for-x520-machines.patch +++ /dev/null @@ -1,37 +0,0 @@ -From tmassimi@gmail.com Tue May 10 15:40:27 2011 -From: Tommaso Massimi <tmassimi@gmail.com> -Date: Sat, 23 Apr 2011 22:36:37 +0200 -Message-ID: <BANLkTimYBw5BfZWinUy0OtyhJFXygxKnmg@mail.gmail.com> -Subject: Platform: samsung_laptop: add support for X520 machines. -To: linux-kernel@vger.kernel.org, Greg Kroah-Hartman <gregkh@suse.de> - -From: Tommaso Massimi <tmassimi@gmail.com> - -my samsung laptop would be very happy if you add -these lines to the file drivers/platform/x86/samsung-laptop.c - -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/platform/x86/samsung-laptop.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/platform/x86/samsung-laptop.c -+++ b/drivers/platform/x86/samsung-laptop.c -@@ -695,6 +695,15 @@ static struct dmi_system_id __initdata s - }, - .callback = dmi_check_cb, - }, -+ { -+ .ident = "X520", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "X520"), -+ DMI_MATCH(DMI_BOARD_NAME, "X520"), -+ }, -+ .callback = dmi_check_cb, -+ }, - { }, - }; - MODULE_DEVICE_TABLE(dmi, samsung_dmi_table); diff --git a/platform-samsung_laptop-fix-samsung-brightness-min-max-calculations.patch b/platform-samsung_laptop-fix-samsung-brightness-min-max-calculations.patch deleted file mode 100644 index 3887cc3f6700c8..00000000000000 --- a/platform-samsung_laptop-fix-samsung-brightness-min-max-calculations.patch +++ /dev/null @@ -1,60 +0,0 @@ -From jasonbstubbs@gmail.com Wed Aug 24 16:08:19 2011 -From: Jason Stubbs <jasonbstubbs@gmail.com> -To: Greg KH <greg@kroah.com> -Subject: platform: samsung_laptop: fix samsung brightness min/max calculations -Date: Mon, 20 Jun 2011 07:23:19 +1000 -Cc: Greg KH <gregkh@suse.de>, - linux-kernel@vger.kernel.org -Message-Id: <201106200723.20173.jasonbstubbs@gmail.com> - -From: Jason Stubbs <jasonbstubbs@gmail.com> - -The min_brightness value of the sabi_config is incorrectly used in brightness -calculations. For the config where min_brightness = 1 and max_brightness = 8, -the user visible range should be 0 to 7 with hardware being set in the range -of 1 to 8. What is actually happening is that the user visible range is 0 to -8 with hardware being set in the range of -1 to 7. - -This patch fixes the above issue as well as a miscalculation that would occur -in the case of min_brightness > 1. - -Signed-off-by: Jason Stubbs <jasonbstubbs@gmail.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/platform/x86/samsung-laptop.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - ---- a/drivers/platform/x86/samsung-laptop.c -+++ b/drivers/platform/x86/samsung-laptop.c -@@ -370,15 +370,17 @@ static u8 read_brightness(void) - &sretval); - if (!retval) { - user_brightness = sretval.retval[0]; -- if (user_brightness != 0) -+ if (user_brightness > sabi_config->min_brightness) - user_brightness -= sabi_config->min_brightness; -+ else -+ user_brightness = 0; - } - return user_brightness; - } - - static void set_brightness(u8 user_brightness) - { -- u8 user_level = user_brightness - sabi_config->min_brightness; -+ u8 user_level = user_brightness + sabi_config->min_brightness; - - sabi_set_command(sabi_config->commands.set_brightness, user_level); - } -@@ -829,7 +831,8 @@ static int __init samsung_init(void) - /* create a backlight device to talk to this one */ - 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 - -+ sabi_config->min_brightness; - backlight_device = backlight_device_register("samsung", &sdev->dev, - NULL, &backlight_ops, - &props); diff --git a/platform-samsung_laptop-samsung-backlight-for-r528-r728.patch b/platform-samsung_laptop-samsung-backlight-for-r528-r728.patch deleted file mode 100644 index 8d890163366ec8..00000000000000 --- a/platform-samsung_laptop-samsung-backlight-for-r528-r728.patch +++ /dev/null @@ -1,39 +0,0 @@ -From xor@xorik.ru Wed Aug 24 16:05:07 2011 -From: Smelov Andrey <xor29a@bk.ru> -Subject: Platform: samsung_laptop: samsung backlight for R528/R728 -To: Greg Kroah-Hartman <gregkh@suse.de> -Date: Sat, 11 Jun 2011 14:35:51 +0400 -Message-ID: <1307788551.16735.2.camel@notebook> - -From: Smelov Andrey <xor29a@bk.ru> - -patch works for me, but I need to add "acpi_backlight=vendor" to kernel -params - -Signed-off-by: Smelov Andrey <xor29a@bk.ru> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/platform/x86/samsung-laptop.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/platform/x86/samsung-laptop.c -+++ b/drivers/platform/x86/samsung-laptop.c -@@ -704,6 +704,15 @@ static struct dmi_system_id __initdata s - }, - .callback = dmi_check_cb, - }, -+ { -+ .ident = "R528/R728", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "R528/R728"), -+ DMI_MATCH(DMI_BOARD_NAME, "R528/R728"), -+ }, -+ .callback = dmi_check_cb, -+ }, - { }, - }; - MODULE_DEVICE_TABLE(dmi, samsung_dmi_table); @@ -45,11 +45,3 @@ gregkh/gkh-version.patch # staging stuff for next is now in the staging-next tree on git.kernel.org -platform-samsung_laptop-add-dmi-information-for-samsung-r700-laptops.patch -platform-samsung_laptop-add-support-for-x520-machines.patch -platform-samsung_laptop-samsung-backlight-for-r528-r728.patch -platform-samsung_laptop-fix-samsung-brightness-min-max-calculations.patch -platform-fix-error-path-in-samsung-laptop-init.patch -platform-brightness-quirk-for-samsung-laptop-driver.patch -platform-samsung-laptop-dmi-info-for-nc210-nc110.patch -platform-fix-samsung-laptop-dmi-identification-for-n220-model.patch |