[GIT] x86 platform driver updates for 3.11

[GIT] x86 platform driver updates for 3.11

[Matthew Garrett]

[-- Attachment #1: Type: text/plain, Size: 2795 bytes --]

Hi Linus,

Nothing overly exciting here - a couple of new drivers that don't do a 
great deal, along with some miscellaneous fixes and a couple of small 
feature enablement patches.

The following changes since commit d2b4a646717153a1a180b64d4a8464054dbd700e:

  Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma (2013-07-07 11:11:43 -0700)

are available in the git repository at:


  git://cavan.codon.org.uk/platform-drivers-x86.git for_linus

for you to fetch changes up to fef8ce166b2d5cdba8bbf85fa48c4cb8d75ffec4:

  x86 platform drivers: fix gpio leak (2013-07-10 15:09:35 -0400)

----------------------------------------------------------------
AceLan Kao (2):
      asus-wmi: control wlan-led only if wapf == 4
      asus-nb-wmi: set wapf=4 for ASUSTeK COMPUTER INC. 1015E/U

Alex Hung (1):
      hp-wmi: add supports for POST code error

Ben Hutchings (1):
      amilo-rfkill: Add dependency on SERIO_I8042

Libo Chen (4):
      x86: msi-laptop: fix memleak
      x86: asus-laptop: fix invalid point access
      drivers/platform/x86/intel_ips: Convert to module_pci_driver
      x86 platform drivers: fix gpio leak

Matthew Garrett (3):
      hp-wmi: Enable hotkeys on some systems
      Add support driver for Intel Rapid Start Technology
      Add trivial driver to disable Intel Smart Connect

Seth Forshee (1):
      toshiba_acpi: Add dependency on SERIO_I8042

Viktar Vauchkevich (1):
      asus-nb-wmi: ignore ALS notification key code

Wei Yongjun (1):
      dell-laptop: fix error return code in dell_init()

vic (1):
      asus-wmi: append newline to messages

 .../ABI/testing/sysfs-driver-intel-rapid-start     |  21 +++
 drivers/platform/x86/Kconfig                       |  28 +++
 drivers/platform/x86/Makefile                      |   2 +
 drivers/platform/x86/asus-laptop.c                 |   1 -
 drivers/platform/x86/asus-nb-wmi.c                 |  19 ++
 drivers/platform/x86/asus-wmi.c                    |  21 ++-
 drivers/platform/x86/dell-laptop.c                 |   5 +-
 drivers/platform/x86/hp-wmi.c                      |  63 +++++++
 drivers/platform/x86/intel-rst.c                   | 209 +++++++++++++++++++++
 drivers/platform/x86/intel-smartconnect.c          |  90 +++++++++
 drivers/platform/x86/intel_ips.c                   |  13 +-
 drivers/platform/x86/intel_pmic_gpio.c             |   6 +-
 drivers/platform/x86/msi-laptop.c                  |  24 +--
 13 files changed, 462 insertions(+), 40 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-rapid-start
 create mode 100644 drivers/platform/x86/intel-rst.c
 create mode 100644 drivers/platform/x86/intel-smartconnect.c


-- 
Matthew Garrett | mjg59@srcf.ucam.org

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [GIT] x86 platform driver updates for 3.11

[Mattia Dongili]

[-- Attachment #1: Type: text/plain, Size: 530 bytes --]

On Wed, Jul 10, 2013 at 08:44:20PM +0100, Matthew Garrett wrote:
...
> Nothing overly exciting here - a couple of new drivers that don't do a 
> great deal, along with some miscellaneous fixes and a couple of small 
> feature enablement patches.

Hi Matthew,
I sent a couple of fixes for sony-laptop in
Message-Id: <1369778133-24015-1-git-send-email-malattia@linux.it> [1]

Could you pick those up too?

Thanks

[1]:
http://www.mail-archive.com/platform-driver-x86@vger.kernel.org/msg04310.html
-- 
mattia
:wq!

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[PATCH 0/2] Fixes for sony-laptop for 3.11

[Mattia Dongili]

Hi Matthew,
trying again. Could you get these in 3.11?

Daniel Serpell (1):
  sony-laptop: Fix reporting of gfx_switch_status

Wei Yongjun (1):
  sony-laptop: return a negative error code in sonypi_compat_init()

 drivers/platform/x86/sony-laptop.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

-- 
1.8.4.rc1

Re: [PATCH 0/2] Fixes for sony-laptop for 3.11

[Matthew Garrett]

I'm sorry, yes - I'll get these pulled.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

[PATCH 1/2] sony-laptop: return a negative error code in sonypi_compat_init()

[Mattia Dongili]

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Return -1 in the error handling case instead of 0, as done elsewhere in
this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mattia Dongili <malattia@linux.it>
---
 drivers/platform/x86/sony-laptop.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 2ac045f..b162733 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -4320,7 +4320,8 @@ static int sony_pic_add(struct acpi_device *device)
 		goto err_free_resources;
 	}
 
-	if (sonypi_compat_init())
+	result = sonypi_compat_init();
+	if (result)
 		goto err_remove_input;
 
 	/* request io port */
-- 
1.8.4.rc1

[PATCH 2/2] sony-laptop: Fix reporting of gfx_switch_status

[Mattia Dongili]

From: Daniel Serpell <daniel.serpell@gmail.com>

Signed-off-by: Daniel Serpell <daniel.serpell@gmail.com>
Signed-off-by: Mattia Dongili <malattia@linux.it>
---
 drivers/platform/x86/sony-laptop.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index b162733..3a1b6bf 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -2440,7 +2440,10 @@ static ssize_t sony_nc_gfx_switch_status_show(struct device *dev,
 	if (pos < 0)
 		return pos;
 
-	return snprintf(buffer, PAGE_SIZE, "%s\n", pos ? "speed" : "stamina");
+	return snprintf(buffer, PAGE_SIZE, "%s\n",
+					pos == SPEED ? "speed" :
+					pos == STAMINA ? "stamina" :
+					pos == AUTO ? "auto" : "unknown");
 }
 
 static int sony_nc_gfx_switch_setup(struct platform_device *pd,
-- 
1.8.4.rc1