Update surface-acpi

- Rename Kconfig options (SURFACE_ACPI_XXX -> SURFACE_SAM_XXX)
- Rename identifiers/functions.
- Split into multiple modules (surface_sam_ssh, surface_sam_san, ...)
This commit is contained in:
Maximilian Luz 2019-10-21 00:10:47 +02:00
parent dcf51e95e7
commit 3172322f64
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
21 changed files with 11381 additions and 3238 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
From fa7e9dbe07d4e3a7e5bc90483fb3855bf37a55b8 Mon Sep 17 00:00:00 2001
From f784868ed2318515d368e4c994eb99ea2ca73886 Mon Sep 17 00:00:00 2001
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
Date: Fri, 20 Sep 2019 01:03:29 +0900
Date: Sat, 28 Sep 2019 17:48:21 +0200
Subject: [PATCH 02/12] suspend
---

View file

@ -1,6 +1,6 @@
From 5d229605142d04aed881b5df78faf510a3782e4d Mon Sep 17 00:00:00 2001
From 6eb9078484ae4d59a705fc4eabb54d5b60bd5109 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:42:15 +0200
Date: Sat, 27 Jul 2019 17:51:37 +0200
Subject: [PATCH 03/12] buttons
---

View file

@ -1,6 +1,6 @@
From 053effa42ff66c5287a54ee5890ffb36731a99c4 Mon Sep 17 00:00:00 2001
From d3e2d5cde68c18fdebe77456c9e360d17af8f225 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:42:25 +0200
Date: Sat, 28 Sep 2019 17:53:54 +0200
Subject: [PATCH 04/12] cameras
---

View file

@ -1,6 +1,6 @@
From ba20bcf9e7fa8faba1a373d89ecc18b3f9211d5a Mon Sep 17 00:00:00 2001
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
Date: Tue, 10 Sep 2019 21:52:46 +0900
From 1174178edc84d79e1f361bf7917e81d92b0a1f1b Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 28 Sep 2019 17:58:17 +0200
Subject: [PATCH 05/12] ipts
---
@ -6722,7 +6722,7 @@ index 000000000000..9c34b55ff036
+
+#endif // _IPTS_H_
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index cdd7af16d5ee..c1bd39324c98 100644
index f85aa3f4042d..2daace422dce 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -119,6 +119,7 @@
@ -6734,7 +6734,7 @@ index cdd7af16d5ee..c1bd39324c98 100644
#define MEI_DEV_ID_SPT_H_2 0xA13B /* Sunrise Point H 2 */
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index e41f9e0a3fdf..e61be367d7e4 100644
index 28cdd87851cb..c13ba550435c 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -86,6 +86,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {

View file

@ -1,6 +1,6 @@
From b0bbf860d2a601d8c565858b5f3524c94627ab25 Mon Sep 17 00:00:00 2001
From 5ebbd99f31ba145796039bfeaf672d219aeeaf85 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:42:50 +0200
Date: Sat, 28 Sep 2019 17:58:43 +0200
Subject: [PATCH 06/12] hid
---

View file

@ -1,6 +1,6 @@
From 88a3bb4523f4681fd995f6c179e298317d57666f Mon Sep 17 00:00:00 2001
From 7c09061a90a28a9fe2df8e5dc3b9fa8390b40548 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:43:03 +0200
Date: Sat, 28 Sep 2019 17:59:13 +0200
Subject: [PATCH 07/12] sdcard-reader
---

View file

@ -1,6 +1,6 @@
From 91d5d2387c622beda4a808d030d26088f2561715 Mon Sep 17 00:00:00 2001
From 428a110a8e7d8ca6dbf4d916ea4f861747c8f285 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:43:14 +0200
Date: Sat, 28 Sep 2019 18:00:19 +0200
Subject: [PATCH 08/12] wifi
---

View file

@ -1,6 +1,6 @@
From 735dba4a5b07638b17ba1ac139e7028bac29cf1d Mon Sep 17 00:00:00 2001
From 85edee56032573eafc1f58fe612e629b8df694b3 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:43:27 +0200
Date: Sat, 28 Sep 2019 18:00:43 +0200
Subject: [PATCH 09/12] surface3-power
---
@ -11,10 +11,10 @@ Subject: [PATCH 09/12] surface3-power
create mode 100644 drivers/platform/x86/surface3_power.c
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 9a47363a0c30..d6695d8fc795 100644
index ea17f993320e..7cee1015981d 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1257,6 +1257,13 @@ config SURFACE_3_BUTTON
@@ -1160,6 +1160,13 @@ config SURFACE_3_BUTTON
---help---
This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet.
@ -29,10 +29,10 @@ index 9a47363a0c30..d6695d8fc795 100644
tristate "Intel P-Unit IPC Driver"
---help---
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 2250a32a5527..dd045ccf3a90 100644
index ddc2fbfaf110..cbea9579c1d2 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -82,6 +82,7 @@ obj-$(CONFIG_INTEL_PMC_IPC) += intel_pmc_ipc.o
@@ -81,6 +81,7 @@ obj-$(CONFIG_INTEL_PMC_IPC) += intel_pmc_ipc.o
obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o

View file

@ -1,12 +1,12 @@
From 9545f8525aa758207c974215ee6b635516aeac82 Mon Sep 17 00:00:00 2001
From 34bb8ff418427f44896891eab0d8739335491118 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:43:45 +0200
Date: Sat, 28 Sep 2019 18:01:27 +0200
Subject: [PATCH 10/12] mwlwifi
---
drivers/net/wireless/marvell/Kconfig | 1 +
drivers/net/wireless/marvell/Makefile | 1 +
drivers/net/wireless/marvell/mwlwifi/Kconfig | 22 +
drivers/net/wireless/marvell/mwlwifi/Kconfig | 23 +
drivers/net/wireless/marvell/mwlwifi/Makefile | 19 +
.../wireless/marvell/mwlwifi/Makefile.module | 28 +
.../net/wireless/marvell/mwlwifi/README.md | 142 +
@ -35,7 +35,7 @@ Subject: [PATCH 10/12] mwlwifi
...-workaround-for-80+80-and-160-MHz-channels | 32 +
.../wireless/marvell/mwlwifi/hostapd/README | 26 +
.../net/wireless/marvell/mwlwifi/mac80211.c | 933 ++++
.../net/wireless/marvell/mwlwifi/mu_mimo.c | 20 +
.../net/wireless/marvell/mwlwifi/mu_mimo.c | 21 +
.../net/wireless/marvell/mwlwifi/mu_mimo.h | 23 +
.../net/wireless/marvell/mwlwifi/sysadpt.h | 86 +
.../net/wireless/marvell/mwlwifi/thermal.c | 182 +
@ -44,7 +44,7 @@ Subject: [PATCH 10/12] mwlwifi
drivers/net/wireless/marvell/mwlwifi/utils.h | 158 +
.../net/wireless/marvell/mwlwifi/vendor_cmd.c | 136 +
.../net/wireless/marvell/mwlwifi/vendor_cmd.h | 60 +
40 files changed, 19415 insertions(+)
40 files changed, 19417 insertions(+)
create mode 100644 drivers/net/wireless/marvell/mwlwifi/Kconfig
create mode 100644 drivers/net/wireless/marvell/mwlwifi/Makefile
create mode 100644 drivers/net/wireless/marvell/mwlwifi/Makefile.module
@ -109,10 +109,10 @@ index 1b0a7d2bc8e6..04dff3388a41 100644
obj-$(CONFIG_MWL8K) += mwl8k.o
diff --git a/drivers/net/wireless/marvell/mwlwifi/Kconfig b/drivers/net/wireless/marvell/mwlwifi/Kconfig
new file mode 100644
index 000000000000..8832217430f5
index 000000000000..a9bcb9cd4100
--- /dev/null
+++ b/drivers/net/wireless/marvell/mwlwifi/Kconfig
@@ -0,0 +1,22 @@
@@ -0,0 +1,23 @@
+config MWLWIFI
+ tristate "Marvell Avastar 88W8864/88W8897 PCIe driver (mac80211 compatible)"
+ depends on PCI && MAC80211
@ -135,6 +135,7 @@ index 000000000000..8832217430f5
+ select either MWIFIEX or MWLWIFI, not both. MWIFIEX is fullmac,
+ supporting more comprehensive client functions for laptops/embedded
+ devices. MWLWIFI is mac80211-based for full AP/Wireless Bridge.
+
diff --git a/drivers/net/wireless/marvell/mwlwifi/Makefile b/drivers/net/wireless/marvell/mwlwifi/Makefile
new file mode 100644
index 000000000000..061833703c7f
@ -196,7 +197,7 @@ index 000000000000..d11a1b88cab6
+ find . -name "*.o" -exec rm -f {} \;
diff --git a/drivers/net/wireless/marvell/mwlwifi/README.md b/drivers/net/wireless/marvell/mwlwifi/README.md
new file mode 100644
index 000000000000..530dc33e7f41
index 000000000000..788c5d4dc80d
--- /dev/null
+++ b/drivers/net/wireless/marvell/mwlwifi/README.md
@@ -0,0 +1,142 @@
@ -225,7 +226,7 @@ index 000000000000..530dc33e7f41
+ commit 03a72eacda5d9a1837a74387081596a0d5466ec1
+ Author: Jouni Malinen <jouni@qca.qualcomm.com>
+ Date: Thu Dec 17 18:39:19 2015 +0200
+
+
+ VHT: Add an interoperability workaround for 80+80 and 160 MHz channels
+
+ Number of deployed 80 MHz capable VHT stations that do not support 80+80
@ -256,10 +257,10 @@ index 000000000000..530dc33e7f41
+
+ #Disable 5g band
+ marvell,5ghz = <0>;
+
+
+ #Specify antenna number, default is 4x4. For WRT1200AC, you must set these values to 2x2.
+ marvell,chainmask = <4 4>;
+
+
+ #Specify external power table. If your device needs external power table, you must provide the power table via this parameter, otherwise the Tx power will be pretty low.
+ marvell,powertable
+ ```
@ -268,7 +269,7 @@ index 000000000000..530dc33e7f41
+ ```sh
+ cat /sys/kernel/debug/ieee80211/phy0/mwlwifi/info
+ ```
+
+
+ You should see a line in the results which looks like the following:
+ ```sh
+ power table loaded from dts: no
@ -292,7 +293,7 @@ index 000000000000..530dc33e7f41
+ There are two ways to resolve this problem:
+ * Please don't change country code and let mwlwifi set it for you.
+ * Remove phy2. Under this case, even though you change country code, mwlwifi will reject it. Because phy2 is not existed, country code setting won't be conflicted. To do this, run the following commands (for OpenWrt/LEDE):
+
+
+ ```sh
+ opkg remove kmod-mwifiex-sdio
+ opkg remove mwifiex-sdio-firmware
@ -17404,7 +17405,7 @@ index 000000000000..2ad5f381b9ee
+#endif /* _TX_NDP_H_ */
diff --git a/drivers/net/wireless/marvell/mwlwifi/hostapd/700-interoperability-workaround-for-80+80-and-160-MHz-channels b/drivers/net/wireless/marvell/mwlwifi/hostapd/700-interoperability-workaround-for-80+80-and-160-MHz-channels
new file mode 100644
index 000000000000..c73d02e31977
index 000000000000..adadd2e4d8d4
--- /dev/null
+++ b/drivers/net/wireless/marvell/mwlwifi/hostapd/700-interoperability-workaround-for-80+80-and-160-MHz-channels
@@ -0,0 +1,32 @@
@ -17413,9 +17414,9 @@ index 000000000000..c73d02e31977
+--- a/src/ap/ieee802_11_vht.c
++++ b/src/ap/ieee802_11_vht.c
+@@ -82,6 +82,27 @@ u8 * hostapd_eid_vht_operation(struct hostapd_data *hapd, u8 *eid)
+
+ oper->vht_op_info_chwidth = hapd->iconf->vht_oper_chwidth;
+
+
+ oper->vht_op_info_chwidth = hapd->iconf->vht_oper_chwidth;
+
++ if (hapd->iconf->vht_oper_chwidth == 2) {
++ /*
++ * Convert 160 MHz channel width to new style as interop
@ -17437,16 +17438,16 @@ index 000000000000..c73d02e31977
++ oper->vht_op_info_chwidth = 1;
++ }
++
+ /* VHT Basic MCS set comes from hw */
+ /* Hard code 1 stream, MCS0-7 is a min Basic VHT MCS rates */
+ oper->vht_basic_mcs_set = host_to_le16(0xfffc);
+ /* VHT Basic MCS set comes from hw */
+ /* Hard code 1 stream, MCS0-7 is a min Basic VHT MCS rates */
+ oper->vht_basic_mcs_set = host_to_le16(0xfffc);
diff --git a/drivers/net/wireless/marvell/mwlwifi/hostapd/README b/drivers/net/wireless/marvell/mwlwifi/hostapd/README
new file mode 100644
index 000000000000..312586e8b5a1
index 000000000000..a5fb2b68d3d3
--- /dev/null
+++ b/drivers/net/wireless/marvell/mwlwifi/hostapd/README
@@ -0,0 +1,26 @@
+700-interoperability-workaround-for-80+80-and-160-MHz-channels:
+700-interoperability-workaround-for-80+80-and-160-MHz-channels:
+
+patch for OpenWrt hostapd package 2016-01-15 for following commit
+(move it to package/network/services/hostapd/patches).
@ -18413,10 +18414,10 @@ index 000000000000..725dec0f604b
+};
diff --git a/drivers/net/wireless/marvell/mwlwifi/mu_mimo.c b/drivers/net/wireless/marvell/mwlwifi/mu_mimo.c
new file mode 100644
index 000000000000..23c70df6caa8
index 000000000000..74ab054f947e
--- /dev/null
+++ b/drivers/net/wireless/marvell/mwlwifi/mu_mimo.c
@@ -0,0 +1,20 @@
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2006-2018, Marvell International Ltd.
+ *
@ -18437,6 +18438,7 @@ index 000000000000..23c70df6caa8
+#include "sysadpt.h"
+#include "core.h"
+#include "mu_mimo.h"
+
diff --git a/drivers/net/wireless/marvell/mwlwifi/mu_mimo.h b/drivers/net/wireless/marvell/mwlwifi/mu_mimo.h
new file mode 100644
index 000000000000..24179f404774

View file

@ -1,6 +1,6 @@
From 59199ea3163562e29bc8a5ad2a1c1bf11cc634f9 Mon Sep 17 00:00:00 2001
From 2b33096313db62f3c76924c2d4b3f50f93a6cbf9 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:43:57 +0200
Date: Sat, 28 Sep 2019 18:02:03 +0200
Subject: [PATCH 11/12] surface-lte
---

View file

@ -1,6 +1,6 @@
From 11d49c9f0d336f6575f38228044a209652d1ede1 Mon Sep 17 00:00:00 2001
From 06b632658527c60bd254622fc812d5abd4019315 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:44:10 +0200
Date: Sat, 28 Sep 2019 18:02:33 +0200
Subject: [PATCH 12/12] surfacebook2-dgpu
---
@ -11,7 +11,7 @@ Subject: [PATCH 12/12] surfacebook2-dgpu
create mode 100644 drivers/platform/x86/surfacebook2_dgpu_hps.c
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index d6695d8fc795..16f40109337c 100644
index 7cee1015981d..75665b560a6f 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -436,6 +436,15 @@ config SURFACE3_WMI
@ -31,10 +31,10 @@ index d6695d8fc795..16f40109337c 100644
tristate "ThinkPad ACPI Laptop Extras"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index dd045ccf3a90..6d24ede71496 100644
index cbea9579c1d2..6eb62f822953 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_ACPI_WMI) += wmi.o
@@ -44,6 +44,7 @@ obj-$(CONFIG_ACPI_WMI) += wmi.o
obj-$(CONFIG_MSI_WMI) += msi-wmi.o
obj-$(CONFIG_PEAQ_WMI) += peaq-wmi.o
obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o

View file

@ -1,5 +1,5 @@
From c7543d2458c5282bda2802701324cc77478146d8 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
From 140c70aff419f61a2c2b6cca9fe2c1c5ade3629d Mon Sep 17 00:00:00 2001
From: qzed <qzed@users.noreply.github.com>
Date: Mon, 26 Aug 2019 01:11:08 +0200
Subject: [PATCH 1/9] surface-acpi

View file

@ -1,4 +1,4 @@
From 83d479932acd83ecf45941386615d8518d79f568 Mon Sep 17 00:00:00 2001
From f3c8c1722e729e2b8ef4c1cb261fa21fecf13f5d Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 27 Jul 2019 17:51:37 +0200
Subject: [PATCH 2/9] buttons

View file

@ -1,4 +1,4 @@
From 1f8ca45b0f8650219a98d05f14ccf98c33967ba7 Mon Sep 17 00:00:00 2001
From 887b26209eea40ed443ad7f1989f0e009f8928dd Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 2 Jul 2019 22:17:46 +0200
Subject: [PATCH 3/9] surfacebook2-dgpu

View file

@ -1,5 +1,5 @@
From ea18400e859c6d7656b81e5d33314046743d34a1 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
From 487a63fd1eb7055ae79248e60d9688cb81c0f30c Mon Sep 17 00:00:00 2001
From: qzed <qzed@users.noreply.github.com>
Date: Tue, 17 Sep 2019 17:16:23 +0200
Subject: [PATCH 4/9] hid

View file

@ -1,5 +1,5 @@
From a39f413e5460c0d1fb901872518a33038b9d463c Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
From 4f79244298b003c92cd9590b767769d5b84b1ee1 Mon Sep 17 00:00:00 2001
From: qzed <qzed@users.noreply.github.com>
Date: Tue, 17 Sep 2019 17:17:56 +0200
Subject: [PATCH 5/9] surface3-power

View file

@ -1,5 +1,5 @@
From 83e53749458cab7575105ddbae13f750a4cc09e4 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
From e260eacab655d64cf9c1489dc37f89c410aa58a0 Mon Sep 17 00:00:00 2001
From: qzed <qzed@users.noreply.github.com>
Date: Tue, 17 Sep 2019 17:21:43 +0200
Subject: [PATCH 6/9] surface-lte

View file

@ -1,5 +1,5 @@
From 829c222814c0617dad16d036876f94c725d2d638 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
From 2a01efb959a43a387dab97223bcccfe6be4e582f Mon Sep 17 00:00:00 2001
From: qzed <qzed@users.noreply.github.com>
Date: Wed, 18 Sep 2019 03:18:25 +0200
Subject: [PATCH 7/9] wifi

View file

@ -1,5 +1,5 @@
From 05296f2e99a9f6c9ef6fa47e7c879c73b07c7322 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
From cc0158b2e542fcb3c9f1102227e4b35316c25040 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Mon, 16 Sep 2019 04:10:51 +0200
Subject: [PATCH 8/9] legacy-i915

File diff suppressed because it is too large Load diff