diff options
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/board-t5325.c | 26 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/board.h | 6 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/kirkwood.c | 3 |
5 files changed, 0 insertions, 43 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 8c9fd60de40d..d6b0a772a6dd 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig | |||
| @@ -104,13 +104,6 @@ config MACH_KIRKWOOD | |||
| 104 | Say 'Y' here if you want your kernel to support boards based | 104 | Say 'Y' here if you want your kernel to support boards based |
| 105 | on the Marvell Kirkwood device tree. | 105 | on the Marvell Kirkwood device tree. |
| 106 | 106 | ||
| 107 | config MACH_T5325 | ||
| 108 | bool "HP T5325 thin client" | ||
| 109 | depends on MACH_KIRKWOOD | ||
| 110 | help | ||
| 111 | Say 'Y' here if you want your kernel to support the | ||
| 112 | HP T5325 Thin client | ||
| 113 | |||
| 114 | endmenu | 107 | endmenu |
| 115 | 108 | ||
| 116 | endif | 109 | endif |
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index ec0b2177d991..854b72af9faa 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile | |||
| @@ -13,4 +13,3 @@ endif | |||
| 13 | 13 | ||
| 14 | obj-$(CONFIG_MACH_DOVE) += dove.o | 14 | obj-$(CONFIG_MACH_DOVE) += dove.o |
| 15 | obj-$(CONFIG_MACH_KIRKWOOD) += kirkwood.o kirkwood-pm.o | 15 | obj-$(CONFIG_MACH_KIRKWOOD) += kirkwood.o kirkwood-pm.o |
| 16 | obj-$(CONFIG_MACH_T5325) += board-t5325.o | ||
diff --git a/arch/arm/mach-mvebu/board-t5325.c b/arch/arm/mach-mvebu/board-t5325.c deleted file mode 100644 index f2401b298218..000000000000 --- a/arch/arm/mach-mvebu/board-t5325.c +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * HP T5325 Board Setup | ||
| 3 | * | ||
| 4 | * Copyright (C) 2014 | ||
| 5 | * | ||
| 6 | * Andrew Lunn <andrew@lunn.ch> | ||
| 7 | * | ||
| 8 | * This file is licensed under the terms of the GNU General Public | ||
| 9 | * License version 2. This program is licensed "as is" without any | ||
| 10 | * warranty of any kind, whether express or implied. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/kernel.h> | ||
| 14 | #include <linux/init.h> | ||
| 15 | #include <linux/platform_device.h> | ||
| 16 | #include "board.h" | ||
| 17 | |||
| 18 | static struct platform_device hp_t5325_audio_device = { | ||
| 19 | .name = "t5325-audio", | ||
| 20 | .id = -1, | ||
| 21 | }; | ||
| 22 | |||
| 23 | void __init t5325_init(void) | ||
| 24 | { | ||
| 25 | platform_device_register(&hp_t5325_audio_device); | ||
| 26 | } | ||
diff --git a/arch/arm/mach-mvebu/board.h b/arch/arm/mach-mvebu/board.h index de7f0a191394..9c7bb4386f8b 100644 --- a/arch/arm/mach-mvebu/board.h +++ b/arch/arm/mach-mvebu/board.h | |||
| @@ -13,10 +13,4 @@ | |||
| 13 | #ifndef __ARCH_MVEBU_BOARD_H | 13 | #ifndef __ARCH_MVEBU_BOARD_H |
| 14 | #define __ARCH_MVEBU_BOARD_H | 14 | #define __ARCH_MVEBU_BOARD_H |
| 15 | 15 | ||
| 16 | #ifdef CONFIG_MACH_T5325 | ||
| 17 | void t5325_init(void); | ||
| 18 | #else | ||
| 19 | static inline void t5325_init(void) {}; | ||
| 20 | #endif | ||
| 21 | |||
| 22 | #endif | 16 | #endif |
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index a77e0bae9c55..46f105913c84 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c | |||
| @@ -180,9 +180,6 @@ static void __init kirkwood_dt_init(void) | |||
| 180 | kirkwood_pm_init(); | 180 | kirkwood_pm_init(); |
| 181 | kirkwood_dt_eth_fixup(); | 181 | kirkwood_dt_eth_fixup(); |
| 182 | 182 | ||
| 183 | if (of_machine_is_compatible("hp,t5325")) | ||
| 184 | t5325_init(); | ||
| 185 | |||
| 186 | of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL); | 183 | of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL); |
| 187 | } | 184 | } |
| 188 | 185 | ||
