Skip to content

Commit e55feea

Browse files
committed
Merge tag 'soc-fixes-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann: "The main code change is a revert of the Raspberry Pi RP1 overlay support that was decided to not be ready. The other fixes are all for devicetree sources: - ethernet configuration on ixp42x-actiontec-mi424wr is board revision specific - validation warning fixes for imx27/imx51/imx6, hikey960 and k3 - Minor corrections across imx8 boards, addressing all types of issues with interrups, dma, ethernet and clock settings, all simple one-line changes" * tag 'soc-fixes-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (25 commits) arm64: dts: hisilicon: hikey960: Drop "snps,gctl-reset-quirk" and "snps,tx_de_emphasis*" properties Documentation/process: maintainer-soc: Mark 'make' as commands Documentation/process: maintainer-soc: Be more explicit about defconfig arm64: dts: mba8mx: Fix Ethernet PHY IRQ support arm64: dts: imx8qm-ss-dma: correct the dma channels of lpuart arm64: dts: imx8mp: Fix LAN8740Ai PHY reference clock on DH electronics i.MX8M Plus DHCOM arm64: dts: freescale: tx8p-ml81: fix eqos nvmem-cells arm64: dts: freescale: moduline-display: fix compatible dt-bindings: arm: fsl: moduline-display: fix compatible ARM: dts: imx6q-ba16: fix RTC interrupt level arm64: dts: freescale: imx95-toradex-smarc: fix SMARC_SDIO_WP label position arm64: dts: freescale: imx95-toradex-smarc: use edge trigger for ethphy1 interrupt arm64: dts: add off-on-delay-us for usdhc2 regulator arm64: dts: imx8qm-mek: correct the light sensor interrupt type to low level ARM: dts: nxp: imx: Fix mc13xxx LED node names arm64: dts: imx95: correct I3C2 pclk to IMX95_CLK_BUSWAKEUP MAINTAINERS: Fix a linusw mail address arm64: dts: broadcom: rp1: drop RP1 overlay arm64: dts: broadcom: bcm2712: fix RP1 endpoint PCI topology misc: rp1: drop overlay support ...
2 parents 4621c33 + bf10403 commit e55feea

34 files changed

Lines changed: 111 additions & 150 deletions

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,6 @@ properties:
11051105
- gateworks,imx8mp-gw74xx # i.MX8MP Gateworks Board
11061106
- gateworks,imx8mp-gw75xx-2x # i.MX8MP Gateworks Board
11071107
- gateworks,imx8mp-gw82xx-2x # i.MX8MP Gateworks Board
1108-
- gocontroll,moduline-display # GOcontroll Moduline Display controller
11091108
- prt,prt8ml # Protonic PRT8ML
11101109
- skov,imx8mp-skov-basic # SKOV i.MX8MP baseboard without frontplate
11111110
- skov,imx8mp-skov-revb-hdmi # SKOV i.MX8MP climate control without panel
@@ -1164,6 +1163,14 @@ properties:
11641163
- const: engicam,icore-mx8mp # i.MX8MP Engicam i.Core MX8M Plus SoM
11651164
- const: fsl,imx8mp
11661165

1166+
- description: Ka-Ro TX8P-ML81 SoM based boards
1167+
items:
1168+
- enum:
1169+
- gocontroll,moduline-display
1170+
- gocontroll,moduline-display-106
1171+
- const: karo,tx8p-ml81
1172+
- const: fsl,imx8mp
1173+
11671174
- description: Kontron i.MX8MP OSM-S SoM based Boards
11681175
items:
11691176
- const: kontron,imx8mp-bl-osm-s # Kontron BL i.MX8MP OSM-S Board

Documentation/devicetree/bindings/misc/pci1de4,1.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ properties:
2525
items:
2626
- const: pci1de4,1
2727

28+
reg:
29+
maxItems: 1
30+
description: The PCI Bus-Device-Function address.
31+
2832
'#interrupt-cells':
2933
const: 2
3034
description: |
@@ -101,6 +105,7 @@ unevaluatedProperties: false
101105

102106
required:
103107
- compatible
108+
- reg
104109
- '#interrupt-cells'
105110
- interrupt-controller
106111
- pci-ep-bus@1
@@ -111,8 +116,9 @@ examples:
111116
#address-cells = <3>;
112117
#size-cells = <2>;
113118
114-
rp1@0,0 {
119+
dev@0,0 {
115120
compatible = "pci1de4,1";
121+
reg = <0x10000 0x0 0x0 0x0 0x0>;
116122
ranges = <0x01 0x00 0x00000000 0x82010000 0x00 0x00 0x00 0x400000>;
117123
#address-cells = <3>;
118124
#size-cells = <2>;

Documentation/process/maintainer-soc.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ Submitting Patches for Given SoC
5757

5858
All typical platform related patches should be sent via SoC submaintainers
5959
(platform-specific maintainers). This includes also changes to per-platform or
60-
shared defconfigs (scripts/get_maintainer.pl might not provide correct
61-
addresses in such case).
60+
shared defconfigs. Note that scripts/get_maintainer.pl might not provide
61+
correct addresses for the shared defconfig, so ignore its output and manually
62+
create CC-list based on MAINTAINERS file or use something like
63+
``scripts/get_maintainer.pl -f drivers/soc/FOO/``).
6264

6365
Submitting Patches to the Main SoC Maintainers
6466
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -114,9 +116,9 @@ coordinating how the changes get merged through different maintainer trees.
114116
Usually the branch that includes a driver change will also include the
115117
corresponding change to the devicetree binding description, to ensure they are
116118
in fact compatible. This means that the devicetree branch can end up causing
117-
warnings in the "make dtbs_check" step. If a devicetree change depends on
119+
warnings in the ``make dtbs_check`` step. If a devicetree change depends on
118120
missing additions to a header file in include/dt-bindings/, it will fail the
119-
"make dtbs" step and not get merged.
121+
``make dtbs`` step and not get merged.
120122

121123
There are multiple ways to deal with this:
122124

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2012,7 +2012,7 @@ ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
20122012
M: Arnd Bergmann <arnd@arndb.de>
20132013
M: Krzysztof Kozlowski <krzk@kernel.org>
20142014
M: Alexandre Belloni <alexandre.belloni@bootlin.com>
2015-
M: Linus Walleij <linus.walleij@linaro.org>
2015+
M: Linus Walleij <linusw@kernel.org>
20162016
R: Drew Fustini <fustini@kernel.org>
20172017
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
20182018
L: soc@lists.linux.dev

arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-ac.dts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@
1212
model = "Actiontec MI424WR rev A/C";
1313
compatible = "actiontec,mi424wr-ac", "intel,ixp42x";
1414

15+
/* Connect the switch to EthC */
16+
spi {
17+
ethernet-switch@0 {
18+
ethernet-ports {
19+
ethernet-port@4 {
20+
ethernet = <&ethc>;
21+
};
22+
};
23+
};
24+
};
25+
1526
soc {
1627
/* EthB used for WAN */
1728
ethernet@c8009000 {

arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-d.dts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@
1212
model = "Actiontec MI424WR rev D";
1313
compatible = "actiontec,mi424wr-d", "intel,ixp42x";
1414

15+
/* Connect the switch to EthB */
16+
spi {
17+
ethernet-switch@0 {
18+
ethernet-ports {
19+
ethernet-port@4 {
20+
ethernet = <&ethb>;
21+
};
22+
};
23+
};
24+
};
25+
1526
soc {
1627
/* EthB used for LAN */
1728
ethernet@c8009000 {

arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
};
153153
ethernet-port@4 {
154154
reg = <4>;
155-
ethernet = <&ethc>;
156155
phy-mode = "mii";
157156
fixed-link {
158157
speed = <100>;

arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,14 @@
248248
linux,default-trigger = "nand-disk";
249249
};
250250

251-
ledg3: led@10 {
252-
reg = <10>;
251+
ledg3: led@a {
252+
reg = <0xa>;
253253
label = "system:green3:live";
254254
linux,default-trigger = "heartbeat";
255255
};
256256

257-
ledb3: led@11 {
258-
reg = <11>;
257+
ledb3: led@b {
258+
reg = <0xb>;
259259
label = "system:blue3:cpu";
260260
linux,default-trigger = "cpu0";
261261
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,13 +398,13 @@
398398
#size-cells = <0>;
399399
led-control = <0x0 0x0 0x3f83f8 0x0>;
400400

401-
sysled0@3 {
401+
led@3 {
402402
reg = <3>;
403403
label = "system:green:status";
404404
linux,default-trigger = "default-on";
405405
};
406406

407-
sysled1@4 {
407+
led@4 {
408408
reg = <4>;
409409
label = "system:green:act";
410410
linux,default-trigger = "heartbeat";

arch/arm/boot/dts/nxp/imx/imx51-zii-scu2-mezz.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,13 @@
225225
#size-cells = <0>;
226226
led-control = <0x0 0x0 0x3f83f8 0x0>;
227227

228-
sysled3: led3@3 {
228+
sysled3: led@3 {
229229
reg = <3>;
230230
label = "system:red:power";
231231
linux,default-trigger = "default-on";
232232
};
233233

234-
sysled4: led4@4 {
234+
sysled4: led@4 {
235235
reg = <4>;
236236
label = "system:green:act";
237237
linux,default-trigger = "heartbeat";

0 commit comments

Comments
 (0)