Skip to content

Commit 0efb9fa

Browse files
committed
Merge tag 'imx-dt-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX arm32 device tree changes for 6.4: - New board device trees: Tolino Vison, chargebyte Tarragon, new revision of the IOTA board. - A couple of imx7d-remarkable2 update to enable cyttsp5 touch and BD71815 PMIC. - A series from Oleksij Rempel to configure Ethernet reference clock from device tree. - A series from Stefan Wahren to use label references for i.MX28 based boards. * tag 'imx-dt-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (31 commits) ARM: dts: imx6ull: Add chargebyte Tarragon support ARM: dts: imx: Add devicetree for Tolino Vison ARM: dts: imx6dl-yapp43: Add support for new HW revision of the IOTA board ARM: dts: imx6dl-yapp4: Remove unneeded status "okay" ARM: dts: imx6dl-yapp4: Move status to the end of property list ARM: dts: imx6dl-yapp4: Move phy reset into switch node ARM: dts: imx28-tx28: add SPDX-License-Identifier ARM: dts: imx28-ts4600: Convert to use label references ARM: dts: imx28-evk: Convert to use label references ARM: dts: imx28-duckbill-2: Include base board ARM: dts: imx28-duckbill: Convert to use label references ARM: dts: imx28-cfa10036: Convert to use label references ARM: dts: imx28-apx4devkit: Convert to use label references ARM: dts: imx28-m28/sps1: Convert to use label references ARM: dts: imx28-apf28: Convert to use label references ARM: dts: imx7d-remarkable2: Enable the rohm,bd71815 ARM: dts: imx7d-remarkable2: Enable the cyttsp5 ARM: dts: imx6dl-yapp4: Use reset-gpios property name ARM: dts: imx6ul-prti6g: configure ethernet reference clock parent ARM: dts: imx6ul: set enet_clk_ref to CLK_ENETx_REF_SEL ... Link: https://lore.kernel.org/r/20230408101928.280271-4-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 86724b7 + 5e4f393 commit 0efb9fa

48 files changed

Lines changed: 4852 additions & 2793 deletions

Some content is hidden

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

arch/arm/boot/dts/Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,9 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
561561
imx6dl-wandboard-revd1.dtb \
562562
imx6dl-yapp4-draco.dtb \
563563
imx6dl-yapp4-hydra.dtb \
564+
imx6dl-yapp4-lynx.dtb \
564565
imx6dl-yapp4-orion.dtb \
566+
imx6dl-yapp4-phoenix.dtb \
565567
imx6dl-yapp4-ursa.dtb \
566568
imx6q-apalis-eval.dtb \
567569
imx6q-apalis-ixora.dtb \
@@ -668,6 +670,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
668670
imx6q-wandboard-revb1.dtb \
669671
imx6q-wandboard-revd1.dtb \
670672
imx6q-yapp4-crux.dtb \
673+
imx6q-yapp4-pegasus.dtb \
671674
imx6q-zii-rdu2.dtb \
672675
imx6qp-mba6b.dtb \
673676
imx6qp-nitrogen6_max.dtb \
@@ -683,13 +686,15 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
683686
imx6qp-vicutp.dtb \
684687
imx6qp-wandboard-revd1.dtb \
685688
imx6qp-yapp4-crux-plus.dtb \
689+
imx6qp-yapp4-pegasus-plus.dtb \
686690
imx6qp-zii-rdu2.dtb \
687691
imx6s-dhcom-drc02.dtb
688692
dtb-$(CONFIG_SOC_IMX6SL) += \
689693
imx6sl-evk.dtb \
690694
imx6sl-kobo-aura2.dtb \
691695
imx6sl-tolino-shine2hd.dtb \
692696
imx6sl-tolino-shine3.dtb \
697+
imx6sl-tolino-vision.dtb \
693698
imx6sl-tolino-vision5.dtb \
694699
imx6sl-warp.dtb
695700
dtb-$(CONFIG_SOC_IMX6SLL) += \
@@ -755,6 +760,10 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
755760
imx6ull-phytec-segin-lc-rdk-nand.dtb \
756761
imx6ull-phytec-tauri-emmc.dtb \
757762
imx6ull-phytec-tauri-nand.dtb \
763+
imx6ull-tarragon-master.dtb \
764+
imx6ull-tarragon-micro.dtb \
765+
imx6ull-tarragon-slave.dtb \
766+
imx6ull-tarragon-slavext.dtb \
758767
imx6ull-tqma6ull2-mba6ulx.dtb \
759768
imx6ull-tqma6ull2l-mba6ulx.dtb \
760769
imx6ulz-14x14-evk.dtb \

