From: Mathias Kresin Date: Wed, 17 Jan 2018 07:14:41 +0000 (+0100) Subject: ramips: add flash size postfix to Widora neo X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a411881a4000452ff791761c8f1d37ea6faa298a;p=openwrt%2Fstaging%2Fblogic.git ramips: add flash size postfix to Widora neo Rename the Widora neo by adding a flash size prefix. Move the common parts into a dtsi to be prepare everything for upcomming support of the 32MB version. Migrate the Widora neo to the generic board detection as well. Signed-off-by: Mathias Kresin --- diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index f50a5a6d4642..53d885560b35 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -57,7 +57,7 @@ ramips_setup_interfaces() omega2p | \ timecloud|\ w150m|\ - widora-neo|\ + widora,neo-16m|\ wnce2001|\ zbt-cpe102|\ zte-q7) diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 22687b197099..f08e8e1c17cb 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -285,7 +285,7 @@ get_status_led() { zbt-we2026) status_led="$boardname:red:power" ;; - widora-neo) + widora,neo-16m) status_led="widora:orange:wifi" ;; wzr-agl300nh) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 60cf9b298cce..491320badf4e 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -577,9 +577,6 @@ ramips_board_detect() { *"WHR-G300N") name="whr-g300n" ;; - *"Widora-NEO") - name="widora-neo" - ;; *"WiTi") name="witi" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 730f487b3022..6374e3d1e70c 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -167,7 +167,7 @@ platform_check_image() { whr-300hp2|\ whr-600d|\ whr-g300n|\ - widora-neo|\ + widora,neo-16m|\ witi|\ wizfi630a|\ wl-330n|\ diff --git a/target/linux/ramips/dts/WIDORA-NEO-16M.dts b/target/linux/ramips/dts/WIDORA-NEO-16M.dts new file mode 100644 index 000000000000..726515e7ec1e --- /dev/null +++ b/target/linux/ramips/dts/WIDORA-NEO-16M.dts @@ -0,0 +1,54 @@ +/dts-v1/; + +#include "WIDORA-NEO.dtsi" + +/ { + compatible = "widora,neo-16m", "widora,neo", "mediatek,mt7628an-soc"; + model = "Widora-NEO (16M)"; +}; + +&spi0 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <40000000>; + m25p,chunked-io = <31>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0x0fb0000>; + }; + }; + + spidev@1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "linux,spidev"; + reg = <1>; + spi-max-frequency = <40000000>; + }; +}; diff --git a/target/linux/ramips/dts/WIDORA-NEO.dts b/target/linux/ramips/dts/WIDORA-NEO.dts deleted file mode 100644 index 195e80605b5c..000000000000 --- a/target/linux/ramips/dts/WIDORA-NEO.dts +++ /dev/null @@ -1,171 +0,0 @@ -/dts-v1/; - -#include "mt7628an.dtsi" - -#include -#include - -/ { - compatible = "widora,neo", "mediatek,mt7628an-soc"; - model = "Widora-NEO"; - - chosen { - bootargs = "console=ttyS0,115200"; - }; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x8000000>; - }; - - gpio-leds { - compatible = "gpio-leds"; - - wifi { - label = "widora:orange:wifi"; - gpios = <&wgpio 0 GPIO_ACTIVE_HIGH>; - default-state = "on"; - }; - }; - - gpio-keys-polled { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - wps { - label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - - wgpio: gpio-wifi { - compatible = "mediatek,gpio-wifi"; - #address-cells = <1>; - #size-cells = <0>; - gpio-controller; - #gpio-cells = <2>; - }; -}; - -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; - }; - - perst { - ralink,group = "perst"; - ralink,function = "gpio"; - }; - - refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; - }; - - i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; - }; - - spis { - ralink,group = "spis"; - ralink,function = "gpio"; - }; - - wled_kn { - ralink,group = "wled_kn"; - ralink,function = "gpio"; - }; - - wled_an { - ralink,group = "wled_an"; - ralink,function = "wled_an"; - }; - - wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; - }; - }; -}; - - -&spi0 { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <40000000>; - m25p,chunked-io = <31>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "u-boot-env"; - reg = <0x30000 0x10000>; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - label = "firmware"; - reg = <0x50000 0x0fb0000>; - }; - }; - - spidev@1 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "linux,spidev"; - reg = <1>; - spi-max-frequency = <40000000>; - }; -}; - -&i2c { - status = "okay"; -}; - -&uart1 { - status = "okay"; -}; - -&uart2 { - status = "okay"; -}; - -&pwm { - status = "okay"; -}; - -ðernet { - mtd-mac-address = <&factory 0x28>; -}; - -&sdhci { - status = "okay"; - mediatek,cd-low; -}; - -&wmac { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/WIDORA-NEO.dtsi b/target/linux/ramips/dts/WIDORA-NEO.dtsi new file mode 100644 index 000000000000..3334c88e22ad --- /dev/null +++ b/target/linux/ramips/dts/WIDORA-NEO.dtsi @@ -0,0 +1,121 @@ +#include "mt7628an.dtsi" + +#include +#include + +/ { + compatible = "widora,neo", "mediatek,mt7628an-soc"; + + chosen { + bootargs = "console=ttyS0,115200"; + }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x8000000>; + }; + + gpio-leds { + compatible = "gpio-leds"; + + wifi { + label = "widora:orange:wifi"; + gpios = <&wgpio 0 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + }; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + wps { + label = "reset"; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + wgpio: gpio-wifi { + compatible = "mediatek,gpio-wifi"; + #address-cells = <1>; + #size-cells = <0>; + gpio-controller; + #gpio-cells = <2>; + }; +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "gpio"; + ralink,function = "gpio"; + }; + + perst { + ralink,group = "perst"; + ralink,function = "gpio"; + }; + + refclk { + ralink,group = "refclk"; + ralink,function = "gpio"; + }; + + i2s { + ralink,group = "i2s"; + ralink,function = "gpio"; + }; + + spis { + ralink,group = "spis"; + ralink,function = "gpio"; + }; + + wled_kn { + ralink,group = "wled_kn"; + ralink,function = "gpio"; + }; + + wled_an { + ralink,group = "wled_an"; + ralink,function = "wled_an"; + }; + + wdt { + ralink,group = "wdt"; + ralink,function = "gpio"; + }; + }; +}; + +&i2c { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&pwm { + status = "okay"; +}; + +ðernet { + mtd-mac-address = <&factory 0x28>; +}; + +&sdhci { + status = "okay"; + mediatek,cd-low; +}; + +&wmac { + status = "okay"; +}; diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index ae8a1344d57e..6c0102fc9249 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -215,13 +215,14 @@ define Device/wl-wn575a3 endef TARGET_DEVICES += wl-wn575a3 -define Device/widora-neo - DTS := WIDORA-NEO +define Device/widora_neo-16m + DTS := WIDORA-NEO-16M IMAGE_SIZE := $(ralink_default_fw_size_16M) - DEVICE_TITLE := Widora-NEO + DEVICE_TITLE := Widora-NEO (16M) DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci + SUPPORTED_DEVICES += widora-neo endef -TARGET_DEVICES += widora-neo +TARGET_DEVICES += widora_neo-16m define Device/wrtnode2p DTS := WRTNODE2P