Skip to content

Commit b9a10f8

Browse files
committed
Merge tag 'soc-fixes-6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann: "These are mainly devicetree fixes for the rockchip and nxp platforms on arm64, addressing mistakes in the board and soc specific descriptions. In particular the newly added Rock 5T board required multiple bugfixes for PCIe and USB, while on the i.MX platform there are a number of regulator related fixes. The only other platforms with devicetree fixes are at91 with a fixup for SD/MMC and a change to enable all the available UARTS on the Axiado reference board. Also on the at91 platform, a Kconfig change addresses a regression that stopped the DMA engine from working in 6.17-rc. Three drivers each have a simple bugfix, stopping incorrect behavior in op-tee firmware, the tee subsystem and the qualcomm mdt_loader. Two trivial MAINTAINERS file changes are needed to make sure that patches reach the correct maintainer, but don't change the actual responsibilities" * tag 'soc-fixes-6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (27 commits) ARM: dts: microchip: sama7d65: Force SDMMC Legacy mode ARM: at91: select ARCH_MICROCHIP arm64: dts: rockchip: fix second M.2 slot on ROCK 5T arm64: dts: rockchip: fix USB on RADXA ROCK 5T MAINTAINERS: exclude defconfig from ARM64 PORT arm64: dts: axiado: Add missing UART aliases MAINTAINERS: Update Nobuhiro Iwamatsu's email address arm64: dts: rockchip: Add vcc-supply to SPI flash on Pinephone Pro arm64: dts: rockchip: fix es8388 address on rk3588s-roc-pc arm64: dts: rockchip: Fix Bluetooth interrupts flag on Neardi LBA3368 arm64: dts: rockchip: correct network description on Sige5 arm64: dts: rockchip: Minor whitespace cleanup ARM: dts: rockchip: Minor whitespace cleanup arm64: dts: rockchip: Add supplies for eMMC on rk3588-orangepi-5 arm64: dts: rockchip: Fix the headphone detection on the orangepi 5 plus arm64: dts: imx95: Fix JPEG encoder node assigned clock arm64: dts: imx95-19x19-evk: correct the phy setting for flexcan1/2 arm64: dts: imx8mp: Fix missing microSD slot vqmmc on Data Modul i.MX8M Plus eDM SBC arm64: dts: imx8mp: Fix missing microSD slot vqmmc on DH electronics i.MX8M Plus DHCOM arm64: dts: imx8mp-tqma8mpql: remove virtual 3.3V regulator ...
2 parents ec299e4 + 875691c commit b9a10f8

32 files changed

+139
-66
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ Nikolay Aleksandrov <[email protected]> <[email protected]>
589589
Nikolay Aleksandrov <[email protected]> <[email protected]>
590590
Nikolay Aleksandrov <[email protected]> <[email protected]>
591591
Nikolay Aleksandrov <[email protected]> <[email protected]>
592+
592593
593594
Oleksandr Natalenko <[email protected]> <[email protected]>
594595

MAINTAINERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3526,7 +3526,7 @@ F: Documentation/devicetree/bindings/arm/ti/nspire.yaml
35263526
F: arch/arm/boot/dts/nspire/
35273527

35283528
ARM/TOSHIBA VISCONTI ARCHITECTURE
3529-
M: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
3529+
M: Nobuhiro Iwamatsu <nobuhiro.iwamatsu[email protected]>
35303530
L: [email protected] (moderated for non-subscribers)
35313531
S: Supported
35323532
T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
@@ -3667,6 +3667,7 @@ F: drivers/virt/coco/arm-cca-guest/
36673667
F: drivers/virt/coco/pkvm-guest/
36683668
F: tools/testing/selftests/arm64/
36693669
X: arch/arm64/boot/dts/
3670+
X: arch/arm64/configs/defconfig
36703671

36713672
ARROW SPEEDCHIPS XRS7000 SERIES ETHERNET SWITCH DRIVER
36723673
M: George McCollister <[email protected]>

