Re: [PATCH v2 2/3] ARM: amlogic: add JetHub D1/H1 device support
20.09.2021 09:43, Neil Armstrong wrote: Hi, On 19/09/2021 17:52, Vyacheslav Bocharov wrote: Add support for new home automation devices. While applying I had a few warnings: + if (!env_get("serial")) { + len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, ERROR: trailing whitespace #777: FILE: board/amlogic/jethub-j80/jethub-j80.c:48: +^I^Ilen = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, $ CHECK: Alignment should match open parenthesis #778: FILE: board/amlogic/jethub-j80/jethub-j80.c:49: + len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, + EFUSE_SN_SIZE); CHECK: Alignment should match open parenthesis #785: FILE: board/amlogic/jethub-j80/jethub-j80.c:56: + len = meson_sm_read_efuse(EFUSE_USID_OFFSET, usid, + EFUSE_USID_SIZE); I'll double-check everything and resend a new version of the patches. This file isn't part of any MAINTAINERS file, either add it to the s400 one or the j80 one. I'll add it to jethub-j80/MAINTAINERS. Thanks!
Re: [PATCH v2 2/3] ARM: amlogic: add JetHub D1/H1 device support
Hi, On 19/09/2021 17:52, Vyacheslav Bocharov wrote: > Add support for new home automation devices. While applying I had a few warnings: > > JetHome Jethub D1 (http://jethome.ru/jethub-d1) is a home automation > controller with the following features: > - DIN Rail Mounting case > - Amlogic A113X (ARM Cortex-A53) quad-core up to 1.5GHz > - no video out > - 512Mb/1GB DDR3 > - 8/16GB eMMC flash > - 1 x USB 2.0 > - 1 x 10/100Mbps ethernet > - WiFi / Bluetooth AMPAK AP6255 (Broadcom BCM43455) IEEE 802.11a/b/g/n/ac, > Bluetooth 4.2. > - TI CC2538 + CC2592 Zigbee Wireless Module with up to 20dBm output power and > Zigbee 3.0 support. > - 2 x gpio LEDS > - GPIO user Button > - 1 x 1-Wire > - 2 x RS-485 > - 4 x dry contact digital GPIO inputs > - 3 x relay GPIO outputs > - DC source with a voltage of 9 to 56 V / Passive POE > > JetHome Jethub H1 (http://jethome.ru/jethub-h1) is a home automation > controller with the following features: > - Square plastic case > - Amlogic S905W (ARM Cortex-A53) quad-core up to 1.5GHz > - no video out > - 1GB DDR3 > - 8/16GB eMMC flash > - 2 x USB 2.0 > - 1 x 10/100Mbps ethernet > - WiFi / Bluetooth RTL8822CS IEEE 802.11a/b/g/n/ac, Bluetooth 5.0. > - TI CC2538 + CC2592 Zigbee Wireless Module with up to 20dBm output power and > Zigbee 3.0 support. > - MicroSD 2.x/3.x/4.x DS/HS cards. > - 1 x gpio LED > - ADC user Button > - DC source 5V microUSB with serial console > > Patches from: > - JetHub H1 > https://lore.kernel.org/r/20210915085715.1134940-4-ad...@lexina.in > https://git.kernel.org/amlogic/c/abfaae24ecf3e7f00508b60fa05e2b6789b8f607 > - JetHub D1 > https://lore.kernel.org/r/20210915085715.1134940-5-ad...@lexina.in > https://git.kernel.org/amlogic/c/8e279fb2903990cc6296ec56b3b80b2f854b6c79 > > Signed-off-by: Vyacheslav Bocharov > Reviewed-by: Neil Armstrong > --- > arch/arm/dts/Makefile | 2 + > .../arm/dts/meson-axg-jethome-jethub-j100.dts | 361 ++ > .../meson-gxl-s905w-jethome-jethub-j80.dts| 241 > board/amlogic/jethub-j80/MAINTAINERS | 6 + > board/amlogic/jethub-j80/Makefile | 6 + > board/amlogic/jethub-j80/jethub-j80.c | 68 > configs/jethub_j100_defconfig | 55 +++ > configs/jethub_j80_defconfig | 63 +++ > 8 files changed, 802 insertions(+) > create mode 100644 arch/arm/dts/meson-axg-jethome-jethub-j100.dts > create mode 100644 arch/arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts > create mode 100644 board/amlogic/jethub-j80/MAINTAINERS > create mode 100644 board/amlogic/jethub-j80/Makefile > create mode 100644 board/amlogic/jethub-j80/jethub-j80.c > create mode 100644 configs/jethub_j100_defconfig > create mode 100644 configs/jethub_j80_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index f0160d2dc0..d1893a9812 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -169,10 +169,12 @@ dtb-$(CONFIG_ARCH_MESON) += \ > meson-gxl-s905x-libretech-cc-v2.dtb \ > meson-gxl-s905x-khadas-vim.dtb \ > meson-gxl-s905d-libretech-pc.dtb \ > + meson-gxl-s905w-jethome-jethub-j80.dtb \ > meson-gxm-khadas-vim2.dtb \ > meson-gxm-s912-libretech-pc.dtb \ > meson-gxm-wetek-core2.dtb \ > meson-axg-s400.dtb \ > + meson-axg-jethome-jethub-j100.dtb \ > meson-g12a-u200.dtb \ > meson-g12a-sei510.dtb \ > meson-g12b-gtking.dtb \ > diff --git a/arch/arm/dts/meson-axg-jethome-jethub-j100.dts > b/arch/arm/dts/meson-axg-jethome-jethub-j100.dts > new file mode 100644 > index 00..5783732dc6 > --- /dev/null > +++ b/arch/arm/dts/meson-axg-jethome-jethub-j100.dts > @@ -0,0 +1,361 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2021 Vyacheslav Bocharov > + * Copyright (c) 2020 JetHome > + * Author: Aleksandr Kazantsev > + * Author: Alexey Shevelkin > + * Author: Vyacheslav Bocharov > + */ > + > +/dts-v1/; > + > +#include "meson-axg.dtsi" > +#include > +#include > + > +/ { > + compatible = "jethome,jethub-j100", "amlogic,a113d", > "amlogic,meson-axg"; > + model = "JetHome JetHub J100"; > + aliases { > + serial0 = &uart_AO; /* Console */ > + serial1 = &uart_AO_B; /* External UART (Wireless Module) */ > + ethernet0 = ðmac; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + /* 1024MB RAM */ > + memory@0 { > + device_type = "memory"; > + reg = <0x0 0x0 0x0 0x4000>; > + }; > + > + reserved-memory { > + linux,cma { > + size = <0x0 0x40>; > + }; > + }; > + > + emmc_pwrseq: emmc-pwrseq { > + compatible = "mmc-pwrseq-emmc"; > + reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; > + }; > + > + vcc_3v3: regulator-vcc_3v3 { > + compatible = "regulator-fixed"; > +
[PATCH v2 2/3] ARM: amlogic: add JetHub D1/H1 device support
Add support for new home automation devices. JetHome Jethub D1 (http://jethome.ru/jethub-d1) is a home automation controller with the following features: - DIN Rail Mounting case - Amlogic A113X (ARM Cortex-A53) quad-core up to 1.5GHz - no video out - 512Mb/1GB DDR3 - 8/16GB eMMC flash - 1 x USB 2.0 - 1 x 10/100Mbps ethernet - WiFi / Bluetooth AMPAK AP6255 (Broadcom BCM43455) IEEE 802.11a/b/g/n/ac, Bluetooth 4.2. - TI CC2538 + CC2592 Zigbee Wireless Module with up to 20dBm output power and Zigbee 3.0 support. - 2 x gpio LEDS - GPIO user Button - 1 x 1-Wire - 2 x RS-485 - 4 x dry contact digital GPIO inputs - 3 x relay GPIO outputs - DC source with a voltage of 9 to 56 V / Passive POE JetHome Jethub H1 (http://jethome.ru/jethub-h1) is a home automation controller with the following features: - Square plastic case - Amlogic S905W (ARM Cortex-A53) quad-core up to 1.5GHz - no video out - 1GB DDR3 - 8/16GB eMMC flash - 2 x USB 2.0 - 1 x 10/100Mbps ethernet - WiFi / Bluetooth RTL8822CS IEEE 802.11a/b/g/n/ac, Bluetooth 5.0. - TI CC2538 + CC2592 Zigbee Wireless Module with up to 20dBm output power and Zigbee 3.0 support. - MicroSD 2.x/3.x/4.x DS/HS cards. - 1 x gpio LED - ADC user Button - DC source 5V microUSB with serial console Patches from: - JetHub H1 https://lore.kernel.org/r/20210915085715.1134940-4-ad...@lexina.in https://git.kernel.org/amlogic/c/abfaae24ecf3e7f00508b60fa05e2b6789b8f607 - JetHub D1 https://lore.kernel.org/r/20210915085715.1134940-5-ad...@lexina.in https://git.kernel.org/amlogic/c/8e279fb2903990cc6296ec56b3b80b2f854b6c79 Signed-off-by: Vyacheslav Bocharov Reviewed-by: Neil Armstrong --- arch/arm/dts/Makefile | 2 + .../arm/dts/meson-axg-jethome-jethub-j100.dts | 361 ++ .../meson-gxl-s905w-jethome-jethub-j80.dts| 241 board/amlogic/jethub-j80/MAINTAINERS | 6 + board/amlogic/jethub-j80/Makefile | 6 + board/amlogic/jethub-j80/jethub-j80.c | 68 configs/jethub_j100_defconfig | 55 +++ configs/jethub_j80_defconfig | 63 +++ 8 files changed, 802 insertions(+) create mode 100644 arch/arm/dts/meson-axg-jethome-jethub-j100.dts create mode 100644 arch/arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts create mode 100644 board/amlogic/jethub-j80/MAINTAINERS create mode 100644 board/amlogic/jethub-j80/Makefile create mode 100644 board/amlogic/jethub-j80/jethub-j80.c create mode 100644 configs/jethub_j100_defconfig create mode 100644 configs/jethub_j80_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index f0160d2dc0..d1893a9812 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -169,10 +169,12 @@ dtb-$(CONFIG_ARCH_MESON) += \ meson-gxl-s905x-libretech-cc-v2.dtb \ meson-gxl-s905x-khadas-vim.dtb \ meson-gxl-s905d-libretech-pc.dtb \ + meson-gxl-s905w-jethome-jethub-j80.dtb \ meson-gxm-khadas-vim2.dtb \ meson-gxm-s912-libretech-pc.dtb \ meson-gxm-wetek-core2.dtb \ meson-axg-s400.dtb \ + meson-axg-jethome-jethub-j100.dtb \ meson-g12a-u200.dtb \ meson-g12a-sei510.dtb \ meson-g12b-gtking.dtb \ diff --git a/arch/arm/dts/meson-axg-jethome-jethub-j100.dts b/arch/arm/dts/meson-axg-jethome-jethub-j100.dts new file mode 100644 index 00..5783732dc6 --- /dev/null +++ b/arch/arm/dts/meson-axg-jethome-jethub-j100.dts @@ -0,0 +1,361 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2021 Vyacheslav Bocharov + * Copyright (c) 2020 JetHome + * Author: Aleksandr Kazantsev + * Author: Alexey Shevelkin + * Author: Vyacheslav Bocharov + */ + +/dts-v1/; + +#include "meson-axg.dtsi" +#include +#include + +/ { + compatible = "jethome,jethub-j100", "amlogic,a113d", "amlogic,meson-axg"; + model = "JetHome JetHub J100"; + aliases { + serial0 = &uart_AO; /* Console */ + serial1 = &uart_AO_B; /* External UART (Wireless Module) */ + ethernet0 = ðmac; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + /* 1024MB RAM */ + memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x4000>; + }; + + reserved-memory { + linux,cma { + size = <0x0 0x40>; + }; + }; + + emmc_pwrseq: emmc-pwrseq { + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; + }; + + vcc_3v3: regulator-vcc_3v3 { + compatible = "regulator-fixed"; + regulator-name = "VCC_3V3"; + regulator-min-microvolt = <330>; + regulator-max-microvolt = <330>; + vin-supply = <&vddao_3v3>; + regulator-always-on; + }; + + vcc_5v: regulator-vcc_5v { + compatible = "r