From: Mieczyslaw Nalewaj Date: Sat, 27 Apr 2024 05:41:51 +0000 (+0200) Subject: ramips: rename include file to a more suitable name X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8d7fa0918143cf09049d4631a0cdef7962554147;p=openwrt%2Fstaging%2Fblocktrron.git ramips: rename include file to a more suitable name Rename from mt7621_dlink_dir-xx60-a1.dtsi to mt7621_dlink_dir_nand_128m.dtsi and associated group name when creating the mt7621.mk image Co-authored-by: Alan Luck Signed-off-by: Mieczyslaw Nalewaj --- diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts index 13883f9f74..531076216d 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts @@ -2,7 +2,7 @@ #include -#include "mt7621_dlink_dir-xx60-a1.dtsi" +#include "mt7621_dlink_dir_nand_128m.dtsi" / { compatible = "dlink,dir-1960-a1", "mediatek,mt7621-soc"; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts index d4b8069a33..fd25b94e8d 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "mt7621_dlink_dir-xx60-a1.dtsi" +#include "mt7621_dlink_dir_nand_128m.dtsi" / { compatible = "dlink,dir-2640-a1", "mediatek,mt7621-soc"; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts index a4590cb35f..d8c347198b 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "mt7621_dlink_dir-xx60-a1.dtsi" +#include "mt7621_dlink_dir_nand_128m.dtsi" / { compatible = "dlink,dir-2660-a1", "mediatek,mt7621-soc"; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-3040-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-3040-a1.dts index 4bb35a948d..0bcfa022fa 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-3040-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-3040-a1.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "mt7621_dlink_dir-xx60-a1.dtsi" +#include "mt7621_dlink_dir_nand_128m.dtsi" / { compatible = "dlink,dir-3040-a1", "mediatek,mt7621-soc"; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi b/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi deleted file mode 100644 index d5adb8728c..0000000000 --- a/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi +++ /dev/null @@ -1,224 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "mt7621.dtsi" - -#include -#include -#include - -/ { - aliases { - label-mac-device = &gmac0; - led-boot = &led_power_orange; - led-failsafe = &led_power_white; - led-running = &led_power_white; - led-upgrade = &led_net_orange; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - wps: wps { - label = "wps"; - gpios = <&gpio 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - - leds: leds { - compatible = "gpio-leds"; - - led_power_orange: power_orange { - function = LED_FUNCTION_POWER; - color = ; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - }; - - led_power_white: power_white { - function = LED_FUNCTION_POWER; - color = ; - gpios = <&gpio 16 GPIO_ACTIVE_LOW>; - }; - - led_net_orange: net_orange { - label = "orange:net"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - net_white { - label = "white:net"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&nand { - status = "okay"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "Bootloader"; - reg = <0x0 0x80000>; - read-only; - }; - - partition@80000 { - label = "config"; - reg = <0x80000 0x80000>; - read-only; - }; - - partition@100000 { - label = "factory"; - reg = <0x100000 0x40000>; - read-only; - - nvmem-layout { - compatible = "fixed-layout"; - #address-cells = <1>; - #size-cells = <1>; - - eeprom_factory_0: eeprom@0 { - reg = <0x0 0x4da8>; - }; - - eeprom_factory_8000: eeprom@8000 { - reg = <0x8000 0x4da8>; - }; - - macaddr_factory_e000: macaddr@e000 { - compatible = "mac-base"; - reg = <0xe000 0x6>; - #nvmem-cell-cells = <1>; - }; - }; - }; - - partition@140000 { - label = "config2"; - reg = <0x140000 0x40000>; - read-only; - }; - - partition@180000 { - label = "firmware"; - compatible = "openwrt,uimage", "denx,uimage"; - openwrt,padding = <96>; - reg = <0x180000 0x2800000>; - }; - - partition@2980000 { - label = "private"; - reg = <0x2980000 0x2000000>; - read-only; - }; - - partition@4980000 { - label = "firmware2"; - reg = <0x4980000 0x2800000>; - }; - - partition@7180000 { - label = "mydlink"; - reg = <0x7180000 0x600000>; - read-only; - }; - - partition@7780000 { - label = "reserved"; - reg = <0x7780000 0x880000>; - read-only; - }; - }; -}; - -&pcie { - status = "okay"; -}; - -&pcie0 { - wifi0: wifi@0,0 { - compatible = "mediatek,mt76"; - reg = <0x0000 0 0 0 0>; - nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_e000 1>; - nvmem-cell-names = "eeprom", "mac-address"; - ieee80211-freq-limit = <2400000 2500000>; - - led { - led-active-low; - }; - }; -}; - -&pcie1 { - wifi1: wifi@0,0 { - compatible = "mediatek,mt76"; - reg = <0x0000 0 0 0 0>; - nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_e000 2>; - nvmem-cell-names = "eeprom", "mac-address"; - ieee80211-freq-limit = <5000000 6000000>; - - led { - led-active-low; - }; - }; -}; - -&gmac0 { - nvmem-cells = <&macaddr_factory_e000 0>; - nvmem-cell-names = "mac-address"; -}; - -&gmac1 { - status = "okay"; - label = "wan"; - phy-handle = <ðphy4>; - - nvmem-cells = <&macaddr_factory_e000 3>; - nvmem-cell-names = "mac-address"; -}; - -ðphy4 { - /delete-property/ interrupts; -}; - -&switch0 { - ports { - port@0 { - status = "okay"; - label = "lan4"; - }; - - port@1 { - status = "okay"; - label = "lan3"; - }; - - port@2 { - status = "okay"; - label = "lan2"; - }; - - port@3 { - status = "okay"; - label = "lan1"; - }; - }; -}; - -&state_default { - gpio { - groups = "i2c", "uart3", "jtag", "wdt"; - function = "gpio"; - }; -}; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir_nand_128m.dtsi b/target/linux/ramips/dts/mt7621_dlink_dir_nand_128m.dtsi new file mode 100644 index 0000000000..d5adb8728c --- /dev/null +++ b/target/linux/ramips/dts/mt7621_dlink_dir_nand_128m.dtsi @@ -0,0 +1,224 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7621.dtsi" + +#include +#include +#include + +/ { + aliases { + label-mac-device = &gmac0; + led-boot = &led_power_orange; + led-failsafe = &led_power_white; + led-running = &led_power_white; + led-upgrade = &led_net_orange; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps: wps { + label = "wps"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds: leds { + compatible = "gpio-leds"; + + led_power_orange: power_orange { + function = LED_FUNCTION_POWER; + color = ; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + }; + + led_power_white: power_white { + function = LED_FUNCTION_POWER; + color = ; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + + led_net_orange: net_orange { + label = "orange:net"; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + + net_white { + label = "white:net"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&nand { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "Bootloader"; + reg = <0x0 0x80000>; + read-only; + }; + + partition@80000 { + label = "config"; + reg = <0x80000 0x80000>; + read-only; + }; + + partition@100000 { + label = "factory"; + reg = <0x100000 0x40000>; + read-only; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + eeprom_factory_0: eeprom@0 { + reg = <0x0 0x4da8>; + }; + + eeprom_factory_8000: eeprom@8000 { + reg = <0x8000 0x4da8>; + }; + + macaddr_factory_e000: macaddr@e000 { + compatible = "mac-base"; + reg = <0xe000 0x6>; + #nvmem-cell-cells = <1>; + }; + }; + }; + + partition@140000 { + label = "config2"; + reg = <0x140000 0x40000>; + read-only; + }; + + partition@180000 { + label = "firmware"; + compatible = "openwrt,uimage", "denx,uimage"; + openwrt,padding = <96>; + reg = <0x180000 0x2800000>; + }; + + partition@2980000 { + label = "private"; + reg = <0x2980000 0x2000000>; + read-only; + }; + + partition@4980000 { + label = "firmware2"; + reg = <0x4980000 0x2800000>; + }; + + partition@7180000 { + label = "mydlink"; + reg = <0x7180000 0x600000>; + read-only; + }; + + partition@7780000 { + label = "reserved"; + reg = <0x7780000 0x880000>; + read-only; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi0: wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_e000 1>; + nvmem-cell-names = "eeprom", "mac-address"; + ieee80211-freq-limit = <2400000 2500000>; + + led { + led-active-low; + }; + }; +}; + +&pcie1 { + wifi1: wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_e000 2>; + nvmem-cell-names = "eeprom", "mac-address"; + ieee80211-freq-limit = <5000000 6000000>; + + led { + led-active-low; + }; + }; +}; + +&gmac0 { + nvmem-cells = <&macaddr_factory_e000 0>; + nvmem-cell-names = "mac-address"; +}; + +&gmac1 { + status = "okay"; + label = "wan"; + phy-handle = <ðphy4>; + + nvmem-cells = <&macaddr_factory_e000 3>; + nvmem-cell-names = "mac-address"; +}; + +ðphy4 { + /delete-property/ interrupts; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan4"; + }; + + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + }; +}; + +&state_default { + gpio { + groups = "i2c", "uart3", "jtag", "wdt"; + function = "gpio"; + }; +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 10e7857614..dbb69e0fae 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -742,7 +742,7 @@ define Device/dlink_dir-8xx-r1 check-size | append-metadata endef -define Device/dlink_dir-xx60-a1 +define Device/dlink_dir_nand_128m $(Device/nand) IMAGE_SIZE := 40960k DEVICE_VENDOR := D-Link @@ -763,35 +763,35 @@ endef TARGET_DEVICES += dlink_dir-1935-a1 define Device/dlink_dir-1960-a1 - $(Device/dlink_dir-xx60-a1) + $(Device/dlink_dir_nand_128m) DEVICE_MODEL := DIR-1960 DEVICE_VARIANT := A1 endef TARGET_DEVICES += dlink_dir-1960-a1 define Device/dlink_dir-2640-a1 - $(Device/dlink_dir-xx60-a1) + $(Device/dlink_dir_nand_128m) DEVICE_MODEL := DIR-2640 DEVICE_VARIANT := A1 endef TARGET_DEVICES += dlink_dir-2640-a1 define Device/dlink_dir-2660-a1 - $(Device/dlink_dir-xx60-a1) + $(Device/dlink_dir_nand_128m) DEVICE_MODEL := DIR-2660 DEVICE_VARIANT := A1 endef TARGET_DEVICES += dlink_dir-2660-a1 define Device/dlink_dir-3040-a1 - $(Device/dlink_dir-xx60-a1) + $(Device/dlink_dir_nand_128m) DEVICE_MODEL := DIR-3040 DEVICE_VARIANT := A1 endef TARGET_DEVICES += dlink_dir-3040-a1 define Device/dlink_dir-3060-a1 - $(Device/dlink_dir-xx60-a1) + $(Device/dlink_dir_nand_128m) DEVICE_MODEL := DIR-3060 DEVICE_VARIANT := A1 endef @@ -806,7 +806,7 @@ endef TARGET_DEVICES += dlink_dir-853-a1 define Device/dlink_dir-853-a3 - $(Device/dlink_dir-xx60-a1) + $(Device/dlink_dir_nand_128m) DEVICE_MODEL := DIR-853 DEVICE_VARIANT := A3 IMAGES += factory.bin