diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-22 17:26:37 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-04-26 15:45:21 -0400 |
commit | aeba6964788d0d8ac0a32113ffecdfdb0db7c786 (patch) | |
tree | acb1eb46e31f20784895aed11d13f35d0aeba581 /arch/arm/mach-orion5x | |
parent | 9c4d82e5c2aad09becd1b370c9ead7bc087ce406 (diff) |
ARM: orion5x: remove unneeded code for edmini_v2
The edmini_v2 platform is now fully converted to the Device Tree, so
we can get rid of the old style board-file and the related Kconfig
option.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1398202002-28530-34-git-send-email-thomas.petazzoni@free-electrons.com
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-orion5x')
-rw-r--r-- | arch/arm/mach-orion5x/Kconfig | 8 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/board-dt.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/common.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/edmini_v2-setup.c | 53 |
5 files changed, 0 insertions, 72 deletions
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index 3c69a3c0ab46..928f4cbdb7f3 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig | |||
@@ -107,14 +107,6 @@ config MACH_MV2120 | |||
107 | Say 'Y' here if you want your kernel to support the | 107 | Say 'Y' here if you want your kernel to support the |
108 | HP Media Vault mv2120 or mv5100. | 108 | HP Media Vault mv2120 or mv5100. |
109 | 109 | ||
110 | config MACH_EDMINI_V2_DT | ||
111 | bool "LaCie Ethernet Disk mini V2 (Flattened Device Tree)" | ||
112 | select I2C_BOARDINFO | ||
113 | select ARCH_ORION5X_DT | ||
114 | help | ||
115 | Say 'Y' here if you want your kernel to support the | ||
116 | LaCie Ethernet Disk mini V2 (Flattened Device Tree). | ||
117 | |||
118 | config MACH_D2NET | 110 | config MACH_D2NET |
119 | bool "LaCie d2 Network" | 111 | bool "LaCie d2 Network" |
120 | select I2C_BOARDINFO | 112 | select I2C_BOARDINFO |
diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile index 45da805fb236..e8fdbdd02e95 100644 --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion5x/Makefile | |||
@@ -23,4 +23,3 @@ obj-$(CONFIG_MACH_RD88F6183AP_GE) += rd88f6183ap-ge-setup.o | |||
23 | obj-$(CONFIG_MACH_LINKSTATION_LSCHL) += ls-chl-setup.o | 23 | obj-$(CONFIG_MACH_LINKSTATION_LSCHL) += ls-chl-setup.o |
24 | 24 | ||
25 | obj-$(CONFIG_ARCH_ORION5X_DT) += board-dt.o | 25 | obj-$(CONFIG_ARCH_ORION5X_DT) += board-dt.o |
26 | obj-$(CONFIG_MACH_EDMINI_V2_DT) += edmini_v2-setup.o | ||
diff --git a/arch/arm/mach-orion5x/board-dt.c b/arch/arm/mach-orion5x/board-dt.c index 6dc4846519ec..78d2e528f982 100644 --- a/arch/arm/mach-orion5x/board-dt.c +++ b/arch/arm/mach-orion5x/board-dt.c | |||
@@ -61,9 +61,6 @@ static void __init orion5x_dt_init(void) | |||
61 | cpu_idle_poll_ctrl(true); | 61 | cpu_idle_poll_ctrl(true); |
62 | } | 62 | } |
63 | 63 | ||
64 | if (of_machine_is_compatible("lacie,ethernet-disk-mini-v2")) | ||
65 | edmini_v2_init(); | ||
66 | |||
67 | of_platform_populate(NULL, of_default_bus_match_table, | 64 | of_platform_populate(NULL, of_default_bus_match_table, |
68 | orion5x_auxdata_lookup, NULL); | 65 | orion5x_auxdata_lookup, NULL); |
69 | } | 66 | } |
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h index f565f9944af2..7d64a17a3943 100644 --- a/arch/arm/mach-orion5x/common.h +++ b/arch/arm/mach-orion5x/common.h | |||
@@ -64,13 +64,6 @@ int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); | |||
64 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); | 64 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); |
65 | int orion5x_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin); | 65 | int orion5x_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin); |
66 | 66 | ||
67 | /* board init functions for boards not fully converted to fdt */ | ||
68 | #ifdef CONFIG_MACH_EDMINI_V2_DT | ||
69 | void edmini_v2_init(void); | ||
70 | #else | ||
71 | static inline void edmini_v2_init(void) {}; | ||
72 | #endif | ||
73 | |||
74 | struct meminfo; | 67 | struct meminfo; |
75 | struct tag; | 68 | struct tag; |
76 | extern void __init tag_fixup_mem32(struct tag *, char **, struct meminfo *); | 69 | extern void __init tag_fixup_mem32(struct tag *, char **, struct meminfo *); |
diff --git a/arch/arm/mach-orion5x/edmini_v2-setup.c b/arch/arm/mach-orion5x/edmini_v2-setup.c deleted file mode 100644 index 6bef2d50e16d..000000000000 --- a/arch/arm/mach-orion5x/edmini_v2-setup.c +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-orion5x/edmini_v2-setup.c | ||
3 | * | ||
4 | * LaCie Ethernet Disk mini V2 Setup | ||
5 | * | ||
6 | * Copyright (C) 2008 Christopher Moore <moore@free.fr> | ||
7 | * Copyright (C) 2008 Albert Aribaud <albert.aribaud@free.fr> | ||
8 | * | ||
9 | * This file is licensed under the terms of the GNU General Public | ||
10 | * License version 2. This program is licensed "as is" without any | ||
11 | * warranty of any kind, whether express or implied. | ||
12 | */ | ||
13 | |||
14 | /* | ||
15 | * TODO: add Orion USB device port init when kernel.org support is added. | ||
16 | * TODO: add flash write support: see below. | ||
17 | * TODO: add power-off support. | ||
18 | * TODO: add I2C EEPROM support. | ||
19 | */ | ||
20 | |||
21 | #include <linux/kernel.h> | ||
22 | #include <linux/init.h> | ||
23 | #include <linux/platform_device.h> | ||
24 | #include <linux/pci.h> | ||
25 | #include <linux/irq.h> | ||
26 | #include <linux/mbus.h> | ||
27 | #include <linux/mtd/physmap.h> | ||
28 | #include <linux/leds.h> | ||
29 | #include <linux/gpio_keys.h> | ||
30 | #include <linux/input.h> | ||
31 | #include <linux/i2c.h> | ||
32 | #include <linux/ata_platform.h> | ||
33 | #include <linux/gpio.h> | ||
34 | #include <asm/mach-types.h> | ||
35 | #include <asm/mach/arch.h> | ||
36 | #include <asm/mach/pci.h> | ||
37 | #include <mach/orion5x.h> | ||
38 | #include "common.h" | ||
39 | #include "mpp.h" | ||
40 | |||
41 | /***************************************************************************** | ||
42 | * EDMINI_V2 Info | ||
43 | ****************************************************************************/ | ||
44 | |||
45 | /***************************************************************************** | ||
46 | * General Setup | ||
47 | ****************************************************************************/ | ||
48 | |||
49 | void __init edmini_v2_init(void) | ||
50 | { | ||
51 | pr_notice("edmini_v2: USB device port, flash write and power-off " | ||
52 | "are not yet supported.\n"); | ||
53 | } | ||