forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ramips: convert most mtd-mac-address cases in DTSI to nvmem
Convert most of the cases from mtd-mac-address to nvmem where
MAC addresses are set in the DTSI, but the partitions are only
located in the device DTS. This posed some problems earlier, since
in these cases we are using partitions before they are defined,
and the nvmem system did not seem to like that.
There have been a few different resolution approaches, based on
the different tradeoffs of deduplication vs. maintainability:
1. In many cases, the partition tables were identical except for
the firmware partition size, and the firmware partition was
the last in the table.
In these cases, the partition table has been moved to the
DTSI, and only the firmware partition's "reg" property has
been kept in the DTS files. So, the updated nvmem definition
could stay in the DTSI files as well.
2. For all other cases, splitting up the partition table would
have introduced additional complexity. Thus, the nodes to be
converted to nvmem have been moved to the DTS files where the
partitioning was defined.
3. For Netgear EX2700 and WN3000RP v3, the remaining DTSI file
was completely dissolved, as it was quite small and the name
was not really nice either.
4. The D-Link DIR-853 A3 was converted to nvmem as well, though
it is just a plain DTS file not taken care of in the first
wave.
In addition, some minor rearrangements have been made for tidyness.
Not covered (yet) by this patch are:
* Various unielec devices
* The D-Link DIR-8xx family
Signed-off-by: Adrian Schmutzler <[email protected]>- Loading branch information
Showing
47 changed files
with
938 additions
and
1,021 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,10 @@ | |
| * Copyright (C) 2016 Joseph C. Lehner <[email protected]> | ||
| */ | ||
|
|
||
| #include "mt7620a_netgear_ex2700_wn3000rp-v3.dtsi" | ||
| #include "mt7620a.dtsi" | ||
|
|
||
| #include <dt-bindings/gpio/gpio.h> | ||
| #include <dt-bindings/input/input.h> | ||
|
|
||
| / { | ||
| compatible = "netgear,ex2700", "ralink,mt7620a-soc"; | ||
|
|
@@ -16,6 +19,22 @@ | |
| led-upgrade = &led_power_green; | ||
| }; | ||
|
|
||
| keys { | ||
| compatible = "gpio-keys"; | ||
|
|
||
| reset { | ||
| label = "reset"; | ||
| gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; | ||
| linux,code = <KEY_RESTART>; | ||
| }; | ||
|
|
||
| wps { | ||
| label = "wps"; | ||
| gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; | ||
| linux,code = <KEY_WPS_BUTTON>; | ||
| }; | ||
| }; | ||
|
|
||
| leds { | ||
| compatible = "gpio-leds"; | ||
|
|
||
|
|
@@ -57,28 +76,79 @@ | |
| }; | ||
| }; | ||
|
|
||
| &partitions { | ||
| partition@0 { | ||
| label = "u-boot"; | ||
| reg = <0x0 0x30000>; | ||
| read-only; | ||
| &gpio1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &spi0 { | ||
| status = "okay"; | ||
|
|
||
| flash@0 { | ||
| compatible = "jedec,spi-nor"; | ||
| reg = <0>; | ||
| spi-max-frequency = <10000000>; | ||
|
|
||
| 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 0x10000>; | ||
| read-only; | ||
| }; | ||
|
|
||
| partition@40000 { | ||
| compatible = "denx,uimage"; | ||
| label = "firmware"; | ||
| reg = <0x40000 0x3b0000>; | ||
| }; | ||
|
|
||
| art: partition@3f0000 { | ||
| label = "art"; | ||
| reg = <0x3f0000 0x10000>; | ||
| read-only; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| ðernet { | ||
| nvmem-cells = <&macaddr_art_0>; | ||
| nvmem-cell-names = "mac-address"; | ||
| }; | ||
|
|
||
| &wmac { | ||
| ralink,mtd-eeprom = <&art 0x1000>; | ||
|
|
||
| nvmem-cells = <&macaddr_art_6>; | ||
| nvmem-cell-names = "mac-address"; | ||
| }; | ||
|
|
||
| partition@30000 { | ||
| label = "u-boot-env"; | ||
| reg = <0x30000 0x10000>; | ||
| read-only; | ||
| &state_default { | ||
| default { | ||
| groups = "i2c", "uartf", "spi refclk"; | ||
| function = "gpio"; | ||
| }; | ||
| }; | ||
|
|
||
| &art { | ||
| compatible = "nvmem-cells"; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
|
|
||
| partition@40000 { | ||
| compatible = "denx,uimage"; | ||
| label = "firmware"; | ||
| reg = <0x40000 0x3b0000>; | ||
| macaddr_art_0: macaddr@0 { | ||
| reg = <0x0 0x6>; | ||
| }; | ||
|
|
||
| art: partition@3f0000 { | ||
| label = "art"; | ||
| reg = <0x3f0000 0x10000>; | ||
| read-only; | ||
| macaddr_art_6: macaddr@6 { | ||
| reg = <0x6 0x6>; | ||
| }; | ||
| }; | ||
58 changes: 0 additions & 58 deletions
58
target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi
This file was deleted.
Oops, something went wrong.
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
Oops, something went wrong.