[generic/3.9]: refresh patches against -rc4
[openwrt.git] / target / linux / gemini / patches-3.8 / 121-arm-gemini-add-ethernet-device.patch
1 --- a/arch/arm/mach-gemini/common.h
2 +++ b/arch/arm/mach-gemini/common.h
3 @@ -13,6 +13,7 @@
4  #define __GEMINI_COMMON_H__
5  
6  struct mtd_partition;
7 +struct gemini_gmac_platform_data;
8  
9  extern void gemini_map_io(void);
10  extern void gemini_init_irq(void);
11 @@ -26,6 +27,7 @@ extern int platform_register_pflash(unsi
12                                     struct mtd_partition *parts,
13                                     unsigned int nr_parts);
14  extern int platform_register_watchdog(void);
15 +extern int platform_register_ethernet(struct gemini_gmac_platform_data *pdata);
16  
17  extern void gemini_restart(char mode, const char *cmd);
18  
19 --- a/arch/arm/mach-gemini/devices.c
20 +++ b/arch/arm/mach-gemini/devices.c
21 @@ -17,6 +17,7 @@
22  #include <mach/irqs.h>
23  #include <mach/hardware.h>
24  #include <mach/global_reg.h>
25 +#include <mach/gmac.h>
26  #include "common.h"
27  
28  static struct plat_serial8250_port serial_platform_data[] = {
29 @@ -134,3 +135,53 @@ int __init platform_register_watchdog(vo
30  {
31         return platform_device_register(&wdt_device);
32  }
33 +
34 +static struct resource gmac_resources[] = {
35 +       {
36 +               .start  = 0x60000000,
37 +               .end    = 0x6000ffff,
38 +               .flags  = IORESOURCE_MEM,
39 +       },
40 +       {
41 +               .start  = IRQ_GMAC0,
42 +               .end    = IRQ_GMAC0,
43 +               .flags  = IORESOURCE_IRQ,
44 +       },
45 +       {
46 +               .start  = IRQ_GMAC1,
47 +               .end    = IRQ_GMAC1,
48 +               .flags  = IORESOURCE_IRQ,
49 +       },
50 +};
51 +
52 +static u64 gmac_dmamask = 0xffffffffUL;
53 +
54 +static struct platform_device ethernet_device = {
55 +       .name   = "gemini-gmac",
56 +       .id     = 0,
57 +       .dev    = {
58 +               .dma_mask = &gmac_dmamask,
59 +               .coherent_dma_mask = DMA_BIT_MASK(32),
60 +       },
61 +       .num_resources  = ARRAY_SIZE(gmac_resources),
62 +       .resource       = gmac_resources,
63 +};
64 +
65 +int __init platform_register_ethernet(struct gemini_gmac_platform_data *pdata)
66 +{
67 +       unsigned int reg;
68 +
69 +       reg = __raw_readl(IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_MISC_CTRL);
70 +       reg &= ~(GMAC_GMII | GMAC_1_ENABLE);
71 +
72 +       if (pdata->bus_id[1])
73 +               reg |= GMAC_1_ENABLE;
74 +       else if (pdata->interface[0] == PHY_INTERFACE_MODE_GMII)
75 +               reg |= GMAC_GMII;
76 +
77 +       __raw_writel(reg, IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_MISC_CTRL);
78 +
79 +       ethernet_device.dev.platform_data = pdata;
80 +
81 +       return platform_device_register(&ethernet_device);
82 +}