aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/gemini/patches-3.10/121-arm-gemini-add-ethernet-device.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-07-06 17:51:14 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-07-06 17:51:14 +0000
commit3f78cadedd901579d8592fa4d6297899bec3a333 (patch)
tree3f0715628a962bda0ec01a437dfc6b57bc3d763e /target/linux/gemini/patches-3.10/121-arm-gemini-add-ethernet-device.patch
parent3597b7d456f33f4d27c3d8e07e9707b30e13cfc1 (diff)
downloadupstream-3f78cadedd901579d8592fa4d6297899bec3a333.tar.gz
upstream-3f78cadedd901579d8592fa4d6297899bec3a333.tar.bz2
upstream-3f78cadedd901579d8592fa4d6297899bec3a333.zip
gemini: add support for kernel 3.10
This is compile tested only, please run test and report back. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 41531
Diffstat (limited to 'target/linux/gemini/patches-3.10/121-arm-gemini-add-ethernet-device.patch')
-rw-r--r--target/linux/gemini/patches-3.10/121-arm-gemini-add-ethernet-device.patch82
1 files changed, 82 insertions, 0 deletions
diff --git a/target/linux/gemini/patches-3.10/121-arm-gemini-add-ethernet-device.patch b/target/linux/gemini/patches-3.10/121-arm-gemini-add-ethernet-device.patch
new file mode 100644
index 0000000000..d6def9b687
--- /dev/null
+++ b/target/linux/gemini/patches-3.10/121-arm-gemini-add-ethernet-device.patch
@@ -0,0 +1,82 @@
+--- a/arch/arm/mach-gemini/common.h
++++ b/arch/arm/mach-gemini/common.h
+@@ -13,6 +13,7 @@
+ #define __GEMINI_COMMON_H__
+
+ struct mtd_partition;
++struct gemini_gmac_platform_data;
+
+ extern void gemini_map_io(void);
+ extern void gemini_init_irq(void);
+@@ -26,6 +27,7 @@ extern int platform_register_pflash(unsi
+ struct mtd_partition *parts,
+ unsigned int nr_parts);
+ extern int platform_register_watchdog(void);
++extern int platform_register_ethernet(struct gemini_gmac_platform_data *pdata);
+
+ extern void gemini_restart(char mode, const char *cmd);
+
+--- a/arch/arm/mach-gemini/devices.c
++++ b/arch/arm/mach-gemini/devices.c
+@@ -17,6 +17,7 @@
+ #include <mach/irqs.h>
+ #include <mach/hardware.h>
+ #include <mach/global_reg.h>
++#include <mach/gmac.h>
+ #include "common.h"
+
+ static struct plat_serial8250_port serial_platform_data[] = {
+@@ -134,3 +135,53 @@ int __init platform_register_watchdog(vo
+ {
+ return platform_device_register(&wdt_device);
+ }
++
++static struct resource gmac_resources[] = {
++ {
++ .start = 0x60000000,
++ .end = 0x6000ffff,
++ .flags = IORESOURCE_MEM,
++ },
++ {
++ .start = IRQ_GMAC0,
++ .end = IRQ_GMAC0,
++ .flags = IORESOURCE_IRQ,
++ },
++ {
++ .start = IRQ_GMAC1,
++ .end = IRQ_GMAC1,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++static u64 gmac_dmamask = 0xffffffffUL;
++
++static struct platform_device ethernet_device = {
++ .name = "gemini-gmac",
++ .id = 0,
++ .dev = {
++ .dma_mask = &gmac_dmamask,
++ .coherent_dma_mask = DMA_BIT_MASK(32),
++ },
++ .num_resources = ARRAY_SIZE(gmac_resources),
++ .resource = gmac_resources,
++};
++
++int __init platform_register_ethernet(struct gemini_gmac_platform_data *pdata)
++{
++ unsigned int reg;
++
++ reg = __raw_readl(IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_MISC_CTRL);
++ reg &= ~(GMAC_GMII | GMAC_1_ENABLE);
++
++ if (pdata->bus_id[1])
++ reg |= GMAC_1_ENABLE;
++ else if (pdata->interface[0] == PHY_INTERFACE_MODE_GMII)
++ reg |= GMAC_GMII;
++
++ __raw_writel(reg, IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_MISC_CTRL);
++
++ ethernet_device.dev.platform_data = pdata;
++
++ return platform_device_register(&ethernet_device);
++}