diff options
8 files changed, 195 insertions, 166 deletions
diff --git a/target/linux/ath79/dts/ar9344_devolo_dlan-pro-1200plus-ac.dts b/target/linux/ath79/dts/ar9344_devolo_dlan-pro-1200plus-ac.dts new file mode 100644 index 0000000000..fb06d71ad4 --- /dev/null +++ b/target/linux/ath79/dts/ar9344_devolo_dlan-pro-1200plus-ac.dts @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "ar9344_devolo_dlan_wifi.dtsi" + +/ { + model = "Devolo dLAN pro 1200+ WiFi ac"; + compatible = "devolo,dlan-pro-1200plus-ac", "qca,ar9344"; +}; diff --git a/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi b/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi new file mode 100644 index 0000000000..9424e48654 --- /dev/null +++ b/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "ar9344.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + aliases { + led-boot = &led_dlan_red; + led-failsafe = &led_dlan_red; + led-running = &led_dlan_white; + led-upgrade = &led_dlan_red; + }; + + leds { + compatible = "gpio-leds"; + + wlan { + label = "white:wlan"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + + led_dlan_white: dlan_white { + label = "white:dlan"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + led_dlan_red: dlan_red { + label = "red:dlan"; + gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; + panic-indicator; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "Reset button"; + linux,code = <KEY_RESTART>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + wifi { + label = "WIFI button"; + linux,code = <KEY_RFKILL>; + gpios = <&gpio 20 GPIO_ACTIVE_HIGH>; + debounce-interval = <60>; + }; + + dlan { + label = "DLAN button"; + linux,code = <BTN_0>; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; +}; + +&gpio { + wlan_power { + gpio-hog; + line-name = "WLAN power"; + gpios = <&gpio 21 GPIO_ACTIVE_HIGH>; + output-high; + }; +}; + +&spi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + label = "u-boot"; + reg = <0x0 0x40000>; + read-only; + }; + + partition@40000 { + label = "u-boot-env"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "Config1"; + reg = <0x50000 0x10000>; + read-only; + }; + + partition@60000 { + label = "Config2"; + reg = <0x60000 0x10000>; + read-only; + }; + + partition@70000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x70000 0xf80000>; + }; + + art: partition@ff0000 { + label = "art"; + reg = <0xff0000 0x10000>; + read-only; + }; + }; + }; +}; + +&ref { + clock-frequency = <40000000>; +}; + +ð0 { + status = "okay"; + + pll-data = <0x02000000 0x00000101 0x00001616>; + + mtd-mac-address = <&art 0x1002>; + mtd-mac-address-increment = <2>; + + phy-mode = "rgmii"; + phy-handle = <&phy0>; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; +}; + +&pcie { + status = "okay"; + + wifi@0,0 { + compatible = "qcom,ath10k"; + reg = <0 0 0 0 0>; + }; +}; + +&mdio0 { + status = "okay"; + + phy0: ethernet-phy@0 { + reg = <0>; + phy-mode = "rgmii"; + + qca,ar8327-initvals = < + /* PORT0: RGMII, MAC0/6 exchange, tx_delay 01, No rx_delay */ + 0x04 0x06400000 + 0x08 0x00000000 /* PORT5 PAD MODE CTRL */ + 0x0c 0x00000000 /* PORT6 PAD MODE CTRL */ + 0x7c 0x0000007e /* PORT0_STATUS */ + >; + }; +}; diff --git a/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts b/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts index 627265bf70..d2fd8ecadf 100644 --- a/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts +++ b/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts @@ -1,173 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "ar9344.dtsi" - -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> +#include "ar9344_devolo_dlan_wifi.dtsi" / { model = "Devolo Magic 2 Wifi"; compatible = "devolo,magic-2-wifi", "qca,ar9344"; - - aliases { - led-boot = &led_dlan_red; - led-failsafe = &led_dlan_red; - led-running = &led_dlan_white; - led-upgrade = &led_dlan_red; - }; - - leds { - compatible = "gpio-leds"; - - wlan { - label = "white:wlan"; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - - led_dlan_white: dlan_white { - label = "white:dlan"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - }; - - led_dlan_red: dlan_red { - label = "red:dlan"; - gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; - panic-indicator; - }; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "Reset button"; - linux,code = <KEY_RESTART>; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - debounce-interval = <60>; - }; - - wifi { - label = "WIFI button"; - linux,code = <KEY_RFKILL>; - gpios = <&gpio 20 GPIO_ACTIVE_HIGH>; - debounce-interval = <60>; - }; - - dlan { - label = "DLAN button"; - linux,code = <BTN_0>; - gpios = <&gpio 22 GPIO_ACTIVE_LOW>; - debounce-interval = <60>; - }; - }; -}; - -&gpio { - wlan_power { - gpio-hog; - line-name = "WLAN power"; - gpios = <&gpio 21 GPIO_ACTIVE_HIGH>; - output-high; - }; -}; - -&spi { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - uboot: partition@0 { - label = "u-boot"; - reg = <0x0 0x40000>; - read-only; - }; - - partition@40000 { - label = "u-boot-env"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - label = "Config1"; - reg = <0x50000 0x10000>; - read-only; - }; - - partition@60000 { - label = "Config2"; - reg = <0x60000 0x10000>; - read-only; - }; - - partition@70000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x70000 0xf80000>; - }; - - art: partition@ff0000 { - label = "art"; - reg = <0xff0000 0x10000>; - read-only; - }; - }; - }; -}; - -&ref { - clock-frequency = <40000000>; -}; - -ð0 { - status = "okay"; - - pll-data = <0x02000000 0x00000101 0x00001616>; - - mtd-mac-address = <&art 0x1002>; - mtd-mac-address-increment = <2>; - - phy-mode = "rgmii"; - phy-handle = <&phy0>; -}; - -&wmac { - status = "okay"; - - mtd-cal-data = <&art 0x1000>; -}; - -&pcie { - status = "okay"; - - wifi@0,0 { - compatible = "qcom,ath10k"; - reg = <0 0 0 0 0>; - }; -}; - -&mdio0 { - status = "okay"; - - phy0: ethernet-phy@0 { - reg = <0>; - phy-mode = "rgmii"; - - qca,ar8327-initvals = < - /* PORT0: RGMII, MAC0/6 exchage, tx_delay 01, No rx_delay */ - 0x04 0x06400000 - 0x08 0x00000000 /* PORT5 PAD MODE CTRL */ - 0x0c 0x00000000 /* PORT6 PAD MODE CTRL */ - 0x7c 0x0000007e /* PORT0_STATUS */ - >; - }; }; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds index 8ead3ec0a3..9720e37f99 100644 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds @@ -178,6 +178,7 @@ compex,wpj531-16m) ucidef_set_led_rssi "sig3" "SIG3" "green:sig3" "wlan0" "65" "100" ucidef_set_led_rssi "sig4" "SIG4" "green:sig4" "wlan0" "50" "100" ;; +devolo,dlan-pro-1200plus-ac|\ devolo,magic-2-wifi) ucidef_set_led_netdev "plcw" "dLAN" "white:dlan" "eth0.1" "rx" ;; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 8ea52af67a..ffafe7db20 100644 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -210,6 +210,7 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "3:lan" "2:wan" ;; + devolo,dlan-pro-1200plus-ac|\ devolo,magic-2-wifi) ucidef_add_switch "switch0" \ "0@eth0" "2:wan" "3:lan" "4:lan" @@ -502,6 +503,7 @@ ath79_setup_macs() compex,wpj563) wan_mac=$(mtd_get_mac_binary u-boot 0x2e018) ;; + devolo,dlan-pro-1200plus-ac|\ devolo,magic-2-wifi) label_mac=$(macaddr_add "$(mtd_get_mac_binary art 0x1002)" 3) ;; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches b/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches index cd21932bfd..83f428c54a 100644 --- a/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches +++ b/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches @@ -31,6 +31,9 @@ telco,t1) ucidef_add_gpio_switch "lte_poweroff" "LTE Poweroff" "1" "1" ucidef_add_gpio_switch "lte_reset" "LTE Reset" "12" "1" ;; +devolo,dlan-pro-1200plus-ac) + ucidef_add_gpio_switch "plc_enable" "PLC enable" "13" "0" + ;; devolo,magic-2-wifi) ucidef_add_gpio_switch "plc_pairing" "PLC pairing" "11" "1" ucidef_add_gpio_switch "plc_enable" "PLC enable" "13" "1" diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index b7cb2da8cd..b2392c2c64 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -23,6 +23,7 @@ case "$FIRMWARE" in ;; comfast,cf-wr650ac-v1|\ comfast,cf-wr650ac-v2|\ + devolo,dlan-pro-1200plus-ac|\ devolo,magic-2-wifi|\ qxwlan,e1700ac-v2-8m|\ qxwlan,e1700ac-v2-16m|\ diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 4d3f455e49..b459136ef5 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -664,6 +664,15 @@ define Device/compex_wpj563 endef TARGET_DEVICES += compex_wpj563 +define Device/devolo_dlan-pro-1200plus-ac + SOC := ar9344 + DEVICE_VENDOR := Devolo + DEVICE_MODEL := dLAN pro 1200+ WiFi ac + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct + IMAGE_SIZE := 15872k +endef +TARGET_DEVICES += devolo_dlan-pro-1200plus-ac + define Device/devolo_dvl1200e SOC := qca9558 DEVICE_VENDOR := devolo |