[armhf/armmp] Add EMAC ethernet driver found on Allwinner A10 SoCs (Closes: #711998)
- Add MDIO bus driver for the Allwinner EMAC - Add EMAC controller node to sun4i DTSI - cubieboard: Enable ethernet (EMAC) support in dts - Add EMAC Controller to Hackberry dt All cherry-picked by Niall Walsh svn path=/dists/trunk/linux/; revision=20250
This commit is contained in:
parent
b1c74f1912
commit
3353739262
|
@ -1,3 +1,14 @@
|
||||||
|
linux (3.10~rc5-1~exp2) UNRELEASED; urgency=low
|
||||||
|
|
||||||
|
* [armhf/armmp] Add EMAC ethernet driver found on Allwinner A10 SoCs,
|
||||||
|
thanks to Niall Walsh (Closes: #711998)
|
||||||
|
- Add MDIO bus driver for the Allwinner EMAC
|
||||||
|
- Add EMAC controller node to sun4i DTSI
|
||||||
|
- cubieboard: Enable ethernet (EMAC) support in dts
|
||||||
|
- Add EMAC Controller to Hackberry dt
|
||||||
|
|
||||||
|
-- Ben Hutchings <ben@decadent.org.uk> Thu, 13 Jun 2013 01:50:52 +0100
|
||||||
|
|
||||||
linux (3.10~rc5-1~exp1) experimental; urgency=low
|
linux (3.10~rc5-1~exp1) experimental; urgency=low
|
||||||
|
|
||||||
* New upstream release candidate
|
* New upstream release candidate
|
||||||
|
|
|
@ -332,6 +332,11 @@ CONFIG_MTD_NAND_MXC=m
|
||||||
CONFIG_MTD_ONENAND=y
|
CONFIG_MTD_ONENAND=y
|
||||||
CONFIG_MTD_ONENAND_OMAP2=m
|
CONFIG_MTD_ONENAND_OMAP2=m
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: drivers/net/ethernet/allwinner/Kconfig
|
||||||
|
##
|
||||||
|
CONFIG_SUN4I_EMAC=m
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/net/ethernet/marvell/Kconfig
|
## file: drivers/net/ethernet/marvell/Kconfig
|
||||||
##
|
##
|
||||||
|
@ -353,6 +358,11 @@ CONFIG_TI_DAVINCI_MDIO=m
|
||||||
CONFIG_TI_DAVINCI_CPDMA=m
|
CONFIG_TI_DAVINCI_CPDMA=m
|
||||||
CONFIG_TI_CPSW=m
|
CONFIG_TI_CPSW=m
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: drivers/net/phy/Kconfig
|
||||||
|
##
|
||||||
|
CONFIG_MDIO_SUN4I=y
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/net/wireless/ti/wl1251/Kconfig
|
## file: drivers/net/wireless/ti/wl1251/Kconfig
|
||||||
##
|
##
|
||||||
|
|
1221
debian/patches/features/arm/sunxi-emac/0001-net-Add-EMAC-ethernet-driver-found-on-Allwinner-A10-.patch
vendored
Normal file
1221
debian/patches/features/arm/sunxi-emac/0001-net-Add-EMAC-ethernet-driver-found-on-Allwinner-A10-.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
286
debian/patches/features/arm/sunxi-emac/0002-net-Add-MDIO-bus-driver-for-the-Allwinner-EMAC.patch
vendored
Normal file
286
debian/patches/features/arm/sunxi-emac/0002-net-Add-MDIO-bus-driver-for-the-Allwinner-EMAC.patch
vendored
Normal file
|
@ -0,0 +1,286 @@
|
||||||
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Date: Thu, 30 May 2013 03:49:21 +0000
|
||||||
|
Subject: [PATCH 02/10] net: Add MDIO bus driver for the Allwinner EMAC
|
||||||
|
Bug-Debian: http://bugs.debian.org/711998
|
||||||
|
|
||||||
|
This patch adds a separate driver for the MDIO interface of the
|
||||||
|
Allwinner ethernet controllers.
|
||||||
|
|
||||||
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Tested-by: Richard Genoud <richard.genoud@gmail.com>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
(cherry picked from commit 4bdcb1dd9feb03608e12cfa46aba385035af8ea5)
|
||||||
|
---
|
||||||
|
.../bindings/net/allwinner,sun4i-mdio.txt | 26 +++
|
||||||
|
drivers/net/phy/Kconfig | 10 +
|
||||||
|
drivers/net/phy/Makefile | 1 +
|
||||||
|
drivers/net/phy/mdio-sun4i.c | 194 ++++++++++++++++++++
|
||||||
|
4 files changed, 231 insertions(+)
|
||||||
|
create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
|
||||||
|
create mode 100644 drivers/net/phy/mdio-sun4i.c
|
||||||
|
|
||||||
|
diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt b/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..00b9f9a
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
|
||||||
|
@@ -0,0 +1,26 @@
|
||||||
|
+* Allwinner A10 MDIO Ethernet Controller interface
|
||||||
|
+
|
||||||
|
+Required properties:
|
||||||
|
+- compatible: should be "allwinner,sun4i-mdio".
|
||||||
|
+- reg: address and length of the register set for the device.
|
||||||
|
+
|
||||||
|
+Optional properties:
|
||||||
|
+- phy-supply: phandle to a regulator if the PHY needs one
|
||||||
|
+
|
||||||
|
+Example at the SoC level:
|
||||||
|
+mdio@01c0b080 {
|
||||||
|
+ compatible = "allwinner,sun4i-mdio";
|
||||||
|
+ reg = <0x01c0b080 0x14>;
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <0>;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+And at the board level:
|
||||||
|
+
|
||||||
|
+mdio@01c0b080 {
|
||||||
|
+ phy-supply = <®_emac_3v3>;
|
||||||
|
+
|
||||||
|
+ phy0: ethernet-phy@0 {
|
||||||
|
+ reg = <0>;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
|
||||||
|
index 1e11f2b..3a316b3 100644
|
||||||
|
--- a/drivers/net/phy/Kconfig
|
||||||
|
+++ b/drivers/net/phy/Kconfig
|
||||||
|
@@ -144,6 +144,16 @@ config MDIO_OCTEON
|
||||||
|
|
||||||
|
If in doubt, say Y.
|
||||||
|
|
||||||
|
+config MDIO_SUN4I
|
||||||
|
+ tristate "Allwinner sun4i MDIO interface support"
|
||||||
|
+ depends on ARCH_SUNXI
|
||||||
|
+ select REGULATOR
|
||||||
|
+ select REGULATOR_FIXED_VOLTAGE
|
||||||
|
+ help
|
||||||
|
+ This driver supports the MDIO interface found in the network
|
||||||
|
+ interface units of the Allwinner SoC that have an EMAC (A10,
|
||||||
|
+ A12, A10s, etc.)
|
||||||
|
+
|
||||||
|
config MDIO_BUS_MUX
|
||||||
|
tristate
|
||||||
|
depends on OF_MDIO
|
||||||
|
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
|
||||||
|
index 9645e38..23a2ab2 100644
|
||||||
|
--- a/drivers/net/phy/Makefile
|
||||||
|
+++ b/drivers/net/phy/Makefile
|
||||||
|
@@ -30,3 +30,4 @@ obj-$(CONFIG_AMD_PHY) += amd.o
|
||||||
|
obj-$(CONFIG_MDIO_BUS_MUX) += mdio-mux.o
|
||||||
|
obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-mux-gpio.o
|
||||||
|
obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o
|
||||||
|
+obj-$(CONFIG_MDIO_SUN4I) += mdio-sun4i.o
|
||||||
|
diff --git a/drivers/net/phy/mdio-sun4i.c b/drivers/net/phy/mdio-sun4i.c
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..61d3f4e
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/drivers/net/phy/mdio-sun4i.c
|
||||||
|
@@ -0,0 +1,194 @@
|
||||||
|
+/*
|
||||||
|
+ * Allwinner EMAC MDIO interface driver
|
||||||
|
+ *
|
||||||
|
+ * Copyright 2012-2013 Stefan Roese <sr@denx.de>
|
||||||
|
+ * Copyright 2013 Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
+ *
|
||||||
|
+ * Based on the Linux driver provided by Allwinner:
|
||||||
|
+ * Copyright (C) 1997 Sten Wang
|
||||||
|
+ *
|
||||||
|
+ * This file is licensed under the terms of the GNU General Public
|
||||||
|
+ * License version 2. This program is licensed "as is" without any
|
||||||
|
+ * warranty of any kind, whether express or implied.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <linux/delay.h>
|
||||||
|
+#include <linux/init.h>
|
||||||
|
+#include <linux/kernel.h>
|
||||||
|
+#include <linux/module.h>
|
||||||
|
+#include <linux/mutex.h>
|
||||||
|
+#include <linux/of_address.h>
|
||||||
|
+#include <linux/of_mdio.h>
|
||||||
|
+#include <linux/phy.h>
|
||||||
|
+#include <linux/platform_device.h>
|
||||||
|
+#include <linux/regulator/consumer.h>
|
||||||
|
+
|
||||||
|
+#define EMAC_MAC_MCMD_REG (0x00)
|
||||||
|
+#define EMAC_MAC_MADR_REG (0x04)
|
||||||
|
+#define EMAC_MAC_MWTD_REG (0x08)
|
||||||
|
+#define EMAC_MAC_MRDD_REG (0x0c)
|
||||||
|
+#define EMAC_MAC_MIND_REG (0x10)
|
||||||
|
+#define EMAC_MAC_SSRR_REG (0x14)
|
||||||
|
+
|
||||||
|
+#define MDIO_TIMEOUT (msecs_to_jiffies(100))
|
||||||
|
+
|
||||||
|
+struct sun4i_mdio_data {
|
||||||
|
+ void __iomem *membase;
|
||||||
|
+ struct regulator *regulator;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static int sun4i_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
|
||||||
|
+{
|
||||||
|
+ struct sun4i_mdio_data *data = bus->priv;
|
||||||
|
+ unsigned long start_jiffies;
|
||||||
|
+ int value;
|
||||||
|
+
|
||||||
|
+ /* issue the phy address and reg */
|
||||||
|
+ writel((mii_id << 8) | regnum, data->membase + EMAC_MAC_MADR_REG);
|
||||||
|
+ /* pull up the phy io line */
|
||||||
|
+ writel(0x1, data->membase + EMAC_MAC_MCMD_REG);
|
||||||
|
+
|
||||||
|
+ /* Wait read complete */
|
||||||
|
+ start_jiffies = jiffies;
|
||||||
|
+ while (readl(data->membase + EMAC_MAC_MIND_REG) & 0x1) {
|
||||||
|
+ if (time_after(start_jiffies,
|
||||||
|
+ start_jiffies + MDIO_TIMEOUT))
|
||||||
|
+ return -ETIMEDOUT;
|
||||||
|
+ msleep(1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* push down the phy io line */
|
||||||
|
+ writel(0x0, data->membase + EMAC_MAC_MCMD_REG);
|
||||||
|
+ /* and read data */
|
||||||
|
+ value = readl(data->membase + EMAC_MAC_MRDD_REG);
|
||||||
|
+
|
||||||
|
+ return value;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int sun4i_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
|
||||||
|
+ u16 value)
|
||||||
|
+{
|
||||||
|
+ struct sun4i_mdio_data *data = bus->priv;
|
||||||
|
+ unsigned long start_jiffies;
|
||||||
|
+
|
||||||
|
+ /* issue the phy address and reg */
|
||||||
|
+ writel((mii_id << 8) | regnum, data->membase + EMAC_MAC_MADR_REG);
|
||||||
|
+ /* pull up the phy io line */
|
||||||
|
+ writel(0x1, data->membase + EMAC_MAC_MCMD_REG);
|
||||||
|
+
|
||||||
|
+ /* Wait read complete */
|
||||||
|
+ start_jiffies = jiffies;
|
||||||
|
+ while (readl(data->membase + EMAC_MAC_MIND_REG) & 0x1) {
|
||||||
|
+ if (time_after(start_jiffies,
|
||||||
|
+ start_jiffies + MDIO_TIMEOUT))
|
||||||
|
+ return -ETIMEDOUT;
|
||||||
|
+ msleep(1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* push down the phy io line */
|
||||||
|
+ writel(0x0, data->membase + EMAC_MAC_MCMD_REG);
|
||||||
|
+ /* and write data */
|
||||||
|
+ writel(value, data->membase + EMAC_MAC_MWTD_REG);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int sun4i_mdio_reset(struct mii_bus *bus)
|
||||||
|
+{
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int sun4i_mdio_probe(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ struct device_node *np = pdev->dev.of_node;
|
||||||
|
+ struct mii_bus *bus;
|
||||||
|
+ struct sun4i_mdio_data *data;
|
||||||
|
+ int ret, i;
|
||||||
|
+
|
||||||
|
+ bus = mdiobus_alloc_size(sizeof(*data));
|
||||||
|
+ if (!bus)
|
||||||
|
+ return -ENOMEM;
|
||||||
|
+
|
||||||
|
+ bus->name = "sun4i_mii_bus";
|
||||||
|
+ bus->read = &sun4i_mdio_read;
|
||||||
|
+ bus->write = &sun4i_mdio_write;
|
||||||
|
+ bus->reset = &sun4i_mdio_reset;
|
||||||
|
+ snprintf(bus->id, MII_BUS_ID_SIZE, "%s-mii", dev_name(&pdev->dev));
|
||||||
|
+ bus->parent = &pdev->dev;
|
||||||
|
+
|
||||||
|
+ bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
|
||||||
|
+ if (!bus->irq) {
|
||||||
|
+ ret = -ENOMEM;
|
||||||
|
+ goto err_out_free_mdiobus;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < PHY_MAX_ADDR; i++)
|
||||||
|
+ bus->irq[i] = PHY_POLL;
|
||||||
|
+
|
||||||
|
+ data = bus->priv;
|
||||||
|
+ data->membase = of_iomap(np, 0);
|
||||||
|
+ if (!data->membase) {
|
||||||
|
+ ret = -ENOMEM;
|
||||||
|
+ goto err_out_free_mdio_irq;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ data->regulator = devm_regulator_get(&pdev->dev, "phy");
|
||||||
|
+ if (IS_ERR(data->regulator)) {
|
||||||
|
+ if (PTR_ERR(data->regulator) == -EPROBE_DEFER)
|
||||||
|
+ return -EPROBE_DEFER;
|
||||||
|
+
|
||||||
|
+ dev_info(&pdev->dev, "no regulator found\n");
|
||||||
|
+ } else {
|
||||||
|
+ ret = regulator_enable(data->regulator);
|
||||||
|
+ if (ret)
|
||||||
|
+ goto err_out_free_mdio_irq;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ret = of_mdiobus_register(bus, np);
|
||||||
|
+ if (ret < 0)
|
||||||
|
+ goto err_out_disable_regulator;
|
||||||
|
+
|
||||||
|
+ platform_set_drvdata(pdev, bus);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+err_out_disable_regulator:
|
||||||
|
+ regulator_disable(data->regulator);
|
||||||
|
+err_out_free_mdio_irq:
|
||||||
|
+ kfree(bus->irq);
|
||||||
|
+err_out_free_mdiobus:
|
||||||
|
+ mdiobus_free(bus);
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int sun4i_mdio_remove(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ struct mii_bus *bus = platform_get_drvdata(pdev);
|
||||||
|
+
|
||||||
|
+ mdiobus_unregister(bus);
|
||||||
|
+ kfree(bus->irq);
|
||||||
|
+ mdiobus_free(bus);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static const struct of_device_id sun4i_mdio_dt_ids[] = {
|
||||||
|
+ { .compatible = "allwinner,sun4i-mdio" },
|
||||||
|
+ { }
|
||||||
|
+};
|
||||||
|
+MODULE_DEVICE_TABLE(of, sun4i_mdio_dt_ids);
|
||||||
|
+
|
||||||
|
+static struct platform_driver sun4i_mdio_driver = {
|
||||||
|
+ .probe = sun4i_mdio_probe,
|
||||||
|
+ .remove = sun4i_mdio_remove,
|
||||||
|
+ .driver = {
|
||||||
|
+ .name = "sun4i-mdio",
|
||||||
|
+ .of_match_table = sun4i_mdio_dt_ids,
|
||||||
|
+ },
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+module_platform_driver(sun4i_mdio_driver);
|
||||||
|
+
|
||||||
|
+MODULE_DESCRIPTION("Allwinner EMAC MDIO interface driver");
|
||||||
|
+MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
|
||||||
|
+MODULE_LICENSE("GPL");
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Date: Thu, 30 May 2013 03:49:22 +0000
|
||||||
|
Subject: [PATCH 03/10] ARM: sun4i: Add muxing options for the ethernet
|
||||||
|
controller
|
||||||
|
Bug-Debian: http://bugs.debian.org/711998
|
||||||
|
|
||||||
|
The EMAC only has one pinset available for muxing, so hopefully, we
|
||||||
|
cover all cases.
|
||||||
|
|
||||||
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Tested-by: Richard Genoud <richard.genoud@gmail.com>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
(cherry picked from commit b21da664120b1c8332fc5059a1e7c1462dd26433)
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/sun4i-a10.dtsi | 11 +++++++++++
|
||||||
|
1 file changed, 11 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
|
||||||
|
index e7ef619..ff1f41f 100644
|
||||||
|
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
|
||||||
|
@@ -199,6 +199,17 @@
|
||||||
|
allwinner,drive = <0>;
|
||||||
|
allwinner,pull = <0>;
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+ emac_pins_a: emac0@0 {
|
||||||
|
+ allwinner,pins = "PA0", "PA1", "PA2",
|
||||||
|
+ "PA3", "PA4", "PA5", "PA6",
|
||||||
|
+ "PA7", "PA8", "PA9", "PA10",
|
||||||
|
+ "PA11", "PA12", "PA13", "PA14",
|
||||||
|
+ "PA15", "PA16";
|
||||||
|
+ allwinner,function = "emac";
|
||||||
|
+ allwinner,drive = <0>;
|
||||||
|
+ allwinner,pull = <0>;
|
||||||
|
+ };
|
||||||
|
};
|
||||||
|
|
||||||
|
timer@01c20c00 {
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Date: Thu, 30 May 2013 03:49:23 +0000
|
||||||
|
Subject: [PATCH 04/10] ARM: sunxi: Add EMAC controller node to sun4i DTSI
|
||||||
|
Bug-Debian: http://bugs.debian.org/711998
|
||||||
|
|
||||||
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Tested-by: Richard Genoud <richard.genoud@gmail.com>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
(cherry picked from commit e38afcb33ff4b472254c8f6f140699e002c44d84)
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/sun4i-a10.dtsi | 16 ++++++++++++++++
|
||||||
|
1 file changed, 16 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
|
||||||
|
index ff1f41f..983da33 100644
|
||||||
|
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
|
||||||
|
@@ -163,6 +163,22 @@
|
||||||
|
reg = <0x01c20000 0x300000>;
|
||||||
|
ranges;
|
||||||
|
|
||||||
|
+ emac: ethernet@01c0b000 {
|
||||||
|
+ compatible = "allwinner,sun4i-emac";
|
||||||
|
+ reg = <0x01c0b000 0x1000>;
|
||||||
|
+ interrupts = <55>;
|
||||||
|
+ clocks = <&ahb_gates 17>;
|
||||||
|
+ status = "disabled";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ mdio@01c0b080 {
|
||||||
|
+ compatible = "allwinner,sun4i-mdio";
|
||||||
|
+ reg = <0x01c0b080 0x14>;
|
||||||
|
+ status = "disabled";
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <0>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
intc: interrupt-controller@01c20400 {
|
||||||
|
compatible = "allwinner,sun4i-ic";
|
||||||
|
reg = <0x01c20400 0x400>;
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
From: Stefan Roese <sr@denx.de>
|
||||||
|
Date: Thu, 30 May 2013 03:49:24 +0000
|
||||||
|
Subject: [PATCH 05/10] ARM: cubieboard: Enable ethernet (EMAC) support in dts
|
||||||
|
Bug-Debian: http://bugs.debian.org/711998
|
||||||
|
|
||||||
|
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||||
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Tested-by: Richard Genoud <richard.genoud@gmail.com>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
(cherry picked from commit e5a84bac5d6797c64541f87e7a567d56699bbb74)
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 15 +++++++++++++++
|
||||||
|
1 file changed, 15 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
|
||||||
|
index b70fe0d..e752b57 100644
|
||||||
|
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
|
||||||
|
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
|
||||||
|
@@ -27,6 +27,21 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
soc@01c20000 {
|
||||||
|
+ emac: ethernet@01c0b000 {
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&emac_pins_a>;
|
||||||
|
+ phy = <&phy1>;
|
||||||
|
+ status = "okay";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ mdio@01c0b080 {
|
||||||
|
+ status = "okay";
|
||||||
|
+
|
||||||
|
+ phy1: ethernet-phy@1 {
|
||||||
|
+ reg = <1>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
pinctrl@01c20800 {
|
||||||
|
led_pins_cubieboard: led_pins@0 {
|
||||||
|
allwinner,pins = "PH20", "PH21";
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
75
debian/patches/features/arm/sunxi-emac/0006-ARM-sunxi-Add-EMAC-Controller-to-Hackberry-dt.patch
vendored
Normal file
75
debian/patches/features/arm/sunxi-emac/0006-ARM-sunxi-Add-EMAC-Controller-to-Hackberry-dt.patch
vendored
Normal file
|
@ -0,0 +1,75 @@
|
||||||
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Date: Thu, 30 May 2013 03:49:25 +0000
|
||||||
|
Subject: [PATCH 06/10] ARM: sunxi: Add EMAC Controller to Hackberry dt
|
||||||
|
Bug-Debian: http://bugs.debian.org/711998
|
||||||
|
|
||||||
|
The Hackberry has a PHY that needs to be powered up through a GPIO, so
|
||||||
|
we need to use a fixed regulator here.
|
||||||
|
|
||||||
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Tested-by: Richard Genoud <richard.genoud@gmail.com>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
(cherry picked from commit d97a079a79a7dcbc2470572b41cd1f07a16d8b7f)
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 41 +++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 41 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
|
||||||
|
index b9efac1..3514b37 100644
|
||||||
|
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
|
||||||
|
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
|
||||||
|
@@ -23,10 +23,51 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
soc@01c20000 {
|
||||||
|
+ emac: ethernet@01c0b000 {
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&emac_pins_a>;
|
||||||
|
+ phy = <&phy0>;
|
||||||
|
+ status = "okay";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ mdio@01c0b080 {
|
||||||
|
+ phy-supply = <®_emac_3v3>;
|
||||||
|
+ status = "okay";
|
||||||
|
+
|
||||||
|
+ phy0: ethernet-phy@0 {
|
||||||
|
+ reg = <0>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ pio: pinctrl@01c20800 {
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&hackberry_hogs>;
|
||||||
|
+
|
||||||
|
+ hackberry_hogs: hogs@0 {
|
||||||
|
+ allwinner,pins = "PH19";
|
||||||
|
+ allwinner,function = "gpio_out";
|
||||||
|
+ allwinner,drive = <0>;
|
||||||
|
+ allwinner,pull = <0>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
uart0: serial@01c28000 {
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&uart0_pins_a>;
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+ regulators {
|
||||||
|
+ compatible = "simple-bus";
|
||||||
|
+
|
||||||
|
+ reg_emac_3v3: emac-3v3 {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "emac-3v3";
|
||||||
|
+ regulator-min-microvolt = <3300000>;
|
||||||
|
+ regulator-max-microvolt = <3300000>;
|
||||||
|
+ enable-active-high;
|
||||||
|
+ gpio = <&pio 7 19 0>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
};
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
31
debian/patches/features/arm/sunxi-emac/0007-net-sun4i-emac-fix-a-typo-in-emac_probe.patch
vendored
Normal file
31
debian/patches/features/arm/sunxi-emac/0007-net-sun4i-emac-fix-a-typo-in-emac_probe.patch
vendored
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
|
||||||
|
Date: Mon, 3 Jun 2013 03:36:52 +0000
|
||||||
|
Subject: [PATCH 07/10] net: sun4i-emac: fix a typo in emac_probe()
|
||||||
|
Bug-Debian: http://bugs.debian.org/711998
|
||||||
|
|
||||||
|
Just fixed a typo in emac_probe().
|
||||||
|
|
||||||
|
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
|
||||||
|
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
(cherry picked from commit 93baf4c615584fa02c21aa78f305428fc7060656)
|
||||||
|
---
|
||||||
|
drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
index b411344..26083cd 100644
|
||||||
|
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
@@ -821,7 +821,7 @@ static int emac_probe(struct platform_device *pdev)
|
||||||
|
db->membase = of_iomap(np, 0);
|
||||||
|
if (!db->membase) {
|
||||||
|
dev_err(&pdev->dev, "failed to remap registers\n");
|
||||||
|
- return -ENOMEM;
|
||||||
|
+ ret = -ENOMEM;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
43
debian/patches/features/arm/sunxi-emac/0008-net-sun4i-emac-remove-erroneous-assignment.patch
vendored
Normal file
43
debian/patches/features/arm/sunxi-emac/0008-net-sun4i-emac-remove-erroneous-assignment.patch
vendored
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
From: Arnd Bergmann <arnd@arndb.de>
|
||||||
|
Date: Mon, 3 Jun 2013 11:36:50 +0000
|
||||||
|
Subject: [PATCH 08/10] net: sun4i-emac: remove erroneous assignment
|
||||||
|
Bug-Debian: http://bugs.debian.org/711998
|
||||||
|
|
||||||
|
The newly added sun4i-emac driver causes a build error when
|
||||||
|
CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
|
||||||
|
assign a pointer to netdev->poll_controller, which has
|
||||||
|
been replaced with ops->ndo_poll_controller in 2.6.31!
|
||||||
|
|
||||||
|
The correct assignment is present as well, so we just need
|
||||||
|
to remove the wrong one.
|
||||||
|
|
||||||
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
||||||
|
Cc: Stefan Roese <sr@denx.de>
|
||||||
|
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Cc: Richard Genoud <richard.genoud@gmail.com>
|
||||||
|
Acked-by: Stefan Roese <sr@denx.de>
|
||||||
|
Acked-by: Maxime Ripard <maxime.ripard@anandra.org>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
(cherry picked from commit 10e179e364beafc23d837e81cf98d99720f42551)
|
||||||
|
---
|
||||||
|
drivers/net/ethernet/allwinner/sun4i-emac.c | 4 ----
|
||||||
|
1 file changed, 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
index 26083cd..0bb2f4a 100644
|
||||||
|
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
@@ -869,10 +869,6 @@ static int emac_probe(struct platform_device *pdev)
|
||||||
|
ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
|
||||||
|
ndev->ethtool_ops = &emac_ethtool_ops;
|
||||||
|
|
||||||
|
-#ifdef CONFIG_NET_POLL_CONTROLLER
|
||||||
|
- ndev->poll_controller = &emac_poll_controller;
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
platform_set_drvdata(pdev, ndev);
|
||||||
|
|
||||||
|
/* Carrier starts down, phylib will bring it up */
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
From: Sachin Kamat <sachin.kamat@linaro.org>
|
||||||
|
Date: Tue, 4 Jun 2013 00:31:19 +0000
|
||||||
|
Subject: [PATCH 09/10] net: sun4i-emac: Remove redundant
|
||||||
|
platform_set_drvdata()
|
||||||
|
Bug-Debian: http://bugs.debian.org/711998
|
||||||
|
|
||||||
|
Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
|
||||||
|
driver is bound) removes the need to set driver data field to
|
||||||
|
NULL.
|
||||||
|
|
||||||
|
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
|
||||||
|
Cc: Stefan Roese <sr@denx.de>
|
||||||
|
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
(cherry picked from commit aff5c3557cf72fcad913d8b4b44b055a4e034bb5)
|
||||||
|
---
|
||||||
|
drivers/net/ethernet/allwinner/sun4i-emac.c | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
index 0bb2f4a..e9c8dbe 100644
|
||||||
|
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
@@ -898,8 +898,6 @@ static int emac_remove(struct platform_device *pdev)
|
||||||
|
{
|
||||||
|
struct net_device *ndev = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
|
- platform_set_drvdata(pdev, NULL);
|
||||||
|
-
|
||||||
|
unregister_netdev(ndev);
|
||||||
|
free_netdev(ndev);
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
41
debian/patches/features/arm/sunxi-emac/0010-net-sun4i-emac-Staticize-local-symbols.patch
vendored
Normal file
41
debian/patches/features/arm/sunxi-emac/0010-net-sun4i-emac-Staticize-local-symbols.patch
vendored
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
From: Sachin Kamat <sachin.kamat@linaro.org>
|
||||||
|
Date: Tue, 4 Jun 2013 00:31:20 +0000
|
||||||
|
Subject: [PATCH 10/10] net: sun4i-emac: Staticize local symbols
|
||||||
|
Bug-Debian: http://bugs.debian.org/711998
|
||||||
|
|
||||||
|
Some symbols referenced only in this file are made static.
|
||||||
|
|
||||||
|
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
|
||||||
|
Cc: Stefan Roese <sr@denx.de>
|
||||||
|
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
(cherry picked from commit 11a164a04382d735230b01f4cc46ad78a7c4abf6)
|
||||||
|
---
|
||||||
|
drivers/net/ethernet/allwinner/sun4i-emac.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
index e9c8dbe..50b853a 100644
|
||||||
|
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
|
||||||
|
@@ -258,7 +258,7 @@ static const struct ethtool_ops emac_ethtool_ops = {
|
||||||
|
.get_link = ethtool_op_get_link,
|
||||||
|
};
|
||||||
|
|
||||||
|
-unsigned int emac_setup(struct net_device *ndev)
|
||||||
|
+static unsigned int emac_setup(struct net_device *ndev)
|
||||||
|
{
|
||||||
|
struct emac_board_info *db = netdev_priv(ndev);
|
||||||
|
unsigned int reg_val;
|
||||||
|
@@ -310,7 +310,7 @@ unsigned int emac_setup(struct net_device *ndev)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-unsigned int emac_powerup(struct net_device *ndev)
|
||||||
|
+static unsigned int emac_powerup(struct net_device *ndev)
|
||||||
|
{
|
||||||
|
struct emac_board_info *db = netdev_priv(ndev);
|
||||||
|
unsigned int reg_val;
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
|
@ -88,3 +88,13 @@ features/arm/imx53-qsb-usb-power.patch
|
||||||
bugfix/all/ath9k-Disable-PowerSave-by-default.patch
|
bugfix/all/ath9k-Disable-PowerSave-by-default.patch
|
||||||
bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
|
bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
|
||||||
bugfix/all/iwlegacy-use-consistent-condition-for-il_pm_ops.patch
|
bugfix/all/iwlegacy-use-consistent-condition-for-il_pm_ops.patch
|
||||||
|
features/arm/sunxi-emac/0001-net-Add-EMAC-ethernet-driver-found-on-Allwinner-A10-.patch
|
||||||
|
features/arm/sunxi-emac/0002-net-Add-MDIO-bus-driver-for-the-Allwinner-EMAC.patch
|
||||||
|
features/arm/sunxi-emac/0003-ARM-sun4i-Add-muxing-options-for-the-ethernet-contro.patch
|
||||||
|
features/arm/sunxi-emac/0004-ARM-sunxi-Add-EMAC-controller-node-to-sun4i-DTSI.patch
|
||||||
|
features/arm/sunxi-emac/0005-ARM-cubieboard-Enable-ethernet-EMAC-support-in-dts.patch
|
||||||
|
features/arm/sunxi-emac/0006-ARM-sunxi-Add-EMAC-Controller-to-Hackberry-dt.patch
|
||||||
|
features/arm/sunxi-emac/0007-net-sun4i-emac-fix-a-typo-in-emac_probe.patch
|
||||||
|
features/arm/sunxi-emac/0008-net-sun4i-emac-remove-erroneous-assignment.patch
|
||||||
|
features/arm/sunxi-emac/0009-net-sun4i-emac-Remove-redundant-platform_set_drvdata.patch
|
||||||
|
features/arm/sunxi-emac/0010-net-sun4i-emac-Staticize-local-symbols.patch
|
||||||
|
|
Loading…
Reference in New Issue