Skip to content

Commit 959d86a

Browse files
author
Shawn Guo
committed
Merge branch 'imx/dt64' into for-next
2 parents 69cc951 + f68db46 commit 959d86a

File tree

108 files changed

+5210
-401
lines changed

Some content is hidden

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

108 files changed

+5210
-401
lines changed

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb
129129
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw71xx-0x.dtb
130130
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x.dtb
131131
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x.dtb
132+
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw75xx-0x.dtb
132133
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7901.dtb
133134
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7902.dtb
134135
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7903.dtb
135136
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7904.dtb
136-
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7905-0x.dtb
137137
dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-dahlia.dtb
138138
dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-dev.dtb
139139
dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-mallow.dtb
@@ -174,16 +174,19 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-icore-mx8mp-edimm2.2.dtb
174174
dtb-$(CONFIG_ARCH_MXC) += imx8mp-msc-sm2s-ep1.dtb
175175
dtb-$(CONFIG_ARCH_MXC) += imx8mp-navqp.dtb
176176
dtb-$(CONFIG_ARCH_MXC) += imx8mp-phyboard-pollux-rdk.dtb
177+
imx8mp-phyboard-pollux-rdk-no-eth-dtbs += imx8mp-phyboard-pollux-rdk.dtb imx8mp-phycore-no-eth.dtbo
178+
dtb-$(CONFIG_ARCH_MXC) += imx8mp-phyboard-pollux-rdk-no-eth.dtb
177179
dtb-$(CONFIG_ARCH_MXC) += imx8mp-skov-revb-hdmi.dtb
178180
dtb-$(CONFIG_ARCH_MXC) += imx8mp-skov-revb-lt6.dtb
179181
dtb-$(CONFIG_ARCH_MXC) += imx8mp-skov-revb-mi1010ait-1cp1.dtb
180182
dtb-$(CONFIG_ARCH_MXC) += imx8mp-tqma8mpql-mba8mpxl.dtb
181183
dtb-$(CONFIG_ARCH_MXC) += imx8mp-tqma8mpql-mba8mp-ras314.dtb
184+
dtb-$(CONFIG_ARCH_MXC) += imx8mp-var-som-symphony.dtb
182185
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw71xx-2x.dtb
183186
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw72xx-2x.dtb
184187
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw73xx-2x.dtb
185188
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw74xx.dtb
186-
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw7905-2x.dtb
189+
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw75xx-2x.dtb
187190
dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-nonwifi-dahlia.dtb
188191
dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-nonwifi-dev.dtb
189192
dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-nonwifi-mallow.dtb
@@ -238,6 +241,8 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qxp-tqma8xqp-mba8xx.dtb
238241
dtb-$(CONFIG_ARCH_MXC) += imx8ulp-evk.dtb
239242
dtb-$(CONFIG_ARCH_MXC) += imx93-9x9-qsb.dtb
240243
dtb-$(CONFIG_ARCH_MXC) += imx93-11x11-evk.dtb
244+
dtb-$(CONFIG_ARCH_MXC) += imx93-14x14-evk.dtb
245+
dtb-$(CONFIG_ARCH_MXC) += imx93-kontron-bl-osm-s.dtb
241246
dtb-$(CONFIG_ARCH_MXC) += imx93-phyboard-segin.dtb
242247
dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxca.dtb
243248
dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxla.dtb

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
clock-frequency = <25000000>;
2121
};
2222

