From c8b309b53d6739b91d81311e4228f66f31c894f1 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 28 Apr 2020 18:19:48 +0100 Subject: [PATCH] ath79: split Teltonika RUT955 to support other RUT9xx models Split device-tree of Teltonika RUT955 into a generic RUT9xx part and a part specific to that version of RUT955 already supported. Also harmonize GPIO and LED names with what is used by the vendor firmware and assign RS485 DTR signal. Signed-off-by: Daniel Golle --- .../ath79/dts/ar9344_teltonika_rut955.dts | 190 ++---------------- .../ath79/dts/ar9344_teltonika_rut9xx.dtsi | 179 +++++++++++++++++ 2 files changed, 198 insertions(+), 171 deletions(-) create mode 100644 target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts index a8aeef0fa4..53dc7dd9b9 100644 --- a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts +++ b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts @@ -1,63 +1,44 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include -#include - -#include "ar9344.dtsi" +#include "ar9344_teltonika_rut9xx.dtsi" / { model = "Teltonika RUT955"; - compatible = "teltonika,rut955", "qca,ar9344"; + compatible = "teltonika,rut955", "teltonika,rut9xx", "qca,ar9344"; aliases { - serial0 = &uart; - serial1 = &hs_uart; led-boot = &led_system_green; led-failsafe = &led_system_red; led-running = &led_system_green; led-upgrade = &led_system_red; - label-mac-device = ð1; - }; - - i2c { - compatible = "i2c-gpio"; - scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - #address-cells = <1>; - #size-cells = <0>; - - hwmon@4d { - compatible = "microchip,mcp3221"; - reg = <0x4d>; - }; }; leds { compatible = "gpio-leds"; + signal0 { + label = "rut955:green:signal0"; + gpios = <&gpio_ext 0 GPIO_ACTIVE_HIGH>; + }; + signal1 { label = "rut955:green:signal1"; - gpios = <&gpio_ext 0 GPIO_ACTIVE_HIGH>; + gpios = <&gpio_ext 1 GPIO_ACTIVE_HIGH>; }; signal2 { label = "rut955:green:signal2"; - gpios = <&gpio_ext 1 GPIO_ACTIVE_HIGH>; + gpios = <&gpio_ext 2 GPIO_ACTIVE_HIGH>; }; signal3 { label = "rut955:green:signal3"; - gpios = <&gpio_ext 2 GPIO_ACTIVE_HIGH>; + gpios = <&gpio_ext 3 GPIO_ACTIVE_HIGH>; }; signal4 { label = "rut955:green:signal4"; - gpios = <&gpio_ext 3 GPIO_ACTIVE_HIGH>; - }; - - signal5 { - label = "rut955:green:signal5"; gpios = <&gpio_ext 4 GPIO_ACTIVE_HIGH>; }; @@ -72,17 +53,6 @@ default-state = "on"; }; }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - linux,code = ; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - debounce-interval = <60>; - }; - }; }; &gpio { @@ -169,83 +139,12 @@ }; }; -&ref { - clock-frequency = <40000000>; -}; - -&uart { - status = "okay"; -}; - -&hs_uart { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <&pmx_uart2>; - - rts-gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; - rs485-rts-active-low; - linux,rs485-enabled-at-boot-time; -}; - &spi { status = "okay"; num-cs = <3>; pinctrl-names = "default"; - pinctrl-0 = <&pmx_spi>; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x20000>; - read-only; - }; - - config: partition@20000 { - label = "config"; - reg = <0x20000 0x10000>; - read-only; - }; - - art: partition@30000 { - label = "art"; - reg = <0x30000 0x10000>; - read-only; - }; - - partition@40000 { - label = "firmware"; - reg = <0x40000 0xf30000>; - compatible = "tplink,firmware"; - }; - - partition@f70000 { - label = "event-log"; - reg = <0xf70000 0x90000>; - read-only; - }; - }; - }; - - microsd@1 { - status = "disabled"; - - compatible = "mmc-spi-slot"; - spi-max-frequency = <25000000>; - reg = <1>; - voltage-ranges = <3200 3400>; - broken-cd; - }; + pinctrl-0 = <&pmx_spi>, <&pmx_spi_ext>; gpio_ext: gpio_ext@2 { compatible = "fairchild,74hc595"; @@ -254,51 +153,16 @@ #gpio-cells = <2>; registers-number = <2>; spi-max-frequency = <10000000>; - gpio-line-names = "led_signal_bar1", "led_signal_bar2", "led_signal_bar3", "led_signal_bar4", - "led_signal_bar5", "led_status_red", "led_status_green", "sim_sel", + gpio-line-names = "signal_bar0", "signal_bar1", "signal_bar2", "signal_bar3", + "signal_bar4", "status_red", "status_green", "sim_sel", "DOUT1", "DOUT2", "modem_vbus", "modem_rst", "DOUT3", "RS485_R", "SDCS", "HWRST"; }; }; -&usb { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - port@1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - - port@1 { - compatible = "usb-a-connector"; - reg = <1>; - }; - - port@3 { - label = "RS-232 serial adapter"; - reg = <3>; - }; - - port@4 { - label = "internal wwan modem"; - reg = <4>; - }; - }; -}; - -&usb_phy { - status = "okay"; -}; - -&wmac { - status = "okay"; - - mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&config 0x0>; - mtd-mac-address-increment = <2>; -}; +&hs_uart { + dtr-gpios = <&gpio_ext 13 GPIO_ACTIVE_HIGH>; +} ð0 { status = "okay"; @@ -321,26 +185,10 @@ }; &pinmux { - pmx_spi: spi { - // SPI_CS1 on GPIO 3, 2nd SCK on GPIO 4 - // 2nd MOSI on GPIO 12, SPI_CS2 on GPIO 20 - pinctrl-single,bits = <0x0 0x07000000 0xff000000>, - <0x4 0x0a 0xff>, + pmx_spi_ext: spi_ext { + // 2nd SCK on GPIO 4, 2nd MOSI on GPIO 12, SPI_CS2 on GPIO 20 + pinctrl-single,bits = <0x4 0x0a 0xff>, <0xc 0x0b 0xff>, <0x14 0x08 0xff>; }; - - pmx_leds_switch: leds_switch { - // switch port LEDs on GPIO 1, GPIO 13, GPIO 14 and GPIO 22 - pinctrl-single,bits = <0x0 0x00002d00 0x0000ff00>, - <0xc 0x002c2b00 0x00ffff00>, - <0x14 0x002a0000 0x00ff0000>; - }; - - pmx_uart2: uart2 { - // UART1_DTR on GPIO 0, UART1_RD on GPIO 11, UART1_TD on GPIO 18 - pinctrl-single,bits = <0x0 0x0 0xff>, - <0x10 0x4f000000 0xff000000>, - <0x3c 0x000b0000 0x00ff0000>; - }; }; diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi new file mode 100644 index 0000000000..0025e5d8b0 --- /dev/null +++ b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi @@ -0,0 +1,179 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "ar9344.dtsi" + +/ { + compatible = "teltonika,rut9xx", "qca,ar9344"; + + aliases { + serial0 = &uart; + serial1 = &hs_uart; + label-mac-device = ð1; + }; + + i2c0: i2c { + compatible = "i2c-gpio"; + scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + #address-cells = <1>; + #size-cells = <0>; + + hwmon@4d { + compatible = "microchip,mcp3221"; + reg = <0x4d>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; +}; + +&ref { + clock-frequency = <40000000>; +}; + +&uart { + status = "okay"; +}; + +&hs_uart { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pmx_uart2>; + + rts-gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; + rs485-rts-active-low; + linux,rs485-enabled-at-boot-time; +}; + +&spi { + status = "okay"; + num-cs = <2>; + pinctrl-names = "default"; + pinctrl-0 = <&pmx_spi>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x20000>; + read-only; + }; + + config: partition@20000 { + label = "config"; + reg = <0x20000 0x10000>; + read-only; + }; + + art: partition@30000 { + label = "art"; + reg = <0x30000 0x10000>; + read-only; + }; + + partition@40000 { + label = "firmware"; + reg = <0x40000 0xf30000>; + compatible = "tplink,firmware"; + }; + + partition@f70000 { + label = "event-log"; + reg = <0xf70000 0x90000>; + read-only; + }; + }; + }; + + microsd@1 { + status = "disabled"; + + compatible = "mmc-spi-slot"; + spi-max-frequency = <25000000>; + reg = <1>; + voltage-ranges = <3200 3400>; + broken-cd; + }; +}; + +&usb { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + port@1 { + compatible = "usb-a-connector"; + reg = <1>; + }; + + port@3 { + label = "RS-232 serial adapter"; + reg = <3>; + }; + + port@4 { + label = "internal wwan modem"; + reg = <4>; + }; + }; +}; + +&usb_phy { + status = "okay"; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&config 0x0>; + mtd-mac-address-increment = <2>; +}; + +&pinmux { + pmx_spi: spi { + // SPI_CS1 on GPIO 3 + pinctrl-single,bits = <0x0 0x07000000 0xff000000>; + }; + + pmx_leds_switch: leds_switch { + // switch port LEDs on GPIO 1, GPIO 13, GPIO 14 and GPIO 22 + pinctrl-single,bits = <0x0 0x00002d00 0x0000ff00>, + <0xc 0x002c2b00 0x00ffff00>, + <0x14 0x002a0000 0x00ff0000>; + }; + + pmx_uart2: uart2 { + // UART1_DTR on GPIO 0, UART1_RD on GPIO 11, UART1_TD on GPIO 18 + pinctrl-single,bits = <0x0 0x0 0xff>, + <0x10 0x4f000000 0xff000000>, + <0x3c 0x000b0000 0x00ff0000>; + }; +}; -- 2.25.1