Skip to content

Commit b236edb

Browse files
frank-wfrank-w
committed
Merge tag 'v5.15.172' into 5.15-main
This is the 5.15.172 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmc16YoACgkQONu9yGCS # aT4nDw/7Bn5jbiGB9wky9cj4I2thkfsH6spL8yX9Bm/X0bMXynOuCTQYYcqlDcV2 # TaIZzkrSoIttN0UHic0cIr9wycQl+xjWQXg42bPvXPDO7OoYVdOobe9AuljfCYx8 # NqsshuSrC9G34Q0KaTzLxHmADEVKf1L9dIxhKbbHpLWEY5Nj20ssR+pUcEhWj7Se # eAaxw/g6XKogn8cvlcIIwYzSzliPoX8Odj7qWq1j/Vzly22hKHyCP++e5hX4xDq+ # 7AzzmIsAyYzPIKmxz4g6v24LTwOQAvPPfjctzZ+ruLHPywahn3S7e5Gppv/qpeEl # 5f4toZSEnMUZ+2ymeNLEAIypucJBd+bnUxuvhIKyx8TF64pw1No5NFEezlpRZ7JO # GzM0EkESoCtiZXcYeIUPdf4qeben90cZXi1UjyjJAR21+UMu52YxEz3UPthYFVJE # XDs6BpMGOgEosZn48/KvodPPk39jybmBmBYW48VcS2dm/l/V05O1QA1doNwfnFN2 # rNDttctpaBGccrDxNyD0qOk7nqfHI5GIEVoTuu1sDgdY6sHFkWteAMjV/a8TVdEi # CTH3ss7cAmJqJXOwL4jE6bhuVjtqMwS02NAAqy1XYhqiyUN7dRPWc+Ek9GhV27ZQ # KnZlmOoZuE39yYgzaMQqZeVpnhddiNKy9VP09LPDpbMTKDVBByU= # =SjAE # -----END PGP SIGNATURE----- # gpg: Signature made Thu Nov 14 13:14:02 2024 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents c79c51a + d98fd10 commit b236edb

Some content is hidden

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

72 files changed

+673
-179
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 15
4-
SUBLEVEL = 171
4+
SUBLEVEL = 172
55
EXTRAVERSION =
66
NAME = Trick or Treat
77

‎arch/arm/boot/dts/rk3036-kylin.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@
300300
&i2c2 {
301301
status = "okay";
302302

303-
rt5616: rt5616@1b {
304-
compatible = "rt5616";
303+
rt5616: audio-codec@1b {
304+
compatible = "realtek,rt5616";
305305
reg = <0x1b>;
306306
clocks = <&cru SCLK_I2S_OUT>;
307307
clock-names = "mclk";

‎arch/arm/boot/dts/rk3036.dtsi‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -382,12 +382,13 @@
382382
};
383383
};
384384

385-
acodec: acodec-ana@20030000 {
386-
compatible = "rk3036-codec";
385+
acodec: audio-codec@20030000 {
386+
compatible = "rockchip,rk3036-codec";
387387
reg = <0x20030000 0x4000>;
388-
rockchip,grf = <&grf>;
389388
clock-names = "acodec_pclk";
390389
clocks = <&cru PCLK_ACODEC>;
390+
rockchip,grf = <&grf>;
391+
#sound-dai-cells = <0>;
391392
status = "disabled";
392393
};
393394

@@ -397,7 +398,6 @@
397398
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
398399
clocks = <&cru PCLK_HDMI>;
399400
clock-names = "pclk";
400-
rockchip,grf = <&grf>;
401401
pinctrl-names = "default";
402402
pinctrl-0 = <&hdmi_ctl>;
403403
status = "disabled";
@@ -550,11 +550,11 @@
550550
};
551551

552552
spi: spi@20074000 {
553-
compatible = "rockchip,rockchip-spi";
553+
compatible = "rockchip,rk3036-spi";
554554
reg = <0x20074000 0x1000>;
555555
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
556-
clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;
557-
clock-names = "apb-pclk","spi_pclk";
556+
clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;
557+
clock-names = "spiclk", "apb_pclk";
558558
dmas = <&pdma 8>, <&pdma 9>;
559559
dma-names = "tx", "rx";
560560
pinctrl-names = "default";

‎arch/arm64/boot/dts/freescale/imx8mp.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@
740740
compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc";
741741
reg = <0x30b40000 0x10000>;
742742
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
743-
clocks = <&clk IMX8MP_CLK_DUMMY>,
743+
clocks = <&clk IMX8MP_CLK_IPG_ROOT>,
744744
<&clk IMX8MP_CLK_NAND_USDHC_BUS>,
745745
<&clk IMX8MP_CLK_USDHC1_ROOT>;
746746
clock-names = "ipg", "ahb", "per";
@@ -754,7 +754,7 @@
754754
compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc";
755755
reg = <0x30b50000 0x10000>;
756756
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
757-
clocks = <&clk IMX8MP_CLK_DUMMY>,
757+
clocks = <&clk IMX8MP_CLK_IPG_ROOT>,
758758
<&clk IMX8MP_CLK_NAND_USDHC_BUS>,
759759
<&clk IMX8MP_CLK_USDHC2_ROOT>;
760760
clock-names = "ipg", "ahb", "per";
@@ -768,7 +768,7 @@
768768
compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc";
769769
reg = <0x30b60000 0x10000>;
770770
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
771-
clocks = <&clk IMX8MP_CLK_DUMMY>,
771+
clocks = <&clk IMX8MP_CLK_IPG_ROOT>,
772772
<&clk IMX8MP_CLK_NAND_USDHC_BUS>,
773773
<&clk IMX8MP_CLK_USDHC3_ROOT>;
774774
clock-names = "ipg", "ahb", "per";

‎arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636

3737
power_led: led-0 {
3838
label = "firefly:red:power";
39-
linux,default-trigger = "ir-power-click";
39+
linux,default-trigger = "default-on";
4040
default-state = "on";
4141
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
4242
};
4343

4444
user_led: led-1 {
4545
label = "firefly:blue:user";
46-
linux,default-trigger = "ir-user-click";
46+
linux,default-trigger = "rc-feedback";
4747
default-state = "off";
4848
gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;
4949
};

‎arch/arm64/boot/dts/rockchip/rk3328.dtsi‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,8 +711,7 @@
711711
compatible = "rockchip,rk3328-dw-hdmi";
712712
reg = <0x0 0xff3c0000 0x0 0x20000>;
713713
reg-io-width = <4>;
714-
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,
715-
<GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
714+
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
716715
clocks = <&cru PCLK_HDMI>,
717716
<&cru SCLK_HDMI_SFC>,
718717
<&cru SCLK_RTC32K>;

‎arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
fan: fan@18 {
6161
compatible = "ti,amc6821";
6262
reg = <0x18>;
63-
#cooling-cells = <2>;
6463
};
6564

6665
rtc_twi: rtc@6f {

‎arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@
574574
bluetooth {
575575
compatible = "brcm,bcm43438-bt";
576576
clocks = <&rk808 1>;
577-
clock-names = "ext_clock";
577+
clock-names = "txco";
578578
device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
579579
host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
580580
shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;

‎arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
status = "okay";
164164

165165
rt5651: rt5651@1a {
166-
compatible = "rockchip,rt5651";
166+
compatible = "realtek,rt5651";
167167
reg = <0x1a>;
168168
clocks = <&cru SCLK_I2S_8CH_OUT>;
169169
clock-names = "mclk";

‎drivers/acpi/prmt.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct prm_context_buffer {
5252
static LIST_HEAD(prm_module_list);
5353

5454
struct prm_handler_info {
55-
guid_t guid;
55+
efi_guid_t guid;
5656
void *handler_addr;
5757
u64 static_data_buffer_addr;
5858
u64 acpi_param_buffer_addr;

0 commit comments

Comments
 (0)