arch/arm/boot/dts/microchip/at91-sama7d65_curiosity.dts

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

388388
&sdmmc1 {
389389
bus-width = <4>;
390+
no-1-8-v;
391+
sdhci-caps-mask = <0x0 0x00200000>;
390392
pinctrl-names = "default";
391393
pinctrl-0 = <&pinctrl_sdmmc1_default>;
392394
status = "okay";

arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272
phy-mode = "rmii";
273273
phy-handle = <&phy0>;
274274
assigned-clocks = <&cru SCLK_MAC_SRC>;
275-
assigned-clock-rates= <50000000>;
275+
assigned-clock-rates = <50000000>;
276276
pinctrl-names = "default";
277277
pinctrl-0 = <&rmii_pins>;
278278
status = "okay";

arch/arm/boot/dts/rockchip/rv1109-relfor-saib.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@
250250
&i2s0 {
251251
/delete-property/ pinctrl-0;
252252
rockchip,trcm-sync-rx-only;
253-
pinctrl-0 = <&i2s0m0_sclk_rx>,
254-
<&i2s0m0_lrck_rx>,
255-
<&i2s0m0_sdi0>;
253+
pinctrl-0 = <&i2s0m0_sclk_rx>,
254+
<&i2s0m0_lrck_rx>,
255+
<&i2s0m0_sdi0>;
256256
pinctrl-names = "default";
257257
status = "okay";
258258
};

arch/arm/mach-at91/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2+
config ARCH_MICROCHIP
3+
bool
4+
25
menuconfig ARCH_AT91
36
bool "AT91/Microchip SoCs"
47
depends on (CPU_LITTLE_ENDIAN && (ARCH_MULTI_V4T || ARCH_MULTI_V5)) || \
@@ -8,6 +11,7 @@ menuconfig ARCH_AT91
811
select GPIOLIB
912
select PINCTRL
1013
select SOC_BUS
14+
select ARCH_MICROCHIP
1115

1216
if ARCH_AT91
1317
config SOC_SAMV7

arch/arm64/boot/dts/axiado/ax3000-evk.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
#size-cells = <2>;
1515

1616
aliases {
17+
serial0 = &uart0;
18+
serial1 = &uart1;
19+
serial2 = &uart2;
1720
serial3 = &uart3;
1821
};
1922

arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@
555555
pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
556556
cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
557557
vmmc-supply = <&reg_usdhc2_vmmc>;
558+
vqmmc-supply = <&ldo5>;
558559
bus-width = <4>;
559560
status = "okay";
560561
};

arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@
609609
pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
610610
cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
611611
vmmc-supply = <&reg_usdhc2_vmmc>;
612+
vqmmc-supply = <&ldo5>;
612613
bus-width = <4>;
613614
status = "okay";
614615
};

arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,10 @@
467467
status = "okay";
468468
};
469469

470+
&reg_usdhc2_vqmmc {
471+
status = "okay";
472+
};
473+
470474
&sai5 {
471475
pinctrl-names = "default";
472476
pinctrl-0 = <&pinctrl_sai5>;
@@ -876,8 +880,7 @@
876880
<MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d2>,
877881
<MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d2>,
878882
<MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d2>,
879-
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d2>,
880-
<MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0>;
883+
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d2>;
881884
};
882885

883886
pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
@@ -886,8 +889,7 @@
886889
<MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d4>,
887890
<MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d4>,
888891
<MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d4>,
889-
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>,
890-
<MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0>;
892+
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>;
891893
};
892894

893895
pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
@@ -896,8 +898,7 @@
896898
<MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d4>,
897899
<MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d4>,
898900
<MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d4>,
899-
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>,
900-
<MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0>;
901+
<MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4>;
901902
};
902903

903904
pinctrl_usdhc2_gpio: usdhc2-gpiogrp {

0 commit comments

Comments
 (0)