Skip to content

Commit 1c49f28

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "Most of the contents are bugfixes for the devicetree files: - A Qualcomm MSM8974 pin controller regression, caused by a cleanup patch that gets partially reverted here. - Missing properties for Broadcom BCM49xx to fix timer detection and SMP boot. - Fix touchscreen pinctrl for imx6ull-colibri board - Multiple fixes for Rockchip rk3399 based machines including the vdu clock-rate fix, otg port fix on Quartz64-A and ethernet on Quartz64-B - Fixes for misspelled DT contents causing minor problems on imx6qdl-ts7970m, orangepi-zero, sama5d2, kontron-kswitch-d10, and ls1028a And a couple of changes elsewhere: - Fix binding for Allwinner D1 display pipeline - Trivial code fixes to the TEE and reset controller driver subsystems and the rockchip platform code. - Multiple updates to the MAINTAINERS files, marking the Palm Treo support as orphaned, and fixing some entries for added or changed file names" * tag 'soc-fixes-5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (21 commits) arm64: dts: broadcom: bcm4908: Fix cpu node for smp boot arm64: dts: broadcom: bcm4908: Fix timer node for BCM4906 SoC ARM: dts: sunxi: Fix SPI NOR campatible on Orange Pi Zero ARM: dts: at91: sama5d2: Fix typo in i2s1 node tee: tee_get_drvdata(): fix description of return value optee: Remove duplicate 'of' in two places. ARM: dts: kswitch-d10: use open drain mode for coma-mode pins ARM: dts: colibri-imx6ull: fix snvs pinmux group optee: smc_abi.c: fix wrong pointer passed to IS_ERR/PTR_ERR() MAINTAINERS: add polarfire rng, pci and clock drivers MAINTAINERS: mark ARM/PALM TREO SUPPORT orphan ARM: dts: imx6qdl-ts7970: Fix ngpio typo and count arm64: dts: ls1028a: Update SFP node to include clock dt-bindings: display: sun4i: Fix D1 pipeline count ARM: dts: qcom: msm8974: re-add missing pinctrl reset: Fix devm bulk optional exclusive control getter MAINTAINERS: rectify entry for SYNOPSYS AXS10x RESET CONTROLLER DRIVER ARM: rockchip: Add missing of_node_put() in rockchip_suspend_init() arm64: dts: rockchip: Assign RK3399 VDU clock rate arm64: dts: rockchip: Fix Quartz64-A dwc3 otg port behavior ...
2 parents 2a347a0 + d332a1f commit 1c49f28

21 files changed

Lines changed: 83 additions & 29 deletions

‎CREDITS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,10 @@ S: 48287 Sawleaf
627627
S: Fremont, California 94539
628628
S: USA
629629

630+
N: Tomas Cech
631+
E: sleep_walker@suse.com
632+
D: arm/palm treo support
633+
630634
N: Florent Chabaud
631635
E: florent.chabaud@polytechnique.org
632636
D: software suspend

‎Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ if:
9494
- allwinner,sun8i-a83t-display-engine
9595
- allwinner,sun8i-r40-display-engine
9696
- allwinner,sun9i-a80-display-engine
97+
- allwinner,sun20i-d1-display-engine
9798
- allwinner,sun50i-a64-display-engine
9899

99100
then:

‎MAINTAINERS‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2498,10 +2498,8 @@ F: drivers/power/reset/oxnas-restart.c
24982498
N: oxnas
24992499

25002500
ARM/PALM TREO SUPPORT
2501-
M: Tomas Cech <sleep_walker@suse.com>
25022501
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2503-
S: Maintained
2504-
W: http://hackndev.com
2502+
S: Orphan
25052503
F: arch/arm/mach-pxa/palmtreo.*
25062504

25072505
ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
@@ -17274,12 +17272,15 @@ N: riscv
1727417272
K: riscv
1727517273

1727617274
RISC-V/MICROCHIP POLARFIRE SOC SUPPORT
17277-
M: Lewis Hanly <lewis.hanly@microchip.com>
1727817275
M: Conor Dooley <conor.dooley@microchip.com>
17276+
M: Daire McNamara <daire.mcnamara@microchip.com>
1727917277
L: linux-riscv@lists.infradead.org
1728017278
S: Supported
1728117279
F: arch/riscv/boot/dts/microchip/
17280+
F: drivers/char/hw_random/mpfs-rng.c
17281+
F: drivers/clk/microchip/clk-mpfs.c
1728217282
F: drivers/mailbox/mailbox-mpfs.c
17283+
F: drivers/pci/controller/pcie-microchip-host.c
1728317284
F: drivers/soc/microchip/
1728417285
F: include/soc/microchip/mpfs.h
1728517286

‎arch/arm/boot/dts/imx6qdl-ts7970.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
reg = <0x28>;
227227
#gpio-cells = <2>;
228228
gpio-controller;
229-
ngpio = <32>;
229+
ngpios = <62>;
230230
};
231231

232232
sgtl5000: codec@a {

‎arch/arm/boot/dts/imx6ull-colibri.dtsi‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
atmel_mxt_ts: touchscreen@4a {
167167
compatible = "atmel,maxtouch";
168168
pinctrl-names = "default";
169-
pinctrl-0 = <&pinctrl_atmel_conn>;
169+
pinctrl-0 = <&pinctrl_atmel_conn &pinctrl_atmel_snvs_conn>;
170170
reg = <0x4a>;
171171
interrupt-parent = <&gpio5>;
172172
interrupts = <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 / INT */
@@ -331,7 +331,6 @@
331331
pinctrl_atmel_conn: atmelconngrp {
332332
fsl,pins = <
333333
MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */
334-
MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */
335334
>;
336335
};
337336

@@ -684,6 +683,12 @@
684683
};
685684

686685
&iomuxc_snvs {
686+
pinctrl_atmel_snvs_conn: atmelsnvsconngrp {
687+
fsl,pins = <
688+
MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */
689+
>;
690+
};
691+
687692
pinctrl_snvs_gpio1: snvsgpio1grp {
688693
fsl,pins = <
689694
MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */

‎arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,22 @@
8787

8888
phy4: ethernet-phy@5 {
8989
reg = <5>;
90-
coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
90+
coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;
9191
};
9292

9393
phy5: ethernet-phy@6 {
9494
reg = <6>;
95-
coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
95+
coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;
9696
};
9797

9898
phy6: ethernet-phy@7 {
9999
reg = <7>;
100-
coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
100+
coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;
101101
};
102102

103103
phy7: ethernet-phy@8 {
104104
reg = <8>;
105-
coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
105+
coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;
106106
};
107107
};
108108

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

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,8 @@
506506
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
507507
clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
508508
clock-names = "core", "iface";
509+
pinctrl-names = "default";
510+
pinctrl-0 = <&blsp1_uart2_default>;
509511
status = "disabled";
510512
};
511513

@@ -581,6 +583,9 @@
581583
interrupts = <GIC_SPI 113 IRQ_TYPE_NONE>;
582584
clocks = <&gcc GCC_BLSP2_UART1_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
583585
clock-names = "core", "iface";
586+
pinctrl-names = "default", "sleep";
587+
pinctrl-0 = <&blsp2_uart1_default>;
588+
pinctrl-1 = <&blsp2_uart1_sleep>;
584589
status = "disabled";
585590
};
586591

@@ -599,6 +604,8 @@
599604
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
600605
clocks = <&gcc GCC_BLSP2_UART4_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
601606
clock-names = "core", "iface";
607+
pinctrl-names = "default";
608+
pinctrl-0 = <&blsp2_uart4_default>;
602609
status = "disabled";
603610
};
604611

@@ -639,6 +646,9 @@
639646
interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
640647
clocks = <&gcc GCC_BLSP2_QUP6_I2C_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
641648
clock-names = "core", "iface";
649+
pinctrl-names = "default", "sleep";
650+
pinctrl-0 = <&blsp2_i2c6_default>;
651+
pinctrl-1 = <&blsp2_i2c6_sleep>;
642652
#address-cells = <1>;
643653
#size-cells = <0>;
644654
};
@@ -1256,7 +1266,7 @@
12561266
};
12571267
};
12581268

1259-
blsp1_uart2_active: blsp1-uart2-active {
1269+
blsp1_uart2_default: blsp1-uart2-default {
12601270
rx {
12611271
pins = "gpio5";
12621272
function = "blsp_uart2";
@@ -1272,7 +1282,7 @@
12721282
};
12731283
};
12741284

1275-
blsp2_uart1_active: blsp2-uart1-active {
1285+
blsp2_uart1_default: blsp2-uart1-default {
12761286
tx-rts {
12771287
pins = "gpio41", "gpio44";
12781288
function = "blsp_uart7";
@@ -1295,7 +1305,7 @@
12951305
bias-pull-down;
12961306
};
12971307

1298-
blsp2_uart4_active: blsp2-uart4-active {
1308+
blsp2_uart4_default: blsp2-uart4-default {
12991309
tx-rts {
13001310
pins = "gpio53", "gpio56";
13011311
function = "blsp_uart10";
@@ -1406,7 +1416,19 @@
14061416
bias-pull-up;
14071417
};
14081418

1409-
/* BLSP2_I2C6 info is missing - nobody uses it though? */
1419+
blsp2_i2c6_default: blsp2-i2c6-default {
1420+
pins = "gpio87", "gpio88";
1421+
function = "blsp_i2c12";
1422+
drive-strength = <2>;
1423+
bias-disable;
1424+
};
1425+
1426+
blsp2_i2c6_sleep: blsp2-i2c6-sleep {
1427+
pins = "gpio87", "gpio88";
1428+
function = "blsp_i2c12";
1429+
drive-strength = <2>;
1430+
bias-pull-up;
1431+
};
14101432

14111433
spi8_default: spi8_default {
14121434
mosi {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,7 @@
11241124
clocks = <&pmc PMC_TYPE_PERIPHERAL 55>, <&pmc PMC_TYPE_GCK 55>;
11251125
clock-names = "pclk", "gclk";
11261126
assigned-clocks = <&pmc PMC_TYPE_CORE PMC_I2S1_MUX>;
1127-
assigned-parrents = <&pmc PMC_TYPE_GCK 55>;
1127+
assigned-clock-parents = <&pmc PMC_TYPE_GCK 55>;
11281128
status = "disabled";
11291129
};
11301130

‎arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
flash@0 {
170170
#address-cells = <1>;
171171
#size-cells = <1>;
172-
compatible = "mxicy,mx25l1606e", "winbond,w25q128";
172+
compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
173173
reg = <0>;
174174
spi-max-frequency = <40000000>;
175175
};

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ void __init rockchip_suspend_init(void)
311311
&match);
312312
if (!match) {
313313
pr_err("Failed to find PMU node\n");
314-
return;
314+
goto out_put;
315315
}
316316
pm_data = (struct rockchip_pm_data *) match->data;
317317

@@ -320,9 +320,12 @@ void __init rockchip_suspend_init(void)
320320

321321
if (ret) {
322322
pr_err("%s: matches init error %d\n", __func__, ret);
323-
return;
323+
goto out_put;
324324
}
325325
}
326326

327327
suspend_set_ops(pm_data->ops);
328+
329+
out_put:
330+
of_node_put(np);
328331
}

0 commit comments

Comments
 (0)