Skip to content

Commit 84368d8

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "Another set of devicetree and code changes for SoC platforms, notably: - DT schema warning fixes for i.MX - Functional fixes for i.MX tqma8mqml-mba8mx USB and i.MX8M OCOTP - MAINTAINERS updates for Hisilicon and RISC-V, documenting which RISC-V SoC specific patches will now get merged through the SoC tree in the future. - A code fix for at91 suspend, to work around broken hardware - A devicetree fix for lan966x/pcb8291 LED support - Lots of DT fixes for Qualcomm SoCs, mostly fixing minor problems like incorrect register sizes and schema warnings. One fix makes the UFS controller work on sc8280xp, and six fixes address the same regulator problem in a variety of platforms" * tag 'soc-fixes-6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (31 commits) MAINTAINERS: repair Microchip corei2c driver entry MAINTAINERS: add an entry for StarFive devicetrees MAINTAINERS: generify the Microchip RISC-V entry name MAINTAINERS: add entries for misc. RISC-V SoC drivers and devicetrees MAINTAINERS: git://github.com -> https://github.com for HiSilicon soc: imx8m: Enable OCOTP clock before reading the register arm64: dts: imx93-pinfunc: drop execution permission arm64: dts: imx8mn: Fix NAND controller size-cells arm64: dts: imx8mm: Fix NAND controller size-cells ARM: dts: imx7: Fix NAND controller size-cells arm64: dts: imx8mm-tqma8mqml-mba8mx: Fix USB DR ARM: at91: pm: avoid soft resetting AC DLL ARM: dts: lan966x: Enable sgpio on pcb8291 arm64: dts: qcom: sm8250: Disable the not yet supported cluster idle state ARM: dts: at91: sama7g5: fix signal name of pin PB2 arm64: dts: qcom: sc7280: Add the reset reg for lpass audiocc on SC7280 arm64: dts: qcom: sc8280xp: fix UFS PHY serdes size arm64: dts: qcom: sc8280xp: drop broken DP PHY nodes arm64: dts: qcom: sc8280xp: fix USB PHY PCS registers arm64: dts: qcom: sc8280xp: fix USB1 PHY RX1 registers ...
2 parents ae75334 + 0d6a10d commit 84368d8

22 files changed

+171
-51
lines changed

‎MAINTAINERS‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2197,7 +2197,7 @@ M: Wei Xu <[email protected]>
21972197
L: [email protected] (moderated for non-subscribers)
21982198
S: Supported
21992199
W: http://www.hisilicon.com
2200-
T: git git://github.com/hisilicon/linux-hisi.git
2200+
T: git https://github.com/hisilicon/linux-hisi.git
22012201
F: arch/arm/boot/dts/hi3*
22022202
F: arch/arm/boot/dts/hip*
22032203
F: arch/arm/boot/dts/hisi*
@@ -13625,6 +13625,12 @@ S: Supported
1362513625
F: drivers/misc/atmel-ssc.c
1362613626
F: include/linux/atmel-ssc.h
1362713627

13628+
MICROCHIP SOC DRIVERS
13629+
M: Conor Dooley <[email protected]>
13630+
S: Supported
13631+
T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
13632+
F: drivers/soc/microchip/
13633+
1362813634
MICROCHIP USB251XB DRIVER
1362913635
M: Richard Leitner <[email protected]>
1363013636
L: [email protected]
@@ -17723,7 +17729,7 @@ F: arch/riscv/
1772317729
N: riscv
1772417730
K: riscv
1772517731

17726-
RISC-V/MICROCHIP POLARFIRE SOC SUPPORT
17732+
RISC-V MICROCHIP FPGA SUPPORT
1772717733
M: Conor Dooley <[email protected]>
1772817734
M: Daire McNamara <[email protected]>
1772917735
L: [email protected]
@@ -17741,17 +17747,26 @@ F: Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
1774117747
F: arch/riscv/boot/dts/microchip/
1774217748
F: drivers/char/hw_random/mpfs-rng.c
1774317749
F: drivers/clk/microchip/clk-mpfs.c
17744-
F: drivers/i2c/busses/i2c-microchip-core.c
17750+
F: drivers/i2c/busses/i2c-microchip-corei2c.c
1774517751
F: drivers/mailbox/mailbox-mpfs.c
1774617752
F: drivers/pci/controller/pcie-microchip-host.c
1774717753
F: drivers/reset/reset-mpfs.c
1774817754
F: drivers/rtc/rtc-mpfs.c
17749-
F: drivers/soc/microchip/
17755+
F: drivers/soc/microchip/mpfs-sys-controller.c
1775017756
F: drivers/spi/spi-microchip-core-qspi.c
1775117757
F: drivers/spi/spi-microchip-core.c
1775217758
F: drivers/usb/musb/mpfs.c
1775317759
F: include/soc/microchip/mpfs.h
1775417760

