From: Sungbo Eo Date: Tue, 29 Oct 2019 15:18:35 +0000 (+0900) Subject: ramips: fix MTK_SOC for RT3662 devices X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6ea5f7d44c8dccdf018af0aa9750903308aa95b7;p=openwrt%2Fstaging%2Flinusw.git ramips: fix MTK_SOC for RT3662 devices rt3883.mk contains both RT3662 and RT3883 device profiles, but commit 6a104ac77206 set MTK_SOC to rt3883 for all devices. This patch fixes it, and renames dts files accordingly. And SoC compatible strings are also appended in the dts. Fixes: 6a104ac77206 ("ramips/rt288x,rt3883: Name DTS files based on scheme") Signed-off-by: Sungbo Eo --- diff --git a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts new file mode 100644 index 0000000000..13f6cdd1dd --- /dev/null +++ b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts @@ -0,0 +1,151 @@ +/dts-v1/; + +#include "rt3883.dtsi" + +#include +#include + +/ { + compatible = "asus,rt-n56u", "ralink,rt3662-soc", "ralink,rt3883-soc"; + model = "Asus RT-N56U"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + + nor-flash@1c000000 { + compatible = "cfi-flash"; + reg = <0x1c000000 0x800000>; + bank-width = <2>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x0 0x0030000>; + label = "u-boot"; + read-only; + }; + + partition@30000 { + reg = <0x00030000 0x00010000>; + label = "u-boot-env"; + read-only; + }; + + factory: partition@40000 { + reg = <0x00040000 0x00010000>; + label = "factory"; + read-only; + }; + + partition@50000 { + compatible = "denx,uimage"; + reg = <0x00050000 0x007b0000>; + label = "firmware"; + }; + }; + }; + + rtl8367 { + compatible = "realtek,rtl8367"; + gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>; + gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>; + realtek,extif1 = <1 0 1 1 1 1 1 1 2>; + }; + + keys { + compatible = "gpio-keys-polled"; + poll-interval = <100>; + + reset { + label = "reset"; + gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "rt-n56u:blue:power"; + gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + }; + + lan { + label = "rt-n56u:blue:lan"; + gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; + }; + + wan { + label = "rt-n56u:blue:wan"; + gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; + }; + + usb { + label = "rt-n56u:blue:usb"; + gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&gpio1 { + status = "okay"; +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; +}; + +ðernet { + mtd-mac-address = <&factory 0x4>; + + port@0 { + mediatek,fixed-link = <1000 1 1 1>; + }; +}; + +&pci { + status = "okay"; +}; + +&pci1 { + status = "okay"; + + wifi@0,0 { + compatible = "pci1814,3091"; + reg = <0x10000 0 0 0 0>; + ralink,mtd-eeprom = <&factory 0x8000>; + }; +}; + +&wmac { + status = "okay"; + ralink,2ghz = <0>; + ralink,mtd-eeprom = <&factory 0>; +}; + +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; diff --git a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts new file mode 100644 index 0000000000..5effbf9fa2 --- /dev/null +++ b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts @@ -0,0 +1,152 @@ +/dts-v1/; + +#include "rt3883.dtsi" + +#include +#include + +/ { + compatible = "dlink,dir-645", "ralink,rt3662-soc", "ralink,rt3883-soc"; + model = "D-Link DIR-645"; + + aliases { + led-boot = &led_wps; + led-failsafe = &led_wps; + led-running = &led_wps; + led-upgrade = &led_wps; + }; + + rtl8367b { + compatible = "realtek,rtl8367b"; + gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>; + gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>; + realtek,extif1 = <1 0 1 1 1 1 1 1 2>; + }; + + keys { + compatible = "gpio-keys-polled"; + poll-interval = <100>; + + reset { + label = "reset"; + gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + inet { + label = "dir-645:green:inet"; + gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + }; + + led_wps: wps { + label = "dir-645:green:wps"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + }; + }; + + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; + + usb { + gpio-export,name = "usb"; + gpio-export,output = <1>; + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&gpio1 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + m25p80@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "uboot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "uboot-env"; + reg = <0x30000 0x4000>; + read-only; + }; + + factory: partition@34000 { + label = "factory"; + reg = <0x34000 0x4000>; + read-only; + }; + + partition@38000 { + label = "nvram"; + reg = <0x38000 0x8000>; + read-only; + }; + + partition@40000 { + label = "devdata"; + reg = <0x40000 0x10000>; + }; + + partition@50000 { + compatible = "seama"; + label = "firmware"; + reg = <0x50000 0x7b0000>; + }; + }; + }; +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; +}; + +ðernet { + mtd-mac-address = <&factory 0x4>; + + port@0 { + mediatek,fixed-link = <1000 1 1 0>; + }; +}; + +&wmac { + ralink,5ghz = <0>; + ralink,mtd-eeprom = <&factory 0>; +}; + +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; diff --git a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts new file mode 100644 index 0000000000..9e6d98f95a --- /dev/null +++ b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts @@ -0,0 +1,180 @@ +/dts-v1/; + +#include "rt3883.dtsi" + +#include +#include + +/ { + compatible = "edimax,br-6475nd", "ralink,rt3662-soc", "ralink,rt3883-soc"; + model = "Edimax BR-6475nD"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + + keys { + compatible = "gpio-keys-polled"; + poll-interval = <100>; + + reset { + label = "reset"; + gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + rfkill { + label = "rfkill"; + gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; + linux,input-type = ; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "br-6475nd:green:power"; + gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + }; + + wlan { + label = "br-6475nd:amber:wlan"; + gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + }; + + wlan_5ghz { + label = "br-6475nd:amber:wlan_5ghz"; + gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + }; + }; + + nor-flash@1c000000 { + compatible = "cfi-flash"; + reg = <0x1c000000 0x800000>; + bank-width = <2>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x00000000 0x00030000>; + label = "u-boot"; + read-only; + }; + + partition@30000 { + reg = <0x00030000 0x00010000>; + label = "nvram"; + read-only; + }; + + factory: partition@40000 { + reg = <0x00040000 0x00010000>; + label = "factory"; + read-only; + }; + + devdata: partition@50000 { + reg = <0x00050000 0x00020000>; + label = "devdata"; + read-only; + }; + + partition@70000 { + compatible = "edimax,uimage"; + reg = <0x00070000 0x00790000>; + label = "firmware"; + }; + }; + }; + + rtl8367 { + compatible = "realtek,rtl8367"; + gpio-sda = <&gpio0 5 GPIO_ACTIVE_HIGH>; + gpio-sck = <&gpio0 4 GPIO_ACTIVE_HIGH>; + realtek,extif0 = <1 0 1 1 1 1 1 1 2>; + }; + + /* + * Unclear if this is the correct gpio setup; the USB ports are + * unpopulated on a stock BR-6475nD, even though the hardware exists + * and the headers are there. + */ + /* + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; + + usb { + gpio-export,name="usb"; + gpio-export,output=<0>; + gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; + }; + }; + */ +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; +}; + +&timer { + status = "okay"; +}; + +&gpio1 { + status = "okay"; +}; + +&uartlite { + status = "okay"; +}; + +ðernet { + status = "okay"; + mtd-mac-address = <&devdata 0x0d>; + + port@0 { + mediatek,fixed-link = <1000 1 1 1>; + }; +}; + +&wmac { + status = "okay"; + ralink,mtd-eeprom = <&factory 0>; +}; + +&pci { + status = "okay"; +}; + +&pci1 { + status = "okay"; + + wifi@0,0 { + compatible = "pci0,0"; + reg = <0x10000 0 0 0 0>; + ralink,5ghz = <0>; + ralink,mtd-eeprom = <&factory 0x8000>; + }; +}; + +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; diff --git a/target/linux/ramips/dts/rt3662_loewe_wmdr-143n.dts b/target/linux/ramips/dts/rt3662_loewe_wmdr-143n.dts new file mode 100644 index 0000000000..af5ffda28e --- /dev/null +++ b/target/linux/ramips/dts/rt3662_loewe_wmdr-143n.dts @@ -0,0 +1,68 @@ +/dts-v1/; + +#include "rt3883.dtsi" + +/ { + compatible = "loewe,wmdr-143n", "ralink,rt3662-soc", "ralink,rt3883-soc"; + model = "Loewe WMDR-143N"; +}; + +&spi0 { + status = "okay"; + + m25p80@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 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x00010000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x50000 0x7b0000>; + }; + }; + }; +}; + +ðernet { + port@0 { + phy-handle = <&phy0>; + phy-mode = "mii"; + }; + mdio-bus { + status = "okay"; + + phy0: ethernet-phy@0 { + reg = <0>; + phy-mode = "mii"; + }; + }; +}; + +&wmac { + status = "okay"; + ralink,mtd-eeprom = <&factory 0x0>; +}; diff --git a/target/linux/ramips/dts/rt3662_omnima_hpm.dts b/target/linux/ramips/dts/rt3662_omnima_hpm.dts new file mode 100644 index 0000000000..5d3f3278a5 --- /dev/null +++ b/target/linux/ramips/dts/rt3662_omnima_hpm.dts @@ -0,0 +1,162 @@ +/dts-v1/; + +#include "rt3883.dtsi" + +#include +#include + +/ { + compatible = "omnima,hpm", "ralink,rt3662-soc", "ralink,rt3883-soc"; + model = "Omnima HPM"; + + aliases { + led-boot = &led_status; + led-failsafe = &led_status; + led-running = &led_status; + led-upgrade = &led_status; + }; + + chosen { + bootargs = "console=ttyS0,115200"; + }; + + keys { + compatible = "gpio-keys-polled"; + poll-interval = <100>; + + reset { + label = "reset"; + gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + power { + label = "hpm:orange:power"; + gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + led_status: status { + label = "hpm:green:status"; + gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + eth { + label = "hpm:green:eth"; + gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; + }; + + eth2 { + label = "hpm:red:eth"; + gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + }; + + wifi { + label = "hpm:green:wifi"; + gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + }; + + wifi2 { + label = "hpm:red:wifi"; + gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; + }; + }; + + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; + /* gpio 12 and 13 handle the OC input */ + + usb0 { + gpio-export,name = "usb0"; + gpio-export,output = <1>; + gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; + }; + + usb1 { + gpio-export,name = "usb1"; + gpio-export,output = <1>; + gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&spi0 { + status = "okay"; + + m25p80@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <25000000>; + reg = <0>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x0 0x0030000>; + label = "u-boot"; + read-only; + }; + + partition@30000 { + reg = <0x00030000 0x00010000>; + label = "config"; + read-only; + }; + + factory: partition@40000 { + reg = <0x00040000 0x00010000>; + label = "factory"; + read-only; + }; + + partition@50000 { + compatible = "denx,uimage"; + reg = <0x00050000 0x00fb0000>; + label = "firmware"; + }; + }; + }; +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; +}; + +ðernet { + phy-handle = <&phy0>; + phy-mode = "rgmii"; + mtd-mac-address = <&factory 0x28>; + + mdio-bus { + status = "okay"; + + phy0: ethernet-phy@4 { + reg = <4>; + }; + }; +}; + +&wmac { + ralink,mtd-eeprom = <&factory 0>; +}; + +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; diff --git a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts new file mode 100644 index 0000000000..a25d9d02c1 --- /dev/null +++ b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts @@ -0,0 +1,152 @@ +/dts-v1/; + +#include "rt3883.dtsi" + +#include +#include + +/ { + compatible = "samsung,cy-swr1100", "ralink,rt3662-soc", "ralink,rt3883-soc"; + model = "Samsung CY-SWR1100"; + + aliases { + led-boot = &led_wps; + led-failsafe = &led_wps; + }; + + nor-flash@1c000000 { + compatible = "cfi-flash"; + reg = <0x1c000000 0x800000>; + bank-width = <2>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "uboot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "uboot-env"; + reg = <0x30000 0x4000>; + read-only; + }; + + factory: partition@34000 { + label = "factory"; + reg = <0x34000 0x4000>; + read-only; + }; + + partition@38000 { + label = "nvram"; + reg = <0x38000 0x8000>; + read-only; + }; + + partition@40000 { + label = "devdata"; + reg = <0x40000 0x10000>; + }; + + partition@50000 { + compatible = "seama"; + label = "firmware"; + reg = <0x50000 0x7b0000>; + }; + }; + }; + + rtl8367 { + compatible = "realtek,rtl8367"; + gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>; + gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>; + realtek,extif0 = <1 0 1 1 1 1 1 1 2>; + }; + + keys { + compatible = "gpio-keys-polled"; + poll-interval = <100>; + + reset { + label = "reset"; + gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_wps: wps { + label = "cy-swr1100:blue:wps"; + gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + }; + + usb { + label = "cy-swr1100:blue:usb"; + gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + trigger-sources = <&ohci_port1>, <&ehci_port1>; + linux,default-trigger = "usbport"; + }; + }; +}; + +&gpio1 { + status = "okay"; +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "spi"; + ralink,function = "gpio"; + }; + }; +}; + +ðernet { + port@0 { + mediatek,fixed-link = <1000 1 1 1>; + phy-mode = "rgmii"; + }; +}; + +&pci { + status = "okay"; +}; + +&pci1 { + status = "okay"; + + wifi@0,0 { + compatible = "pci0,0"; + reg = <0x10000 0 0 0 0>; + ralink,5ghz = <0>; + ralink,mtd-eeprom = <&factory 0x2000>; + }; +}; + +&wmac { + status = "okay"; + ralink,2ghz = <0>; + ralink,mtd-eeprom = <&factory 0>; +}; + +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; diff --git a/target/linux/ramips/dts/rt3883_asus_rt-n56u.dts b/target/linux/ramips/dts/rt3883_asus_rt-n56u.dts deleted file mode 100644 index 9c2a32a988..0000000000 --- a/target/linux/ramips/dts/rt3883_asus_rt-n56u.dts +++ /dev/null @@ -1,151 +0,0 @@ -/dts-v1/; - -#include "rt3883.dtsi" - -#include -#include - -/ { - compatible = "asus,rt-n56u", "ralink,rt3883-soc"; - model = "Asus RT-N56U"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - nor-flash@1c000000 { - compatible = "cfi-flash"; - reg = <0x1c000000 0x800000>; - bank-width = <2>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - reg = <0x0 0x0030000>; - label = "u-boot"; - read-only; - }; - - partition@30000 { - reg = <0x00030000 0x00010000>; - label = "u-boot-env"; - read-only; - }; - - factory: partition@40000 { - reg = <0x00040000 0x00010000>; - label = "factory"; - read-only; - }; - - partition@50000 { - compatible = "denx,uimage"; - reg = <0x00050000 0x007b0000>; - label = "firmware"; - }; - }; - }; - - rtl8367 { - compatible = "realtek,rtl8367"; - gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>; - gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>; - realtek,extif1 = <1 0 1 1 1 1 1 1 2>; - }; - - keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; - - reset { - label = "reset"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - wps { - label = "wps"; - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - - leds { - compatible = "gpio-leds"; - - led_power: power { - label = "rt-n56u:blue:power"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; - }; - - lan { - label = "rt-n56u:blue:lan"; - gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; - }; - - wan { - label = "rt-n56u:blue:wan"; - gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; - }; - - usb { - label = "rt-n56u:blue:usb"; - gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&gpio1 { - status = "okay"; -}; - -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; - }; -}; - -ðernet { - mtd-mac-address = <&factory 0x4>; - - port@0 { - mediatek,fixed-link = <1000 1 1 1>; - }; -}; - -&pci { - status = "okay"; -}; - -&pci1 { - status = "okay"; - - wifi@0,0 { - compatible = "pci1814,3091"; - reg = <0x10000 0 0 0 0>; - ralink,mtd-eeprom = <&factory 0x8000>; - }; -}; - -&wmac { - status = "okay"; - ralink,2ghz = <0>; - ralink,mtd-eeprom = <&factory 0>; -}; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt3883_dlink_dir-645.dts b/target/linux/ramips/dts/rt3883_dlink_dir-645.dts deleted file mode 100644 index 35d011ebba..0000000000 --- a/target/linux/ramips/dts/rt3883_dlink_dir-645.dts +++ /dev/null @@ -1,152 +0,0 @@ -/dts-v1/; - -#include "rt3883.dtsi" - -#include -#include - -/ { - compatible = "dlink,dir-645", "ralink,rt3883-soc"; - model = "D-Link DIR-645"; - - aliases { - led-boot = &led_wps; - led-failsafe = &led_wps; - led-running = &led_wps; - led-upgrade = &led_wps; - }; - - rtl8367b { - compatible = "realtek,rtl8367b"; - gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>; - gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>; - realtek,extif1 = <1 0 1 1 1 1 1 1 2>; - }; - - keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; - - reset { - label = "reset"; - gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; - linux,code = ; - }; - - wps { - label = "wps"; - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; - linux,code = ; - }; - }; - - leds { - compatible = "gpio-leds"; - - inet { - label = "dir-645:green:inet"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; - }; - - led_wps: wps { - label = "dir-645:green:wps"; - gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; - }; - }; - - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; - - usb { - gpio-export,name = "usb"; - gpio-export,output = <1>; - gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&gpio1 { - status = "okay"; -}; - -&spi0 { - status = "okay"; - - m25p80@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "uboot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "uboot-env"; - reg = <0x30000 0x4000>; - read-only; - }; - - factory: partition@34000 { - label = "factory"; - reg = <0x34000 0x4000>; - read-only; - }; - - partition@38000 { - label = "nvram"; - reg = <0x38000 0x8000>; - read-only; - }; - - partition@40000 { - label = "devdata"; - reg = <0x40000 0x10000>; - }; - - partition@50000 { - compatible = "seama"; - label = "firmware"; - reg = <0x50000 0x7b0000>; - }; - }; - }; -}; - -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; - }; -}; - -ðernet { - mtd-mac-address = <&factory 0x4>; - - port@0 { - mediatek,fixed-link = <1000 1 1 0>; - }; -}; - -&wmac { - ralink,5ghz = <0>; - ralink,mtd-eeprom = <&factory 0>; -}; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt3883_edimax_br-6475nd.dts b/target/linux/ramips/dts/rt3883_edimax_br-6475nd.dts deleted file mode 100644 index f7fb8b5c40..0000000000 --- a/target/linux/ramips/dts/rt3883_edimax_br-6475nd.dts +++ /dev/null @@ -1,180 +0,0 @@ -/dts-v1/; - -#include "rt3883.dtsi" - -#include -#include - -/ { - compatible = "edimax,br-6475nd", "ralink,rt3883-soc"; - model = "Edimax BR-6475nD"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; - - reset { - label = "reset"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - rfkill { - label = "rfkill"; - gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; - linux,input-type = ; - linux,code = ; - }; - }; - - leds { - compatible = "gpio-leds"; - - led_power: power { - label = "br-6475nd:green:power"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - }; - - wlan { - label = "br-6475nd:amber:wlan"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; - }; - - wlan_5ghz { - label = "br-6475nd:amber:wlan_5ghz"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; - }; - }; - - nor-flash@1c000000 { - compatible = "cfi-flash"; - reg = <0x1c000000 0x800000>; - bank-width = <2>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - reg = <0x00000000 0x00030000>; - label = "u-boot"; - read-only; - }; - - partition@30000 { - reg = <0x00030000 0x00010000>; - label = "nvram"; - read-only; - }; - - factory: partition@40000 { - reg = <0x00040000 0x00010000>; - label = "factory"; - read-only; - }; - - devdata: partition@50000 { - reg = <0x00050000 0x00020000>; - label = "devdata"; - read-only; - }; - - partition@70000 { - compatible = "edimax,uimage"; - reg = <0x00070000 0x00790000>; - label = "firmware"; - }; - }; - }; - - rtl8367 { - compatible = "realtek,rtl8367"; - gpio-sda = <&gpio0 5 GPIO_ACTIVE_HIGH>; - gpio-sck = <&gpio0 4 GPIO_ACTIVE_HIGH>; - realtek,extif0 = <1 0 1 1 1 1 1 1 2>; - }; - - /* - * Unclear if this is the correct gpio setup; the USB ports are - * unpopulated on a stock BR-6475nD, even though the hardware exists - * and the headers are there. - */ - /* - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; - - usb { - gpio-export,name="usb"; - gpio-export,output=<0>; - gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; - }; - }; - */ -}; - -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "jtag", "uartf"; - ralink,function = "gpio"; - }; - }; -}; - -&timer { - status = "okay"; -}; - -&gpio1 { - status = "okay"; -}; - -&uartlite { - status = "okay"; -}; - -ðernet { - status = "okay"; - mtd-mac-address = <&devdata 0x0d>; - - port@0 { - mediatek,fixed-link = <1000 1 1 1>; - }; -}; - -&wmac { - status = "okay"; - ralink,mtd-eeprom = <&factory 0>; -}; - -&pci { - status = "okay"; -}; - -&pci1 { - status = "okay"; - - wifi@0,0 { - compatible = "pci0,0"; - reg = <0x10000 0 0 0 0>; - ralink,5ghz = <0>; - ralink,mtd-eeprom = <&factory 0x8000>; - }; -}; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt3883_loewe_wmdr-143n.dts b/target/linux/ramips/dts/rt3883_loewe_wmdr-143n.dts deleted file mode 100644 index 8cce0d5f38..0000000000 --- a/target/linux/ramips/dts/rt3883_loewe_wmdr-143n.dts +++ /dev/null @@ -1,68 +0,0 @@ -/dts-v1/; - -#include "rt3883.dtsi" - -/ { - compatible = "loewe,wmdr-143n", "ralink,rt3883-soc"; - model = "Loewe WMDR-143N"; -}; - -&spi0 { - status = "okay"; - - m25p80@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 0x30000>; - read-only; - }; - - partition@30000 { - label = "u-boot-env"; - reg = <0x30000 0x00010000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x50000 0x7b0000>; - }; - }; - }; -}; - -ðernet { - port@0 { - phy-handle = <&phy0>; - phy-mode = "mii"; - }; - mdio-bus { - status = "okay"; - - phy0: ethernet-phy@0 { - reg = <0>; - phy-mode = "mii"; - }; - }; -}; - -&wmac { - status = "okay"; - ralink,mtd-eeprom = <&factory 0x0>; -}; diff --git a/target/linux/ramips/dts/rt3883_omnima_hpm.dts b/target/linux/ramips/dts/rt3883_omnima_hpm.dts deleted file mode 100644 index 7ccd078144..0000000000 --- a/target/linux/ramips/dts/rt3883_omnima_hpm.dts +++ /dev/null @@ -1,162 +0,0 @@ -/dts-v1/; - -#include "rt3883.dtsi" - -#include -#include - -/ { - compatible = "omnima,hpm", "ralink,rt3883-soc"; - model = "Omnima HPM"; - - aliases { - led-boot = &led_status; - led-failsafe = &led_status; - led-running = &led_status; - led-upgrade = &led_status; - }; - - chosen { - bootargs = "console=ttyS0,115200"; - }; - - keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; - - reset { - label = "reset"; - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; - linux,code = ; - }; - }; - - leds { - compatible = "gpio-leds"; - - power { - label = "hpm:orange:power"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; - default-state = "on"; - }; - - led_status: status { - label = "hpm:green:status"; - gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; - default-state = "on"; - }; - - eth { - label = "hpm:green:eth"; - gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; - }; - - eth2 { - label = "hpm:red:eth"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; - }; - - wifi { - label = "hpm:green:wifi"; - gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; - }; - - wifi2 { - label = "hpm:red:wifi"; - gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; - /* gpio 12 and 13 handle the OC input */ - - usb0 { - gpio-export,name = "usb0"; - gpio-export,output = <1>; - gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; - }; - - usb1 { - gpio-export,name = "usb1"; - gpio-export,output = <1>; - gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&spi0 { - status = "okay"; - - m25p80@0 { - compatible = "jedec,spi-nor"; - spi-max-frequency = <25000000>; - reg = <0>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - reg = <0x0 0x0030000>; - label = "u-boot"; - read-only; - }; - - partition@30000 { - reg = <0x00030000 0x00010000>; - label = "config"; - read-only; - }; - - factory: partition@40000 { - reg = <0x00040000 0x00010000>; - label = "factory"; - read-only; - }; - - partition@50000 { - compatible = "denx,uimage"; - reg = <0x00050000 0x00fb0000>; - label = "firmware"; - }; - }; - }; -}; - -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; - }; -}; - -ðernet { - phy-handle = <&phy0>; - phy-mode = "rgmii"; - mtd-mac-address = <&factory 0x28>; - - mdio-bus { - status = "okay"; - - phy0: ethernet-phy@4 { - reg = <4>; - }; - }; -}; - -&wmac { - ralink,mtd-eeprom = <&factory 0>; -}; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt3883_samsung_cy-swr1100.dts b/target/linux/ramips/dts/rt3883_samsung_cy-swr1100.dts deleted file mode 100644 index afffee2bd4..0000000000 --- a/target/linux/ramips/dts/rt3883_samsung_cy-swr1100.dts +++ /dev/null @@ -1,152 +0,0 @@ -/dts-v1/; - -#include "rt3883.dtsi" - -#include -#include - -/ { - compatible = "samsung,cy-swr1100", "ralink,rt3883-soc"; - model = "Samsung CY-SWR1100"; - - aliases { - led-boot = &led_wps; - led-failsafe = &led_wps; - }; - - nor-flash@1c000000 { - compatible = "cfi-flash"; - reg = <0x1c000000 0x800000>; - bank-width = <2>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "uboot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "uboot-env"; - reg = <0x30000 0x4000>; - read-only; - }; - - factory: partition@34000 { - label = "factory"; - reg = <0x34000 0x4000>; - read-only; - }; - - partition@38000 { - label = "nvram"; - reg = <0x38000 0x8000>; - read-only; - }; - - partition@40000 { - label = "devdata"; - reg = <0x40000 0x10000>; - }; - - partition@50000 { - compatible = "seama"; - label = "firmware"; - reg = <0x50000 0x7b0000>; - }; - }; - }; - - rtl8367 { - compatible = "realtek,rtl8367"; - gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>; - gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>; - realtek,extif0 = <1 0 1 1 1 1 1 1 2>; - }; - - keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; - - reset { - label = "reset"; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - wps { - label = "wps"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - - leds { - compatible = "gpio-leds"; - - led_wps: wps { - label = "cy-swr1100:blue:wps"; - gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; - }; - - usb { - label = "cy-swr1100:blue:usb"; - gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; - trigger-sources = <&ohci_port1>, <&ehci_port1>; - linux,default-trigger = "usbport"; - }; - }; -}; - -&gpio1 { - status = "okay"; -}; - -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi"; - ralink,function = "gpio"; - }; - }; -}; - -ðernet { - port@0 { - mediatek,fixed-link = <1000 1 1 1>; - phy-mode = "rgmii"; - }; -}; - -&pci { - status = "okay"; -}; - -&pci1 { - status = "okay"; - - wifi@0,0 { - compatible = "pci0,0"; - reg = <0x10000 0 0 0 0>; - ralink,5ghz = <0>; - ralink,mtd-eeprom = <&factory 0x2000>; - }; -}; - -&wmac { - status = "okay"; - ralink,2ghz = <0>; - ralink,mtd-eeprom = <&factory 0>; -}; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk index b0243bfe81..8fc778c864 100644 --- a/target/linux/ramips/image/rt3883.mk +++ b/target/linux/ramips/image/rt3883.mk @@ -6,7 +6,7 @@ define Build/mkrtn56uimg endef define Device/asus_rt-n56u - MTK_SOC := rt3883 + MTK_SOC := rt3662 BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGE/sysupgrade.bin += | mkrtn56uimg -s @@ -33,7 +33,7 @@ TARGET_DEVICES += belkin_f9k1109v1 define Device/dlink_dir-645 $(Device/seama) - MTK_SOC := rt3883 + MTK_SOC := rt3662 BLOCKSIZE := 4k IMAGE_SIZE := 7872k KERNEL := $(KERNEL_DTB) @@ -46,7 +46,7 @@ endef TARGET_DEVICES += dlink_dir-645 define Device/edimax_br-6475nd - MTK_SOC := rt3883 + MTK_SOC := rt3662 BLOCKSIZE := 64k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ @@ -60,7 +60,7 @@ endef TARGET_DEVICES += edimax_br-6475nd define Device/loewe_wmdr-143n - MTK_SOC := rt3883 + MTK_SOC := rt3662 BLOCKSIZE := 64k IMAGE_SIZE := 7872k DEVICE_VENDOR := Loewe @@ -70,7 +70,7 @@ endef TARGET_DEVICES += loewe_wmdr-143n define Device/omnima_hpm - MTK_SOC := rt3883 + MTK_SOC := rt3662 BLOCKSIZE := 64k IMAGE_SIZE := 16064k DEVICE_VENDOR := Omnima @@ -82,7 +82,7 @@ TARGET_DEVICES += omnima_hpm define Device/samsung_cy-swr1100 $(Device/seama) - MTK_SOC := rt3883 + MTK_SOC := rt3662 BLOCKSIZE := 64k IMAGE_SIZE := 7872k KERNEL := $(KERNEL_DTB)