Merge Official Source

target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts

@@ -0,0 +1,186 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "ar7100.dtsi"
+
+/ {
+	compatible = "siemens,ws-ap3610", "qca,ar7161";
+	model = "Siemens WS-AP3610";
+
+	chosen {
+		bootargs = "console=ttyS0,115200";
+	};
+
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_red;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_red;
+		label-mac-device = &eth0;
+	};
+
+	extosc: ref {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-output-names = "ref";
+		clock-frequency = <40000000>;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power_green: led_power_green {
+			label = "ws-ap3610:green:power";
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
+		};
+
+		led_power_red: led_power_red {
+			label = "ws-ap3610:red:power";
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+		};
+
+		led_wlan5_blue {
+			label = "ws-ap3610:blue:wlan5";
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0tpt";
+		};
+
+		led_wlan5_green {
+			label = "ws-ap3610:green:wlan5";
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+		};
+
+		led_wlan2_blue {
+			label = "ws-ap3610:blue:wlan2";
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy1tpt";
+		};
+
+		led_wlan2_green {
+			label = "ws-ap3610:green:wlan2";
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "reset";
+			linux,code = <KEY_RESTART>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&pcie0 {
+	status = "okay";
+};
+
+&uart {
+	status = "okay";
+};
+
+&mdio0 {
+	status = "okay";
+
+	phy0: ethernet-phy@0 {
+		/*
+		 * When the compatible-is missing, PHY autodetection
+		 * is performed, but the PHY-ID reads all 0xff.
+		 *
+		 * Linux does not create the device in this case,
+		 * and the reset is never even de-asserted.
+		 */
+		compatible = "ethernet-phy-id0143.bca2",
+				"ethernet-phy-ieee802.3-c22";
+		reg = <0>;
+
+		resets = <&rst 8>;
+		reset-names = "phy";
+		reset-assert-us = <10000>;
+		reset-deassert-us = <10000>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+
+	phy-mode = "rgmii-id";
+	phy-handle = <&phy0>;
+};
+
+&spi {
+	status = "okay";
+
+	num-cs = <1>;
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <25000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x40000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "u-boot-bak";
+				reg = <0x40000 0x40000>;
+				read-only;
+			};
+
+			partition@80000 {
+				compatible = "denx,uimage";
+				label = "firmware";
+				reg = <0x80000 0xe00000>;
+			};
+
+			partition@e80000 {
+				label = "cfg1";
+				reg = <0xe80000 0x40000>;
+				read-only;
+			};
+
+			partition@ec0000 {
+				label = "cfg2";
+				reg = <0xec0000 0x40000>;
+				read-only;
+			};
+
+			partition@f00000 {
+				label = "nvram1";
+				reg = <0xf00000 0x40000>;
+				read-only;
+			};
+
+			partition@f40000 {
+				label = "nvram2";
+				reg = <0xf40000 0x40000>;
+				read-only;
+			};
+
+			partition@f80000 {
+				label = "rsvd1";
+				reg = <0xf80000 0x40000>;
+				read-only;
+			};
+
+			partition@fc0000 {
+				label = "rsvd2";
+				reg = <0xfc0000 0x40000>;
+				read-only;
+			};
+		};
+	};
+};

target/linux/ath79/generic/base-files/etc/board.d/02_network

@@ -30,6 +30,7 @@ ath79_setup_interfaces()
 	pisen,ts-d084|\
 	pisen,wmb001n|\
 	pisen,wmm003n|\
+	siemens,ws-ap3610|\
 	tplink,cpe210-v2|\
 	tplink,cpe210-v3|\
 	tplink,cpe510-v2|\

target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac

@@ -34,6 +34,9 @@ case "$board" in
 		[ "$PHYNBR" -eq 1 ] && \
 			k2t_get_mac "lan_mac" > /sys${DEVPATH}/macaddress
 		;;
+	siemens,ws-ap3610)
+		mtd_get_mac_ascii cfg1 RADIOADDR${PHYNBR} > /sys${DEVPATH}/macaddress
+		;;
 	trendnet,tew-823dru)
 		# set the 2.4G interface mac address to LAN MAC
 		[ "$PHYNBR" -eq 1 ] && \

target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+preinit_set_mac_address() {
+	case $(board_name) in
+	siemens,ws-ap3610)
+		ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr)
+		;;
+	esac
+}
+
+boot_hook_add preinit_main preinit_set_mac_address

target/linux/ath79/generic/config-default

@@ -1,4 +1,5 @@
 CONFIG_AT803X_PHY=y
+CONFIG_BROADCOM_PHY=y
 CONFIG_GPIO_WATCHDOG=y
 CONFIG_GPIO_WATCHDOG_ARCH_INITCALL=y
 CONFIG_INTEL_XWAY_PHY=y

target/linux/ath79/image/generic.mk

@@ -1041,6 +1041,20 @@ define Device/rosinson_wr818
 endef
 TARGET_DEVICES += rosinson_wr818
 
+define Device/siemens_ws-ap3610
+  SOC := ar7161
+  DEVICE_VENDOR := Siemens
+  DEVICE_MODEL := WS-AP3610
+  IMAGE_SIZE := 14336k
+  LOADER_TYPE := bin
+  LOADER_FLASH_OFFS := 0x82000
+  COMPILE := loader-$(1).bin
+  COMPILE/loader-$(1).bin := loader-okli-compile
+  KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 8128 | uImage none
+  KERNEL_INITRAMFS := kernel-bin | append-dtb | uImage none
+endef
+TARGET_DEVICES += siemens_ws-ap3610
+
 define Device/sitecom_wlr-7100
   SOC := ar1022
   DEVICE_VENDOR := Sitecom

