Skip to content

Commit 382ab4d

Browse files
popcornmixpopcornmix
committed
Merge remote-tracking branch 'stable/linux-6.12.y' into rpi-6.12.y
2 parents 77fc3d0 + df3f6d1 commit 382ab4d

File tree

765 files changed

+8219
-3615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

765 files changed

+8219
-3615
lines changed

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6261,6 +6261,8 @@
62616261

62626262
Selecting 'on' will also enable the mitigation
62636263
against user space to user space task attacks.
6264+
Selecting specific mitigation does not force enable
6265+
user mitigations.
62646266

62656267
Selecting 'off' will disable both the kernel and
62666268
the user space protections.

‎Documentation/driver-api/serial/driver.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ Some helpers are provided in order to set/get modem control lines via GPIO.
103103
.. kernel-doc:: drivers/tty/serial/serial_mctrl_gpio.c
104104
:identifiers: mctrl_gpio_init mctrl_gpio_free mctrl_gpio_to_gpiod
105105
mctrl_gpio_set mctrl_gpio_get mctrl_gpio_enable_ms
106-
mctrl_gpio_disable_ms
106+
mctrl_gpio_disable_ms_sync mctrl_gpio_disable_ms_no_sync

‎Documentation/hwmon/dell-smm-hwmon.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ Temperature sensors and fans can be queried and set via the standard
3232
=============================== ======= =======================================
3333
Name Perm Description
3434
=============================== ======= =======================================
35-
fan[1-3]_input RO Fan speed in RPM.
36-
fan[1-3]_label RO Fan label.
37-
fan[1-3]_min RO Minimal Fan speed in RPM
38-
fan[1-3]_max RO Maximal Fan speed in RPM
39-
fan[1-3]_target RO Expected Fan speed in RPM
40-
pwm[1-3] RW Control the fan PWM duty-cycle.
35+
fan[1-4]_input RO Fan speed in RPM.
36+
fan[1-4]_label RO Fan label.
37+
fan[1-4]_min RO Minimal Fan speed in RPM
38+
fan[1-4]_max RO Maximal Fan speed in RPM
39+
fan[1-4]_target RO Expected Fan speed in RPM
40+
pwm[1-4] RW Control the fan PWM duty-cycle.
4141
pwm1_enable WO Enable or disable automatic BIOS fan
4242
control (not supported on all laptops,
4343
see below for details).
@@ -93,7 +93,7 @@ Again, when you find new codes, we'd be happy to have your patches!
9393
---------------------------
9494

9595
The driver also exports the fans as thermal cooling devices with
96-
``type`` set to ``dell-smm-fan[1-3]``. This allows for easy fan control
96+
``type`` set to ``dell-smm-fan[1-4]``. This allows for easy fan control
9797
using one of the thermal governors.
9898

9999
Module parameters

‎Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 12
4-
SUBLEVEL = 30
4+
SUBLEVEL = 31
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

@@ -997,10 +997,6 @@ NOSTDINC_FLAGS += -nostdinc
997997
# perform bounds checking.
998998
KBUILD_CFLAGS += $(call cc-option, -fstrict-flex-arrays=3)
999999

1000-
#Currently, disable -Wstringop-overflow for GCC 11, globally.
1001-
KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-option, -Wno-stringop-overflow)
1002-
KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow)
1003-
10041000
# disable invalid "can't wrap" optimizations for signed / pointers
10051001
KBUILD_CFLAGS += -fno-strict-overflow
10061002

‎arch/arm/boot/dts/nvidia/tegra114.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
reg = <0x54400000 0x00040000>;
140140
clocks = <&tegra_car TEGRA114_CLK_DSIB>,
141141
<&tegra_car TEGRA114_CLK_DSIBLP>,
142-
<&tegra_car TEGRA114_CLK_PLL_D2_OUT0>;
142+
<&tegra_car TEGRA114_CLK_PLL_D_OUT0>;
143143
clock-names = "dsi", "lp", "parent";
144144
resets = <&tegra_car 82>;
145145
reset-names = "dsi";

‎arch/arm/mach-at91/pm.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -545,11 +545,12 @@ extern u32 at91_pm_suspend_in_sram_sz;
545545

546546
static int at91_suspend_finish(unsigned long val)
547547
{
548-
unsigned char modified_gray_code[] = {
549-
0x00, 0x01, 0x02, 0x03, 0x06, 0x07, 0x04, 0x05, 0x0c, 0x0d,
550-
0x0e, 0x0f, 0x0a, 0x0b, 0x08, 0x09, 0x18, 0x19, 0x1a, 0x1b,
551-
0x1e, 0x1f, 0x1c, 0x1d, 0x14, 0x15, 0x16, 0x17, 0x12, 0x13,
552-
0x10, 0x11,
548+
/* SYNOPSYS workaround to fix a bug in the calibration logic */
549+
unsigned char modified_fix_code[] = {
550+
0x00, 0x01, 0x01, 0x06, 0x07, 0x0c, 0x06, 0x07, 0x0b, 0x18,
551+
0x0a, 0x0b, 0x0c, 0x0d, 0x0d, 0x0a, 0x13, 0x13, 0x12, 0x13,
552+
0x14, 0x15, 0x15, 0x12, 0x18, 0x19, 0x19, 0x1e, 0x1f, 0x14,
553+
0x1e, 0x1f,
553554
};
554555
unsigned int tmp, index;
555556
int i;
@@ -560,25 +561,25 @@ static int at91_suspend_finish(unsigned long val)
560561
* restore the ZQ0SR0 with the value saved here. But the
561562
* calibration is buggy and restoring some values from ZQ0SR0
562563
* is forbidden and risky thus we need to provide processed
563-
* values for these (modified gray code values).
564+
* values for these.
564565
*/
565566
tmp = readl(soc_pm.data.ramc_phy + DDR3PHY_ZQ0SR0);
566567

567568
/* Store pull-down output impedance select. */
568569
index = (tmp >> DDR3PHY_ZQ0SR0_PDO_OFF) & 0x1f;
569-
soc_pm.bu->ddr_phy_calibration[0] = modified_gray_code[index];
570+
soc_pm.bu->ddr_phy_calibration[0] = modified_fix_code[index] << DDR3PHY_ZQ0SR0_PDO_OFF;
570571

571572
/* Store pull-up output impedance select. */
572573
index = (tmp >> DDR3PHY_ZQ0SR0_PUO_OFF) & 0x1f;
573-
soc_pm.bu->ddr_phy_calibration[0] |= modified_gray_code[index];
574+
soc_pm.bu->ddr_phy_calibration[0] |= modified_fix_code[index] << DDR3PHY_ZQ0SR0_PUO_OFF;
574575

575576
/* Store pull-down on-die termination impedance select. */
576577
index = (tmp >> DDR3PHY_ZQ0SR0_PDODT_OFF) & 0x1f;
577-
soc_pm.bu->ddr_phy_calibration[0] |= modified_gray_code[index];
578+
soc_pm.bu->ddr_phy_calibration[0] |= modified_fix_code[index] << DDR3PHY_ZQ0SR0_PDODT_OFF;
578579

579580
/* Store pull-up on-die termination impedance select. */
580581
index = (tmp >> DDR3PHY_ZQ0SRO_PUODT_OFF) & 0x1f;
581-
soc_pm.bu->ddr_phy_calibration[0] |= modified_gray_code[index];
582+
soc_pm.bu->ddr_phy_calibration[0] |= modified_fix_code[index] << DDR3PHY_ZQ0SRO_PUODT_OFF;
582583

583584
/*
584585
* The 1st 8 words of memory might get corrupted in the process

‎arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -151,28 +151,12 @@
151151
vcc-pg-supply = <&reg_aldo1>;
152152
};
153153

154-
&r_ir {
155-
linux,rc-map-name = "rc-beelink-gs1";
156-
status = "okay";
157-
};
158-
159-
&r_pio {
160-
/*
161-
* FIXME: We can't add that supply for now since it would
162-
* create a circular dependency between pinctrl, the regulator
163-
* and the RSB Bus.
164-
*
165-
* vcc-pl-supply = <&reg_aldo1>;
166-
*/
167-
vcc-pm-supply = <&reg_aldo1>;
168-
};
169-
170-
&r_rsb {
154+
&r_i2c {
171155
status = "okay";
172156

173-
axp805: pmic@745 {
157+
axp805: pmic@36 {
174158
compatible = "x-powers,axp805", "x-powers,axp806";
175-
reg = <0x745>;
159+
reg = <0x36>;
176160
interrupt-parent = <&r_intc>;
177161
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
178162
interrupt-controller;
@@ -290,6 +274,22 @@
290274
};
291275
};
292276

277+
&r_ir {
278+
linux,rc-map-name = "rc-beelink-gs1";
279+
status = "okay";
280+
};
281+
282+
&r_pio {
283+
/*
284+
* PL0 and PL1 are used for PMIC I2C
285+
* don't enable the pl-supply else
286+
* it will fail at boot
287+
*
288+
* vcc-pl-supply = <&reg_aldo1>;
289+
*/
290+
vcc-pm-supply = <&reg_aldo1>;
291+
};
292+
293293
&spdif {
294294
pinctrl-names = "default";
295295
pinctrl-0 = <&spdif_tx_pin>;

‎arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,16 +175,12 @@
175175
vcc-pg-supply = <&reg_vcc_wifi_io>;
176176
};
177177

178-
&r_ir {
179-
status = "okay";
180-
};
181-
182-
&r_rsb {
178+
&r_i2c {
183179
status = "okay";
184180

185-
axp805: pmic@745 {
181+
axp805: pmic@36 {
186182
compatible = "x-powers,axp805", "x-powers,axp806";
187-
reg = <0x745>;
183+
reg = <0x36>;
188184
interrupt-parent = <&r_intc>;
189185
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
190186
interrupt-controller;
@@ -295,6 +291,10 @@
295291
};
296292
};
297293

294+
&r_ir {
295+
status = "okay";
296+
};
297+
298298
&rtc {
299299
clocks = <&ext_osc32k>;
300300
};

‎arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,20 +112,12 @@
112112
vcc-pg-supply = <&reg_aldo1>;
113113
};
114114

115-
&r_ir {
116-
status = "okay";
117-
};
118-
119-
&r_pio {
120-
vcc-pm-supply = <&reg_bldo3>;
121-
};
122-
123-
&r_rsb {
115+
&r_i2c {
124116
status = "okay";
125117

126-
axp805: pmic@745 {
118+
axp805: pmic@36 {
127119
compatible = "x-powers,axp805", "x-powers,axp806";
128-
reg = <0x745>;
120+
reg = <0x36>;
129121
interrupt-parent = <&r_intc>;
130122
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
131123
interrupt-controller;
@@ -240,6 +232,14 @@
240232
};
241233
};
242234

235+
&r_ir {
236+
status = "okay";
237+
};
238+
239+
&r_pio {
240+
vcc-pm-supply = <&reg_bldo3>;
241+
};
242+
243243
&rtc {
244244
clocks = <&ext_osc32k>;
245245
};

‎arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
leds {
2828
compatible = "gpio-leds";
29+
pinctrl-names = "default";
30+
pinctrl-0 = <&spi_quad_pins>;
2931

3032
led-power1 {
3133
label = "udpu:green:power";
@@ -82,8 +84,6 @@
8284

8385
&spi0 {
8486
status = "okay";
85-
pinctrl-names = "default";
86-
pinctrl-0 = <&spi_quad_pins>;
8787

8888
flash@0 {
8989
compatible = "jedec,spi-nor";
@@ -108,6 +108,10 @@
108108
};
109109
};
110110

111+
&spi_quad_pins {
112+
function = "gpio";
113+
};
114+
111115
&pinctrl_nb {
112116
i2c2_recovery_pins: i2c2-recovery-pins {
113117
groups = "i2c2";

0 commit comments

Comments
 (0)