Skip to content

Commit 28ed0a0

Browse files
committed
Merge tag 'imx-dt64-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX arm64 device tree changes: - New support of Beacon i.MX8m-Mini development kit. - Add secondary cpus supply on imx8mm-evk and imx8mn-ddr4-evk for completeness. - Add thermal zones for imx8mp and lx2160a, PMIC thermal zone for imx8qxp-mek board. - Update VDD_ARM 1.2GHz setpoint voltage for imx8mn. - Add SRC device interrupt for i.MX8 SoCs. - Use 0.9V for VDD_GPU on imx8mq-librem5-devkit, since there is no need to support overclocking to 1GHz. - Update imx8qxp SCU device to use MU channel with less interrupt triggering, one RX interrupt for a RX and one TX interrupt for a TX. - Specify DMA channels for LS1028A DSPI controllers. - Add QE and DS26522 device support for fsl-ls1043a-rdb board. - Misc random update and cleanup. * tag 'imx-dt64-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (25 commits) arm64: dts: Add ds26522 node to dts to ls1043ardb arm64: dts: add qe node to ls1043ardb arm64: dts: ls1028a: sl28: keep switch port names consistent arm64: dts: imx8mp: Add src node interrupts arm64: dts: imx8mq: Add src node interrupts arm64: dts: imx8m: assign clocks for A53 arm64: dts: freescale: sl28: enable LPUART1 arm64: dts: ls1043a-rdb: add compatible for board arm64: dts: imx8mp: add "fsl,imx6sx-fec" compatible string arm64: dts: imx8qxp-mek: Do not use underscore in node name arm64: dts: fsl: add fsl,extts-fifo property for fman ptp arm64: dts: imx8mn: Update VDD_ARM 1.2GHz setpoint voltage arm64: dts: lx2160a: add more thermal zone support arm64: dts: imx8qxp-mek: Add PMIC thermal zone support arm64: dts: imx8qxp-mek: Sort labels alphabetically arm64: dts: imx8mm: specify #sound-dai-cells for SAI nodes arm64: dts: imx8qxp: support scu mailbox channel arm64: dts: imx8mp: Add thermal zones support arm64: dts: ls1012a: Add QSPI node properties arm64: dts: imx: Add Beacon i.MX8m-Mini development kit ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents d39b6ae + 48ffd4e commit 28ed0a0

24 files changed

+1231
-65
lines changed

arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,21 @@
7474
};
7575
};
7676

77+
&qspi {
78+
status = "okay";
79+
80+
s25fs512s0: flash@0 {
81+
compatible = "jedec,spi-nor";
82+
#address-cells = <1>;
83+
#size-cells = <1>;
84+
spi-max-frequency = <50000000>;
85+
m25p,fast-read;
86+
reg = <0>;
87+
spi-rx-bus-width = <2>;
88+
spi-tx-bus-width = <2>;
89+
};
90+
};
91+
7792
&sai2 {
7893
status = "okay";
7994
};

arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,18 @@
2323
&i2c0 {
2424
status = "okay";
2525
};
26+
27+
&qspi {
28+
status = "okay";
29+
30+
w25q16dw0: flash@0 {
31+
compatible = "jedec,spi-nor";
32+
#address-cells = <1>;
33+
#size-cells = <1>;
34+
m25p,fast-read;
35+
spi-max-frequency = <50000000>;
36+
reg = <0>;
37+
spi-rx-bus-width = <2>;
38+
spi-tx-bus-width = <2>;
39+
};
40+
};

arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,21 @@
128128
};
129129
};
130130

131+
&qspi {
132+
status = "okay";
133+
134+
s25fs512s0: flash@0 {
135+
compatible = "jedec,spi-nor";
136+
#address-cells = <1>;
137+
#size-cells = <1>;
138+
spi-max-frequency = <50000000>;
139+
m25p,fast-read;
140+
reg = <0>;
141+
spi-rx-bus-width = <2>;
142+
spi-tx-bus-width = <2>;
143+
};
144+
};
145+
131146
&sai2 {
132147
status = "okay";
133148
};

arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,21 @@
3535
status = "okay";
3636
};
3737

38+
&qspi {
39+
status = "okay";
40+
41+
s25fs512s0: flash@0 {
42+
compatible = "jedec,spi-nor";
43+
#address-cells = <1>;
44+
#size-cells = <1>;
45+
spi-max-frequency = <50000000>;
46+
m25p,fast-read;
47+
reg = <0>;
48+
spi-rx-bus-width = <2>;
49+
spi-tx-bus-width = <2>;
50+
};
51+
};
52+
3853
&sata {
3954
status = "okay";
4055
};

arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,19 @@
137137
#size-cells = <2>;
138138
ranges;
139139

140+
qspi: spi@1550000 {
141+
compatible = "fsl,ls1021a-qspi";
142+
#address-cells = <1>;
143+
#size-cells = <0>;
144+
reg = <0x0 0x1550000 0x0 0x10000>,
145+
<0x0 0x40000000 0x0 0x10000000>;
146+
reg-names = "QuadSPI", "QuadSPI-memory";
147+
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
148+
clock-names = "qspi_en", "qspi";
149+
clocks = <&clockgen 4 0>, <&clockgen 4 0>;
150+
status = "disabled";
151+
};
152+
140153
esdhc0: esdhc@1560000 {
141154
compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";
142155
reg = <0x0 0x1560000 0x0 0x10000>;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
};
5454

5555
&mscc_felix_port0 {
56-
label = "gbe0";
56+
label = "swp0";
5757
phy-handle = <&phy0>;
5858
phy-mode = "sgmii";
5959
status = "okay";
6060
};
6161

6262
&mscc_felix_port1 {
63-
label = "gbe1";
63+
label = "swp1";
6464
phy-handle = <&phy1>;
6565
phy-mode = "sgmii";
6666
status = "okay";

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
crypto = &crypto;
1818
serial0 = &duart0;
1919
serial1 = &duart1;
20+
serial2 = &lpuart1;
2021
spi0 = &fspi;
2122
spi1 = &dspi2;
2223
};
@@ -185,3 +186,7 @@
185186
pagesize = <32>;
186187
};
187188
};
189+
190+
&lpuart1 {
191+
status = "okay";
192+
};

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@
298298
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
299299
clock-names = "dspi";
300300
clocks = <&clockgen 4 1>;
301+
dmas = <&edma0 0 62>, <&edma0 0 60>;
302+
dma-names = "tx", "rx";
301303
spi-num-chipselects = <4>;
302304
little-endian;
303305
status = "disabled";
@@ -311,6 +313,8 @@
311313
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
312314
clock-names = "dspi";
313315
clocks = <&clockgen 4 1>;
316+
dmas = <&edma0 0 58>, <&edma0 0 56>;
317+
dma-names = "tx", "rx";
314318
spi-num-chipselects = <4>;
315319
little-endian;
316320
status = "disabled";
@@ -324,6 +328,8 @@
324328
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
325329
clock-names = "dspi";
326330
clocks = <&clockgen 4 1>;
331+
dmas = <&edma0 0 54>, <&edma0 0 2>;
332+
dma-names = "tx", "rx";
327333
spi-num-chipselects = <3>;
328334
little-endian;
329335
status = "disabled";

arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/ {
1515
model = "LS1043A RDB Board";
16+
compatible = "fsl,ls1043a-rdb", "fsl,ls1043a";
1617

1718
aliases {
1819
serial0 = &duart0;
@@ -94,6 +95,22 @@
9495
reg = <0>;
9596
spi-max-frequency = <1000000>; /* input clock */
9697
};
98+
99+
slic@2 {
100+
compatible = "maxim,ds26522";
101+
reg = <2>;
102+
spi-max-frequency = <2000000>;
103+
fsl,spi-cs-sck-delay = <100>;
104+
fsl,spi-sck-cs-delay = <50>;
105+
};
106+
107+
slic@3 {
108+
compatible = "maxim,ds26522";
109+
reg = <3>;
110+
spi-max-frequency = <2000000>;
111+
fsl,spi-cs-sck-delay = <100>;
112+
fsl,spi-sck-cs-delay = <50>;
113+
};
97114
};
98115

99116
&duart0 {
@@ -176,3 +193,19 @@
176193
};
177194
};
178195
};
196+
197+
&uqe {
198+
ucc_hdlc: ucc@2000 {
199+
compatible = "fsl,ucc-hdlc";
200+
rx-clock-name = "clk8";
201+
tx-clock-name = "clk9";
202+
fsl,rx-sync-clock = "rsync_pin";
203+
fsl,tx-sync-clock = "tsync_pin";
204+
fsl,tx-timeslot-mask = <0xfffffffe>;
205+
fsl,rx-timeslot-mask = <0xfffffffe>;
206+
fsl,tdm-framer-type = "e1";
207+
fsl,tdm-id = <0>;
208+
fsl,siram-entry-id = <0>;
209+
fsl,tdm-interface;
210+
};
211+
};

arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,71 @@
525525
#interrupt-cells = <2>;
526526
};
527527

528+
uqe: uqe@2400000 {
529+
#address-cells = <1>;
530+
#size-cells = <1>;
531+
compatible = "fsl,qe", "simple-bus";
532+
ranges = <0x0 0x0 0x2400000 0x40000>;
533+
reg = <0x0 0x2400000 0x0 0x480>;
534+
brg-frequency = <100000000>;
535+
bus-frequency = <200000000>;
536+
fsl,qe-num-riscs = <1>;
537+
fsl,qe-num-snums = <28>;
538+
539+
qeic: qeic@80 {
540+
compatible = "fsl,qe-ic";
541+
reg = <0x80 0x80>;
542+
#address-cells = <0>;
543+
interrupt-controller;
544+
#interrupt-cells = <1>;
545+
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
546+
<GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
547+
};
548+
549+
si1: si@700 {
550+
#address-cells = <1>;
551+
#size-cells = <0>;
552+
compatible = "fsl,ls1043-qe-si",
553+
"fsl,t1040-qe-si";
554+
reg = <0x700 0x80>;
555+
};
556+
557+
siram1: siram@1000 {
558+
#address-cells = <1>;
559+
#size-cells = <1>;
560+
compatible = "fsl,ls1043-qe-siram",
561+
"fsl,t1040-qe-siram";
562+
reg = <0x1000 0x800>;
563+
};
564+
565+
ucc@2000 {
566+
cell-index = <1>;
567+
reg = <0x2000 0x200>;
568+
interrupts = <32>;
569+
interrupt-parent = <&qeic>;
570+
};
571+
572+
ucc@2200 {
573+
cell-index = <3>;
574+
reg = <0x2200 0x200>;
575+
interrupts = <34>;
576+
interrupt-parent = <&qeic>;
577+
};
578+
579+
muram@10000 {
580+
#address-cells = <1>;
581+
#size-cells = <1>;
582+
compatible = "fsl,qe-muram", "fsl,cpm-muram";
583+
ranges = <0x0 0x10000 0x6000>;
584+
585+
data-only@0 {
586+
compatible = "fsl,qe-muram-data",
587+
"fsl,cpm-muram-data";
588+
reg = <0x0 0x6000>;
589+
};
590+
};
591+
};
592+
528593
lpuart0: serial@2950000 {
529594
compatible = "fsl,ls1021a-lpuart";
530595
reg = <0x0 0x2950000 0x0 0x1000>;

0 commit comments

Comments
 (0)