Skip to content
Snippets Groups Projects
Unverified Commit 0e2ce959 authored by Clayton Craft's avatar Clayton Craft :speech_balloon:
Browse files

linux-valve-jupiter: upgrade to 6.11 (MR 5557)

- rebased carried patches
- kconfig migrated
- enabled RTL8152/8153 USB ethernet driver

[ci:skip-build]: already built successfully in CI
parent f125fbc4
No related branches found
No related tags found
No related merge requests found
Pipeline #206124 passed
Showing
with 67 additions and 67 deletions
From e2c59e7b301efa7a5473d28d5f840dcf53fb431d Mon Sep 17 00:00:00 2001
From 6139820b0cdd0e5e470d7028c5c30a8e00d51ee9 Mon Sep 17 00:00:00 2001
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Date: Fri, 4 Mar 2022 21:20:39 +0000
Subject: [PATCH 01/21] ACPICA: Limit error message flood caused by firmware
......@@ -113,5 +113,5 @@ index 918aca7c4db4..4a482de2e55d 100644
acpi_os_printf(ACPI_MSG_ERROR);
--
2.45.2
2.46.0
From 174c99bdf20a4a9455bbbe22ac9e1aeaca714b4b Mon Sep 17 00:00:00 2001
From 14d9c8a1d8f4efaa02b3679d6ea550e40bf5fb68 Mon Sep 17 00:00:00 2001
From: "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
Date: Tue, 14 Jun 2022 14:31:18 -0700
Subject: [PATCH 02/21] drivers: video: backlight: Disable backlight
......@@ -37,5 +37,5 @@ index a82934694d05..b9daf4469143 100644
}
--
2.45.2
2.46.0
From 7b4f303d707bf291c2dab32642786f58483f3f90 Mon Sep 17 00:00:00 2001
From 1de0de2a4bf099b59c402061d2554d0af215ed5a Mon Sep 17 00:00:00 2001
From: Shreeya Patel <shreeya.patel@collabora.com>
Date: Mon, 17 Jul 2023 14:02:21 +0530
Subject: [PATCH 03/21] iio: light: ltrf216a: Return floating point values
......@@ -77,5 +77,5 @@ index 68dc48420a88..d2914252b99f 100644
case IIO_CHAN_INFO_INT_TIME:
mutex_lock(&data->lock);
--
2.45.2
2.46.0
From a223b29f825f39e60d4b00b9442c159516ade9df Mon Sep 17 00:00:00 2001
From 350fcf62fa8d05a12b2de15cb05ba30f3b1a3aec Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 19 Feb 2022 16:08:36 -0800
Subject: [PATCH 04/21] mfd: Add MFD core driver for Steam Deck
......@@ -17,10 +17,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
create mode 100644 drivers/mfd/steamdeck.c
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 266b4f54af60..ed732715aef5 100644
index bc8be2e593b6..f450294fbd25 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -2334,5 +2334,16 @@ config MFD_RSMU_SPI
@@ -2390,5 +2390,16 @@ config MFD_RSMU_SPI
Additional drivers must be enabled in order to use the functionality
of the device.
......@@ -38,13 +38,13 @@ index 266b4f54af60..ed732715aef5 100644
endmenu
endif
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index c66f07edcd0e..2bbdf4127232 100644
index 02b651cd7535..71d992afbadd 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -284,3 +284,5 @@ rsmu-i2c-objs := rsmu_core.o rsmu_i2c.o
rsmu-spi-objs := rsmu_core.o rsmu_spi.o
obj-$(CONFIG_MFD_RSMU_I2C) += rsmu-i2c.o
obj-$(CONFIG_MFD_RSMU_SPI) += rsmu-spi.o
@@ -288,3 +288,5 @@ obj-$(CONFIG_MFD_ATC260X_I2C) += atc260x-i2c.o
obj-$(CONFIG_MFD_RSMU_I2C) += rsmu_i2c.o rsmu_core.o
obj-$(CONFIG_MFD_RSMU_SPI) += rsmu_spi.o rsmu_core.o
+
+obj-$(CONFIG_MFD_STEAMDECK) += steamdeck.o
diff --git a/drivers/mfd/steamdeck.c b/drivers/mfd/steamdeck.c
......@@ -181,5 +181,5 @@ index 000000000000..0e504b3c2796
+MODULE_DESCRIPTION("Steam Deck EC MFD core driver");
+MODULE_LICENSE("GPL");
--
2.45.2
2.46.0
From 8a02361d90820e1dcbf26e48fa69e6155feaa61d Mon Sep 17 00:00:00 2001
From ee049588a04618fe813dc8b7a9206654b7025887 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 19 Feb 2022 16:09:45 -0800
Subject: [PATCH 05/21] hwmon: Add driver for Steam Deck's EC sensors
......@@ -15,10 +15,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
create mode 100644 drivers/hwmon/steamdeck-hwmon.c
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e14ae18a973b..595708f955b6 100644
index b60fe2e58ad6..9768782bc32a 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -2059,6 +2059,17 @@ config SENSORS_SCH5636
@@ -2046,6 +2046,17 @@ config SENSORS_SCH5636
This driver can also be built as a module. If so, the module
will be called sch5636.
......@@ -37,13 +37,13 @@ index e14ae18a973b..595708f955b6 100644
tristate "ST Microelectronics STTS751"
depends on I2C
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index e3f25475d1f0..c6eaee13917d 100644
index b1c7056c37db..d6bb7810426d 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -207,6 +207,7 @@ obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o
@@ -207,6 +207,7 @@ obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o
obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o
obj-$(CONFIG_SENSORS_SPD5118) += spd5118.o
+obj-$(CONFIG_SENSORS_STEAMDECK) += steamdeck-hwmon.o
obj-$(CONFIG_SENSORS_STTS751) += stts751.o
obj-$(CONFIG_SENSORS_SURFACE_FAN)+= surface_fan.o
......@@ -279,5 +279,5 @@ index 000000000000..fab9e9460bd4
+MODULE_DESCRIPTION("Steam Deck EC sensors driver");
+MODULE_LICENSE("GPL");
--
2.45.2
2.46.0
From c6e8734dc50591a2c69cbbc01cac419e96ce167a Mon Sep 17 00:00:00 2001
From ff23eb079421458288bf01309df40110550d4eee Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 27 Feb 2022 12:58:05 -0800
Subject: [PATCH 06/21] leds: steamdeck: Add support for Steam Deck LED
......@@ -13,10 +13,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
create mode 100644 drivers/leds/leds-steamdeck.c
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 05e6af88b88c..f1967a88ebeb 100644
index 8d9d8da376e4..cac021837b5b 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -927,6 +927,13 @@ config LEDS_ACER_A500
@@ -951,6 +951,13 @@ config LEDS_ACER_A500
This option enables support for the Power Button LED of
Acer Iconia Tab A500.
......@@ -31,10 +31,10 @@ index 05e6af88b88c..f1967a88ebeb 100644
comment "Flash and Torch LED drivers"
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index effdfc6f1e95..f2929021afeb 100644
index 18afbb5a23ee..b0ff19d14419 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -79,6 +79,7 @@ obj-$(CONFIG_LEDS_POWERNV) += leds-powernv.o
@@ -81,6 +81,7 @@ obj-$(CONFIG_LEDS_POWERNV) += leds-powernv.o
obj-$(CONFIG_LEDS_PWM) += leds-pwm.o
obj-$(CONFIG_LEDS_REGULATOR) += leds-regulator.o
obj-$(CONFIG_LEDS_SC27XX_BLTC) += leds-sc27xx-bltc.o
......@@ -123,5 +123,5 @@ index 000000000000..686500b8de73
+MODULE_DESCRIPTION("Steam Deck LEDs driver");
+MODULE_LICENSE("GPL");
--
2.45.2
2.46.0
From dc7c80a83c9aa6dd7792390462015bd499fd4046 Mon Sep 17 00:00:00 2001
From fbeb4255d216bebd4335dcecf26af6ba1eb4d1df Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 27 Feb 2022 14:46:08 -0800
Subject: [PATCH 07/21] extcon: Add driver for Steam Deck
......@@ -225,5 +225,5 @@ index 000000000000..74f190adc8ea
+MODULE_DESCRIPTION("Steam Deck extcon driver");
+MODULE_LICENSE("GPL");
--
2.45.2
2.46.0
From 4379f5bd26d8068d5dcbddfefc566c655dbe4080 Mon Sep 17 00:00:00 2001
From 58b1dec083ca510d0c71059a586ae2c53ff82592 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 15 Jul 2023 12:58:54 -0700
Subject: [PATCH 08/21] hwmon: steamdeck-hwmon: Add support for max battery
......@@ -104,5 +104,5 @@ index fab9e9460bd4..9d0a5471b181 100644
dev_err(dev, "Failed to register HWMON device");
return PTR_ERR(hwmon);
--
2.45.2
2.46.0
From 1d2bc1067b347a27063cd7b31033c7f93190c2d9 Mon Sep 17 00:00:00 2001
From e129992ce5b743fbcb655a61b241f014f01e6dfe Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 24 Sep 2023 15:02:33 -0700
Subject: [PATCH 09/21] mfd: steamdeck: Expose controller board power in sysfs
......@@ -49,5 +49,5 @@ index 0e504b3c2796..a60fa7db9141 100644
};
--
2.45.2
2.46.0
From dc949530e194827349e2be3c8371febb6c1ff3cf Mon Sep 17 00:00:00 2001
From c40796fc3ecbd30ec9c13a2e491a665b692c83ac Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 00:25:26 -0800
Subject: [PATCH 10/21] x86: implement tsc=directsync for systems without
......@@ -15,10 +15,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
4 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 11e57ba2985c..127021ae9d71 100644
index 09126bb8cc9f..f2ab4bb2791e 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6868,6 +6868,8 @@
@@ -6863,6 +6863,8 @@
This will be suppressed by an earlier tsc=nowatchdog and
can be overridden by a later tsc=nowatchdog. A console
message will flag any such suppression or overriding.
......@@ -28,10 +28,10 @@ index 11e57ba2985c..127021ae9d71 100644
tsc_early_khz= [X86,EARLY] Skip early TSC calibration and use the given
value instead. Useful when the early TSC frequency discovery
diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index 405efb3e4996..eda44749b34c 100644
index 94408a784c8e..530fb2200106 100644
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -42,6 +42,7 @@ extern unsigned long native_calibrate_tsc(void);
@@ -39,6 +39,7 @@ extern unsigned long native_calibrate_tsc(void);
extern unsigned long long native_sched_clock_from_tsc(u64 tsc);
extern int tsc_clocksource_reliable;
......@@ -40,7 +40,7 @@ index 405efb3e4996..eda44749b34c 100644
extern bool tsc_async_resets;
#else
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 06b170759e5b..a306acecff7c 100644
index d4462fb26299..a70616cf0869 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -47,6 +47,7 @@ static unsigned int __initdata tsc_early_khz;
......@@ -159,5 +159,5 @@ index 4334033658ed..3cc241632221 100644
}
--
2.45.2
2.46.0
From 08e7b49bf9d40545fb519a79b4aa41d97e8cca7c Mon Sep 17 00:00:00 2001
From 566127db62f7c5a344b927a766de4e37174f795e Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 11:55:18 -0800
Subject: [PATCH 11/21] x86: touch clocksource watchdog after syncing TSCs
......@@ -40,5 +40,5 @@ index 0c35207320cb..eb8793b04cd1 100644
nmi_selftest();
impress_friends();
--
2.45.2
2.46.0
From b3779261314ec31b9c2ac96d58820cf3ab7f3cdc Mon Sep 17 00:00:00 2001
From 28afac2af617e11e03150141f8deda6dbabfe4ae Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 00:26:20 -0800
Subject: [PATCH 12/21] x86: save/restore TSC counter value during sleep/wake
......@@ -78,5 +78,5 @@ index 02d0ba16ae33..0154ef895960 100644
#ifndef CONFIG_64BIT
--
2.45.2
2.46.0
From e85f58709b6c4d56d7564a2146c233fe896a8c80 Mon Sep 17 00:00:00 2001
From 768c89703cb4ab128c76179242ff58c2ba84349b Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 11:58:46 -0800
Subject: [PATCH 13/21] x86: only restore TSC if we have IA32_TSC_ADJUST or
......@@ -35,5 +35,5 @@ index 07b7f6e578e8..48a7a0341b81 100644
header->real_magic = 0x12345678;
--
2.45.2
2.46.0
From fcbe33fd9bd71650c224769d06e7578871d53882 Mon Sep 17 00:00:00 2001
From 9361949639e0b6a17c71fa4fb03e871018be34a1 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 19:42:32 -0800
Subject: [PATCH 14/21] x86: don't check for random warps if using direct sync
......@@ -27,5 +27,5 @@ index 3cc241632221..ad224f7c0d5b 100644
atomic_set(&test_runs, 0);
--
2.45.2
2.46.0
From 17dfc9c33d6297609d3f30f010957cb161de4596 Mon Sep 17 00:00:00 2001
From 7b1d9786a1a132cc70181d3bf3b4cdea19d7927d Mon Sep 17 00:00:00 2001
From: Muhammad Usama Anjum <usama.anjum@collabora.com>
Date: Tue, 6 Jun 2023 16:12:06 +0500
Subject: [PATCH 15/21] x86: revert extra time added to check for tsc wraps
......@@ -29,5 +29,5 @@ index ad224f7c0d5b..48b033a588c3 100644
}
--
2.45.2
2.46.0
From d080f4a5bb1339e1648ae14db91874611ed9e827 Mon Sep 17 00:00:00 2001
From 5e62cc08b8a555d6090a6e1fd00e0bee5e74da57 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Fri, 2 Sep 2022 19:13:12 +0300
Subject: [PATCH 16/21] usb: dwc3: Hardcode jupiter ACPI device as extcon name
......@@ -17,10 +17,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 9ef821ca2fc7..60be038a5997 100644
index 052852f80146..fee1c911d308 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -179,6 +179,7 @@ static const struct property_entry dwc3_pci_mr_properties[] = {
@@ -183,6 +183,7 @@ static const struct property_entry dwc3_pci_mr_properties[] = {
PROPERTY_ENTRY_BOOL("usb-role-switch"),
PROPERTY_ENTRY_STRING("role-switch-default-mode", "host"),
PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
......@@ -29,5 +29,5 @@ index 9ef821ca2fc7..60be038a5997 100644
};
--
2.45.2
2.46.0
From a930dedf1dc4aad10286e9cfc25d7266903d9981 Mon Sep 17 00:00:00 2001
From 4142d218879226afa7dffc82521f25fe698245c7 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Tue, 18 Jan 2022 08:44:34 -0800
Subject: [PATCH 17/21] usb: dwc3: Bump USB gadget wakeup timeout
......@@ -26,5 +26,5 @@ index 89fc690fdf34..d68bc1650afb 100644
while (retries--) {
reg = dwc3_readl(dwc->regs, DWC3_DSTS);
--
2.45.2
2.46.0
From 6cb407a237815697eef2f5184041dffe24ecc101 Mon Sep 17 00:00:00 2001
From 88ef04b0daf0fecec2a9836360dc4c08fd128db4 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 29 Oct 2022 15:25:21 -0700
Subject: [PATCH 18/21] usb: dwc3: Drop "usb-role-swtich" from
......@@ -20,10 +20,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 2 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 60be038a5997..de33accdc1ce 100644
index fee1c911d308..ac6827f4ef89 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -176,8 +176,6 @@ static const struct property_entry dwc3_pci_amd_properties[] = {
@@ -180,8 +180,6 @@ static const struct property_entry dwc3_pci_amd_properties[] = {
static const struct property_entry dwc3_pci_mr_properties[] = {
PROPERTY_ENTRY_STRING("dr_mode", "otg"),
......@@ -33,5 +33,5 @@ index 60be038a5997..de33accdc1ce 100644
PROPERTY_ENTRY_STRING("linux,extcon-name", "VLV0100:00"),
{}
--
2.45.2
2.46.0
From c9c01ca1d180dcd7bb04ec0881656b72f1b5ff30 Mon Sep 17 00:00:00 2001
From 02d6a2be69db32e90e004abb7d163eb7c77c0e5e Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 27 Feb 2022 16:34:23 -0800
Subject: [PATCH 19/21] usb: dwc3: Fix "linux,extcon-name"
......@@ -10,10 +10,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index de33accdc1ce..24c54211284c 100644
index ac6827f4ef89..23d0c29380a7 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -177,7 +177,7 @@ static const struct property_entry dwc3_pci_amd_properties[] = {
@@ -181,7 +181,7 @@ static const struct property_entry dwc3_pci_amd_properties[] = {
static const struct property_entry dwc3_pci_mr_properties[] = {
PROPERTY_ENTRY_STRING("dr_mode", "otg"),
PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
......@@ -23,5 +23,5 @@ index de33accdc1ce..24c54211284c 100644
};
--
2.45.2
2.46.0
From 3a704bbb7fdfc42b55b61d5fa68e2da32c29793d Mon Sep 17 00:00:00 2001
From a10155ebfafa0da658fe37b5f61f3df14aa77667 Mon Sep 17 00:00:00 2001
From: Gabriel Krisman Bertazi <krisman@collabora.com>
Date: Wed, 5 May 2021 22:12:17 -0400
Subject: [PATCH 20/21] pinctrl-amd: Add quirk to timeout irq pin
......@@ -66,5 +66,5 @@ index 7f66ec73199a..5763c37e5204 100644
}
--
2.45.2
2.46.0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment