[OpenWrt-Devel,1/2] ramips: Update ZBT WE1026 DTS-files
diff mbox series

Message ID 20190623092448.27880-2-kristian.evensen@gmail.com
State New
Headers show
Series
  • Add support for the ZBT WE1026-H
Related show

Commit Message

Kristian Evensen June 23, 2019, 9:24 a.m. UTC
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.
* Changed button from polled to interrupt.
* Use the generic "flash"-name for the spi-nor node.

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>
---
 target/linux/ramips/dts/WE1026-5G-16M.dts |  77 ++---------------
 target/linux/ramips/dts/WE1026-5G.dtsi    |  93 ++------------------
 target/linux/ramips/dts/WE1026.dtsi       | 101 ++++++++++++++++++++++
 3 files changed, 112 insertions(+), 159 deletions(-)
 create mode 100644 target/linux/ramips/dts/WE1026.dtsi

Comments

Rafał Miłecki July 3, 2019, 7:55 a.m. UTC | #1
On Sun, 23 Jun 2019 at 11:25, Kristian Evensen
<kristian.evensen@gmail.com> wrote:
> 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.
> * Changed button from polled to interrupt.
> * Use the generic "flash"-name for the spi-nor node.
>
> 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>

Why you didn't cc Alex, so he can ack your relicensing? You also
didn't care to let us know we need his ack!
Kristian Evensen July 3, 2019, 8:21 a.m. UTC | #2
Hi,

On Wed, Jul 3, 2019 at 9:55 AM Rafał Miłecki <zajec5@gmail.com> wrote:
> Why you didn't cc Alex, so he can ack your relicensing? You also
> didn't care to let us know we need his ack!

While I don't appreciate your tone, I see now that I made a mistake.
When checking the history of the files that I relicense, there are
three more people that should be added to the CC-list (INAGAKI
Hiroshi, Mathias Kresin and Petr Štetiar). I have done so now, thanks
for spotting this and the mistake was of course not intentional.

BR,
Kristian
Mathias Kresin July 3, 2019, 9:20 a.m. UTC | #3
03/07/2019 10:21, Kristian Evensen:
> Hi,
> 
> On Wed, Jul 3, 2019 at 9:55 AM Rafał Miłecki <zajec5@gmail.com> wrote:
>> Why you didn't cc Alex, so he can ack your relicensing? You also
>> didn't care to let us know we need his ack!
> 
> While I don't appreciate your tone, I see now that I made a mistake.
> When checking the history of the files that I relicense, there are
> three more people that should be added to the CC-list (INAGAKI
> Hiroshi, Mathias Kresin and Petr Štetiar). I have done so now, thanks
> for spotting this and the mistake was of course not intentional.
> 
> BR,
> Kristian
> 

I'm fine with re-licensing.

regards
Mathias
Alex Maclean July 3, 2019, 1:04 p.m. UTC | #4
On 23/06/2019 10:24, Kristian Evensen wrote:
> 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.
> * Changed button from polled to interrupt.
> * Use the generic "flash"-name for the spi-nor node.
> 
> 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>

License change is okay with me.

Acked-by: Alex Maclean <monkeh@monkeh.net>
INAGAKI Hiroshi July 5, 2019, 7:58 a.m. UTC | #5
On 2019/07/03 17:21, Kristian Evensen wrote:
> Hi,
> 
> On Wed, Jul 3, 2019 at 9:55 AM Rafał Miłecki <zajec5@gmail.com> wrote:
>> Why you didn't cc Alex, so he can ack your relicensing? You also
>> didn't care to let us know we need his ack!
> 
> While I don't appreciate your tone, I see now that I made a mistake.
> When checking the history of the files that I relicense, there are
> three more people that should be added to the CC-list (INAGAKI
> Hiroshi, Mathias Kresin and Petr Štetiar). I have done so now, thanks
> for spotting this and the mistake was of course not intentional.
> 
> BR,
> Kristian
> .
> 

Sorry for late response, OK with me.

Acked-by: INAGAKI Hiroshi <musashino.open@gmail.com>

regards,
Hiroshi

Patch
diff mbox series

diff --git a/target/linux/ramips/dts/WE1026-5G-16M.dts b/target/linux/ramips/dts/WE1026-5G-16M.dts
index 8954006ece..df31a723c5 100644
--- a/target/linux/ramips/dts/WE1026-5G-16M.dts
+++ b/target/linux/ramips/dts/WE1026-5G-16M.dts
@@ -1,81 +1,16 @@ 
-/*
- *  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.
- */
-
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
 #include "WE1026-5G.dtsi"
 
 / {
-	compatible = "zbtlink,we1026-5g-16m", "ralink,mt7620a-soc";
+	compatible = "zbtlink,we1026-5g-16m", "zbtlink,we1026-5g",
+		     "zbtlink,we1026", "ralink,mt7620a-soc";
 	model = "ZBT WE1026-5G (16M)";
 };
 
-&spi0 {
-	status = "okay";
-
-	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>;
-			};
-		};
-	};
+&firmware {
+	reg = <0x50000 0xfb0000>;
 };
+
diff --git a/target/linux/ramips/dts/WE1026-5G.dtsi b/target/linux/ramips/dts/WE1026-5G.dtsi
index e7e64e251a..d1a8471893 100644
--- a/target/linux/ramips/dts/WE1026-5G.dtsi
+++ b/target/linux/ramips/dts/WE1026-5G.dtsi
@@ -1,47 +1,11 @@ 
-/*
- *  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.
- */
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
 
-#include "mt7620a.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "WE1026.dtsi"
 
 / {
-	compatible = "zbtlink,we1026-5g", "ralink,mt7620a-soc";
-
-	chosen {
-		bootargs = "console=ttyS0,115200";
-	};
+	compatible = "zbtlink,we1026-5g", "zbtlink,we1026",
+		     "ralink,mt7620a-soc";
 
 	leds {
 		compatible = "gpio-leds";
@@ -62,53 +26,6 @@ 
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		poll-interval = <20>;
-		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";
-};
-
-&ethernet {
-	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 {
diff --git a/target/linux/ramips/dts/WE1026.dtsi b/target/linux/ramips/dts/WE1026.dtsi
new file mode 100644
index 0000000000..0780d8f5b5
--- /dev/null
+++ b/target/linux/ramips/dts/WE1026.dtsi
@@ -0,0 +1,101 @@ 
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "mt7620a.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "zbtlink,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>;
+		};
+	};
+};
+
+&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";
+};
+
+&ethernet {
+	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";
+		};
+	};
+};