23+
sc16is7xx_clk: clock-sc16is7xx {
24+
compatible = "fixed-clock";
25+
#clock-cells = <0>;
26+
clock-frequency = <24000000>;
27+
};
28+
2329
reg_1p8v: regulator-1p8v {
2430
compatible = "regulator-fixed";
2531
regulator-name = "1P8V";
@@ -69,12 +75,6 @@
6975
clocks = <&sc16is7xx_clk>;
7076
interrupt-parent = <&gpio1>;
7177
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
72-
73-
sc16is7xx_clk: clock-sc16is7xx {
74-
compatible = "fixed-clock";
75-
#clock-cells = <0>;
76-
clock-frequency = <24000000>;
77-
};
7878
};
7979
};
8080

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@
164164
QORIQ_CLK_PLL_DIV(1)>;
165165
voltage-ranges = <1800 1800 3300 3300>;
166166
sdhci,auto-cmd12;
167-
big-endian;
168167
bus-width = <4>;
169168
status = "disabled";
170169
};
@@ -183,7 +182,6 @@
183182
QORIQ_CLK_PLL_DIV(1)>;
184183
voltage-ranges = <1800 1800 3300 3300>;
185184
sdhci,auto-cmd12;
186-
big-endian;
187185
broken-cd;
188186
bus-width = <4>;
189187
status = "disabled";
@@ -541,7 +539,6 @@
541539
#address-cells = <3>;
542540
#size-cells = <2>;
543541
device_type = "pci";
544-
num-viewport = <2>;
545542
bus-range = <0x0 0xff>;
546543
ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */
547544
0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
@@ -556,7 +553,7 @@
556553
status = "disabled";
557554
};
558555

559-
rcpm: power-controller@1ee2140 {
556+
rcpm: wakeup-controller@1ee2140 {
560557
compatible = "fsl,ls1012a-rcpm", "fsl,qoriq-rcpm-2.1+";
561558
reg = <0x0 0x1ee2140 0x0 0x4>;
562559
#fsl,rcpm-wakeup-cells = <1>;

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

+12
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626
cooling-levels = <1 128 192 255>;
2727
};
2828

29+
reg_3p3v: regulator-3p3v {
30+
compatible = "regulator-fixed";
31+
regulator-name = "3P3V";
32+
regulator-min-microvolt = <3300000>;
33+
regulator-max-microvolt = <3300000>;
34+
};
35+
2936
sound {
3037
#address-cells = <1>;
3138
#size-cells = <0>;
@@ -107,6 +114,11 @@
107114
clock-names = "mclk";
108115
assigned-clocks = <&mclk>;
109116
assigned-clock-rates = <1250000>;
117+
AVDD-supply = <&reg_3p3v>;
118+
CPVDD-supply = <&reg_3p3v>;
119+
DBVDD-supply = <&reg_3p3v>;
120+
DCVDD-supply = <&reg_3p3v>;
121+
MICVDD-supply = <&reg_3p3v>;
110122
};
111123
};
112124

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

+13-16
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,6 @@
112112
};
113113
};
114114

115-
reboot {
116-
compatible = "syscon-reboot";
117-
regmap = <&rst>;
118-
offset = <0>;
119-
mask = <0x02>;
120-
};
121-
122115
timer {
123116
compatible = "arm,armv8-timer";
124117
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
@@ -150,6 +143,7 @@
150143
its: msi-controller@6020000 {
151144
compatible = "arm,gic-v3-its";
152145
msi-controller;
146+
#msi-cells = <1>;
153147
reg = <0x0 0x06020000 0 0x20000>;/* GIC Translater */
154148
};
155149
};
@@ -235,10 +229,16 @@
235229
};
236230
};
237231

238-
rst: syscon@1e60000 {
239-
compatible = "syscon";
232+
syscon@1e60000 {
233+
compatible = "fsl,ls1028a-reset", "syscon", "simple-mfd";
240234
reg = <0x0 0x1e60000 0x0 0x10000>;
241235
little-endian;
236+
237+
reboot {
238+
compatible = "syscon-reboot";
239+
offset = <0>;
240+
mask = <0x02>;
241+
};
242242
};
243243

244244
sfp: efuse@1e80000 {
@@ -381,7 +381,6 @@
381381
dmas = <&edma0 0 62>, <&edma0 0 60>;
382382
dma-names = "tx", "rx";
383383
spi-num-chipselects = <4>;
384-
little-endian;
385384
status = "disabled";
386385
};
387386

@@ -397,7 +396,6 @@
397396
dmas = <&edma0 0 58>, <&edma0 0 56>;
398397
dma-names = "tx", "rx";
399398
spi-num-chipselects = <4>;
400-
little-endian;
401399
status = "disabled";
402400
};
403401

