| 1 | --- a/arch/mips/include/asm/war.h |
| 2 | +++ b/arch/mips/include/asm/war.h |
| 3 | @@ -9,7 +9,7 @@ |
| 4 | #ifndef _ASM_WAR_H |
| 5 | #define _ASM_WAR_H |
| 6 | |
| 7 | -#include <war.h> |
| 8 | +#include <asm/mach-adm5120/war.h> |
| 9 | |
| 10 | /* |
| 11 | * Work around certain R4000 CPU errata (as implemented by GCC): |
| 12 | --- a/drivers/amba/bus.c |
| 13 | +++ b/drivers/amba/bus.c |
| 14 | @@ -16,7 +16,7 @@ |
| 15 | #include <linux/amba/bus.h> |
| 16 | |
| 17 | #include <asm/irq.h> |
| 18 | -#include <asm/sizes.h> |
| 19 | +#include <asm/mach-adm5120/asm/sizes.h> |
| 20 | |
| 21 | #ifndef NO_IRQ |
| 22 | #define NO_IRQ (-1) |
| 23 | --- a/drivers/watchdog/adm5120_wdt.c |
| 24 | +++ b/drivers/watchdog/adm5120_wdt.c |
| 25 | @@ -166,7 +166,7 @@ static const struct file_operations wdt_ |
| 26 | .owner = THIS_MODULE, |
| 27 | .llseek = no_llseek, |
| 28 | .write = wdt_write, |
| 29 | - .ioctl = wdt_ioctl, |
| 30 | + .unlocked_ioctl = wdt_ioctl, |
| 31 | .open = wdt_open, |
| 32 | .release = wdt_release, |
| 33 | }; |
| 34 | --- a/arch/mips/Kbuild.platforms |
| 35 | +++ b/arch/mips/Kbuild.platforms |
| 36 | @@ -1,5 +1,6 @@ |
| 37 | # All platforms listed in alphabetic order |
| 38 | |
| 39 | +platforms += adm5120 |
| 40 | platforms += alchemy |
| 41 | platforms += ar7 |
| 42 | platforms += ath79 |
| 43 | --- a/drivers/net/adm5120sw.c |
| 44 | +++ b/drivers/net/adm5120sw.c |
| 45 | @@ -26,6 +26,7 @@ |
| 46 | #include <linux/platform_device.h> |
| 47 | #include <linux/io.h> |
| 48 | #include <linux/irq.h> |
| 49 | +#include <asm/mach-adm5120/irq.h> |
| 50 | |
| 51 | #include <linux/netdevice.h> |
| 52 | #include <linux/etherdevice.h> |
| 53 | --- a/arch/mips/adm5120/common/clock.c |
| 54 | +++ b/arch/mips/adm5120/common/clock.c |
| 55 | @@ -33,7 +33,7 @@ static struct clk uart_clk = { |
| 56 | |
| 57 | struct clk *clk_get(struct device *dev, const char *id) |
| 58 | { |
| 59 | - char *name = dev_name(dev); |
| 60 | + const char *name = dev_name(dev); |
| 61 | |
| 62 | if (!strcmp(name, "apb:uart0") || !strcmp(name, "apb:uart1")) |
| 63 | return &uart_clk; |
| 64 | --- /dev/null |
| 65 | +++ b/arch/mips/adm5120/Platform |
| 66 | @@ -0,0 +1,53 @@ |
| 67 | +# |
| 68 | +# Core Infineon/ADMtek ADM5120 |
| 69 | +# |
| 70 | +platform-$(CONFIG_ADM5120) += adm5120/common/ |
| 71 | + |
| 72 | +# |
| 73 | +# OEM CELLVISION |
| 74 | +# |
| 75 | +platform-$(CONFIG_ADM5120_OEM_CELLVISION) += adm5120/cellvision/ |
| 76 | + |
| 77 | +# |
| 78 | +# OEM COMPEX |
| 79 | +# |
| 80 | +platform-$(CONFIG_ADM5120_OEM_COMPEX) += adm5120/compex/ |
| 81 | + |
| 82 | +# |
| 83 | +# OEM EDIMAX |
| 84 | +# |
| 85 | +platform-$(CONFIG_ADM5120_OEM_EDIMAX) += adm5120/edimax/ |
| 86 | + |
| 87 | +# |
| 88 | +# OEM GENERIC |
| 89 | +# |
| 90 | +platform-$(CONFIG_ADM5120_OEM_GENERIC) += adm5120/generic/ |
| 91 | + |
| 92 | +# |
| 93 | +# OEM INFINEON |
| 94 | +# |
| 95 | +platform-$(CONFIG_ADM5120_OEM_INFINEON) += adm5120/infineon/ |
| 96 | + |
| 97 | +# |
| 98 | +# OEM MIKROTIK |
| 99 | +# |
| 100 | +platform-$(CONFIG_ADM5120_OEM_MIKROTIK) += adm5120/mikrotik/ |
| 101 | + |
| 102 | +# |
| 103 | +# OEM MOTOROLA |
| 104 | +# |
| 105 | +platform-$(CONFIG_ADM5120_OEM_MOTOROLA) += adm5120/motorola/ |
| 106 | + |
| 107 | +# |
| 108 | +# OEM OSBRIDGE |
| 109 | +# |
| 110 | +platform-$(CONFIG_ADM5120_OEM_OSBRIDGE) += adm5120/osbridge/ |
| 111 | + |
| 112 | +# |
| 113 | +# OEM ZYXEL |
| 114 | +# |
| 115 | +platform-$(CONFIG_ADM5120_OEM_ZYXEL) += adm5120/zyxel/ |
| 116 | + |
| 117 | +cflags-$(CONFIG_ADM5120) += -I$(srctree)/arch/mips/include/asm/mach-adm5120 |
| 118 | +libs-$(CONFIG_ADM5120) += arch/mips/adm5120/prom/ |
| 119 | +load-$(CONFIG_ADM5120) += 0xffffffff80001000 |
| 120 | |