17761+
RISC-V MISC SOC SUPPORT
17762+
M: Conor Dooley <[email protected]>
17763+
L: [email protected]
17764+
S: Maintained
17765+
Q: https://patchwork.kernel.org/project/linux-riscv/list/
17766+
T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
17767+
F: Documentation/devicetree/bindings/riscv/
17768+
F: arch/riscv/boot/dts/
17769+
1775517770
RNBD BLOCK DRIVERS
1775617771
M: Md. Haris Iqbal <[email protected]>
1775717772
M: Jack Wang <[email protected]>
@@ -18778,7 +18793,6 @@ M: Palmer Dabbelt <[email protected]>
1877818793
M: Paul Walmsley <[email protected]>
1877918794
L: [email protected]
1878018795
S: Supported
18781-
T: git https://github.com/sifive/riscv-linux.git
1878218796
N: sifive
1878318797
K: [^@]sifive
1878418798

@@ -18797,6 +18811,13 @@ S: Maintained
1879718811
F: Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
1879818812
F: drivers/dma/sf-pdma/
1879918813

18814+
SIFIVE SOC DRIVERS
18815+
M: Conor Dooley <[email protected]>
18816+
L: [email protected]
18817+
S: Maintained
18818+
T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
18819+
F: drivers/soc/sifive/
18820+
1880018821
SILEAD TOUCHSCREEN DRIVER
1880118822
M: Hans de Goede <[email protected]>
1880218823
L: [email protected]
@@ -19598,6 +19619,11 @@ M: Ion Badulescu <[email protected]>
1959819619
S: Odd Fixes
1959919620
F: drivers/net/ethernet/adaptec/starfire*
1960019621

19622+
STARFIVE DEVICETREES
19623+
M: Emil Renner Berthing <[email protected]>
19624+
S: Maintained
19625+
F: arch/riscv/boot/dts/starfive/
19626+
1960119627
STARFIVE JH7100 CLOCK DRIVERS
1960219628
M: Emil Renner Berthing <[email protected]>
1960319629
S: Maintained

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,10 +1270,10 @@
12701270
clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>;
12711271
};
12721272

1273-
gpmi: nand-controller@33002000{
1273+
gpmi: nand-controller@33002000 {
12741274
compatible = "fsl,imx7d-gpmi-nand";
12751275
#address-cells = <1>;
1276-
#size-cells = <1>;
1276+
#size-cells = <0>;
12771277
reg = <0x33002000 0x2000>, <0x33004000 0x4000>;
12781278
reg-names = "gpmi-nand", "bch";
12791279
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

‎arch/arm/boot/dts/lan966x-pcb8291.dts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@
6969
pins = "GPIO_35", "GPIO_36";
7070
function = "can0_b";
7171
};
72+
73+
sgpio_a_pins: sgpio-a-pins {
74+
/* SCK, D0, D1, LD */
75+
pins = "GPIO_32", "GPIO_33", "GPIO_34", "GPIO_35";
76+
function = "sgpio_a";
77+
};
7278
};
7379

7480
&can0 {
@@ -118,6 +124,20 @@
118124
status = "okay";
119125
};
120126

127+
&sgpio {
128+
pinctrl-0 = <&sgpio_a_pins>;
129+
pinctrl-names = "default";
130+
microchip,sgpio-port-ranges = <0 3>, <8 11>;
131+
status = "okay";
132+
133+
gpio@0 {
134+
ngpios = <64>;
135+
};
136+
gpio@1 {
137+
ngpios = <64>;
138+
};
139+
};
140+
121141
&switch {
122142
status = "okay";
123143
};

‎arch/arm/boot/dts/sama7g5-pinfunc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
#define PIN_PB2__FLEXCOM6_IO0 PINMUX_PIN(PIN_PB2, 2, 1)
262262
#define PIN_PB2__ADTRG PINMUX_PIN(PIN_PB2, 3, 1)
263263
#define PIN_PB2__A20 PINMUX_PIN(PIN_PB2, 4, 1)
264-
#define PIN_PB2__FLEXCOM11_IO0 PINMUX_PIN(PIN_PB2, 6, 3)
264+
#define PIN_PB2__FLEXCOM11_IO1 PINMUX_PIN(PIN_PB2, 6, 3)
265265
#define PIN_PB3 35
266266
#define PIN_PB3__GPIO PINMUX_PIN(PIN_PB3, 0, 0)
267267
#define PIN_PB3__RF1 PINMUX_PIN(PIN_PB3, 1, 1)