@@ -413,7 +411,6 @@
413411
dmas = <&edma0 0 54>, <&edma0 0 2>;
414412
dma-names = "tx", "rx";
415413
spi-num-chipselects = <3>;
416-
little-endian;
417414
status = "disabled";
418415
};
419416

@@ -662,7 +659,7 @@
662659
bus-range = <0x0 0xff>;
663660
ranges = <0x81000000 0x0 0x00000000 0x80 0x00010000 0x0 0x00010000 /* downstream I/O */
664661
0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
665-
msi-parent = <&its>;
662+
msi-parent = <&its 0>;
666663
#interrupt-cells = <1>;
667664
interrupt-map-mask = <0 0 0 7>;
668665
interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
@@ -701,7 +698,7 @@
701698
bus-range = <0x0 0xff>;
702699
ranges = <0x81000000 0x0 0x00000000 0x88 0x00010000 0x0 0x00010000 /* downstream I/O */
703700
0x82000000 0x0 0x40000000 0x88 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
704-
msi-parent = <&its>;
701+
msi-parent = <&its 0>;
705702
#interrupt-cells = <1>;
706703
interrupt-map-mask = <0 0 0 7>;
707704
interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
@@ -1080,7 +1077,7 @@
10801077
reg = <0x01 0xf0000000 0x0 0x100000>;
10811078
#address-cells = <3>;
10821079
#size-cells = <2>;
1083-
msi-parent = <&its>;
1080+
msi-parent = <&its 0>;
10841081
device_type = "pci";
10851082
bus-range = <0x0 0x0>;
10861083
dma-coherent;
@@ -1319,7 +1316,7 @@
13191316
status = "disabled";
13201317
};
13211318

