* [PATCH v2 1/3] phylib: add Davicom PHY support
2018-08-08 19:15 [PATCH v2 0/3] Add Davicom phy + reset-gpios Sam Ravnborg
@ 2018-08-08 19:16 ` Sam Ravnborg
2018-08-08 19:17 ` [PATCH v2 2/3] phylib: add support for reset-gpios Sam Ravnborg
2018-08-08 19:17 ` [PATCH v2 3/3] at91sam9263ek: add PHY, miitool etc. to config Sam Ravnborg
2 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2018-08-08 19:16 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Based on driver from Linux kernel 4.18.0-rc4
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
drivers/net/phy/Kconfig | 5 ++
drivers/net/phy/Makefile | 1 +
drivers/net/phy/davicom.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 146 insertions(+)
create mode 100644 drivers/net/phy/davicom.c
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index cda752b65..79fb917ee 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -18,6 +18,11 @@ config AT803X_PHY
---help---
Currently supports the AT8030, AT8031 and AT8035 PHYs.
+config DAVICOM_PHY
+ bool "Driver for Davicom PHYs"
+ ---help---
+ Currently supports dm9161e and dm9131
+
config LXT_PHY
bool "Driver for the Intel LXT PHYs"
---help---
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 30b20f8ee..4424054d9 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -1,6 +1,7 @@
obj-y += phy.o mdio_bus.o
obj-$(CONFIG_AR8327N_PHY) += ar8327.o
obj-$(CONFIG_AT803X_PHY) += at803x.o
+obj-$(CONFIG_DAVICOM_PHY) += davicom.o
obj-$(CONFIG_LXT_PHY) += lxt.o
obj-$(CONFIG_MARVELL_PHY) += marvell.o
obj-$(CONFIG_MICREL_PHY) += micrel.o
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
new file mode 100644
index 000000000..8a784b1e5
--- /dev/null
+++ b/drivers/net/phy/davicom.c
@@ -0,0 +1,140 @@
+/*
+ * drivers/net/phy/davicom.c
+ *
+ * Driver for Davicom PHYs
+ *
+ * Author: Andy Fleming
+ *
+ * Copyright (c) 2004 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ */
+
+#include <common.h>
+#include <init.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/phy.h>
+
+#define MII_DM9161_SCR 0x10
+#define MII_DM9161_SCR_INIT 0x0610
+#define MII_DM9161_SCR_RMII 0x0100
+
+/* DM9161 Interrupt Register */
+#define MII_DM9161_INTR 0x15
+#define MII_DM9161_INTR_PEND 0x8000
+#define MII_DM9161_INTR_DPLX_MASK 0x0800
+#define MII_DM9161_INTR_SPD_MASK 0x0400
+#define MII_DM9161_INTR_LINK_MASK 0x0200
+#define MII_DM9161_INTR_MASK 0x0100
+#define MII_DM9161_INTR_DPLX_CHANGE 0x0010
+#define MII_DM9161_INTR_SPD_CHANGE 0x0008
+#define MII_DM9161_INTR_LINK_CHANGE 0x0004
+#define MII_DM9161_INTR_INIT 0x0000
+#define MII_DM9161_INTR_STOP \
+(MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK \
+ | MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK)
+
+/* DM9161 10BT Configuration/Status */
+#define MII_DM9161_10BTCSR 0x12
+#define MII_DM9161_10BTCSR_INIT 0x7800
+
+MODULE_DESCRIPTION("Davicom PHY driver");
+MODULE_AUTHOR("Andy Fleming");
+MODULE_LICENSE("GPL");
+
+
+static int dm9161_config_aneg(struct phy_device *phydev)
+{
+ int err;
+
+ /* Isolate the PHY */
+ err = phy_write(phydev, MII_BMCR, BMCR_ISOLATE);
+
+ if (err < 0)
+ return err;
+
+ /* Configure the new settings */
+ err = genphy_config_aneg(phydev);
+
+ if (err < 0)
+ return err;
+
+ return 0;
+}
+
+static int dm9161_config_init(struct phy_device *phydev)
+{
+ int err, temp;
+
+ /* Isolate the PHY */
+ err = phy_write(phydev, MII_BMCR, BMCR_ISOLATE);
+
+ if (err < 0)
+ return err;
+
+ switch (phydev->interface) {
+ case PHY_INTERFACE_MODE_MII:
+ temp = MII_DM9161_SCR_INIT;
+ break;
+ case PHY_INTERFACE_MODE_RMII:
+ temp = MII_DM9161_SCR_INIT | MII_DM9161_SCR_RMII;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ /* Do not bypass the scrambler/descrambler */
+ err = phy_write(phydev, MII_DM9161_SCR, temp);
+ if (err < 0)
+ return err;
+
+ /* Clear 10BTCSR to default */
+ err = phy_write(phydev, MII_DM9161_10BTCSR, MII_DM9161_10BTCSR_INIT);
+
+ if (err < 0)
+ return err;
+
+ /* Reconnect the PHY, and enable Autonegotiation */
+ return phy_write(phydev, MII_BMCR, BMCR_ANENABLE);
+}
+
+static struct phy_driver dm91xx_driver[] = {
+{
+ .phy_id = 0x0181b880,
+ .drv.name = "Davicom DM9161E",
+ .phy_id_mask = 0x0ffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config_init = dm9161_config_init,
+ .config_aneg = dm9161_config_aneg,
+}, {
+ .phy_id = 0x0181b8b0,
+ .drv.name = "Davicom DM9161B/C",
+ .phy_id_mask = 0x0ffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config_init = dm9161_config_init,
+ .config_aneg = dm9161_config_aneg,
+}, {
+ .phy_id = 0x0181b8a0,
+ .drv.name = "Davicom DM9161A",
+ .phy_id_mask = 0x0ffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config_init = dm9161_config_init,
+ .config_aneg = dm9161_config_aneg,
+}, {
+ .phy_id = 0x00181b80,
+ .drv.name = "Davicom DM9131",
+ .phy_id_mask = 0x0ffffff0,
+ .features = PHY_BASIC_FEATURES,
+} };
+
+static int dm9161_init(void)
+{
+ return phy_drivers_register(dm91xx_driver,
+ ARRAY_SIZE(dm91xx_driver));
+}
+fs_initcall(dm9161_init);
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] phylib: add support for reset-gpios
2018-08-08 19:15 [PATCH v2 0/3] Add Davicom phy + reset-gpios Sam Ravnborg
2018-08-08 19:16 ` [PATCH v2 1/3] phylib: add Davicom PHY support Sam Ravnborg
@ 2018-08-08 19:17 ` Sam Ravnborg
2018-08-10 6:40 ` Sascha Hauer
2018-08-08 19:17 ` [PATCH v2 3/3] at91sam9263ek: add PHY, miitool etc. to config Sam Ravnborg
2 siblings, 1 reply; 6+ messages in thread
From: Sam Ravnborg @ 2018-08-08 19:17 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Add minimal support for reset-gpios.
Example DT that uses this:
mdio {
#address-cells = <1>;
#size-cells = <0>;
reset-gpios = <&pioE 17 GPIO_ACTIVE_LOW>;
reset-delay-us = <1000>;
ethphy0: ethernet-phy@1 {
reg = <3>;
};
};
This was required to get the Davicom PHY operational on
my proprietary board.
I added the minimal mdio_reset() calls.
Another options was to use a bus reset, but then
the net/ driver used should have dedicated reset support.
The reset-gpios solution is general and matches the
binding specification in net/mdio.txt
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
drivers/net/phy/mdio_bus.c | 64 ++++++++++++++++++++++++++++++++++++++++++++--
include/linux/phy.h | 5 ++++
2 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index d209716a1..ad358192d 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -17,6 +17,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <common.h>
+#include <of_gpio.h>
+#include <gpio.h>
#include <driver.h>
#include <init.h>
#include <clock.h>
@@ -25,6 +27,8 @@
#include <linux/phy.h>
#include <linux/err.h>
+#define DEFAULT_GPIO_RESET_DELAY 10 /* us */
+
LIST_HEAD(mii_bus_list);
int mdiobus_detect(struct device_d *dev)
@@ -83,6 +87,45 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi
}
/**
+ * of_mdioibus_register_reset - register optional reset-gpios
+ * @mdio: pointer to mii_bus structure
+ * @np: pointer to device_node of MDIO bus.
+ *
+ * Read optional reset-gpios from mido node in DT
+ */
+static void of_mdiobus_register_reset(struct mii_bus *mdio,
+ struct device_node *np)
+{
+ enum of_gpio_flags of_flags;
+ u32 reset_delay;
+ int gpio;
+
+ if (!np)
+ return;
+
+ reset_delay = DEFAULT_GPIO_RESET_DELAY;
+ of_property_read_u32(np, "reset-delay-us", &reset_delay);
+
+ gpio = of_get_named_gpio_flags(np, "reset-gpios", 0, &of_flags);
+ if (gpio_is_valid(gpio)) {
+ unsigned long flags;
+ char *name;
+
+ name = basprintf("%s-reset", dev_name(&mdio->dev));
+ flags = GPIOF_OUT_INIT_INACTIVE;
+
+ if (of_flags & OF_GPIO_ACTIVE_LOW)
+ flags |= GPIOF_ACTIVE_LOW;
+
+ if (gpio_request_one(gpio, flags, name) >= 0) {
+ mdio->reset_gpio = gpio;
+ mdio->reset_delay = reset_delay;
+ }
+ }
+
+}
+
+/**
* of_mdiobus_register - Register mii_bus and create PHYs from the device tree
* @mdio: pointer to mii_bus structure
* @np: pointer to device_node of MDIO bus.
@@ -96,6 +139,9 @@ static int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
u32 addr;
int ret;
+ if (!np)
+ return -ENODEV;
+
/* Loop over the child nodes and register a phy_device for each one */
for_each_available_child_of_node(np, child) {
ret = of_property_read_u32(child, "reg", &addr);
@@ -128,6 +174,7 @@ static int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
*/
int mdiobus_register(struct mii_bus *bus)
{
+ struct device_node *np;
int err;
if (NULL == bus ||
@@ -147,6 +194,11 @@ int mdiobus_register(struct mii_bus *bus)
return -EINVAL;
}
+ np = bus->dev.device_node;
+
+ of_mdiobus_register_reset(bus, np);
+
+ mdio_reset(bus);
if (bus->reset)
bus->reset(bus);
@@ -154,8 +206,7 @@ int mdiobus_register(struct mii_bus *bus)
pr_info("%s: probed\n", dev_name(&bus->dev));
- if (bus->dev.device_node)
- of_mdiobus_register(bus, bus->dev.device_node);
+ of_mdiobus_register(bus, np);
return 0;
}
@@ -190,6 +241,15 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
}
EXPORT_SYMBOL(mdiobus_scan);
+void mdio_reset(const struct mii_bus *bus)
+{
+ if (gpio_is_valid(bus->reset_gpio)) {
+ gpio_set_active(bus->reset_gpio, 1);
+ udelay(bus->reset_delay);
+ gpio_set_active(bus->reset_gpio, 0);
+ }
+}
+EXPORT_SYMBOL(mdio_reset);
/**
*
diff --git a/include/linux/phy.h b/include/linux/phy.h
index ac750f5c3..a34f5b20f 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -99,6 +99,10 @@ struct mii_bus {
/* PHY addresses to be ignored when probing */
u32 phy_mask;
+ /* Optional reset of all PHY's on the bus */
+ int reset_gpio;
+ int reset_delay;
+
struct list_head list;
bool is_multiplexed;
@@ -108,6 +112,7 @@ struct mii_bus {
int mdiobus_register(struct mii_bus *bus);
void mdiobus_unregister(struct mii_bus *bus);
struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
+void mdio_reset(const struct mii_bus *bus);
extern struct list_head mii_bus_list;
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/3] phylib: add support for reset-gpios
2018-08-08 19:17 ` [PATCH v2 2/3] phylib: add support for reset-gpios Sam Ravnborg
@ 2018-08-10 6:40 ` Sascha Hauer
2018-08-10 7:43 ` Sam Ravnborg
0 siblings, 1 reply; 6+ messages in thread
From: Sascha Hauer @ 2018-08-10 6:40 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: Barebox List
Hi Sam,
Some comments inside.
On Wed, Aug 08, 2018 at 09:17:00PM +0200, Sam Ravnborg wrote:
> Add minimal support for reset-gpios.
>
> Example DT that uses this:
>
> mdio {
> #address-cells = <1>;
> #size-cells = <0>;
> reset-gpios = <&pioE 17 GPIO_ACTIVE_LOW>;
> reset-delay-us = <1000>;
> ethphy0: ethernet-phy@1 {
> reg = <3>;
> };
> };
>
> This was required to get the Davicom PHY operational on
> my proprietary board.
> I added the minimal mdio_reset() calls.
>
> Another options was to use a bus reset, but then
> the net/ driver used should have dedicated reset support.
>
> The reset-gpios solution is general and matches the
> binding specification in net/mdio.txt
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> drivers/net/phy/mdio_bus.c | 64 ++++++++++++++++++++++++++++++++++++++++++++--
> include/linux/phy.h | 5 ++++
> 2 files changed, 67 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
> index d209716a1..ad358192d 100644
> --- a/drivers/net/phy/mdio_bus.c
> +++ b/drivers/net/phy/mdio_bus.c
> @@ -17,6 +17,8 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <common.h>
> +#include <of_gpio.h>
> +#include <gpio.h>
> #include <driver.h>
> #include <init.h>
> #include <clock.h>
> @@ -25,6 +27,8 @@
> #include <linux/phy.h>
> #include <linux/err.h>
>
> +#define DEFAULT_GPIO_RESET_DELAY 10 /* us */
> +
> LIST_HEAD(mii_bus_list);
>
> int mdiobus_detect(struct device_d *dev)
> @@ -83,6 +87,45 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi
> }
>
> /**
> + * of_mdioibus_register_reset - register optional reset-gpios
s/mdioibus/mdiobus/
> + * @mdio: pointer to mii_bus structure
> + * @np: pointer to device_node of MDIO bus.
> + *
> + * Read optional reset-gpios from mido node in DT
s/mido/mdio/
> + */
> +static void of_mdiobus_register_reset(struct mii_bus *mdio,
> + struct device_node *np)
> +{
> + enum of_gpio_flags of_flags;
> + u32 reset_delay;
> + int gpio;
> +
> + if (!np)
> + return;
> +
> + reset_delay = DEFAULT_GPIO_RESET_DELAY;
> + of_property_read_u32(np, "reset-delay-us", &reset_delay);
> +
> + gpio = of_get_named_gpio_flags(np, "reset-gpios", 0, &of_flags);
> + if (gpio_is_valid(gpio)) {
> + unsigned long flags;
> + char *name;
> +
> + name = basprintf("%s-reset", dev_name(&mdio->dev));
Free after use?
> + flags = GPIOF_OUT_INIT_INACTIVE;
> +
> + if (of_flags & OF_GPIO_ACTIVE_LOW)
> + flags |= GPIOF_ACTIVE_LOW;
> +
> + if (gpio_request_one(gpio, flags, name) >= 0) {
> + mdio->reset_gpio = gpio;
> + mdio->reset_delay = reset_delay;
> + }
This shouldn't fail silently. If we find a GPIO we should be able to
request it, otherwise it's a bug.
> + }
> +
> +}
> +
> +/**
> * of_mdiobus_register - Register mii_bus and create PHYs from the device tree
> * @mdio: pointer to mii_bus structure
> * @np: pointer to device_node of MDIO bus.
> @@ -96,6 +139,9 @@ static int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
> u32 addr;
> int ret;
>
> + if (!np)
> + return -ENODEV;
> +
> /* Loop over the child nodes and register a phy_device for each one */
> for_each_available_child_of_node(np, child) {
> ret = of_property_read_u32(child, "reg", &addr);
> @@ -128,6 +174,7 @@ static int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
> */
> int mdiobus_register(struct mii_bus *bus)
> {
> + struct device_node *np;
> int err;
>
> if (NULL == bus ||
> @@ -147,6 +194,11 @@ int mdiobus_register(struct mii_bus *bus)
> return -EINVAL;
> }
>
> + np = bus->dev.device_node;
> +
> + of_mdiobus_register_reset(bus, np);
> +
> + mdio_reset(bus);
> if (bus->reset)
> bus->reset(bus);
>
> @@ -154,8 +206,7 @@ int mdiobus_register(struct mii_bus *bus)
>
> pr_info("%s: probed\n", dev_name(&bus->dev));
>
> - if (bus->dev.device_node)
> - of_mdiobus_register(bus, bus->dev.device_node);
> + of_mdiobus_register(bus, np);
>
> return 0;
> }
> @@ -190,6 +241,15 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
> }
> EXPORT_SYMBOL(mdiobus_scan);
>
> +void mdio_reset(const struct mii_bus *bus)
> +{
> + if (gpio_is_valid(bus->reset_gpio)) {
'0' is a valid GPIO, you have to initialize bus->reset_gpio explicitly
to a negative value for the general case when no reset GPIO is
available.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] at91sam9263ek: add PHY, miitool etc. to config
2018-08-08 19:15 [PATCH v2 0/3] Add Davicom phy + reset-gpios Sam Ravnborg
2018-08-08 19:16 ` [PATCH v2 1/3] phylib: add Davicom PHY support Sam Ravnborg
2018-08-08 19:17 ` [PATCH v2 2/3] phylib: add support for reset-gpios Sam Ravnborg
@ 2018-08-08 19:17 ` Sam Ravnborg
2 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2018-08-08 19:17 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Added Davicom phy to the config now it is supported.
Add miitool to show the phy info.
Also add a bunch of extra commands that can be useful
when handling the evaluation board.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/configs/at91sam9263ek_defconfig | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig
index e8ad841fa..45c6f79de 100644
--- a/arch/arm/configs/at91sam9263ek_defconfig
+++ b/arch/arm/configs/at91sam9263ek_defconfig
@@ -18,7 +18,7 @@ CONFIG_BOOTM_OFTREE=y
CONFIG_BOOTM_OFTREE_UIMAGE=y
CONFIG_CONSOLE_ACTIVATE_ALL=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
-# CONFIG_CMD_ARM_CPUINFO is not set
+CONFIG_CMD_DMESG=y
CONFIG_LONGHELP=y
CONFIG_CMD_IOMEM=y
CONFIG_CMD_MEMINFO=y
@@ -33,22 +33,32 @@ CONFIG_CMD_PRINTENV=y
CONFIG_CMD_SAVEENV=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_DHCP=y
+CONFIG_CMD_HOST=y
+CONFIG_NET_CMD_IFUP=y
+CONFIG_CMD_MIITOOL=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SPLASH=y
+CONFIG_CMD_FBTEST=y
CONFIG_CMD_READLINE=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_CLK=y
+CONFIG_CMD_DETECT=y
CONFIG_CMD_FLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_LED=y
CONFIG_CMD_LED_TRIGGER=y
+CONFIG_CMD_OF_NODE=y
+CONFIG_CMD_OF_PROPERTY=y
+CONFIG_CMD_OF_DISPLAY_TIMINGS=y
+CONFIG_CMD_OF_FIXUP_STATUS=y
CONFIG_CMD_OFTREE=y
CONFIG_NET=y
CONFIG_NET_NFS=y
CONFIG_OF_BAREBOX_DRIVERS=y
CONFIG_DRIVER_NET_MACB=y
+CONFIG_DAVICOM_PHY=y
# CONFIG_SPI is not set
CONFIG_MTD=y
# CONFIG_MTD_OOB_DEVICE is not set
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread