Skip to content

Commit f0df584

Browse files
arndbarndb
committed
Merge tag 'imx-dt64-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX arm64 device tree chanage for 6.6: - New board device trees: i.MX93 based MBa93xxLA SBC, DEBIX SOM A, Gateworks i.MX8MM and i.MX8MP Venice boards. - Add HDMI audio and video support for i.MX8MM/N Beacon board. - Add coresight trace support for i.MX8MQ SoC. - Replace deprecated extcon-usb-gpio id-gpio/vbus-gpio properties. - Add sound card support for verdin-imx8mp devices. - A couple of change from Frank Li to add CPU frequency table and thermal support for i.MX8QM SoC. - Add L1 and L2 cache info for LS1028A SoC. - A series of i.MX93 changes from Peng Fan t oadd thermal and CM33 core support. - A few imx8mq-librem5 updates from Martin Kepplinger and Sebastian Krzyszkowiak. - A series of imx8mp-phycore-som changes from Teresa Remmet to update regulators. - A bunch of changes from Tim Harvey to update various Gateworks boards. - A bunch of dtschema warning fixes from Fabio Estevam, Krzysztof Kozlowski, etc. - Other small and random changes. * tag 'imx-dt64-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (88 commits) arm64: dts: imx8mq-librem5-devkit: Drop power-supply arm64: dts: imx8mq-librem5-devkit: Mark buck2 as always on arm64: dts: imx8mm-beacon-baseboard: Remove usbotg2 pinctrl-names arm64: dts: imx8mm-emcon: Remove iomuxc pinctrl-names arm64: dts: imx8m-beacon-kit: Remove extra sound-sai entry arm64: dts: freescale: Add DEBIX SOM A and SOM A I/O Board support arm64: dts: imx8mp-debix: remove unused fec pinctrl node arm64: dts: imx8mp-debix-model-a: Remove invalid rtc property arm64: dts: imx8mp-msc-sm2s-ep1: Remove invalid sgtl5000 property arm64: dts: imx8m-venice: Pass "brcm,bcm4329-fmac" arm64: dts: imx8mp-evk: Add HDMI support arm64: dts: freescale: verdin-imx8mp: dev: add sound card arm64: dts: freescale: verdin-imx8mp: dahlia: add sound card arm64: dts: imx8mm-emcon: Fix the regulator names arm64: dts: imx: Pass a single BD71847 clock entry arm64: dts: ls1028a: add l1 and l2 cache info arm64: dts: imx8mm-phyboard-polis-rdk: Remove 'fsl,spi-num-chipselects' arm64: dts: imx8dxl-evk: Remove 'fsl,spi-num-chipselects' arm64: dts: freescale: Replace deprecated extcon-usb-gpio id-gpio/vbus-gpio properties arm64: dts: tqma8mqnl: Add vcc supply to i2c eeproms ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents a5c3378 + 60ac8a7 commit f0df584

File tree

77 files changed

+5222
-375
lines changed

Some content is hidden

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

77 files changed

+5222
-375
lines changed

‎arch/arm64/boot/dts/freescale/Makefile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7901.dtb
7575
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7902.dtb
7676
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7903.dtb
7777
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7904.dtb
78+
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7905-0x.dtb
7879
dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-dahlia.dtb
7980
dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-dev.dtb
8081
dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-yavia.dtb
@@ -93,13 +94,17 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mn-venice-gw7902.dtb
9394
dtb-$(CONFIG_ARCH_MXC) += imx8mp-beacon-kit.dtb
9495
dtb-$(CONFIG_ARCH_MXC) += imx8mp-data-modul-edm-sbc.dtb
9596
dtb-$(CONFIG_ARCH_MXC) += imx8mp-debix-model-a.dtb
97+
dtb-$(CONFIG_ARCH_MXC) += imx8mp-debix-som-a-bmb-08.dtb
9698
dtb-$(CONFIG_ARCH_MXC) += imx8mp-dhcom-pdk2.dtb
9799
dtb-$(CONFIG_ARCH_MXC) += imx8mp-dhcom-pdk3.dtb
98100
dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb
99101
dtb-$(CONFIG_ARCH_MXC) += imx8mp-icore-mx8mp-edimm2.2.dtb
100102
dtb-$(CONFIG_ARCH_MXC) += imx8mp-msc-sm2s-ep1.dtb
101103
dtb-$(CONFIG_ARCH_MXC) += imx8mp-phyboard-pollux-rdk.dtb
102104
dtb-$(CONFIG_ARCH_MXC) += imx8mp-tqma8mpql-mba8mpxl.dtb
105+
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw71xx-2x.dtb
106+
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw72xx-2x.dtb
107+
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw73xx-2x.dtb
103108
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw74xx.dtb
104109
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw7905-2x.dtb
105110
dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-nonwifi-dahlia.dtb
@@ -141,24 +146,31 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-iris-v2.dtb
141146
dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb
142147
dtb-$(CONFIG_ARCH_MXC) += imx8ulp-evk.dtb
143148
dtb-$(CONFIG_ARCH_MXC) += imx93-11x11-evk.dtb
149+
dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxla.dtb
144150