1322-
rcpm: power-controller@1e34040 {
1319+
rcpm: wakeup-controller@1e34040 {
13231320
compatible = "fsl,ls1028a-rcpm", "fsl,qoriq-rcpm-2.1+";
13241321
reg = <0x0 0x1e34040 0x0 0x1c>;
13251322
#fsl,rcpm-wakeup-cells = <7>;

‎arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
enet1: ethernet@e2000 {
3131
pcsphy-handle = <&pcsphy1>, <&qsgmiib_pcs1>;
32+
pcs-handle = <&pcsphy1>, <&qsgmiib_pcs1>;
3233
pcs-handle-names = "sgmii", "qsgmii";
3334
};
3435

@@ -40,11 +41,13 @@
4041

4142
enet4: ethernet@e8000 {
4243
pcsphy-handle = <&pcsphy4>, <&qsgmiib_pcs2>;
44+
pcs-handle = <&pcsphy4>, <&qsgmiib_pcs2>;
4345
pcs-handle-names = "sgmii", "qsgmii";
4446
};
4547

4648
enet5: ethernet@ea000 {
4749
pcsphy-handle = <&pcsphy5>, <&qsgmiib_pcs3>;
50+
pcs-handle = <&pcsphy5>, <&qsgmiib_pcs3>;
4851
pcs-handle-names = "sgmii", "qsgmii";
4952
};
5053

‎arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
};
212212

213213
&fpga {
214-
mdio-mux-emi1@54 {
214+
mdio-mux@54 {
215215
compatible = "mdio-mux-mmioreg", "mdio-mux";
216216
mdio-parent-bus = <&mdio0>;
217217
#address-cells = <1>;

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

+4-11
Original file line numberDiff line numberDiff line change
@@ -431,15 +431,13 @@
431431
clock-frequency = <0>;
432432
voltage-ranges = <1800 1800 3300 3300>;
433433
sdhci,auto-cmd12;
434-
big-endian;
435434
bus-width = <4>;
436435
};
437436

438437
ddr: memory-controller@1080000 {
439438
compatible = "fsl,qoriq-memory-controller";
440439
reg = <0x0 0x1080000 0x0 0x1000>;
441440
interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
442-
big-endian;
443441
};
444442

445443
tmu: tmu@1f00000 {
@@ -653,7 +651,7 @@
653651
#interrupt-cells = <2>;
654652
};
655653

656-
uqe: uqe@2400000 {
654+
uqe: uqe-bus@2400000 {
657655
#address-cells = <1>;
658656
#size-cells = <1>;
659657
compatible = "fsl,qe", "simple-bus";
@@ -667,24 +665,19 @@
667665
qeic: qeic@80 {
668666
compatible = "fsl,qe-ic";
669667
reg = <0x80 0x80>;
670-
#address-cells = <0>;
671668
interrupt-controller;
672669
#interrupt-cells = <1>;
673670
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
674671
<GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
675672
};
676673

677674
si1: si@700 {
678-
#address-cells = <1>;
679-
#size-cells = <0>;
680675
compatible = "fsl,ls1043-qe-si",
681676
"fsl,t1040-qe-si";
682677
reg = <0x700 0x80>;
683678
};
684679

685680
siram1: siram@1000 {
686-
#address-cells = <1>;
687-
#size-cells = <1>;
688681
compatible = "fsl,ls1043-qe-siram",
689682
"fsl,t1040-qe-siram";
690683
reg = <0x1000 0x800>;
@@ -804,7 +797,7 @@
804797
QORIQ_CLK_PLL_DIV(1)>;
805798
};
806799

807-
aux_bus: aux-bus {
800+
aux_bus: bus {
808801
#address-cells = <2>;
809802
#size-cells = <2>;
810803
compatible = "simple-bus";
@@ -962,7 +955,7 @@
962955
};
963956

964957
qdma: dma-controller@8380000 {
965-
compatible = "fsl,ls1021a-qdma", "fsl,ls1043a-qdma";
958+
compatible = "fsl,ls1043a-qdma", "fsl,ls1021a-qdma";
966959
reg = <0x0 0x8380000 0x0 0x1000>, /* Controller regs */
967960
<0x0 0x8390000 0x0 0x10000>, /* Status regs */
968961
<0x0 0x83a0000 0x0 0x40000>; /* Block regs */
@@ -983,7 +976,7 @@
983976
big-endian;
984977
};
985978

986-
rcpm: power-controller@1ee2140 {
979+
rcpm: wakeup-controller@1ee2140 {
987980
compatible = "fsl,ls1043a-rcpm", "fsl,qoriq-rcpm-2.1+";
988981
reg = <0x0 0x1ee2140 0x0 0x4>;
989982
#fsl,rcpm-wakeup-cells = <1>;

‎arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
/* these aliases provide the FMan ports mapping */
2525
enet0: ethernet@e0000 {
2626
pcsphy-handle = <&qsgmiib_pcs3>;
27+
pcs-handle = <&qsgmiib_pcs3>;
2728
pcs-handle-names = "qsgmii";
2829
};
2930

@@ -38,11 +39,13 @@
3839

3940
enet4: ethernet@e8000 {
4041
pcsphy-handle = <&pcsphy4>, <&qsgmiib_pcs1>;
42+
pcs-handle = <&pcsphy4>, <&qsgmiib_pcs1>;
4143
pcs-handle-names = "sgmii", "qsgmii";
4244
};
4345

4446
enet5: ethernet@ea000 {
4547
pcsphy-handle = <&pcsphy5>, <&pcsphy5>;
48+
pcs-handle = <&pcsphy5>, <&pcsphy5>;
4649
pcs-handle-names = "sgmii", "qsgmii";
4750
};
4851

@@ -51,6 +54,7 @@
5154

5255
enet7: ethernet@f2000 {
5356
pcsphy-handle = <&pcsphy7>, <&qsgmiib_pcs2>, <&pcsphy7>;
57+
pcs-handle = <&pcsphy7>, <&qsgmiib_pcs2>, <&pcsphy7>;
5458
pcs-handle-names = "sgmii", "qsgmii", "xfi";
5559
};
5660

‎arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
#address-cells = <1>;
238238
#size-cells = <1>;
239239

240-
mdio-mux-emi1 {
240+
mdio-mux@54 {
241241
compatible = "mdio-mux-mmioreg", "mdio-mux";
242242
mdio-parent-bus = <&mdio0>;
243243
#address-cells = <1>;

0 commit comments

Comments
 (0)