ARM: dts: dh-imx6: Refactor DT with som and board level defs for use with imx6 duallite
PATCH v3 1/3 ARM: dts: dh-imx6: Refactor DT with som and board level defs for use with imx6 duallite
To use the device tree definitions imx6q-dhcom-som.dtsi for all imx6 derivatives rename it to imx6qdl-dhcom.dtsi. We omit the '-som', because it simplifies further mainlinening of already existing device trees.
To reuse board level common stuff imx6qdl-dhcom-pdk2.dtsi is created and included by imx6q-dhcom-pdk2.dts.
Signed-off-by Ludwig Zenz <[email protected]>
---
Changes in v3:
- move imx6qdl-dhcom.dtsi include from imx6q-dhcom-pdk2.dts to imx6qdl-dhcom-pdk2.dtsi
- fix copyright lines
Changes in v2:
- introduce board level file imx6qdl-dhcom-pdk2.dtsi
- rename imx6q-dhcom-som.dtsi to imx6qdl-dhcom.dtsi
---
arch/arm/dts/imx6q-dhcom-pdk2.dts | 141 +-------------------
arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi | 142 +++++++++++++++++++++
.../{imx6q-dhcom-som.dtsi => imx6qdl-dhcom.dtsi} | 3 +-
3 files changed, 148 insertions(+), 138 deletions(-)
create mode 100644 arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi
rename arch/arm/dts/{imx6q-dhcom-som.dtsi => imx6qdl-dhcom.dtsi} (99%)arch/arm/dts/imx6q-dhcom-pdk2.dts +5 -136
@@ -1,151 +1,20 @@ // SPDX-License-Identifier: (GPL-2.0+) /* - * Copyright (C) 2015 DH electronics GmbH + * Copyright (C) 2015-2019 DH electronics GmbH * Copyright (C) 2018 Marek Vasut <[email protected]> */ /dts-v1/; -#include "imx6q-dhcom-som.dtsi" +#include "imx6q.dtsi" +#include "imx6qdl-dhcom-pdk2.dtsi" / { - model = "Freescale i.MX6 Quad DHCOM Premium Developer Kit (2)"; - compatible = "dh,imx6q-dhcom-pdk2", "dh,imx6q-dhcom-som", "fsl,imx6q"; - - chosen { - stdout-path = &uart1; - }; - - clk_ext_audio_codec: clock-codec { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <24000000>; - }; - - sound { - compatible = "fsl,imx-audio-sgtl5000"; - model = "imx-sgtl5000"; - ssi-controller = <&ssi1>; - audio-codec = <&sgtl5000>; - audio-routing = - "MIC_IN", "Mic Jack", - "Mic Jack", "Mic Bias", - "LINE_IN", "Line In Jack", - "Headphone Jack", "HP_OUT"; - mux-int-port = <1>; - mux-ext-port = <3>; - }; -}; - -&audmux { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_audmux_ext>; - status = "okay"; -}; - -&hdmi { - ddc-i2c-bus = <&i2c2>; - status = "okay"; -}; - -&i2c2 { - sgtl5000: codec at a { - compatible = "fsl,sgtl5000"; - reg = <0x0a>; - #sound-dai-cells = <0>; - clocks = <&clk_ext_audio_codec>; - VDDA-supply = <®_3p3v>; - VDDIO-supply = <®_3p3v>; - }; -}; - -&iomuxc { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_hog_base &pinctrl_hog>; - - pinctrl_hog: hog-grp { - fsl,pins = < - MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x400120b0 - MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x400120b0 - MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x400120b0 - MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x400120b0 - MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x120b0 - MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x400120b0 - MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x120b0 - MX6QDL_PAD_KEY_ROW0__GPIO4_IO07 0x120b0 - MX6QDL_PAD_KEY_COL1__GPIO4_IO08 0x400120b0 - MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x400120b0 - MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x400120b0 - MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x400120b0 - MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x400120b0 - MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x400120b0 - MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x400120b0 - MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x400120b0 - MX6QDL_PAD_SD1_CMD__GPIO1_IO18 0x400120b0 - MX6QDL_PAD_SD1_DAT0__GPIO1_IO16 0x400120b0 - MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x400120b0 - MX6QDL_PAD_SD1_DAT2__GPIO1_IO19 0x400120b0 - MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x400120b0 - MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x400120b0 - MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19 0x400120b0 - MX6QDL_PAD_KEY_COL0__GPIO4_IO06 0x400120b0 - >; - }; - - pinctrl_audmux_ext: audmux-ext-grp { - fsl,pins = < - MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0 - MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x130b0 - MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x110b0 - MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0 - >; - }; - - pinctrl_enet_1G: enet-1G-grp { - fsl,pins = < - MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x100b0 - MX6QDL_PAD_ENET_MDC__ENET_MDC 0x100b0 - MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x100b0 - MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x100b0 - MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x100b0 - MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x100b0 - MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x100b0 - MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x100b0 - MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x100b0 - MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0 - MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0 - MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0 - MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0 - MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0 - MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 - MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x000b0 - MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x000b1 - MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x000b1 - >; - }; - - pinctrl_pcie: pcie-grp { - fsl,pins = < - MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x1b0b1 - >; - }; -}; - -&pcie { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pcie>; - reset-gpio = <&gpio6 14 GPIO_ACTIVE_LOW>; - status = "okay"; -}; - -&ssi1 { - status = "okay"; + model = "Freescale i.MX6 Quad/Dual DHCOM Premium Developer Kit (2)"; + compatible = "dh,imx6q-dhcom-pdk2", "dh,imx6q-dhcom", "fsl,imx6q"; }; &sata { status = "okay"; }; -&usdhc3 { - status = "okay"; -};
arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi new file +142 -0
142 lines not on this page · raw message
arch/arm/dts/imx6qdl-dhcom.dtsi renamed from arch/arm/dts/imx6q-dhcom-som.dtsi +1 -2
@@ -1,10 +1,9 @@ // SPDX-License-Identifier: (GPL-2.0+) /* - * Copyright (C) 2015 DH electronics GmbH + * Copyright (C) 2015-2019 DH electronics GmbH * Copyright (C) 2018 Marek Vasut <[email protected]> */ -#include "imx6q.dtsi" #include <dt-bindings/pwm/pwm.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/clock/imx6qdl-clock.h>
Signature · 1 line
2.11.0
PATCH v3 2/3 ARM: dts: imx: dh-imx6: Add DHCOM iMX6 Duallite PDK2 device tree
This device tree adds support for DHCOM iMX6 duallite and solo deriviates.
---
Changes in v3:
- include of imx6qdl-dhcom.dtsi is done in imx6qdl-dhcom-pdk2.dtsi, remove it here
Changes in v2:
- include common pdk2 code from imx6qdl-dhcom-pdk2.dtsi instead of redefine it
--- arch/arm/dts/Makefile | 5 +++-- arch/arm/dts/imx6dl-dhcom-pdk2.dts | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/imx6dl-dhcom-pdk2.dts
arch/arm/dts/Makefile +3 -2
@@ -548,10 +548,12 @@ dtb-$(CONFIG_TARGET_TBS2910) += \ imx6q-tbs2910.dtb dtb-$(CONFIG_MX6QDL) += \ + imx6dl-dhcom-pdk2.dtb \ imx6dl-icore.dtb \ imx6dl-icore-mipi.dtb \ imx6dl-icore-rqs.dtb \ imx6dl-mamoj.dtb \ + imx6q-dhcom-pdk2.dtb \ imx6q-cm-fx6.dtb \ imx6q-icore.dtb \ imx6q-icore-mipi.dtb \
@@ -596,8 +598,7 @@ dtb-$(CONFIG_MX6ULL) += \ dtb-$(CONFIG_ARCH_MX6) += \ imx6-apalis.dtb \ - imx6-colibri.dtb \ - imx6q-dhcom-pdk2.dtb + imx6-colibri.dtb dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \ imx7d-sdb-qspi.dtb \
arch/arm/dts/imx6dl-dhcom-pdk2.dts new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+) +/* + * Copyright (C) 2019 DH electronics GmbH + */ + +/dts-v1/; + +#include "imx6dl.dtsi" +#include "imx6qdl-dhcom-pdk2.dtsi" + +/ { + model = "Freescale i.MX6 Duallite/Solo DHCOM Premium Developer Kit (2)"; + compatible = "dh,imx6dl-dhcom-pdk2", "dh,imx6dl-dhcom", "fsl,imx6dl"; +};
Signature · 1 line
2.11.0
PATCH v3 2/3 ARM: dts: imx: dh-imx6: Add DHCOM iMX6 Duallite PDK2 device tree
Quoted 4 lines · Ludwig Zenz
This device tree adds support for DHCOM iMX6 duallite and solo deriviates.
Signed-off-by Ludwig Zenz <[email protected]>
PATCH v3 2/3 ARM: dts: imx: dh-imx6: Add DHCOM iMX6 Duallite PDK2 device tree
In reply to Ludwig ZenzQuoted 4 lines
This device tree adds support for DHCOM iMX6 duallite and solo deriviates.
Signed-off-by Ludwig Zenz <[email protected]>Reviewed-by Marek Vasut <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v3 3/3 ARM: imx6: DHCOM i.MX6 PDK: config SPL to load U-Boot fitImage with mulitple DTs
In reply to Ludwig ZenzConfigure fitImage for U-Boot with a device tree for imx6 quad/dual and duallite/solo. This enables to support the imx6 derivates quad/dual/duallite/solo with a single binary.
---
Changes in v3:
- No change
Changes in v2:
- remove CONFIG_SPL_LOAD_FIT from dh_imx6_defconfig
- remove board_fit_config_name_match from dh_imx6_spl.c
--- board/dhelectronics/dh_imx6/dh_imx6.c | 15 +++++++++++++++ configs/dh_imx6_defconfig | 7 +++++-- 2 files changed, 20 insertions(+), 2 deletions(-)
board/dhelectronics/dh_imx6/dh_imx6.c +15 -0
@@ -355,3 +355,18 @@ int checkboard(void)puts ("Board: DHCOM i.MX6\n" );return 0 ; } + +#ifdef CONFIG_MULTI_DTB_FIT +int board_fit_config_name_match (const char *name) +{ +if (is_mx6dq ()) { +if (!strcmp (name,"imx6q-dhcom-pdk2" )) +return 0 ; + }else if (is_mx6sdl ()) { +if (!strcmp (name,"imx6dl-dhcom-pdk2" )) +return 0 ; + } + +return -1 ; +} +#endif
configs/dh_imx6_defconfig +5 -2
@@ -10,14 +10,13 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000 -CONFIG_DM_GPIO=y -CONFIG_DM_MMC=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y +CONFIG_SPL_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 # CONFIG_USE_BOOTCOMMAND is not set
@@ -43,9 +42,13 @@ CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-dhcom-pdk2" +CONFIG_OF_LIST="imx6q-dhcom-pdk2 imx6dl-dhcom-pdk2" +CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_DM_GPIO=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
Signature · 1 line
2.11.0
PATCH v3 3/3 ARM: imx6: DHCOM i.MX6 PDK: config SPL to load U-Boot fitImage with mulitple DTs
Quoted 11 lines · Ludwig Zenz
Configure fitImage for U-Boot with a device tree for imx6 quad/dual and duallite/solo. This enables to support the imx6 derivates quad/dual/duallite/solo with a single binary.
Signed-off-by Ludwig Zenz <[email protected]>---
Changes in v3:
- No change
Changes in v2:
- removeCONFIG_SPL_LOAD_FITfromdh_imx6_defconfig
- removeboard_fit_config_name_matchfromdh_imx6_spl.c
PATCH v3 3/3 ARM: imx6: DHCOM i.MX6 PDK: config SPL to load U-Boot fitImage with mulitple DTs
In reply to Ludwig ZenzQuoted 5 lines
Configure fitImage for U-Boot with a device tree for imx6 quad/dual and duallite/solo. This enables to support the imx6 derivates quad/dual/duallite/solo with a single binary.
Signed-off-by Ludwig Zenz <[email protected]>Reviewed-by Marek Vasut <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v3 1/3 ARM: dts: dh-imx6: Refactor DT with som and board level defs for use with imx6 duallite
In reply to Ludwig ZenzQuoted 7 lines · Ludwig Zenz
To use the device tree definitions
imx6q-dhcom-som.dtsifor all imx6 derivatives rename it toimx6qdl-dhcom.dtsi. We omit the '-som', because it simplifies further mainlinening of already existing device trees.
To reuse board level common stuffimx6qdl-dhcom-pdk2.dtsiis created and included byimx6q-dhcom-pdk2.dts.Signed-off-by Ludwig Zenz <[email protected]>
PATCH v3 1/3 ARM: dts: dh-imx6: Refactor DT with som and board level defs for use with imx6 duallite
In reply to Ludwig ZenzQuoted 7 lines
To use the device tree definitions
imx6q-dhcom-som.dtsifor all imx6 derivatives rename it toimx6qdl-dhcom.dtsi. We omit the '-som', because it simplifies further mainlinening of already existing device trees.
To reuse board level common stuffimx6qdl-dhcom-pdk2.dtsiis created and included byimx6q-dhcom-pdk2.dts.
Signed-off-by Ludwig Zenz <[email protected]>Reviewed-by Marek Vasut <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================