[openwrt/openwrt] ath79: create shared DTSI/definition for Belkin F9J1108/F9K1115 v2

LEDE Commits lede-commits at lists.infradead.org
Mon Dec 14 12:03:51 EST 2020 

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/563ece8a85dad24e8c3ce55af51938a4d37405f0

commit 563ece8a85dad24e8c3ce55af51938a4d37405f0
Author: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
AuthorDate: Sat Nov 28 12:04:00 2020 +0100

    ath79: create shared DTSI/definition for Belkin F9J1108/F9K1115 v2
    
    Belkin F9J1108 v2 and F9K1115 v2 are (seemingly) identical hardware
    with different model numbers. Extract all non-device specific code to a
    common .dtsi so it can be re-used when adding support for the
    F9K1115 v2.
    
    Similar to the .dtsi most of the image building recipe code can be
    re-used. Move everything except the device model, edimax header magic
    and edimax header model into a shared build recipe.
    
    Signed-off-by: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
    [drop duplicate TARGET_DEVICES, add EDIMAX_* to DEVICE_VARS, edit title]
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 .../linux/ath79/dts/qca9558_belkin_f9j1108-v2.dts  | 223 +--------------------
 ...n_f9j1108-v2.dts => qca9558_belkin_f9x-v2.dtsi} |   3 -
 target/linux/ath79/image/generic.mk                |  14 +-
 3 files changed, 12 insertions(+), 228 deletions(-)

diff --git a/target/linux/ath79/dts/qca9558_belkin_f9j1108-v2.dts b/target/linux/ath79/dts/qca9558_belkin_f9j1108-v2.dts
index 0bd3af98db..80775d6cb3 100644
--- a/target/linux/ath79/dts/qca9558_belkin_f9j1108-v2.dts
+++ b/target/linux/ath79/dts/qca9558_belkin_f9j1108-v2.dts
@@ -1,229 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca955x.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "qca9558_belkin_f9x-v2.dtsi"
 
 / {
 	model = "Belkin F9J1108 v2 (AC1750 DB Wi-Fi)";
 	compatible = "belkin,f9j1108-v2", "qca,qca9558";
-
-	aliases {
-		led-boot = &led_system;
-		led-failsafe = &led_system;
-		led-running = &led_system;
-		led-upgrade = &led_system;
-		label-mac-device = &eth1;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		usb {
-			label = "green:usb2";
-			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&hub_port0>;
-			linux,default-trigger = "usbport";
-		};
-
-		status {
-			label = "amber:status";
-			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-		};
-
-		wps-amber {
-			label = "amber:wps";
-			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-		};
-
-		wps-blue {
-			label = "blue:wps";
-			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-		};
-
-		led_system: system {
-			label = "blue:system";
-			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	gpio-export {
-		compatible = "gpio-export";
-		#size-cells = <0>;
-
-		usb2_power {
-			gpio-export,name = "usb2:power";
-			gpio-export,output = <1>;
-			gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		wps {
-			label = "WPS button";
-			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "Reset button";
-			linux,code = <KEY_RESTART>;
-			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-			debounce-interval = <60>;
-		};
-	};
-
-	virtual_flash {
-		compatible = "mtd-concat";
-
-		devices = <&fwpart1 &fwpart2>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition at 0 {
-				compatible = "openwrt,okli";
-				label = "firmware";
-				reg = <0x0 0x0>;
-			};
-		};
-	};
-};
-
-&pcie1 {
-	status = "okay";
-};
-
-&uart {
-	status = "okay";
-};
-
-&usb_phy0 {
-	status = "okay";
-};
-
-&usb0 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-	status = "okay";
-
-	hub_port0: port at 1 {
-		reg = <1>;
-		#trigger-source-cells = <0>;
-	};
-};
-
-&spi {
-	status = "okay";
-
-	flash at 0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <80000000>;
-		m25p,fast-read;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			uboot: partition at 0 {
-				label = "u-boot";
-				reg = <0x000000 0x040000>;
-				read-only;
-			};
-
-			partition at 40000 {
-				label = "u-boot-env";
-				reg = <0x040000 0x010000>;
-			};
-
-			fwpart1: partition at 50000 {
-				label = "fwpart1";
-				reg = <0x050000 0xe20000>;
-			};
-
-			partition at e70000 {
-				label = "loader";
-				reg = <0xe70000 0x10000>;
-				read-only;
-			};
-
-			fwpart2: partition at e80000 {
-				label = "fwpart2";
-				reg = <0xe80000 0x170000>;
-			};
-
-			art: partition at ff0000 {
-				label = "art";
-				reg = <0xff0000 0x010000>;
-			};
-		};
-	};
-};
-
-&mdio0 {
-	status = "okay";
-
-	phy0: ethernet-phy at 0 {
-		reg = <0>;
-
-		qca,ar8327-initvals = <
-			0x04 0x00080080 /* PORT0 PAD MODE CTRL */
-			0x0c 0x07600000 /* PORT6 PAD MODE CTRL */
-			0x50 0xc737c737 /* LED_CTRL0 */
-			0x54 0x00000000 /* LED_CTRL1 */
-			0x58 0x00000000 /* LED_CTRL2 */
-			0x5c 0x0030c300 /* LED_CTRL3 */
-			0x7c 0x0000007e /* PORT0_STATUS */
-			0x94 0x0000007e /* PORT6 STATUS */
-			>;
-	};
-};
-
-&eth0 {
-	status = "okay";
-
-	mtd-mac-address = <&art 0x0>;
-	phy-handle = <&phy0>;
-	pll-data = <0xa6000000 0x00000101 0x00001616>;
-
-	gmac-config {
-		device = <&gmac>;
-		rgmii-enabled = <1>;
-	};
-};
-
-&eth1 {
-	status = "okay";
-
-	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <(-1)>;
-	pll-data = <0x03000101 0x00000101 0x00001616>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-};
-
-&pcie0 {
-	status = "okay";
-
-	wifi at 0,0 {
-		compatible = "qcom,ath10k";
-		reg = <0 0 0 0 0>;
-	};
-};
-
-&wmac {
-	status = "okay";
-
-	mtd-cal-data = <&art 0x1000>;
 };
