Skip to content

Commit 23cb64f

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.18-3' 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 arm platforms from Rockchips NXP, ASpeed and Broadcom, addressing issues with accidental overclocking, pinctrl, network and dtc warnings. There are additional fixes for regressions with the i.MX reset and memory controller drivers as well as the Tegra memory controller driver. Minor updates to the MAINTAINERS file, tee documentation and defconfigs bring those up to date with recent changes elsewhere" * tag 'soc-fixes-6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (29 commits) MAINTAINERS: sync omap devicetree maintainers with omap platform MAINTAINERS: Update Krzysztof Kozlowski's email arm64: dts: rockchip: fix PCIe 3.3V regulator voltage on orangepi-5 arm64: dts: rockchip: disable HS400 on RK3588 Tiger arm64: dts: rockchip: drop reset from rk3576 i2c9 node tee: <uapi/linux/tee.h: fix all kernel-doc issues arm64: dts: rockchip: Fix USB power enable pin for BTT CB2 and Pi2 arm64: dts: broadcom: bcm2712: rpi-5: Add ethernet0 alias arm64: dts: broadcom: Assign clock rates in eth node for RPi5 reset: imx8mp-audiomix: Fix bad mask values ARM: dts: BCM53573: Fix address of Luxul XAP-1440's Ethernet PHY arm64: defconfig: Fix V3D deferred probe timeout arm64: dts: rockchip: Fix vccio4-supply on rk3566-pinetab2 arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1 arm64: dts: imx8mp-kontron: Fix USB OTG role switching arm64: dts: imx95: Fix MSI mapping for PCIe endpoint nodes arm64: dts: imx8-ss-img: Avoid gpio0_mipi_csi GPIOs being deferred arm: imx_v6_v7_defconfig: enable ext4 directly memory: tegra210: Fix incorrect client ids arm64: dts: rockchip: Fix indentation on rk3399 haikou demo dtso ...
2 parents fdeee1c + 7a60132 commit 23cb64f

26 files changed

Lines changed: 94 additions & 61 deletions

‎.mailmap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,7 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
438438
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
439439
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
440440
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
441+
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>
441442
Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
442443
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
443444
Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>

‎MAINTAINERS‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16206,7 +16206,7 @@ MEMORY CONTROLLER DRIVERS
1620616206
M: Krzysztof Kozlowski <krzk@kernel.org>
1620716207
L: linux-kernel@vger.kernel.org
1620816208
S: Maintained
16209-
B: mailto:krzysztof.kozlowski@linaro.org
16209+
B: mailto:krzk@kernel.org
1621016210
T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
1621116211
F: Documentation/devicetree/bindings/memory-controllers/
1621216212
F: drivers/memory/
@@ -18781,6 +18781,10 @@ S: Maintained
1878118781
F: arch/arm/*omap*/*clock*
1878218782

1878318783
OMAP DEVICE TREE SUPPORT
18784+
M: Aaro Koskinen <aaro.koskinen@iki.fi>
18785+
M: Andreas Kemnade <andreas@kemnade.info>
18786+
M: Kevin Hilman <khilman@baylibre.com>
18787+
M: Roger Quadros <rogerq@kernel.org>
1878418788
M: Tony Lindgren <tony@atomide.com>
1878518789
L: linux-omap@vger.kernel.org
1878618790
L: devicetree@vger.kernel.org
@@ -21179,7 +21183,7 @@ F: Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
2117921183
F: drivers/i2c/busses/i2c-qcom-cci.c
2118021184

2118121185
QUALCOMM INTERCONNECT BWMON DRIVER
21182-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
21186+
M: Krzysztof Kozlowski <krzk@kernel.org>
2118321187
L: linux-arm-msm@vger.kernel.org
2118421188
S: Maintained
2118521189
F: Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml

‎arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji-data64.dts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,3 +1254,17 @@
12541254
max-frequency = <25000000>;
12551255
bus-width = <4>;
12561256
};
1257+
1258+
/*
1259+
* FIXME: rgmii delay is introduced by MAC (configured in u-boot now)
1260+
* instead of PCB on fuji board, so the "phy-mode" should be updated to
1261+
* "rgmii-[tx|rx]id" when the aspeed-mac driver can handle the delay
1262+
* properly.
1263+
*/
1264+
&mac3 {
1265+
status = "okay";
1266+
phy-mode = "rgmii";
1267+
phy-handle = <&ethphy3>;
1268+
pinctrl-names = "default";
1269+
pinctrl-0 = <&pinctrl_rgmii4_default>;
1270+
};

‎arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
mdio {
5656
/delete-node/ switch@1e;
5757

58-
bcm54210e: ethernet-phy@0 {
59-
reg = <0>;
58+
bcm54210e: ethernet-phy@25 {
59+
reg = <25>;
6060
};
6161
};
6262
};