arch/arm/boot/dts/imx28-apf28.dts

Lines changed: 44 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -14,67 +14,59 @@
1414
device_type = "memory";
1515
reg = <0x40000000 0x08000000>;
1616
};
17+
};
1718

18-
apb@80000000 {
19-
apbh@80000000 {
20-
nand-controller@8000c000 {
21-
pinctrl-names = "default";
22-
pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
23-
status = "okay";
24-
25-
partition@0 {
26-
label = "u-boot";
27-
reg = <0x0 0x300000>;
28-
};
19+
&duart {
20+
pinctrl-names = "default";
21+
pinctrl-0 = <&duart_pins_a>;
22+
status = "okay";
23+
};
2924

30-
partition@300000 {
31-
label = "env";
32-
reg = <0x300000 0x80000>;
33-
};
25+
&gpmi {
26+
pinctrl-names = "default";
27+
pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
28+
status = "okay";
3429

35-
partition@380000 {
36-
label = "env2";
37-
reg = <0x380000 0x80000>;
38-
};
30+
partition@0 {
31+
label = "u-boot";
32+
reg = <0x0 0x300000>;
33+
};
3934

40-
partition@400000 {
41-
label = "dtb";
42-
reg = <0x400000 0x80000>;
43-
};
35+
partition@300000 {
36+
label = "env";
37+
reg = <0x300000 0x80000>;
38+
};
4439

45-
partition@480000 {
46-
label = "splash";
47-
reg = <0x480000 0x80000>;
48-
};
40+
partition@380000 {
41+
label = "env2";
42+
reg = <0x380000 0x80000>;
43+
};
4944

50-
partition@500000 {
51-
label = "kernel";
52-
reg = <0x500000 0x800000>;
53-
};
45+
partition@400000 {
46+
label = "dtb";
47+
reg = <0x400000 0x80000>;
48+
};
5449

55-
partition@d00000 {
56-
label = "rootfs";
57-
reg = <0xd00000 0xf300000>;
58-
};
59-
};
60-
};
50+
partition@480000 {
51+
label = "splash";
52+
reg = <0x480000 0x80000>;
53+
};
6154

62-
apbx@80040000 {
63-
duart: serial@80074000 {
64-
pinctrl-names = "default";
65-
pinctrl-0 = <&duart_pins_a>;
66-
status = "okay";
67-
};
68-
};
55+
partition@500000 {
56+
label = "kernel";
57+
reg = <0x500000 0x800000>;
6958
};
7059

71-
ahb@80080000 {
72-
mac0: ethernet@800f0000 {
73-
phy-mode = "rmii";
74-
pinctrl-names = "default";
75-
pinctrl-0 = <&mac0_pins_a>;
76-
phy-reset-gpios = <&gpio4 13 GPIO_ACTIVE_LOW>;
77-
status = "okay";
78-
};
60+
partition@d00000 {
61+
label = "rootfs";
62+
reg = <0xd00000 0xf300000>;
7963
};
8064
};
65+
66+
&mac0 {
67+
phy-mode = "rmii";
68+
pinctrl-names = "default";
69+
pinctrl-0 = <&mac0_pins_a>;
70+
phy-reset-gpios = <&gpio4 13 GPIO_ACTIVE_LOW>;
71+
status = "okay";
72+
};

0 commit comments

Comments
 (0)