fix compatible string reference to fsl.yaml change regulator node name replace underscore to dash replace node name remove 'status' attribute from node add board compatible and model to ixm7d-moxa-uc-8210.dts rearrange 82XX alphabet order in Makefile Signed-off-by: Jimmy Chen <jimmy.chen@xxxxxxxx> --- arch/arm/boot/dts/Makefile | 4 +-- arch/arm/boot/dts/imx7d-moxa-uc-8210.dts | 46 +++++++++++------------- arch/arm/boot/dts/imx7d-moxa-uc-8220.dts | 9 +++-- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 37db3b60ba43..c9c57626876c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -747,6 +747,8 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-flex-concentrator-mfg.dtb \ imx7d-mba7.dtb \ imx7d-meerkat96.dtb \ + imx7d-moxa-uc-8210.dtb \ + imx7d-moxa-uc-8220.dtb \ imx7d-nitrogen7.dtb \ imx7d-pico-dwarf.dtb \ imx7d-pico-hobbit.dtb \ @@ -755,8 +757,6 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-remarkable2.dtb \ imx7d-sbc-imx7.dtb \ imx7d-sdb.dtb \ - imx7d-moxa-uc-8210.dtb \ - imx7d-moxa-uc-8220.dtb \ imx7d-sdb-reva.dtb \ imx7d-sdb-sht11.dtb \ imx7d-smegw01.dtb \ diff --git a/arch/arm/boot/dts/imx7d-moxa-uc-8210.dts b/arch/arm/boot/dts/imx7d-moxa-uc-8210.dts index 9ec62d8b510d..fc5a0c7ff295 100644 --- a/arch/arm/boot/dts/imx7d-moxa-uc-8210.dts +++ b/arch/arm/boot/dts/imx7d-moxa-uc-8210.dts @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR MIT - * Copyright (C) 2022 MOXA Inc. - https://www.moxa.com/ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Copyright (C) MOXA Inc. All rights reserved. * Authors: TungYu TY Yang <TungyuTY.Yang@xxxxxxxx> */ @@ -9,7 +9,7 @@ / { model = "Moxa UC-8210"; - compatible = "moxa,uc-8210", "fsl,imx7d-sdb", "fsl,imx7d"; + compatible = "moxa,uc-8210", "fsl,imx7d"; chosen { stdout-path = &uart1; @@ -56,7 +56,7 @@ startup-delay-us = <100>; }; - reg_sd1_vmmc: regulator@5 { + reg_sd1_vmmc: regulator-sd1-3v3 { compatible = "regulator-fixed"; regulator-name = "VDD_SD1"; regulator-min-microvolt = <3300000>; @@ -79,58 +79,58 @@ leds { compatible = "gpio-leds"; - signal_led_1_1 { + signal-led-1-1 { label = "UC8200:YELLOW:SGN1-1"; gpios = <&i2cgpio2 4 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - signal_led_1_2 { + signal-led-1-2 { label = "UC8200:YELLOW:SGN1-2"; gpios = <&i2cgpio2 5 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - signal_led_1_3 { + signal-led-1-3 { label = "UC8200:YELLOW:SGN1-3"; gpios = <&i2cgpio2 12 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - signal_led_2_1 { + signal-led-2-1 { label = "UC8200:YELLOW:SGN2-1"; gpios = <&i2cgpio2 13 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - signal_led_2_2 { + signal-led-2-2 { label = "UC8200:YELLOW:SGN2-2"; gpios = <&i2cgpio2 14 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - signal_led_2_3 { + signal-led-2-3 { label = "UC8200:YELLOW:SGN2-3"; gpios = <&i2cgpio2 15 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - user_led_1_1 { + user-led-1-1 { label = "UC8200:YELLOW:USR"; gpios = <&i2cgpio1 9 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - user_led_1_2 { + user-led-1-2 { label = "UC8200:GREEN:USR"; gpios = <&i2cgpio1 10 GPIO_ACTIVE_HIGH>; default-state = "off"; }; }; - buttons: push_button { + buttons: gpio-keys { compatible = "gpio-keys"; - push_button0 { + button { label = "Reset key"; gpios = <&gpio5 11 1>; linux,code = <0x100>; @@ -164,7 +164,7 @@ cs-gpios = <&gpio4 19 GPIO_ACTIVE_HIGH>; status = "okay"; - tpm_spi_tis@0{ + tpm-spi-tis@0 { compatible = "tcg,tpm_tis-spi"; reg = <0>; spi-max-frequency = <500000>; @@ -344,7 +344,6 @@ rtc@68 { compatible = "dallas,ds1374"; reg = <0x68>; - status = "okay"; }; }; @@ -395,9 +394,6 @@ pinctrl-0 = <&pinctrl_uart5>; assigned-clocks = <&clks IMX7D_UART5_ROOT_SRC>; assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; - /* for DTE mode, add below change */ - /* fsl,dte-mode; */ - /* pinctrl-0 = <&pinctrl_uart5dte>; */ status = "okay"; }; @@ -465,7 +461,7 @@ status = "okay"; flash0: mx25l12805d@0 { - compatible = "macronix,mx25l12805d"; + compatible = "mxicy,mx25l12805d", "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; partitions { @@ -584,7 +580,7 @@ >; }; - pinctrl_gpio_keys: gpio_keysgrp { + pinctrl_gpio_keys: gpio-keysgrp { fsl,pins = < MX7D_PAD_SD2_RESET_B__GPIO5_IO11 0x59 MX7D_PAD_SD2_WP__GPIO5_IO10 0x59 @@ -729,7 +725,7 @@ >; }; - pinctrl_usdhc1_100mhz: usdhc1grp_100mhz { + pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp { fsl,pins = < MX7D_PAD_SD1_CMD__SD1_CMD 0x5a MX7D_PAD_SD1_CLK__SD1_CLK 0x1a @@ -771,7 +767,7 @@ >; }; - pinctrl_usdhc2_100mhz: usdhc2grp_100mhz { + pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp { fsl,pins = < MX7D_PAD_SD2_CMD__SD2_CMD 0x5a MX7D_PAD_SD2_CLK__SD2_CLK 0x1a @@ -810,7 +806,7 @@ >; }; - pinctrl_usdhc3_100mhz: usdhc3grp_100mhz { + pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp { fsl,pins = < MX7D_PAD_SD3_CMD__SD3_CMD 0x5a MX7D_PAD_SD3_CLK__SD3_CLK 0x1a @@ -863,6 +859,4 @@ MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x74 >; }; - - }; diff --git a/arch/arm/boot/dts/imx7d-moxa-uc-8220.dts b/arch/arm/boot/dts/imx7d-moxa-uc-8220.dts index 6a41cd9e13c6..e66accceeb82 100644 --- a/arch/arm/boot/dts/imx7d-moxa-uc-8220.dts +++ b/arch/arm/boot/dts/imx7d-moxa-uc-8220.dts @@ -1,11 +1,16 @@ -/* SPDX-License-Identifier: GPL-2.0 - * Copyright (C) 2019 MOXA Inc. - https://www.moxa.com/ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Copyright (C) MOXA Inc. All rights reserved. * Authors: Fero JD Zhou (周俊達) <FeroJD.Zhou@xxxxxxxx> * Harry YJ Jhou (周亞諄) <HarryYJ.Jhou@xxxxxxxx> */ #include "imx7d-moxa-uc-8210.dts" +/ { + model = "Moxa UC-8220"; + compatible = "moxa,uc-8220", "fsl,imx7d"; +}; + &pcie_phy{ status = "okay"; }; -- 2.20.1
