Skip to content

Commit 80706f5

Browse files
committed
Merge tag 'soc-fixes-6.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "As usual, mostly DT fixes for the major Arm platforms from Qualcomm and NXP, plus a bit for Rockchips and others: The qualcomm fixes mainly deal with their higher-end arm64 devices trees, fixing issues in L3 interconnect, crypto, thermal, UFS and a regression for the DSI phy. NXP i.MX has two correctness fixes for the 64-bit chips, dealing with the imx93 "anatop" module and the CSI interface. On the 32-bit side, there are functional fixes for RTC, display and SD card intefaces. Rockchip fixes are for wifi support on certain boards, a eMMC stability and DT build warnings. On TI OMAP, a regulator is described in DT to avoid problems with the ethernet phy initialization. The code changes include a missing MMIO serialization on OMAP, plus a few minor fixes on ASpeed and AMD/Zynq chips" * tag 'soc-fixes-6.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (30 commits) ARM: dts: am335x-bone-common: Add vcc-supply for on-board eeprom ARM: dts: am335x-bone-common: Add GPIO PHY reset on revision C3 board soc: aspeed: socinfo: Add kfree for kstrdup soc: aspeed: uart-routing: Use __sysfs_match_string ARM: dts: integrator: fix PCI bus dtc warnings arm64: dts: imx93: Fix anatop node size arm64: dts: qcom: sc7180: Fix DSI0_PHY reg-names ARM: dts: imx: Set default tuning step for imx6sx usdhc arm64: dts: imx8mm: Drop CSI1 PHY reference clock configuration arm64: dts: imx8mn: Drop CSI1 PHY reference clock configuration ARM: dts: imx: Set default tuning step for imx7d usdhc ARM: dts: imx6: phytec: fix RTC interrupt level ARM: dts: imx6sx: Remove LDB endpoint arm64: dts: rockchip: Fix Wifi/Bluetooth on ROCK Pi 4 boards ARM: zynq: Explicitly include correct DT includes arm64: dts: qcom: sa8775p-ride: Update L4C parameters arm64: dts: rockchip: minor whitespace cleanup around '=' arm64: dts: rockchip: Disable HS400 for eMMC on ROCK 4C+ arm64: dts: rockchip: Disable HS400 for eMMC on ROCK Pi 4 arm64: dts: rockchip: add missing space before { on indiedroid nova ...
2 parents eabeef9 + 3c78dbf commit 80706f5

Some content is hidden

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

46 files changed

+86
-112
lines changed

arch/arm/boot/dts/arm/integratorap.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
valid-mask = <0x003fffff>;
159159
};
160160

161-
pci: pciv3@62000000 {
161+
pci: pci@62000000 {
162162
compatible = "arm,integrator-ap-pci", "v3,v360epc-pci";
163163
device_type = "pci";
164164
#interrupt-cells = <1>;

arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
pinctrl-0 = <&pinctrl_rtc_int>;
183183
reg = <0x68>;
184184
interrupt-parent = <&gpio7>;
185-
interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
185+
interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
186186
status = "disabled";
187187
};
188188
};

arch/arm/boot/dts/nxp/imx/imx6sx.dtsi

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,6 @@
863863
reg = <0>;
864864

865865
ldb_from_lcdif1: endpoint {
866-
remote-endpoint = <&lcdif1_to_ldb>;
867866
};
868867
};
869868

@@ -1010,6 +1009,8 @@
10101009
<&clks IMX6SX_CLK_USDHC1>;
10111010
clock-names = "ipg", "ahb", "per";
10121011
bus-width = <4>;
1012+
fsl,tuning-start-tap = <20>;
1013+
fsl,tuning-step= <2>;
10131014
status = "disabled";
10141015
};
10151016

@@ -1022,6 +1023,8 @@
10221023
<&clks IMX6SX_CLK_USDHC2>;
10231024
clock-names = "ipg", "ahb", "per";
10241025
bus-width = <4>;
1026+
fsl,tuning-start-tap = <20>;
1027+
fsl,tuning-step= <2>;
10251028
status = "disabled";
10261029
};
10271030

@@ -1034,6 +1037,8 @@
10341037
<&clks IMX6SX_CLK_USDHC3>;
10351038
clock-names = "ipg", "ahb", "per";
10361039
bus-width = <4>;
1040+
fsl,tuning-start-tap = <20>;
1041+
fsl,tuning-step= <2>;
10371042
status = "disabled";
10381043
};
10391044

@@ -1309,11 +1314,8 @@
13091314
power-domains = <&pd_disp>;
13101315
status = "disabled";
13111316

