forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into bananapi4
- Loading branch information
Showing
27 changed files
with
670 additions
and
279 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,9 +17,9 @@ devices in OpenWrt usable again with the default network config.) | |
| Signed-off-by: Jan Hoffmann <[email protected]> | ||
| --- | ||
|
|
||
| --- a/arch/arm/boot/dts/am335x-bone-common.dtsi | ||
| +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi | ||
| @@ -353,27 +353,24 @@ | ||
| --- a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi | ||
| +++ b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi | ||
| @@ -358,27 +358,24 @@ | ||
| }; | ||
| }; | ||
|
|
||
|
|
@@ -52,8 +52,8 @@ Signed-off-by: Jan Hoffmann <[email protected]> | |
|
|
||
| ethphy0: ethernet-phy@0 { | ||
| reg = <0>; | ||
| --- a/arch/arm/boot/dts/am335x-evm.dts | ||
| +++ b/arch/arm/boot/dts/am335x-evm.dts | ||
| --- a/arch/arm/boot/dts/ti/omap/am335x-evm.dts | ||
| +++ b/arch/arm/boot/dts/ti/omap/am335x-evm.dts | ||
| @@ -682,31 +682,28 @@ | ||
| }; | ||
| }; | ||
|
|
||
130 changes: 130 additions & 0 deletions
130
target/linux/ramips/dts/mt7621_dna_valokuitu-plus-ex400.dts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| // SPDX-License-Identifier: GPL-2.0-or-later OR MIT | ||
|
|
||
| #include "mt7621.dtsi" | ||
|
|
||
| #include <dt-bindings/gpio/gpio.h> | ||
| #include <dt-bindings/input/input.h> | ||
| #include <dt-bindings/leds/common.h> | ||
|
|
||
| / { | ||
| compatible = "dna,valokuitu-plus-ex400", "mediatek,mt7621-soc"; | ||
| model = "DNA Valokuitu Plus EX400"; | ||
|
|
||
| aliases { | ||
| ethernet0 = &gmac0; | ||
| label-mac-device = &gmac0; | ||
| led-boot = &led_status_red; | ||
| led-failsafe = &led_status_red; | ||
| led-running = &led_status_green; | ||
| led-upgrade = &led_update_green; | ||
| }; | ||
|
|
||
| chosen { | ||
| bootargs-override = "console=ttyS0,115200 rootfstype=squashfs,jffs2"; | ||
| }; | ||
|
|
||
| keys { | ||
| compatible = "gpio-keys"; | ||
|
|
||
| reset { | ||
| label = "reset"; | ||
| gpios = <&gpio 18 GPIO_ACTIVE_LOW>; | ||
| linux,code = <KEY_RESTART>; | ||
| }; | ||
| }; | ||
|
|
||
| leds { | ||
| compatible = "gpio-leds"; | ||
|
|
||
| led_status_green: led-0 { | ||
| color = <LED_COLOR_ID_GREEN>; | ||
| function = LED_FUNCTION_STATUS; | ||
| gpios = <&gpio 8 GPIO_ACTIVE_LOW>; | ||
| }; | ||
|
|
||
| led_status_red: led-1 { | ||
| color = <LED_COLOR_ID_RED>; | ||
| function = LED_FUNCTION_STATUS; | ||
| gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
|
|
||
| led_update_green: led-2 { | ||
| color = <LED_COLOR_ID_GREEN>; | ||
| function = LED_FUNCTION_PROGRAMMING; | ||
| gpios = <&gpio 12 GPIO_ACTIVE_LOW>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &pcie { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &nand { | ||
| status = "okay"; | ||
|
|
||
| partitions { | ||
| compatible = "fixed-partitions"; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
|
|
||
| partition@0 { | ||
| reg = <0x00 0x100000>; | ||
| label = "uboot"; | ||
| read-only; | ||
| }; | ||
|
|
||
| partition@100000 { | ||
| reg = <0x100000 0xff00000>; | ||
| label = "ubi"; | ||
|
|
||
| volumes { | ||
| ubi-volume-env1 { | ||
| volname = "env1"; | ||
|
|
||
| nvmem-layout { | ||
| compatible = "u-boot,env"; | ||
|
|
||
| ethaddr: ethaddr { | ||
| #nvmem-cell-cells = <1>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &gmac1 { | ||
| label = "wan"; | ||
| phy-handle = <ðphy0>; | ||
| nvmem-cells = <ðaddr 1>; | ||
| nvmem-cell-names = "mac-address"; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &i2c { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| ðphy0 { | ||
| /delete-property/ interrupts; | ||
| }; | ||
|
|
||
| &state_default { | ||
| gpio { | ||
| groups = "uart2", "uart3"; | ||
| function = "gpio"; | ||
| }; | ||
| }; | ||
|
|
||
| &switch0 { | ||
| ports { | ||
| port@1 { | ||
| label = "lan"; | ||
| nvmem-cells = <ðaddr 0>; | ||
| nvmem-cell-names = "mac-address"; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
| }; |
Oops, something went wrong.