Commit a977e18e authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Jason Cooper
Browse files

ARM: kirkwood: remove redundant DT board files 



With DT support for mv643xx_eth board specific init for some boards now
is unneccessary. Remove those board files, Kconfig entries, and
corresponding entries in kirkwood_defconfig.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent b4715df3

arch/arm/configs/kirkwood_defconfig

+0 −23
Original line number Diff line number Diff line
@@ -29,30 +29,7 @@ CONFIG_MACH_SHEEVAPLUG=y 
CONFIG_MACH_T5325=y

CONFIG_MACH_TS219=y

CONFIG_MACH_TS41X=y

CONFIG_MACH_CLOUDBOX_DT=y

CONFIG_MACH_DB88F628X_BP_DT=y

CONFIG_MACH_DLINK_KIRKWOOD_DT=y

CONFIG_MACH_DOCKSTAR_DT=y

CONFIG_MACH_DREAMPLUG_DT=y

CONFIG_MACH_GOFLEXNET_DT=y

CONFIG_MACH_GURUPLUG_DT=y

CONFIG_MACH_IB62X0_DT=y

CONFIG_MACH_ICONNECT_DT=y

CONFIG_MACH_INETSPACE_V2_DT=y

CONFIG_MACH_IOMEGA_IX2_200_DT=y

CONFIG_MACH_KM_KIRKWOOD_DT=y

CONFIG_MACH_LSXL_DT=y

CONFIG_MACH_MPLCEC4_DT=y

CONFIG_MACH_NETSPACE_LITE_V2_DT=y

CONFIG_MACH_NETSPACE_MAX_V2_DT=y

CONFIG_MACH_NETSPACE_MINI_V2_DT=y

CONFIG_MACH_NETSPACE_V2_DT=y

CONFIG_MACH_NSA310_DT=y

CONFIG_MACH_OPENBLOCKS_A6_DT=y

CONFIG_MACH_READYNAS_DT=y

CONFIG_MACH_SHEEVAPLUG_DT=y

CONFIG_MACH_TOPKICK_DT=y

CONFIG_MACH_TS219_DT=y

# CONFIG_CPU_FEROCEON_OLD_ID is not set

CONFIG_PCI_MVEBU=y

CONFIG_PREEMPT=y

arch/arm/mach-kirkwood/Kconfig

+0 −171
Original line number Diff line number Diff line
@@ -139,20 +139,6 @@ config ARCH_KIRKWOOD_DT 
	  Say 'Y' here if you want your kernel to support the

	  Marvell Kirkwood using flattened device tree.



config MACH_CLOUDBOX_DT

	bool "LaCie CloudBox NAS (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the LaCie

	  CloudBox NAS, using Flattened Device Tree.



config MACH_DB88F628X_BP_DT

	bool "Marvell DB-88F628x-BP Development Board (Flattened Device Tree)"

	help

	  Say 'Y' here if you want your kernel to support the Marvell

	  DB-88F6281-BP and DB-88F6282-BP Development Board (Flattened

	  Device Tree).



config MACH_DLINK_KIRKWOOD_DT

	bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT
@@ -161,163 +147,6 @@ config MACH_DLINK_KIRKWOOD_DT 
	  Kirkwood-based D-Link NASes such as DNS-320 & DNS-325,

	  using Flattened Device Tree.



config MACH_DOCKSTAR_DT

	bool "Seagate FreeAgent Dockstar (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  Seagate FreeAgent Dockstar (Flattened Device Tree).



config MACH_DREAMPLUG_DT

	bool "Marvell DreamPlug (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell DreamPlug (Flattened Device Tree).



config MACH_GOFLEXNET_DT

	bool "Seagate GoFlex Net (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  Seagate GoFlex Net (Flattened Device Tree).



config MACH_GURUPLUG_DT

	bool "Marvell GuruPlug Reference Board (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell GuruPlug Reference Board (Flattened Device Tree).



config MACH_IB62X0_DT

	bool "RaidSonic IB-NAS6210, IB-NAS6220 (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  RaidSonic IB-NAS6210 & IB-NAS6220 devices, using

	  Flattened Device Tree.



config MACH_ICONNECT_DT

	bool "Iomega Iconnect (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here to enable Iomega Iconnect support.



config MACH_INETSPACE_V2_DT

	bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the LaCie

	  Internet Space v2 NAS, using Flattened Device Tree.



config MACH_IOMEGA_IX2_200_DT

	bool "Iomega StorCenter ix2-200 (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  Iomega StorCenter ix2-200 (Flattened Device Tree).



config MACH_KM_KIRKWOOD_DT

	bool "Keymile Kirkwood Reference Design (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  Keymile Kirkwood Reference Desgin, using Flattened Device Tree.



config MACH_LSXL_DT

	bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	select POWER_RESET_RESTART

	help

	  Say 'Y' here if you want your kernel to support the

	  Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using

	  Flattened Device Tree.



config MACH_MPLCEC4_DT

	bool "MPL CEC4 (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  MPL CEC4 (Flattened Device Tree).



config MACH_NETSPACE_LITE_V2_DT

	bool "LaCie Network Space Lite v2 NAS (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the LaCie

	  Network Space Lite v2 NAS, using Flattened Device Tree.



config MACH_NETSPACE_MAX_V2_DT

	bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the LaCie

	  Network Space Max v2 NAS, using Flattened Device Tree.