1312-
ports {
1313-
port {
1314-
lcdif1_to_ldb: endpoint {
1315-
remote-endpoint = <&ldb_from_lcdif1>;
1316-
};
1317+
port {
1318+
lcdif1_to_ldb: endpoint {
13171319
};
13181320
};
13191321
};

arch/arm/boot/dts/nxp/imx/imx7s.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,6 +1184,8 @@
11841184
<&clks IMX7D_USDHC1_ROOT_CLK>;
11851185
clock-names = "ipg", "ahb", "per";
11861186
bus-width = <4>;
1187+
fsl,tuning-step = <2>;
1188+
fsl,tuning-start-tap = <20>;
11871189
status = "disabled";
11881190
};
11891191

@@ -1196,6 +1198,8 @@
11961198
<&clks IMX7D_USDHC2_ROOT_CLK>;
11971199
clock-names = "ipg", "ahb", "per";
11981200
bus-width = <4>;
1201+
fsl,tuning-step = <2>;
1202+
fsl,tuning-start-tap = <20>;
11991203
status = "disabled";
12001204
};
12011205

@@ -1208,6 +1212,8 @@
12081212
<&clks IMX7D_USDHC3_ROOT_CLK>;
12091213
clock-names = "ipg", "ahb", "per";
12101214
bus-width = <4>;
1215+
fsl,tuning-step = <2>;
1216+
fsl,tuning-start-tap = <20>;
12111217
status = "disabled";
12121218
};
12131219

arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@
145145
/* MDIO */
146146
AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
147147
AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
148+
/* Added to support GPIO controlled PHY reset */
149+
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE7)
148150
>;
149151
};
150152

@@ -153,6 +155,8 @@
153155
/* MDIO reset value */
154156
AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
155157
AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)
158+
/* Added to support GPIO controlled PHY reset */
159+
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE7)
156160
>;
157161
};
158162

@@ -215,6 +219,7 @@
215219
baseboard_eeprom: baseboard_eeprom@50 {
216220
compatible = "atmel,24c256";
217221
reg = <0x50>;
222+
vcc-supply = <&ldo4_reg>;
218223

219224
#address-cells = <1>;
220225
#size-cells = <1>;
@@ -377,6 +382,10 @@
377382

378383
ethphy0: ethernet-phy@0 {
379384
reg = <0>;
385+
/* Support GPIO reset on revision C3 boards */
386+
reset-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
387+
reset-assert-us = <300>;
388+
reset-deassert-us = <6500>;
380389
};
381390
};
382391

arch/arm/mach-zynq/pm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
*/
99

1010
#include <linux/io.h>
11+
#include <linux/of.h>
1112
#include <linux/of_address.h>
12-
#include <linux/of_device.h>
1313
#include "common.h"
1414

1515
/* register offsets */

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,10 +1221,9 @@
12211221
compatible = "fsl,imx8mm-mipi-csi2";
12221222
reg = <0x32e30000 0x1000>;
12231223
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
1224-
assigned-clocks = <&clk IMX8MM_CLK_CSI1_CORE>,
1225-
<&clk IMX8MM_CLK_CSI1_PHY_REF>;
1226-
assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_1000M>,
1227-
<&clk IMX8MM_SYS_PLL2_1000M>;
1224+
assigned-clocks = <&clk IMX8MM_CLK_CSI1_CORE>;
1225+
assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_1000M>;
1226+
12281227
clock-frequency = <333000000>;
12291228
clocks = <&clk IMX8MM_CLK_DISP_APB_ROOT>,
12301229
<&clk IMX8MM_CLK_CSI1_ROOT>,

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,10 +1175,8 @@
11751175
compatible = "fsl,imx8mm-mipi-csi2";
11761176
reg = <0x32e30000 0x1000>;
11771177
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
1178-
assigned-clocks = <&clk IMX8MN_CLK_CAMERA_PIXEL>,
1179-
<&clk IMX8MN_CLK_CSI1_PHY_REF>;
1180-
assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_1000M>,
1181-
<&clk IMX8MN_SYS_PLL2_1000M>;
1178+
assigned-clocks = <&clk IMX8MN_CLK_CAMERA_PIXEL>;
1179+
assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_1000M>;
11821180
assigned-clock-rates = <333000000>;
11831181
clock-frequency = <333000000>;
11841182
clocks = <&clk IMX8MN_CLK_DISP_APB_ROOT>,

arch/arm64/boot/dts/freescale/imx93.dtsi

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

341341
anatop: anatop@44480000 {
342342
compatible = "fsl,imx93-anatop", "syscon";
343-
reg = <0x44480000 0x10000>;
343+
reg = <0x44480000 0x2000>;
344344
};
345345

346346
adc1: adc@44530000 {

arch/arm64/boot/dts/qcom/qrb5165-rb5.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
};
122122
};
123123

124-
pm8150l-thermal {
124+
pm8150l-pcb-thermal {
125125
polling-delay-passive = <0>;
126126
polling-delay = <0>;
127127
thermal-sensors = <&pm8150l_adc_tm 1>;

0 commit comments

Comments
 (0)