Skip to content

Commit f903dd7

Browse files
frank-wfrank-w
committed
Merge tag 'v6.6.94' into 6.6-main
This is the 6.6.94 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmhUEMcACgkQONu9yGCS # aT75FBAAwHcFDbYcu9KnmDUiHkBpaw0ajUvl4hh8ps1b9XixMYzAoTwGsvVIXQdn # hLB57s0kOtFL8168UwXBdplACvkvXnVN0xif7TtVRUyWea1fHK7r0rQ1I1NPciqD # qzlsBOVoKdZ4yaQRivBDXOIRmzItdNCv04z32GtrQCJHBu6O53pQzuNUuc3izYeE # AgxhtgQWClrA5sAPjcq9T2yCQH0WmS0LeTAIRGzT1X+JHts3iMhZLw2KdfD7p3td # pJMATuwQXH757QRmhe2sTgQXbEbVnHaPsxiTwzOrJJMdueNuUzQkgA4uzT6JvGCw # QdoGJep8fnMsWA4qATHBem5Lu8OTMd/ZP6Lugh6HXxVXlWgdefSFQFnExqjqbNMi # LEVWkyhRy22C5FN/rJltxh+cvlXYlztQaMdEyixQqwKz1tjWIv+3/qkIEt/b+zQx # 9Bt54G48+e+EIYqrv1rCpht/F3v9ScBvqllSMCx1pgPdT6FYhv/Mu0SE3VsuVosT # 0bMbeIyu9McYKCRL+PoKrVL5iXfuC8mXK1E/CILtwux7r7lVlkj5+fO8yyXvhrSd # qjaqePiAIu8XWWc1vy8OW9XqGeVqwxyxz4YJCI8jOK1gSPZtWhH0RA/Qo2rXdPFU # iv/W/AIRcyNpK1+0ep6H7UrT4VQ3rTGQN3NV5GJlW+sOiA8+VUI= # =19eQ # -----END PGP SIGNATURE----- # gpg: Signature made Thu Jun 19 15:29:43 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents f1d5330 + 6282921 commit f903dd7

338 files changed

Lines changed: 3244 additions & 1524 deletions

File tree

Some content is hidden

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

‎Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ properties:
5858
fsl,phy-tx-vboost-level-microvolt:
5959
description:
6060
Adjust the boosted transmit launch pk-pk differential amplitude
61-
minimum: 880
62-
maximum: 1120
61+
enum: [844, 1008, 1156]
6362

6463
fsl,phy-comp-dis-tune-percent:
6564
description:

‎Documentation/devicetree/bindings/regulator/mediatek,mt6357-regulator.yaml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ patternProperties:
3333

3434
"^ldo-v(camio18|aud28|aux18|io18|io28|rf12|rf18|cn18|cn28|fe28)$":
3535
type: object
36-
$ref: fixed-regulator.yaml#
36+
$ref: regulator.yaml#
3737
unevaluatedProperties: false
3838
description:
3939
Properties for single fixed LDO regulator.
@@ -112,7 +112,6 @@ examples:
112112
regulator-enable-ramp-delay = <220>;
113113
};
114114
mt6357_vfe28_reg: ldo-vfe28 {
115-
compatible = "regulator-fixed";
116115
regulator-name = "vfe28";
117116
regulator-min-microvolt = <2800000>;
118117
regulator-max-microvolt = <2800000>;
@@ -125,14 +124,12 @@ examples:
125124
regulator-enable-ramp-delay = <110>;
126125
};
127126
mt6357_vrf18_reg: ldo-vrf18 {
128-
compatible = "regulator-fixed";
129127
regulator-name = "vrf18";
130128
regulator-min-microvolt = <1800000>;
131129
regulator-max-microvolt = <1800000>;
132130
regulator-enable-ramp-delay = <110>;
133131
};
134132
mt6357_vrf12_reg: ldo-vrf12 {
135-
compatible = "regulator-fixed";
136133
regulator-name = "vrf12";
137134
regulator-min-microvolt = <1200000>;
138135
regulator-max-microvolt = <1200000>;
@@ -157,14 +154,12 @@ examples:
157154
regulator-enable-ramp-delay = <264>;
158155
};
159156
mt6357_vcn28_reg: ldo-vcn28 {
160-
compatible = "regulator-fixed";
161157
regulator-name = "vcn28";
162158
regulator-min-microvolt = <2800000>;
163159
regulator-max-microvolt = <2800000>;
164160
regulator-enable-ramp-delay = <264>;
165161
};
166162
mt6357_vcn18_reg: ldo-vcn18 {
167-
compatible = "regulator-fixed";
168163
regulator-name = "vcn18";
169164
regulator-min-microvolt = <1800000>;
170165
regulator-max-microvolt = <1800000>;
@@ -183,7 +178,6 @@ examples:
183178
regulator-enable-ramp-delay = <264>;
184179
};
185180
mt6357_vcamio_reg: ldo-vcamio18 {
186-
compatible = "regulator-fixed";
187181
regulator-name = "vcamio";
188182
regulator-min-microvolt = <1800000>;
189183
regulator-max-microvolt = <1800000>;
@@ -212,28 +206,24 @@ examples:
212206
regulator-always-on;
213207
};
214208
mt6357_vaux18_reg: ldo-vaux18 {
215-
compatible = "regulator-fixed";
216209
regulator-name = "vaux18";
217210
regulator-min-microvolt = <1800000>;
218211
regulator-max-microvolt = <1800000>;
219212
regulator-enable-ramp-delay = <264>;
220213
};
221214
mt6357_vaud28_reg: ldo-vaud28 {
222-
compatible = "regulator-fixed";
223215
regulator-name = "vaud28";
224216
regulator-min-microvolt = <2800000>;
225217
regulator-max-microvolt = <2800000>;
226218
regulator-enable-ramp-delay = <264>;
227219
};
228220
mt6357_vio28_reg: ldo-vio28 {
229-
compatible = "regulator-fixed";
230221
regulator-name = "vio28";
231222
regulator-min-microvolt = <2800000>;
232223
regulator-max-microvolt = <2800000>;
233224
regulator-enable-ramp-delay = <264>;
234225
};
235226
mt6357_vio18_reg: ldo-vio18 {
236-
compatible = "regulator-fixed";
237227
regulator-name = "vio18";
238228
regulator-min-microvolt = <1800000>;
239229
regulator-max-microvolt = <1800000>;

‎Documentation/devicetree/bindings/usb/cypress,hx3.yaml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,22 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- usb4b4,6504
19-
- usb4b4,6506
17+
oneOf:
18+
- enum:
19+
- usb4b4,6504
20+
- usb4b4,6506
21+
- items:
22+
- enum:
23+
- usb4b4,6500
24+
- usb4b4,6508
25+
- const: usb4b4,6504
26+
- items:
27+
- enum:
28+
- usb4b4,6502
29+
- usb4b4,6503
30+
- usb4b4,6507
31+
- usb4b4,650a
32+
- const: usb4b4,6506
2033

2134
reg: true
2235

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,8 @@ patternProperties:
773773
description: Linux-specific binding
774774
"^linx,.*":
775775
description: Linx Technologies
776+
"^liontron,.*":
777+
description: Shenzhen Liontron Technology Co., Ltd
776778
"^liteon,.*":
777779
description: LITE-ON Technology Corp.
778780
"^litex,.*":

‎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 = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 93
4+
SUBLEVEL = 94
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

‎arch/arm/boot/dts/microchip/at91sam9263ek.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
nand@3 {
153153
reg = <0x3 0x0 0x800000>;
154154
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
155-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
155+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
156156
nand-bus-width = <8>;
157157
nand-ecc-mode = "soft";
158158
nand-on-flash-bbt;

‎arch/arm/boot/dts/microchip/tny_a9263.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
nand@3 {
6565
reg = <0x3 0x0 0x800000>;
6666
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
67-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
67+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
6868
nand-bus-width = <8>;
6969
nand-ecc-mode = "soft";
7070
nand-on-flash-bbt;

‎arch/arm/boot/dts/microchip/usb_a9263.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
};
5959

6060
spi0: spi@fffa4000 {
61-
cs-gpios = <&pioB 15 GPIO_ACTIVE_HIGH>;
61+
cs-gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
6262
status = "okay";
6363
flash@0 {
6464
compatible = "atmel,at45", "atmel,dataflash";
@@ -84,7 +84,7 @@
8484
nand@3 {
8585
reg = <0x3 0x0 0x800000>;
8686
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
87-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
87+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
8888
nand-bus-width = <8>;
8989
nand-ecc-mode = "soft";
9090
nand-on-flash-bbt;

‎arch/arm/boot/dts/qcom/qcom-apq8064.dtsi‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,6 @@
213213
};
214214
};
215215

216-
sfpb_mutex: hwmutex {
217-
compatible = "qcom,sfpb-mutex";
218-
syscon = <&sfpb_wrapper_mutex 0x604 0x4>;
219-
#hwlock-cells = <1>;
220-
};
221-
222216
smem {
223217
compatible = "qcom,smem";
224218
memory-region = <&smem_region>;
@@ -322,9 +316,10 @@
322316
pinctrl-0 = <&ps_hold>;
323317
};
324318

325-
sfpb_wrapper_mutex: syscon@1200000 {
326-
compatible = "syscon";
327-
reg = <0x01200000 0x8000>;
319+
sfpb_mutex: hwmutex@1200600 {
320+
compatible = "qcom,sfpb-mutex";
321+
reg = <0x01200600 0x100>;
322+
#hwlock-cells = <1>;
328323
};
329324

330325
intc: interrupt-controller@2000000 {
@@ -343,6 +338,8 @@
343338
<1 3 0x301>;
344339
reg = <0x0200a000 0x100>;
345340
clock-frequency = <27000000>;
341+
clocks = <&sleep_clk>;
342+
clock-names = "sleep";
346343
cpu-offset = <0x80000>;
347344
};
348345

‎arch/arm/mach-aspeed/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
menuconfig ARCH_ASPEED
33
bool "Aspeed BMC architectures"
44
depends on (CPU_LITTLE_ENDIAN && ARCH_MULTI_V5) || ARCH_MULTI_V6 || ARCH_MULTI_V7
5-
select SRAM
65
select WATCHDOG
76
select ASPEED_WATCHDOG
87
select MFD_SYSCON

0 commit comments

Comments
 (0)