mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 16:52:14 +02:00
ARM: dts: i.MX6QDL: U-Boot specific dts for u-boot, dm-spl
u-boot,dm-spl property is specific to U-Boot, so move it into *u-boot.dtsi files for relevant i.MX6QDL files. This make syncing Linux dts files straight forward. Also update the MAINTAINERS file for dts files. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
committed by
Stefano Babic
parent
a18e93d050
commit
2175637843
11
arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi
Normal file
11
arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "imx6qdl-icore-u-boot.dtsi"
|
||||||
|
|
||||||
|
&usdhc3 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
@@ -16,6 +16,5 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&usdhc3 {
|
&usdhc3 {
|
||||||
u-boot,dm-spl;
|
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
7
arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi
Normal file
7
arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "imx6qdl-icore-rqs-u-boot.dtsi"
|
7
arch/arm/dts/imx6dl-icore-u-boot.dtsi
Normal file
7
arch/arm/dts/imx6dl-icore-u-boot.dtsi
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "imx6qdl-icore-u-boot.dtsi"
|
11
arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi
Normal file
11
arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "imx6qdl-icore-u-boot.dtsi"
|
||||||
|
|
||||||
|
&usdhc3 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
@@ -16,6 +16,5 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&usdhc3 {
|
&usdhc3 {
|
||||||
u-boot,dm-spl;
|
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
7
arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi
Normal file
7
arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "imx6qdl-icore-rqs-u-boot.dtsi"
|
7
arch/arm/dts/imx6q-icore-u-boot.dtsi
Normal file
7
arch/arm/dts/imx6q-icore-u-boot.dtsi
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "imx6qdl-icore-u-boot.dtsi"
|
23
arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi
Normal file
23
arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "imx6qdl-u-boot.dtsi"
|
||||||
|
|
||||||
|
&usdhc3 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
||||||
|
|
||||||
|
&usdhc4 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
||||||
|
|
||||||
|
&pinctrl_usdhc3 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
||||||
|
|
||||||
|
&pinctrl_usdhc4 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
@@ -105,7 +105,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&usdhc3 {
|
&usdhc3 {
|
||||||
u-boot,dm-spl;
|
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&pinctrl_usdhc3>;
|
pinctrl-0 = <&pinctrl_usdhc3>;
|
||||||
cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
|
cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
|
||||||
@@ -114,7 +113,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&usdhc4 {
|
&usdhc4 {
|
||||||
u-boot,dm-spl;
|
|
||||||
pinctrl-names = "default", "state_100mhz", "state_200mhz";
|
pinctrl-names = "default", "state_100mhz", "state_200mhz";
|
||||||
pinctrl-0 = <&pinctrl_usdhc4>;
|
pinctrl-0 = <&pinctrl_usdhc4>;
|
||||||
pinctrl-1 = <&pinctrl_usdhc4_100mhz>;
|
pinctrl-1 = <&pinctrl_usdhc4_100mhz>;
|
||||||
@@ -176,7 +174,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_usdhc3: usdhc3grp {
|
pinctrl_usdhc3: usdhc3grp {
|
||||||
u-boot,dm-spl;
|
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17070
|
MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17070
|
||||||
MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10070
|
MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10070
|
||||||
@@ -188,7 +185,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_usdhc4: usdhc4grp {
|
pinctrl_usdhc4: usdhc4grp {
|
||||||
u-boot,dm-spl;
|
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17070
|
MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17070
|
||||||
MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10070
|
MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10070
|
||||||
|
19
arch/arm/dts/imx6qdl-icore-u-boot.dtsi
Normal file
19
arch/arm/dts/imx6qdl-icore-u-boot.dtsi
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "imx6qdl-u-boot.dtsi"
|
||||||
|
|
||||||
|
&usdhc1 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
||||||
|
|
||||||
|
&pinctrl_usdhc1 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
||||||
|
|
||||||
|
&pinctrl_usdhc3 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
@@ -122,7 +122,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&usdhc1 {
|
&usdhc1 {
|
||||||
u-boot,dm-spl;
|
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&pinctrl_usdhc1>;
|
pinctrl-0 = <&pinctrl_usdhc1>;
|
||||||
cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
|
cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
|
||||||
@@ -221,7 +220,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_usdhc1: usdhc1grp {
|
pinctrl_usdhc1: usdhc1grp {
|
||||||
u-boot,dm-spl;
|
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17070
|
MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17070
|
||||||
MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10070
|
MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10070
|
||||||
@@ -233,7 +231,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_usdhc3: usdhc3grp {
|
pinctrl_usdhc3: usdhc3grp {
|
||||||
u-boot,dm-spl;
|
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
|
MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
|
||||||
MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
|
MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
|
||||||
|
27
arch/arm/dts/imx6qdl-u-boot.dtsi
Normal file
27
arch/arm/dts/imx6qdl-u-boot.dtsi
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
/ {
|
||||||
|
soc {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
|
||||||
|
aips-bus@02000000 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
||||||
|
|
||||||
|
aips-bus@02100000 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
&gpio1 {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
||||||
|
|
||||||
|
&iomuxc {
|
||||||
|
u-boot,dm-spl;
|
||||||
|
};
|
@@ -77,7 +77,6 @@
|
|||||||
compatible = "simple-bus";
|
compatible = "simple-bus";
|
||||||
interrupt-parent = <&gpc>;
|
interrupt-parent = <&gpc>;
|
||||||
ranges;
|
ranges;
|
||||||
u-boot,dm-spl;
|
|
||||||
|
|
||||||
dma_apbh: dma-apbh@00110000 {
|
dma_apbh: dma-apbh@00110000 {
|
||||||
compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
|
compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
|
||||||
@@ -226,7 +225,6 @@
|
|||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
reg = <0x02000000 0x100000>;
|
reg = <0x02000000 0x100000>;
|
||||||
ranges;
|
ranges;
|
||||||
u-boot,dm-spl;
|
|
||||||
|
|
||||||
spba-bus@02000000 {
|
spba-bus@02000000 {
|
||||||
compatible = "fsl,spba-bus", "simple-bus";
|
compatible = "fsl,spba-bus", "simple-bus";
|
||||||
@@ -518,7 +516,6 @@
|
|||||||
#gpio-cells = <2>;
|
#gpio-cells = <2>;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
#interrupt-cells = <2>;
|
#interrupt-cells = <2>;
|
||||||
u-boot,dm-spl;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
gpio2: gpio@020a0000 {
|
gpio2: gpio@020a0000 {
|
||||||
@@ -808,7 +805,6 @@
|
|||||||
iomuxc: iomuxc@020e0000 {
|
iomuxc: iomuxc@020e0000 {
|
||||||
compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc";
|
compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc";
|
||||||
reg = <0x020e0000 0x4000>;
|
reg = <0x020e0000 0x4000>;
|
||||||
u-boot,dm-spl;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
ldb: ldb@020e0008 {
|
ldb: ldb@020e0008 {
|
||||||
@@ -893,7 +889,6 @@
|
|||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
reg = <0x02100000 0x100000>;
|
reg = <0x02100000 0x100000>;
|
||||||
ranges;
|
ranges;
|
||||||
u-boot,dm-spl;
|
|
||||||
|
|
||||||
crypto: caam@2100000 {
|
crypto: caam@2100000 {
|
||||||
compatible = "fsl,sec-v4.0";
|
compatible = "fsl,sec-v4.0";
|
||||||
|
@@ -9,12 +9,21 @@ F: configs/imx6dl_icore_nand_defconfig
|
|||||||
F: configs/imx6qdl_icore_rqs_defconfig
|
F: configs/imx6qdl_icore_rqs_defconfig
|
||||||
F: configs/imx6qdl_icore_mipi_defconfig
|
F: configs/imx6qdl_icore_mipi_defconfig
|
||||||
F: configs/imx6qdl_icore_nand_defconfig
|
F: configs/imx6qdl_icore_nand_defconfig
|
||||||
|
F: arch/arm/dts/imx6qdl.dtsi
|
||||||
|
F: arch/arm/dts/imx6qdl-u-boot.dtsi
|
||||||
F: arch/arm/dts/imx6qdl-icore.dtsi
|
F: arch/arm/dts/imx6qdl-icore.dtsi
|
||||||
|
F: arch/arm/dts/imx6qdl-icore-u-boot.dtsi
|
||||||
F: arch/arm/dts/imx6q-icore.dts
|
F: arch/arm/dts/imx6q-icore.dts
|
||||||
|
F: arch/arm/dts/imx6q-icore-u-boot.dtsi
|
||||||
F: arch/arm/dts/imx6dl-icore.dts
|
F: arch/arm/dts/imx6dl-icore.dts
|
||||||
|
F: arch/arm/dts/imx6dl-icore-u-boot.dtsi
|
||||||
F: arch/arm/dts/imx6qdl-icore-rqs.dtsi
|
F: arch/arm/dts/imx6qdl-icore-rqs.dtsi
|
||||||
|
F: arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi
|
||||||
F: arch/arm/dts/imx6q-icore-rqs.dts
|
F: arch/arm/dts/imx6q-icore-rqs.dts
|
||||||
|
F: arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi
|
||||||
F: arch/arm/dts/imx6dl-icore-rqs.dts
|
F: arch/arm/dts/imx6dl-icore-rqs.dts
|
||||||
|
F: arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi
|
||||||
F: arch/arm/dts/imx6dl-icore-mipi.dts
|
F: arch/arm/dts/imx6dl-icore-mipi.dts
|
||||||
|
F: arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi
|
||||||
F: arch/arm/dts/imx6q-icore-mipi.dts
|
F: arch/arm/dts/imx6q-icore-mipi.dts
|
||||||
F: arch/arm/dts/imx6qdl-icore.dtsi
|
F: arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi
|
||||||
|
Reference in New Issue
Block a user