‎arch/arm/mach-at91/pm_suspend.S‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,15 @@ sr_ena_2:
169169
cmp tmp1, #UDDRC_STAT_SELFREF_TYPE_SW
170170
bne sr_ena_2
171171

172-
/* Put DDR PHY's DLL in bypass mode for non-backup modes. */
172+
/* Disable DX DLLs for non-backup modes. */
173173
cmp r7, #AT91_PM_BACKUP
174174
beq sr_ena_3
175175

176+
/* Do not soft reset the AC DLL. */
177+
ldr tmp1, [r3, DDR3PHY_ACDLLCR]
178+
bic tmp1, tmp1, DDR3PHY_ACDLLCR_DLLSRST
179+
str tmp1, [r3, DDR3PHY_ACDLLCR]
180+
176181
/* Disable DX DLLs. */
177182
ldr tmp1, [r3, #DDR3PHY_DX0DLLCR]
178183
orr tmp1, tmp1, #DDR3PHY_DXDLLCR_DLLDIS

‎arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,25 @@
3434
off-on-delay-us = <12000>;
3535
};
3636

37-
extcon_usbotg1: extcon-usbotg1 {
38-
compatible = "linux,extcon-usb-gpio";
37+
connector {
38+
compatible = "gpio-usb-b-connector", "usb-b-connector";
39+
type = "micro";
40+
label = "X19";
3941
pinctrl-names = "default";
40-
pinctrl-0 = <&pinctrl_usb1_extcon>;
41-
id-gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
42+
pinctrl-0 = <&pinctrl_usb1_connector>;
43+
id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
44+
45+
ports {
46+
#address-cells = <1>;
47+
#size-cells = <0>;
48+
49+
port@0 {
50+
reg = <0>;
51+
usb_dr_connector: endpoint {
52+
remote-endpoint = <&usb1_drd_sw>;
53+
};
54+
};
55+
};
4256
};
4357
};
4458

@@ -105,13 +119,19 @@
105119
pinctrl-names = "default";
106120
pinctrl-0 = <&pinctrl_usbotg1>;
107121
dr_mode = "otg";
108-
extcon = <&extcon_usbotg1>;
109122
srp-disable;
110123
hnp-disable;
111124
adp-disable;
112125
power-active-high;
113126
over-current-active-low;
127+
usb-role-switch;
114128
status = "okay";
129+
130+
port {
131+
usb1_drd_sw: endpoint {
132+
remote-endpoint = <&usb_dr_connector>;
133+
};
134+
};
115135
};
116136

117137
&usbotg2 {
@@ -231,7 +251,7 @@
231251
<MX8MM_IOMUXC_GPIO1_IO13_USB1_OTG_OC 0x84>;
232252
};
233253

234-
pinctrl_usb1_extcon: usb1-extcongrp {
254+
pinctrl_usb1_connector: usb1-connectorgrp {
235255
fsl,pins = <MX8MM_IOMUXC_GPIO1_IO10_GPIO1_IO10 0x1c0>;
236256
};
237257

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,10 +1244,10 @@
12441244
clocks = <&clk IMX8MM_CLK_NAND_USDHC_BUS_RAWNAND_CLK>;
12451245
};
12461246

1247-
gpmi: nand-controller@33002000{
1247+
gpmi: nand-controller@33002000 {
12481248
compatible = "fsl,imx8mm-gpmi-nand", "fsl,imx7d-gpmi-nand";
12491249
#address-cells = <1>;
1250-
#size-cells = <1>;
1250+
#size-cells = <0>;
12511251
reg = <0x33002000 0x2000>, <0x33004000 0x4000>;
12521252
reg-names = "gpmi-nand", "bch";
12531253
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@
11021102
gpmi: nand-controller@33002000 {
11031103
compatible = "fsl,imx8mn-gpmi-nand", "fsl,imx7d-gpmi-nand";
11041104
#address-cells = <1>;
1105-
#size-cells = <1>;
1105+
#size-cells = <0>;
11061106
reg = <0x33002000 0x2000>, <0x33004000 0x4000>;
11071107
reg-names = "gpmi-nand", "bch";
11081108
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

‎arch/arm64/boot/dts/freescale/imx93-pinfunc.h‎

100755100644
File mode changed.

‎arch/arm64/boot/dts/qcom/ipq8074.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@
668668

669669
apcs_glb: mailbox@b111000 {
670670
compatible = "qcom,ipq8074-apcs-apps-global";
671-
reg = <0x0b111000 0x6000>;
671+
reg = <0x0b111000 0x1000>;
672672

673673
#clock-cells = <1>;
674674
#mbox-cells = <1>;

0 commit comments

Comments
 (0)