‎arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
pinctrl-0 = <&pinctrl_audmux>;
260260
status = "okay";
261261

262-
ssi2 {
262+
mux-ssi2 {
263263
fsl,audmux-port = <1>;
264264
fsl,port-config = <
265265
(IMX_AUDMUX_V2_PTCR_SYN |
@@ -271,7 +271,7 @@
271271
>;
272272
};
273273

274-
aud3 {
274+
mux-aud3 {
275275
fsl,audmux-port = <2>;
276276
fsl,port-config = <
277277
IMX_AUDMUX_V2_PTCR_SYN

‎arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea-rmm.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
interrupt-parent = <&gpio2>;
137137
interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
138138
reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
139-
report-rate-hz = <6>;
139+
report-rate-hz = <60>;
140140
/* settings valid only for Hycon touchscreen */
141141
touchscreen-size-x = <1280>;
142142
touchscreen-size-y = <800>;

‎arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,21 @@
1818

1919
#include "bcm2712-rpi-5-b-ovl-rp1.dts"
2020

21+
/ {
22+
aliases {
23+
ethernet0 = &rp1_eth;
24+
};
25+
};
26+
2127
&pcie2 {
2228
#include "rp1-nexus.dtsi"
2329
};
2430

2531
&rp1_eth {
32+
assigned-clocks = <&rp1_clocks RP1_CLK_ETH_TSU>,
33+
<&rp1_clocks RP1_CLK_ETH>;
34+
assigned-clock-rates = <50000000>,
35+
<125000000>;
2636
status = "okay";
2737
phy-mode = "rgmii-id";
2838
phy-handle = <&phy1>;

‎arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ img_subsys: bus@58000000 {
6767
power-domains = <&pd IMX_SC_R_CSI_0>;
6868
fsl,channel = <0>;
6969
fsl,num-irqs = <32>;
70-
status = "disabled";
7170
};
7271

7372
gpio0_mipi_csi0: gpio@58222000 {
@@ -144,7 +143,6 @@ img_subsys: bus@58000000 {
144143
power-domains = <&pd IMX_SC_R_CSI_1>;
145144
fsl,channel = <0>;
146145
fsl,num-irqs = <32>;
147-
status = "disabled";
148146
};
149147

150148
gpio0_mipi_csi1: gpio@58242000 {

‎arch/arm64/boot/dts/freescale/imx8mp-kontron-bl-osm-s.dts‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,20 @@
1616
ethernet1 = &eqos;
1717
};
1818

19-
extcon_usbc: usbc {
20-
compatible = "linux,extcon-usb-gpio";
19+
connector {
20+
compatible = "gpio-usb-b-connector", "usb-b-connector";
21+
id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
22+
label = "Type-C";
2123
pinctrl-names = "default";
2224
pinctrl-0 = <&pinctrl_usb1_id>;
23-
id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
25+
type = "micro";
26+
vbus-supply = <&reg_usb1_vbus>;
27+
28+
port {
29+
usb_dr_connector: endpoint {
30+
remote-endpoint = <&usb3_dwc>;
31+
};
32+
};
2433
};
2534

2635
leds {
@@ -244,9 +253,15 @@
244253
hnp-disable;
245254
srp-disable;
246255
dr_mode = "otg";
247-
extcon = <&extcon_usbc>;
248256
usb-role-switch;
257+
role-switch-default-mode = "peripheral";
249258
status = "okay";
259+
260+
port {
261+
usb3_dwc: endpoint {
262+
remote-endpoint = <&usb_dr_connector>;
263+
};
264+
};
250265
};
251266

252267
&usb_dwc3_1 {
@@ -273,7 +288,6 @@
273288
};
274289

275290
&usb3_phy0 {
276-
vbus-supply = <&reg_usb1_vbus>;
277291
status = "okay";
278292
};
279293

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@
18861886
assigned-clock-rates = <3600000000>, <100000000>, <10000000>;
18871887
assigned-clock-parents = <0>, <0>,
18881888
<&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;
1889-
msi-map = <0x0 &its 0x98 0x1>;
1889+
msi-map = <0x0 &its 0x10 0x1>;
18901890
power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
18911891
status = "disabled";
18921892
};
@@ -1963,6 +1963,7 @@
19631963
assigned-clock-rates = <3600000000>, <100000000>, <10000000>;
19641964
assigned-clock-parents = <0>, <0>,
19651965
<&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;
1966+
msi-map = <0x0 &its 0x98 0x1>;
19661967
power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
19671968
status = "disabled";
19681969
};

0 commit comments

Comments
 (0)