145-
imx8mm-venice-gw72xx-0x-imx219-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-imx219.dtbo
151+
imx8mm-venice-gw72xx-0x-imx219-dtbs := imx8mm-venice-gw72xx-0x.dtb imx8mm-venice-gw72xx-0x-imx219.dtbo
152+
imx8mm-venice-gw72xx-0x-rpidsi-dtbs := imx8mm-venice-gw72xx-0x.dtb imx8mm-venice-gw72xx-0x-rpidsi.dtbo
146153
imx8mm-venice-gw72xx-0x-rs232-rts-dtbs := imx8mm-venice-gw72xx-0x.dtb imx8mm-venice-gw72xx-0x-rs232-rts.dtbo
147154
imx8mm-venice-gw72xx-0x-rs422-dtbs := imx8mm-venice-gw72xx-0x.dtb imx8mm-venice-gw72xx-0x-rs422.dtbo
148155
imx8mm-venice-gw72xx-0x-rs485-dtbs := imx8mm-venice-gw72xx-0x.dtb imx8mm-venice-gw72xx-0x-rs485.dtbo
149156
imx8mm-venice-gw73xx-0x-imx219-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-imx219.dtbo
157+
imx8mm-venice-gw73xx-0x-rpidsi-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rpidsi.dtbo
150158
imx8mm-venice-gw73xx-0x-rs232-rts-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs232-rts.dtbo
151159
imx8mm-venice-gw73xx-0x-rs422-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs422.dtbo
152160
imx8mm-venice-gw73xx-0x-rs485-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs485.dtbo
161+
imx8mp-venice-gw74xx-rpidsi-dtbs := imx8mp-venice-gw74xx.dtb imx8mp-venice-gw74xx-rpidsi.dtbo
153162

154163
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x-imx219.dtb
164+
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x-rpidsi.dtb
155165
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x-rs232-rts.dtb
156166
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x-rs422.dtb
157167
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x-rs485.dtb
158168
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-imx219.dtb
169+
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rpidsi.dtb
159170
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs232-rts.dtb
160171
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs422.dtb
161172
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs485.dtb
173+
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw74xx-rpidsi.dtb
162174

163175
dtb-$(CONFIG_ARCH_S32) += s32g274a-evb.dtb
164176
dtb-$(CONFIG_ARCH_S32) += s32g274a-rdb2.dtb

‎arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,14 @@
5656
};
5757

5858
&enetc_port2 {
59+
nvmem-cells = <&base_mac_address 2>;
60+
nvmem-cell-names = "mac-address";
5961
status = "okay";
6062
};
6163

6264
&enetc_port3 {
65+
nvmem-cells = <&base_mac_address 3>;
66+
nvmem-cell-names = "mac-address";
6367
status = "okay";
6468
};
6569

@@ -80,6 +84,8 @@
8084
managed = "in-band-status";
8185
phy-handle = <&qsgmii_phy0>;
8286
phy-mode = "qsgmii";
87+
nvmem-cells = <&base_mac_address 4>;
88+
nvmem-cell-names = "mac-address";
8389
status = "okay";
8490
};
8591

@@ -88,6 +94,8 @@
8894
managed = "in-band-status";
8995
phy-handle = <&qsgmii_phy1>;
9096
phy-mode = "qsgmii";
97+
nvmem-cells = <&base_mac_address 5>;
98+
nvmem-cell-names = "mac-address";
9199
status = "okay";
92100
};
93101

@@ -96,6 +104,8 @@
96104
managed = "in-band-status";
97105
phy-handle = <&qsgmii_phy2>;
98106
phy-mode = "qsgmii";
107+
nvmem-cells = <&base_mac_address 6>;
108+
nvmem-cell-names = "mac-address";
99109
status = "okay";
100110
};
101111

@@ -104,6 +114,8 @@
104114
managed = "in-band-status";
105115
phy-handle = <&qsgmii_phy3>;
106116
phy-mode = "qsgmii";
117+
nvmem-cells = <&base_mac_address 7>;
118+
nvmem-cell-names = "mac-address";
107119
status = "okay";
108120
};
109121

‎arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,7 @@
5555
&enetc_port1 {
5656
phy-handle = <&phy0>;
5757
phy-mode = "rgmii-id";
58+
nvmem-cells = <&base_mac_address 0>;
59+
nvmem-cell-names = "mac-address";
5860
status = "okay";
5961
};

‎arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,14 @@
3636
};
3737

3838
&enetc_port2 {
39+
nvmem-cells = <&base_mac_address 2>;
40+
nvmem-cell-names = "mac-address";
3941
status = "okay";
4042
};
4143

4244
&enetc_port3 {
45+
nvmem-cells = <&base_mac_address 3>;
46+
nvmem-cell-names = "mac-address";
4347
status = "okay";
4448
};
4549

@@ -52,6 +56,8 @@
5256
managed = "in-band-status";
5357
phy-handle = <&phy0>;
5458
phy-mode = "sgmii";
59+
nvmem-cells = <&base_mac_address 0>;
60+
nvmem-cell-names = "mac-address";
5561
status = "okay";
5662
};
5763

@@ -60,6 +66,8 @@
6066
managed = "in-band-status";
6167
phy-handle = <&phy1>;
6268
phy-mode = "sgmii";
69+
nvmem-cells = <&base_mac_address 1>;
70+
nvmem-cell-names = "mac-address";
6371
status = "okay";
6472
};
6573

‎arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var4.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@
4343
&enetc_port1 {
4444
phy-handle = <&phy1>;
4545
phy-mode = "rgmii-id";
46+
nvmem-cells = <&base_mac_address 1>;
47+
nvmem-cell-names = "mac-address";
4648
status = "okay";
4749
};

‎arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
9292
phy-handle = <&phy0>;
9393
phy-mode = "sgmii";
9494
managed = "in-band-status";
95+
nvmem-cells = <&base_mac_address 0>;
96+
nvmem-cell-names = "mac-address";
9597
status = "okay";
9698
};
9799

@@ -154,6 +156,21 @@
154156
label = "bootloader environment";
155157
};
156158
};
159+
160+
otp-1 {
161+
compatible = "user-otp";
162+
163+
nvmem-layout {
164+
compatible = "kontron,sl28-vpd";
165+
166+
serial_number: serial-number {
167+
};
168+
169+
base_mac_address: base-mac-address {
170+
#nvmem-cell-cells = <1>;
171+
};
172+
};
173+
};
157174
};
158175
};
159176

‎arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
reg = <0x0>;
2929
enable-method = "psci";
3030
clocks = <&clockgen QORIQ_CLK_CMUX 0>;
31+
i-cache-size = <0xc000>;
32+
i-cache-line-size = <64>;
33+
i-cache-sets = <256>;
34+
d-cache-size = <0x8000>;
35+
d-cache-line-size = <64>;
36+
d-cache-sets = <256>;
3137
next-level-cache = <&l2>;
3238
cpu-idle-states = <&CPU_PW20>;
3339
#cooling-cells = <2>;
@@ -39,6 +45,12 @@
3945
reg = <0x1>;
4046
enable-method = "psci";
4147
clocks = <&clockgen QORIQ_CLK_CMUX 0>;
48+
i-cache-size = <0xc000>;
49+
i-cache-line-size = <64>;
50+
i-cache-sets = <256>;
51+
d-cache-size = <0x8000>;
52+
d-cache-line-size = <64>;
53+
d-cache-sets = <256>;
4254
next-level-cache = <&l2>;
4355
cpu-idle-states = <&CPU_PW20>;
4456
#cooling-cells = <2>;
@@ -48,6 +60,9 @@
4860
compatible = "cache";
4961
cache-level = <2>;
5062
cache-unified;
63+
cache-size = <0x100000>;
64+
cache-line-size = <64>;
65+
cache-sets = <1024>;
5166
};
5267
};
5368

‎arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
mdio-parent-bus = <&emdio1>;
7070
reg = <0x54 1>; /* BRDCFG4 */
7171
mux-mask = <0xe0>; /* EMI1_MDIO */
72-
#address-cells=<1>;
72+
#address-cells = <1>;
7373
#size-cells = <0>;
7474

7575
/* Child MDIO buses, one for each riser card:

‎arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -684,15 +684,15 @@
684684
};
685685

686686
/* Messaging Units */
687-
&mu_m0{
687+
&mu_m0 {
688688
status = "okay";
689689
};
690690

691-
&mu1_m0{
691+
&mu1_m0 {
692692
status = "okay";
693693
};
694694

695-
&mu2_m0{
695+
&mu2_m0 {
696696
status = "okay";
697697
};
698698

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,10 @@ conn_subsys: bus@5b000000 {
157157

158158
usbotg3_cdns3: usb@5b120000 {
159159
compatible = "cdns,usb3";
160-
reg = <0x5b130000 0x10000>, /* memory area for HOST registers */
161-
<0x5b140000 0x10000>, /* memory area for DEVICE registers */
162-
<0x5b120000 0x10000>; /* memory area for OTG/DRD registers */
163-
reg-names = "xhci", "dev", "otg";
164-
#address-cells = <1>;
165-
#size-cells = <1>;
160+
reg = <0x5b120000 0x10000>, /* memory area for OTG/DRD registers */
161+
<0x5b130000 0x10000>, /* memory area for HOST registers */
162+
<0x5b140000 0x10000>; /* memory area for DEVICE registers */
163+
reg-names = "otg", "xhci", "dev";
166164
interrupt-parent = <&gic>;
167165
interrupts = <GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH>,
168166
<GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH>,

0 commit comments

Comments
 (0)