diff --git a/target/linux/ath79/dts/qca9558_belkin_f9j1108-v2.dts b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
similarity index 97%
copy from target/linux/ath79/dts/qca9558_belkin_f9j1108-v2.dts
copy to target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
index 0bd3af98db..c88e2b0ba6 100644
--- a/target/linux/ath79/dts/qca9558_belkin_f9j1108-v2.dts
+++ b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
@@ -6,9 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "Belkin F9J1108 v2 (AC1750 DB Wi-Fi)";
-	compatible = "belkin,f9j1108-v2", "qca,qca9558";
-
 	aliases {
 		led-boot = &led_system;
 		led-failsafe = &led_system;
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index d5fbd89c26..02fdf8ecad 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -7,6 +7,7 @@ DEVICE_VARS += ADDPATTERN_ID ADDPATTERN_VERSION
 DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK
 DEVICE_VARS += KERNEL_INITRAMFS_PREFIX
 DEVICE_VARS += DAP_SIGNATURE ENGENIUS_IMGNAME
+DEVICE_VARS += EDIMAX_HEADER_MAGIC EDIMAX_HEADER_MODEL
 
 define Build/add-elecom-factory-initramfs
   $(eval edimax_model=$(word 1,$(1)))
@@ -381,10 +382,9 @@ define Device/avm_fritzdvbc
 endef
 TARGET_DEVICES += avm_fritzdvbc
 
-define Device/belkin_f9j1108-v2
+define Device/belkin_f9x-v2
   SOC := qca9558
   DEVICE_VENDOR := Belkin
-  DEVICE_MODEL := F9J1108 v2 (AC1750 DB Wi-Fi)
   IMAGE_SIZE := 14464k
   DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-usb2 \
 	kmod-usb3 kmod-usb-ledtrig-usbport
@@ -398,7 +398,15 @@ define Device/belkin_f9j1108-v2
   IMAGES += factory.bin
   IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \
 	append-rootfs | pad-rootfs | check-size | \
-	edimax-headers F9J1108v1 BR-6679BAC | pad-to $$$$(BLOCKSIZE)
+	edimax-headers $$$$(EDIMAX_HEADER_MAGIC) $$$$(EDIMAX_HEADER_MODEL) | \
+	pad-to $$$$(BLOCKSIZE)
+endef
+
+define Device/belkin_f9j1108-v2
+  $(Device/belkin_f9x-v2)
+  DEVICE_MODEL := F9J1108 v2 (AC1750 DB Wi-Fi)
+  EDIMAX_HEADER_MAGIC := F9J1108v1
+  EDIMAX_HEADER_MODEL := BR-6679BAC
 endef
 TARGET_DEVICES += belkin_f9j1108-v2

More information about the lede-commits mailing list