ramips: update ZBT WE1026 DTS-files
This commit makes the following changes to the WE1026 DTS-files: * The parts that are unique to the -5G-version (LED and 5GHz wifi) are moved to a separate file, so that WE1026.dtsi can be referenced also by the DTS for the -H version. * Use the generic "flash"-name for the spi-nor node. * Add label MAC. All changes have been tested on the WE1026-5G-16M and work fine. I.e., the device works as before the DTS-changes. Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com> Acked-by: Mathias Kresin <dev@kresin.me> Acked-by: Alex Maclean <monkeh@monkeh.net> Acked-by: INAGAKI Hiroshi <musashino.open@gmail.com> Acked-by: Petr Štetiar <ynezz@true.cz> [minor style fixes, rebased onto base-files split, remove obsolete gpio-keys comment] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
		 Kristian Evensen
					Kristian Evensen
				
			
				
					committed by
					
						 Adrian Schmutzler
						Adrian Schmutzler
					
				
			
			
				
	
			
			
			 Adrian Schmutzler
						Adrian Schmutzler
					
				
			
						parent
						
							65d76175a5
						
					
				
				
					commit
					a033f14fe9
				
			| @@ -1,81 +1,14 @@ | |||||||
| /* | // SPDX-License-Identifier: GPL-2.0-or-later OR MIT | ||||||
|  *  BSD LICENSE |  | ||||||
|  * |  | ||||||
|  *  Copyright(c) 2017 Kristian Evensen <kristian.evensen@gmail.com>. |  | ||||||
|  *  All rights reserved. |  | ||||||
|  * |  | ||||||
|  *  Redistribution and use in source and binary forms, with or without |  | ||||||
|  *  modification, are permitted provided that the following conditions |  | ||||||
|  *  are met: |  | ||||||
|  * |  | ||||||
|  *    * Redistributions of source code must retain the above copyright |  | ||||||
|  *      notice, this list of conditions and the following disclaimer. |  | ||||||
|  *    * Redistributions in binary form must reproduce the above copyright |  | ||||||
|  *      notice, this list of conditions and the following disclaimer in |  | ||||||
|  *      the documentation and/or other materials provided with the |  | ||||||
|  *      distribution. |  | ||||||
|  *    * Neither the name of Broadcom Corporation nor the names of its |  | ||||||
|  *      contributors may be used to endorse or promote products derived |  | ||||||
|  *      from this software without specific prior written permission. |  | ||||||
|  * |  | ||||||
|  *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |  | ||||||
|  *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |  | ||||||
|  *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |  | ||||||
|  *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |  | ||||||
|  *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |  | ||||||
|  *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |  | ||||||
|  *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |  | ||||||
|  *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |  | ||||||
|  *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |  | ||||||
|  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |  | ||||||
|  *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  | ||||||
|  */ |  | ||||||
|  |  | ||||||
| /dts-v1/; | /dts-v1/; | ||||||
|  |  | ||||||
| #include "mt7620a_zbtlink_zbt-we1026-5g.dtsi" | #include "mt7620a_zbtlink_zbt-we1026-5g.dtsi" | ||||||
|  |  | ||||||
| / { | / { | ||||||
| 	compatible = "zbtlink,zbt-we1026-5g-16m", "ralink,mt7620a-soc"; | 	compatible = "zbtlink,zbt-we1026-5g-16m", "zbtlink,zbt-we1026-5g", | ||||||
|  | 		"zbtlink,zbt-we1026", "ralink,mt7620a-soc"; | ||||||
| 	model = "Zbtlink ZBT-WE1026-5G (16M)"; | 	model = "Zbtlink ZBT-WE1026-5G (16M)"; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| &spi0 { | &firmware { | ||||||
| 	status = "okay"; | 	reg = <0x50000 0xfb0000>; | ||||||
|  |  | ||||||
| 	en25q128@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; |  | ||||||
| 			}; |  | ||||||
|  |  | ||||||
| 			factory: partition@40000 { |  | ||||||
| 				label = "factory"; |  | ||||||
| 				reg = <0x40000 0x10000>; |  | ||||||
| 				read-only; |  | ||||||
| 			}; |  | ||||||
|  |  | ||||||
| 			firmware: partition@50000 { |  | ||||||
| 				compatible = "denx,uimage"; |  | ||||||
| 				label = "firmware"; |  | ||||||
| 				reg = <0x50000 0xfb0000>; |  | ||||||
| 			}; |  | ||||||
| 		}; |  | ||||||
| 	}; |  | ||||||
| }; | }; | ||||||
|   | |||||||
| @@ -1,47 +1,10 @@ | |||||||
| /* | // SPDX-License-Identifier: GPL-2.0-or-later OR MIT | ||||||
|  *  BSD LICENSE |  | ||||||
|  * |  | ||||||
|  *  Copyright(c) 2017 Kristian Evensen <kristian.evensen@gmail.com>. |  | ||||||
|  *  All rights reserved. |  | ||||||
|  * |  | ||||||
|  *  Redistribution and use in source and binary forms, with or without |  | ||||||
|  *  modification, are permitted provided that the following conditions |  | ||||||
|  *  are met: |  | ||||||
|  * |  | ||||||
|  *    * Redistributions of source code must retain the above copyright |  | ||||||
|  *      notice, this list of conditions and the following disclaimer. |  | ||||||
|  *    * Redistributions in binary form must reproduce the above copyright |  | ||||||
|  *      notice, this list of conditions and the following disclaimer in |  | ||||||
|  *      the documentation and/or other materials provided with the |  | ||||||
|  *      distribution. |  | ||||||
|  *    * Neither the name of Broadcom Corporation nor the names of its |  | ||||||
|  *      contributors may be used to endorse or promote products derived |  | ||||||
|  *      from this software without specific prior written permission. |  | ||||||
|  * |  | ||||||
|  *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |  | ||||||
|  *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |  | ||||||
|  *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |  | ||||||
|  *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |  | ||||||
|  *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |  | ||||||
|  *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |  | ||||||
|  *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |  | ||||||
|  *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |  | ||||||
|  *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |  | ||||||
|  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |  | ||||||
|  *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  | ||||||
|  */ |  | ||||||
|  |  | ||||||
| #include "mt7620a.dtsi" | #include "mt7620a_zbtlink_zbt-we1026.dtsi" | ||||||
|  |  | ||||||
| #include <dt-bindings/gpio/gpio.h> |  | ||||||
| #include <dt-bindings/input/input.h> |  | ||||||
|  |  | ||||||
| / { | / { | ||||||
| 	compatible = "zbtlink,zbt-we1026-5g", "ralink,mt7620a-soc"; | 	compatible = "zbtlink,zbt-we1026-5g", "zbtlink,zbt-we1026", | ||||||
|  | 		"ralink,mt7620a-soc"; | ||||||
| 	chosen { |  | ||||||
| 		bootargs = "console=ttyS0,115200"; |  | ||||||
| 	}; |  | ||||||
|  |  | ||||||
| 	leds { | 	leds { | ||||||
| 		compatible = "gpio-leds"; | 		compatible = "gpio-leds"; | ||||||
| @@ -63,53 +26,6 @@ | |||||||
| 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; | 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; | ||||||
| 		}; | 		}; | ||||||
| 	}; | 	}; | ||||||
|  |  | ||||||
| 	keys { |  | ||||||
| 		compatible = "gpio-keys"; |  | ||||||
|  |  | ||||||
| 		reset { |  | ||||||
| 			label = "reset"; |  | ||||||
| 			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; |  | ||||||
| 			linux,code = <KEY_RESTART>; |  | ||||||
| 		}; |  | ||||||
| 	}; |  | ||||||
| }; |  | ||||||
|  |  | ||||||
| &gpio2 { |  | ||||||
| 	status = "okay"; |  | ||||||
| }; |  | ||||||
|  |  | ||||||
| &gpio3 { |  | ||||||
| 	status = "okay"; |  | ||||||
| }; |  | ||||||
|  |  | ||||||
| &sdhci { |  | ||||||
| 	status = "okay"; |  | ||||||
| }; |  | ||||||
|  |  | ||||||
| &ehci { |  | ||||||
| 	status = "okay"; |  | ||||||
| }; |  | ||||||
|  |  | ||||||
| &ohci { |  | ||||||
| 	status = "okay"; |  | ||||||
| }; |  | ||||||
|  |  | ||||||
| ðernet { |  | ||||||
| 	mtd-mac-address = <&factory 0x28>; |  | ||||||
| }; |  | ||||||
|  |  | ||||||
| &wmac { |  | ||||||
| 	ralink,mtd-eeprom = <&factory 0>; |  | ||||||
| }; |  | ||||||
|  |  | ||||||
| &pinctrl { |  | ||||||
| 	state_default: pinctrl0 { |  | ||||||
| 		default { |  | ||||||
| 			ralink,group = "i2c", "uartf", "spi refclk", "ephy", "wled"; |  | ||||||
| 			ralink,function = "gpio"; |  | ||||||
| 		}; |  | ||||||
| 	}; |  | ||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie { | &pcie { | ||||||
|   | |||||||
							
								
								
									
										104
									
								
								target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										104
									
								
								target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,104 @@ | |||||||
|  | // SPDX-License-Identifier: GPL-2.0-or-later OR MIT | ||||||
|  |  | ||||||
|  | #include "mt7620a.dtsi" | ||||||
|  |  | ||||||
|  | #include <dt-bindings/gpio/gpio.h> | ||||||
|  | #include <dt-bindings/input/input.h> | ||||||
|  |  | ||||||
|  | / { | ||||||
|  | 	compatible = "zbtlink,zbt-we1026", "ralink,mt7620a-soc"; | ||||||
|  |  | ||||||
|  | 	chosen { | ||||||
|  | 		bootargs = "console=ttyS0,115200"; | ||||||
|  | 	}; | ||||||
|  |  | ||||||
|  | 	keys { | ||||||
|  | 		compatible = "gpio-keys"; | ||||||
|  |  | ||||||
|  | 		reset { | ||||||
|  | 			label = "reset"; | ||||||
|  | 			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; | ||||||
|  | 			linux,code = <KEY_RESTART>; | ||||||
|  | 		}; | ||||||
|  | 	}; | ||||||
|  |  | ||||||
|  | 	aliases { | ||||||
|  | 		label-mac-device = &wmac; | ||||||
|  | 	}; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &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; | ||||||
|  | 			}; | ||||||
|  |  | ||||||
|  | 			factory: partition@40000 { | ||||||
|  | 				label = "factory"; | ||||||
|  | 				reg = <0x40000 0x10000>; | ||||||
|  | 				read-only; | ||||||
|  | 			}; | ||||||
|  |  | ||||||
|  | 			firmware: partition@50000 { | ||||||
|  | 				compatible = "denx,uimage"; | ||||||
|  | 				label = "firmware"; | ||||||
|  | 			}; | ||||||
|  | 		}; | ||||||
|  | 	}; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &gpio2 { | ||||||
|  | 	status = "okay"; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &gpio3 { | ||||||
|  | 	status = "okay"; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &sdhci { | ||||||
|  | 	status = "okay"; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &ehci { | ||||||
|  | 	status = "okay"; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &ohci { | ||||||
|  | 	status = "okay"; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | ðernet { | ||||||
|  | 	mtd-mac-address = <&factory 0x28>; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &wmac { | ||||||
|  | 	ralink,mtd-eeprom = <&factory 0x0>; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &pinctrl { | ||||||
|  | 	state_default: pinctrl0 { | ||||||
|  | 		default { | ||||||
|  | 			ralink,group = "i2c", "uartf", "spi refclk", "ephy", "wled"; | ||||||
|  | 			ralink,function = "gpio"; | ||||||
|  | 		}; | ||||||
|  | 	}; | ||||||
|  | }; | ||||||
| @@ -273,6 +273,9 @@ ramips_setup_macs() | |||||||
| 	linksys,e1700) | 	linksys,e1700) | ||||||
| 		wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR) | 		wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR) | ||||||
| 		;; | 		;; | ||||||
|  | 	zbtlink,zbt-we1026-5g-16m) | ||||||
|  | 		label_mac=$(cat /sys/class/ieee80211/phy1/macaddress) | ||||||
|  | 		;; | ||||||
| 	zyxel,keenetic-omni|\ | 	zyxel,keenetic-omni|\ | ||||||
| 	zyxel,keenetic-omni-ii|\ | 	zyxel,keenetic-omni-ii|\ | ||||||
| 	zyxel,keenetic-viva) | 	zyxel,keenetic-viva) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user