target/linux/ath79/patches-4.19/700-net-phy-add-reset-controller-support.patch

@@ -0,0 +1,107 @@
+From 71dd6c0dff51b5f1fef2e9dfa6f6a948aac975f3 Mon Sep 17 00:00:00 2001
+From: David Bauer <mail@david-bauer.net>
+Date: Wed, 17 Apr 2019 23:59:21 +0200
+Subject: [PATCH] net: phy: add support for reset-controller
+
+This commit adds support for PHY reset pins handled by a reset controller.
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/phy/mdio_bus.c    | 27 +++++++++++++++++++++++++--
+ drivers/net/phy/mdio_device.c | 13 +++++++++++--
+ include/linux/mdio.h          |  1 +
+ 3 files changed, 37 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -29,6 +29,7 @@
+ #include <linux/of_gpio.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
++#include <linux/reset.h>
+ #include <linux/skbuff.h>
+ #include <linux/spinlock.h>
+ #include <linux/mm.h>
+@@ -65,8 +66,23 @@ static int mdiobus_register_gpiod(struct
+ 
+ 	mdiodev->reset = gpiod;
+ 
+-	/* Assert the reset signal again */
+-	mdio_device_reset(mdiodev, 1);
++	return 0;
++}
++
++static int mdiobus_register_reset(struct mdio_device *mdiodev)
++{
++	struct reset_control *reset = NULL;
++
++	if (mdiodev->dev.of_node)
++		reset = devm_reset_control_get_exclusive(&mdiodev->dev,
++							 "phy");
++	if (PTR_ERR(reset) == -ENOENT ||
++	    PTR_ERR(reset) == -ENOTSUPP)
++		reset = NULL;
++	else if (IS_ERR(reset))
++		return PTR_ERR(reset);
++
++	mdiodev->reset_ctrl = reset;
+ 
+ 	return 0;
+ }
+@@ -82,6 +98,13 @@ int mdiobus_register_device(struct mdio_
+ 		err = mdiobus_register_gpiod(mdiodev);
+ 		if (err)
+ 			return err;
++
++		err = mdiobus_register_reset(mdiodev);
++		if (err)
++			return err;
++
++		/* Assert the reset signal */
++		mdio_device_reset(mdiodev, 1);
+ 	}
+ 
+ 	mdiodev->bus->mdio_map[mdiodev->addr] = mdiodev;
+--- a/drivers/net/phy/mdio_device.c
++++ b/drivers/net/phy/mdio_device.c
+@@ -21,6 +21,7 @@
+ #include <linux/mii.h>
+ #include <linux/module.h>
+ #include <linux/phy.h>
++#include <linux/reset.h>
+ #include <linux/slab.h>
+ #include <linux/string.h>
+ #include <linux/unistd.h>
+@@ -121,10 +122,18 @@ void mdio_device_reset(struct mdio_devic
+ {
+ 	unsigned int d;
+ 
+-	if (!mdiodev->reset)
++	if (!mdiodev->reset && !mdiodev->reset_ctrl)
+ 		return;
+ 
+-	gpiod_set_value(mdiodev->reset, value);
++	if (mdiodev->reset)
++		gpiod_set_value(mdiodev->reset, value);
++
++	if (mdiodev->reset_ctrl) {
++		if (value)
++			reset_control_assert(mdiodev->reset_ctrl);
++		else
++			reset_control_deassert(mdiodev->reset_ctrl);
++	}
+ 
+ 	d = value ? mdiodev->reset_assert_delay : mdiodev->reset_deassert_delay;
+ 	if (d)
+--- a/include/linux/mdio.h
++++ b/include/linux/mdio.h
+@@ -40,6 +40,7 @@ struct mdio_device {
+ 	int addr;
+ 	int flags;
+ 	struct gpio_desc *reset;
++	struct reset_control *reset_ctrl;
+ 	unsigned int reset_assert_delay;
+ 	unsigned int reset_deassert_delay;
+ };

target/linux/ath79/patches-4.19/701-mdio-bus-dont-use-managed-reset-controller.patch

@@ -0,0 +1,44 @@
+From 32085f25d7b68404055f3525c780142fc72e543f Mon Sep 17 00:00:00 2001
+From: David Bauer <mail@david-bauer.net>
+Date: Fri, 22 Nov 2019 22:44:51 +0100
+Subject: [PATCH] mdio_bus: don't use managed reset-controller
+
+Geert Uytterhoeven reported that using devm_reset_controller_get leads
+to a WARNING when probing a reset-controlled PHY. This is because the
+device devm_reset_controller_get gets supplied is not actually the
+one being probed.
+
+Acquire an unmanaged reset-control as well as free the reset_control on
+unregister to fix this.
+
+Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
+CC: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David Bauer <mail@david-bauer.net>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/phy/mdio_bus.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -74,8 +74,8 @@ static int mdiobus_register_reset(struct
+ 	struct reset_control *reset = NULL;
+ 
+ 	if (mdiodev->dev.of_node)
+-		reset = devm_reset_control_get_exclusive(&mdiodev->dev,
+-							 "phy");
++		reset = of_reset_control_get_exclusive(mdiodev->dev.of_node,
++						       "phy");
+ 	if (PTR_ERR(reset) == -ENOENT ||
+ 	    PTR_ERR(reset) == -ENOTSUPP)
+ 		reset = NULL;
+@@ -118,6 +118,8 @@ int mdiobus_unregister_device(struct mdi
+ 	if (mdiodev->bus->mdio_map[mdiodev->addr] != mdiodev)
+ 		return -EINVAL;
+ 
++	reset_control_put(mdiodev->reset_ctrl);
++
+ 	mdiodev->bus->mdio_map[mdiodev->addr] = NULL;
+ 
+ 	return 0;