* [PATCH v2 1/3] Remove an entry for MOXA platform board
@ 2022-07-12 4:55 Jimmy Chen
2022-07-12 4:55 ` [PATCH v2 2/3] dt-bindings: arm: fsl: Add Moxa UC8210/8220 series Jimmy Chen
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jimmy Chen @ 2022-07-12 4:55 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski; +Cc: Jimmy Chen, devicetree, linux-kernel
use Freescale instead of create new MOXA entry
Signed-off-by: Jimmy Chen <jimmy.chen@moxa.com>
---
.../devicetree/bindings/arm/moxa.yaml | 21 -------------------
1 file changed, 21 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/moxa.yaml
diff --git a/Documentation/devicetree/bindings/arm/moxa.yaml b/Documentation/devicetree/bindings/arm/moxa.yaml
deleted file mode 100644
index 73f4bf883b06..000000000000
--- a/Documentation/devicetree/bindings/arm/moxa.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/arm/moxa.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: MOXA platform device tree bindings
-
-maintainers:
- - Jimmy Chen <jimmy.chen@moxa.com>
-
-properties:
- compatible:
- description: UC-82XX-LX embedded computer
- items:
- - const: moxa,uc-8210
- - const: moxa,uc-8220
-
-additionalProperties: true
-...
-
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 2/3] dt-bindings: arm: fsl: Add Moxa UC8210/8220 series 2022-07-12 4:55 [PATCH v2 1/3] Remove an entry for MOXA platform board Jimmy Chen @ 2022-07-12 4:55 ` Jimmy Chen 2022-07-12 7:41 ` Krzysztof Kozlowski 2022-07-12 4:55 ` [PATCH v2 3/3] ARM: dts: imx7d: fixed dts for UC-8210/8220 hardware Jimmy Chen 2022-07-12 7:40 ` [PATCH v2 1/3] Remove an entry for MOXA platform board Krzysztof Kozlowski 2 siblings, 1 reply; 6+ messages in thread From: Jimmy Chen @ 2022-07-12 4:55 UTC (permalink / raw) To: Rob Herring, Krzysztof Kozlowski, Shawn Guo, Li Yang Cc: Jimmy Chen, devicetree, linux-kernel Moxa UC8210/8220 use Freescale i.MX7d CPU Signed-off-by: Jimmy Chen <jimmy.chen@moxa.com> --- Documentation/devicetree/bindings/arm/fsl.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml index ef524378d449..0746801aeb27 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -767,6 +767,9 @@ properties: - toradex,colibri-imx7d-emmc # Colibri iMX7D 1GB (eMMC) Module - zii,imx7d-rmu2 # ZII RMU2 Board - zii,imx7d-rpu2 # ZII RPU2 Board + - moxa,uc-8210 # MOXA UC-8210 board + - moxa,uc-8220 # MOXA UC-8220 board + - const: fsl,imx7d - description: TQ-Systems TQMa7D SoM on MBa7x board -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/3] dt-bindings: arm: fsl: Add Moxa UC8210/8220 series 2022-07-12 4:55 ` [PATCH v2 2/3] dt-bindings: arm: fsl: Add Moxa UC8210/8220 series Jimmy Chen @ 2022-07-12 7:41 ` Krzysztof Kozlowski 0 siblings, 0 replies; 6+ messages in thread From: Krzysztof Kozlowski @ 2022-07-12 7:41 UTC (permalink / raw) To: Jimmy Chen, Rob Herring, Krzysztof Kozlowski, Shawn Guo, Li Yang Cc: Jimmy Chen, devicetree, linux-kernel On 12/07/2022 06:55, Jimmy Chen wrote: > Moxa UC8210/8220 use Freescale i.MX7d CPU > > Signed-off-by: Jimmy Chen <jimmy.chen@moxa.com> > --- > Documentation/devicetree/bindings/arm/fsl.yaml | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml > index ef524378d449..0746801aeb27 100644 > --- a/Documentation/devicetree/bindings/arm/fsl.yaml > +++ b/Documentation/devicetree/bindings/arm/fsl.yaml > @@ -767,6 +767,9 @@ properties: > - toradex,colibri-imx7d-emmc # Colibri iMX7D 1GB (eMMC) Module > - zii,imx7d-rmu2 # ZII RMU2 Board > - zii,imx7d-rpu2 # ZII RPU2 Board > + - moxa,uc-8210 # MOXA UC-8210 board > + - moxa,uc-8220 # MOXA UC-8220 board Keep existing order, do not introduce differences. > + Why adding this blank line? > - const: fsl,imx7d > > - description: TQ-Systems TQMa7D SoM on MBa7x board Best regards, Krzysztof ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] ARM: dts: imx7d: fixed dts for UC-8210/8220 hardware 2022-07-12 4:55 [PATCH v2 1/3] Remove an entry for MOXA platform board Jimmy Chen 2022-07-12 4:55 ` [PATCH v2 2/3] dt-bindings: arm: fsl: Add Moxa UC8210/8220 series Jimmy Chen @ 2022-07-12 4:55 ` Jimmy Chen 2022-07-12 7:42 ` Krzysztof Kozlowski 2022-07-12 7:40 ` [PATCH v2 1/3] Remove an entry for MOXA platform board Krzysztof Kozlowski 2 siblings, 1 reply; 6+ messages in thread From: Jimmy Chen @ 2022-07-12 4:55 UTC (permalink / raw) To: Arnd Bergmann, Olof Johansson, soc, Rob Herring, Krzysztof Kozlowski, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team Cc: Jimmy Chen, linux-arm-kernel, devicetree, linux-kernel 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@moxa.com> --- 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@moxa.com> */ @@ -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@moxa.com> * Harry YJ Jhou (周亞諄) <HarryYJ.Jhou@moxa.com> */ #include "imx7d-moxa-uc-8210.dts" +/ { + model = "Moxa UC-8220"; + compatible = "moxa,uc-8220", "fsl,imx7d"; +}; + &pcie_phy{ status = "okay"; }; -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 3/3] ARM: dts: imx7d: fixed dts for UC-8210/8220 hardware 2022-07-12 4:55 ` [PATCH v2 3/3] ARM: dts: imx7d: fixed dts for UC-8210/8220 hardware Jimmy Chen @ 2022-07-12 7:42 ` Krzysztof Kozlowski 0 siblings, 0 replies; 6+ messages in thread From: Krzysztof Kozlowski @ 2022-07-12 7:42 UTC (permalink / raw) To: Jimmy Chen, Arnd Bergmann, Olof Johansson, soc, Rob Herring, Krzysztof Kozlowski, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team Cc: Jimmy Chen, linux-arm-kernel, devicetree, linux-kernel On 12/07/2022 06:55, Jimmy Chen wrote: > 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 This commit description does not make any sense. You messed up commit description with changelog. Please go through SubmittingPatches doc few times. > > Signed-off-by: Jimmy Chen <jimmy.chen@moxa.com> > --- > 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 \ There are no such entries. Rest is even weirder... Best regards, Krzysztof ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/3] Remove an entry for MOXA platform board 2022-07-12 4:55 [PATCH v2 1/3] Remove an entry for MOXA platform board Jimmy Chen 2022-07-12 4:55 ` [PATCH v2 2/3] dt-bindings: arm: fsl: Add Moxa UC8210/8220 series Jimmy Chen 2022-07-12 4:55 ` [PATCH v2 3/3] ARM: dts: imx7d: fixed dts for UC-8210/8220 hardware Jimmy Chen @ 2022-07-12 7:40 ` Krzysztof Kozlowski 2 siblings, 0 replies; 6+ messages in thread From: Krzysztof Kozlowski @ 2022-07-12 7:40 UTC (permalink / raw) To: Jimmy Chen, Rob Herring, Krzysztof Kozlowski Cc: Jimmy Chen, devicetree, linux-kernel On 12/07/2022 06:55, Jimmy Chen wrote: > use Freescale instead of create new MOXA entry > > Signed-off-by: Jimmy Chen <jimmy.chen@moxa.com> > --- > .../devicetree/bindings/arm/moxa.yaml | 21 ------------------- There is no such file... What do you try to remove? On what tree this is based? Best regards, Krzysztof ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-07-12 7:43 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-07-12 4:55 [PATCH v2 1/3] Remove an entry for MOXA platform board Jimmy Chen 2022-07-12 4:55 ` [PATCH v2 2/3] dt-bindings: arm: fsl: Add Moxa UC8210/8220 series Jimmy Chen 2022-07-12 7:41 ` Krzysztof Kozlowski 2022-07-12 4:55 ` [PATCH v2 3/3] ARM: dts: imx7d: fixed dts for UC-8210/8220 hardware Jimmy Chen 2022-07-12 7:42 ` Krzysztof Kozlowski 2022-07-12 7:40 ` [PATCH v2 1/3] Remove an entry for MOXA platform board Krzysztof Kozlowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).