config MACH_NETSPACE_MINI_V2_DT

	bool "LaCie Network Space Mini v2 NAS (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the LaCie

	  Network Space Mini v2 NAS using Flattened Device Tree.



	  This board is embedded in a product named CloudBox, which

	  provides automatic backup on a 100GB cloud storage. This

	  should not confused with a more recent LaCie NAS also named

	  CloudBox. For this last, the disk capacity is 1TB or above.



config MACH_NETSPACE_V2_DT

	bool "LaCie Network Space v2 NAS (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the LaCie

	  Network Space v2 NAS, using Flattened Device Tree.



config MACH_OPENBLOCKS_A6_DT

	bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  Plat'Home OpenBlocks A6 (Flattened Device Tree).



config MACH_READYNAS_DT

	bool "NETGEAR ReadyNAS Duo v2 (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	select ARM_APPENDED_DTB

	select ARM_ATAG_DTB_COMPAT

	help

	  Say 'Y' here if you want your kernel to support the

	  NETGEAR ReadyNAS Duo v2 using Fattened Device Tree.



config MACH_SHEEVAPLUG_DT

	bool "Marvell (eSATA) SheevaPlug (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell (eSATA) SheevaPlug (Flattened Device Tree).



config MACH_TOPKICK_DT

	bool "USI Topkick (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  USI Topkick, using Flattened Device Tree



config MACH_TS219_DT

	bool "Device Tree for QNAP TS-11X, TS-21X NAS"

	select ARCH_KIRKWOOD_DT

	select ARM_APPENDED_DTB

	select ARM_ATAG_DTB_COMPAT

	select POWER_RESET_QNAP

	help

	  Say 'Y' here if you want your kernel to support the QNAP

	  TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and

	  TS-219P+ Turbo NAS devices using Fattened Device Tree.

	  There are two different Device Tree descriptions, depending

	  on if the device is based on an if the board uses the MV6281

	  or MV6282. If you have the wrong one, the buttons will not

	  work.



endmenu



endif

arch/arm/mach-kirkwood/Makefile

+0 −22
Original line number Diff line number Diff line
@@ -19,26 +19,4 @@ obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o 
obj-$(CONFIG_MACH_TS41X)		+= ts41x-setup.o tsx1x-common.o



obj-$(CONFIG_ARCH_KIRKWOOD_DT)		+= board-dt.o

obj-$(CONFIG_MACH_CLOUDBOX_DT)		+= board-ns2.o

obj-$(CONFIG_MACH_DB88F628X_BP_DT)	+= board-db88f628x-bp.o

obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)	+= board-dnskw.o
 
obj-$(CONFIG_MACH_DOCKSTAR_DT)		+= board-dockstar.o

obj-$(CONFIG_MACH_DREAMPLUG_DT)		+= board-dreamplug.o

obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o

obj-$(CONFIG_MACH_GURUPLUG_DT)		+= board-guruplug.o

obj-$(CONFIG_MACH_IB62X0_DT)		+= board-ib62x0.o

obj-$(CONFIG_MACH_ICONNECT_DT)		+= board-iconnect.o

obj-$(CONFIG_MACH_INETSPACE_V2_DT)	+= board-ns2.o

obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)	+= board-iomega_ix2_200.o

obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)	+= board-km_kirkwood.o

obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o

obj-$(CONFIG_MACH_MPLCEC4_DT)		+= board-mplcec4.o

obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT)	+= board-ns2.o

obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)	+= board-ns2.o

obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT)	+= board-ns2.o

obj-$(CONFIG_MACH_NETSPACE_V2_DT)	+= board-ns2.o

obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)	+= board-openblocks_a6.o

obj-$(CONFIG_MACH_READYNAS_DT)		+= board-readynas.o

obj-$(CONFIG_MACH_SHEEVAPLUG_DT)	+= board-sheevaplug.o

obj-$(CONFIG_MACH_TOPKICK_DT)		+= board-usi_topkick.o

obj-$(CONFIG_MACH_TS219_DT)		+= board-ts219.o tsx1x-common.o

arch/arm/mach-kirkwood/board-db88f628x-bp.c

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/*

 * Saeed Bishara <saeed@marvell.com>

 *

 * Marvell DB-88F628{1,2}-BP Development Board Setup

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/of.h>

#include <linux/mv643xx_eth.h>

#include "common.h"



static struct mv643xx_eth_platform_data db88f628x_ge00_data = {

	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),

};



void __init db88f628x_init(void)

{

	kirkwood_ge00_init(&db88f628x_ge00_data);

}

arch/arm/mach-kirkwood/board-dnskw.c

+0 −7
Original line number Diff line number Diff line
@@ -14,14 +14,9 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/mv643xx_eth.h>

#include <linux/gpio.h>

#include "common.h"



static struct mv643xx_eth_platform_data dnskw_ge00_data = {

	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),

};



/* Register any GPIO for output and set the value */

static void __init dnskw_gpio_register(unsigned gpio, char *name, int def)

{
@@ -36,8 +31,6 @@ static void __init dnskw_gpio_register(unsigned gpio, char *name, int def) 


void __init dnskw_init(void)

{

	kirkwood_ge00_init(&dnskw_ge00_data);



	/* Set NAS to turn back on after a power failure */

	dnskw_gpio_register(37, "dnskw:power:recover", 1);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE