Commit 06f11dfb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: mmp: remove all board files 



The old-style board files were marked as 'unused' a while ago
and can now be removed for good, leaving only devicetree based
boot support.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 90ca4d90

arch/arm/configs/pxa168_defconfig

+0 −3
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_MACH_ASPENITE=y

CONFIG_MACH_ZYLONITE2=y

CONFIG_MACH_AVENGERS_LITE=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

arch/arm/configs/pxa910_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_MACH_TAVOREVB=y

CONFIG_MACH_TTC_DKB=y

CONFIG_AEABI=y

CONFIG_FPE_NWFPE=y

CONFIG_SLAB=y

arch/arm/mach-mmp/Kconfig

+0 −96
Original line number Diff line number Diff line
@@ -13,99 +13,6 @@ if ARCH_MMP 


menu "Marvell PXA168/910/MMP2 Implementations"



if ATAGS



config MACH_ASPENITE

	bool "Marvell's PXA168 Aspenite Development Board"

	depends on ARCH_MULTI_V5

	depends on UNUSED_BOARD_FILES

	select CPU_PXA168

	help

	  Say 'Y' here if you want to support the Marvell PXA168-based

	  Aspenite Development Board.



config MACH_ZYLONITE2

	bool "Marvell's PXA168 Zylonite2 Development Board"

	depends on ARCH_MULTI_V5

	depends on UNUSED_BOARD_FILES

	select CPU_PXA168

	help

	  Say 'Y' here if you want to support the Marvell PXA168-based

	  Zylonite2 Development Board.



config MACH_AVENGERS_LITE

	bool "Marvell's PXA168 Avengers Lite Development Board"

	depends on ARCH_MULTI_V5

	depends on UNUSED_BOARD_FILES

	select CPU_PXA168

	help

	  Say 'Y' here if you want to support the Marvell PXA168-based

	  Avengers Lite Development Board.



config MACH_TTC_DKB

	bool "Marvell's PXA910 TavorEVB/TTC_DKB Development Board"

	depends on ARCH_MULTI_V5

	depends on UNUSED_BOARD_FILES

	select CPU_PXA910

	help

	  Say 'Y' here if you want to support the Marvell PXA910-based

	  TTC_DKB Development Board.



config MACH_BROWNSTONE

	bool "Marvell's Brownstone Development Platform"

	depends on ARCH_MULTI_V7

	depends on UNUSED_BOARD_FILES

	select CPU_MMP2

	help

	  Say 'Y' here if you want to support the Marvell MMP2-based

	  Brown Development Platform.

	  MMP2-based board can't be co-existed with PXA168-based &

	  PXA910-based development board. Since MMP2 is compatible to

	  ARMv7 architecture.



config MACH_FLINT

	bool "Marvell's Flint Development Platform"

	depends on ARCH_MULTI_V7

	depends on UNUSED_BOARD_FILES

	select CPU_MMP2

	help

	  Say 'Y' here if you want to support the Marvell MMP2-based

	  Flint Development Platform.

	  MMP2-based board can't be co-existed with PXA168-based &

	  PXA910-based development board. Since MMP2 is compatible to

	  ARMv7 architecture.



config MACH_MARVELL_JASPER

	bool "Marvell's Jasper Development Platform"

	depends on ARCH_MULTI_V7

	depends on UNUSED_BOARD_FILES

	select CPU_MMP2

	help

	  Say 'Y' here if you want to support the Marvell MMP2-base

	  Jasper Development Platform.

	  MMP2-based board can't be co-existed with PXA168-based &

	  PXA910-based development board. Since MMP2 is compatible to

	  ARMv7 architecture.



config MACH_TETON_BGA

	bool "Marvell's PXA168 Teton BGA Development Board"

	depends on ARCH_MULTI_V5

	depends on UNUSED_BOARD_FILES

	select CPU_PXA168

	help

	  Say 'Y' here if you want to support the Marvell PXA168-based

	  Teton BGA Development Board.



config MACH_GPLUGD

	bool "Marvell's PXA168 GuruPlug Display (gplugD) Board"

	depends on ARCH_MULTI_V5

	depends on UNUSED_BOARD_FILES

	select CPU_PXA168

	help

	  Say 'Y' here if you want to support the Marvell PXA168-based

	  GuruPlug Display (gplugD) Board

endif



config MACH_MMP_DT

	bool "Support MMP (ARMv5) platforms from device tree"

	depends on ARCH_MULTI_V5
@@ -178,7 +85,4 @@ config USB_EHCI_MV_U2O 
	help

	  Enables support for OTG controller which can be switched to host mode.



config MMP_SRAM

	bool



endif

arch/arm/mach-mmp/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -19,15 +19,6 @@ obj-$(CONFIG_MACH_MMP3_DT) += platsmp.o 
endif



# board support

obj-$(CONFIG_MACH_ASPENITE)	+= aspenite.o

obj-$(CONFIG_MACH_ZYLONITE2)	+= aspenite.o

obj-$(CONFIG_MACH_AVENGERS_LITE)+= avengers_lite.o

obj-$(CONFIG_MACH_TTC_DKB)	+= ttc_dkb.o

obj-$(CONFIG_MACH_BROWNSTONE)	+= brownstone.o

obj-$(CONFIG_MACH_FLINT)	+= flint.o

obj-$(CONFIG_MACH_MARVELL_JASPER) += jasper.o

obj-$(CONFIG_MACH_MMP_DT)	+= mmp-dt.o

obj-$(CONFIG_MACH_MMP2_DT)	+= mmp2-dt.o

obj-$(CONFIG_MACH_MMP3_DT)	+= mmp3.o
 
obj-$(CONFIG_MACH_TETON_BGA)	+= teton_bga.o

obj-$(CONFIG_MACH_GPLUGD)	+= gplugd.o

arch/arm/mach-mmp/aspenite.c

deleted100644 → 0
+0 −284
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 *  linux/arch/arm/mach-mmp/aspenite.c

 *

 *  Support for the Marvell PXA168-based Aspenite and Zylonite2

 *  Development Platform.

 */

#include <linux/gpio.h>

#include <linux/gpio-pxa.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/smc91x.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/rawnand.h>

#include <linux/interrupt.h>

#include <linux/platform_data/mv_usb.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <video/pxa168fb.h>

#include <linux/input.h>

#include <linux/platform_data/keypad-pxa27x.h>



#include "addr-map.h"

#include "mfp-pxa168.h"

#include "pxa168.h"

#include "pxa910.h"

#include "irqs.h"

#include "common.h"



static unsigned long common_pin_config[] __initdata = {

	/* Data Flash Interface */

	GPIO0_DFI_D15,

	GPIO1_DFI_D14,

	GPIO2_DFI_D13,

	GPIO3_DFI_D12,

	GPIO4_DFI_D11,

	GPIO5_DFI_D10,

	GPIO6_DFI_D9,

	GPIO7_DFI_D8,

	GPIO8_DFI_D7,

	GPIO9_DFI_D6,

	GPIO10_DFI_D5,

	GPIO11_DFI_D4,

	GPIO12_DFI_D3,

	GPIO13_DFI_D2,

	GPIO14_DFI_D1,

	GPIO15_DFI_D0,



	/* Static Memory Controller */

	GPIO18_SMC_nCS0,

	GPIO34_SMC_nCS1,

	GPIO23_SMC_nLUA,

	GPIO25_SMC_nLLA,

	GPIO28_SMC_RDY,

	GPIO29_SMC_SCLK,

	GPIO35_SMC_BE1,

	GPIO36_SMC_BE2,

	GPIO27_GPIO,	/* Ethernet IRQ */



	/* UART1 */

	GPIO107_UART1_RXD,

	GPIO108_UART1_TXD,



	/* SSP1 */

	GPIO113_I2S_MCLK,

	GPIO114_I2S_FRM,

	GPIO115_I2S_BCLK,

	GPIO116_I2S_RXD,

	GPIO117_I2S_TXD,



	/* LCD */

	GPIO56_LCD_FCLK_RD,

	GPIO57_LCD_LCLK_A0,

	GPIO58_LCD_PCLK_WR,

	GPIO59_LCD_DENA_BIAS,

	GPIO60_LCD_DD0,

	GPIO61_LCD_DD1,

	GPIO62_LCD_DD2,

	GPIO63_LCD_DD3,

	GPIO64_LCD_DD4,

	GPIO65_LCD_DD5,

	GPIO66_LCD_DD6,

	GPIO67_LCD_DD7,

	GPIO68_LCD_DD8,

	GPIO69_LCD_DD9,

	GPIO70_LCD_DD10,

	GPIO71_LCD_DD11,

	GPIO72_LCD_DD12,

	GPIO73_LCD_DD13,

	GPIO74_LCD_DD14,

	GPIO75_LCD_DD15,

	GPIO76_LCD_DD16,

	GPIO77_LCD_DD17,

	GPIO78_LCD_DD18,

	GPIO79_LCD_DD19,

	GPIO80_LCD_DD20,

	GPIO81_LCD_DD21,

	GPIO82_LCD_DD22,

	GPIO83_LCD_DD23,



	/* Keypad */

	GPIO109_KP_MKIN1,

	GPIO110_KP_MKIN0,

	GPIO111_KP_MKOUT7,

	GPIO112_KP_MKOUT6,

	GPIO121_KP_MKIN4,

};



static struct pxa_gpio_platform_data pxa168_gpio_pdata = {

	.irq_base	= MMP_GPIO_TO_IRQ(0),

};



static struct smc91x_platdata smc91x_info = {

	.flags	= SMC91X_USE_16BIT | SMC91X_NOWAIT,

};



static struct resource smc91x_resources[] = {

	[0] = {

		.start	= SMC_CS1_PHYS_BASE + 0x300,

		.end	= SMC_CS1_PHYS_BASE + 0xfffff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= MMP_GPIO_TO_IRQ(27),

		.end	= MMP_GPIO_TO_IRQ(27),

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

	}

};



static struct platform_device smc91x_device = {

	.name		= "smc91x",

	.id		= 0,

	.dev		= {

		.platform_data = &smc91x_info,

	},

	.num_resources	= ARRAY_SIZE(smc91x_resources),

	.resource	= smc91x_resources,

};



static struct mtd_partition aspenite_nand_partitions[] = {

	{

		.name		= "bootloader",

		.offset		= 0,

		.size		= SZ_1M,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "reserved",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_128K,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "reserved",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_8M,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "kernel",

		.offset		= MTDPART_OFS_APPEND,

		.size		= (SZ_2M + SZ_1M),

		.mask_flags	= 0,

	}, {

		.name		= "filesystem",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_32M + SZ_16M,

		.mask_flags	= 0,

	}

};



static struct pxa3xx_nand_platform_data aspenite_nand_info = {

	.parts		= aspenite_nand_partitions,

	.nr_parts	= ARRAY_SIZE(aspenite_nand_partitions),

};



static struct i2c_board_info aspenite_i2c_info[] __initdata = {

	{ I2C_BOARD_INFO("wm8753", 0x1b), },

};



static struct fb_videomode video_modes[] = {

	[0] = {

		.pixclock	= 30120,

		.refresh	= 60,

		.xres		= 800,

		.yres		= 480,

		.hsync_len	= 1,

		.left_margin	= 215,

		.right_margin	= 40,

		.vsync_len	= 1,

		.upper_margin	= 34,

		.lower_margin	= 10,

		.sync		= FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,

	},

};



struct pxa168fb_mach_info aspenite_lcd_info = {

	.id			= "Graphic Frame",

	.modes			= video_modes,

	.num_modes		= ARRAY_SIZE(video_modes),

	.pix_fmt		= PIX_FMT_RGB565,

	.io_pin_allocation_mode = PIN_MODE_DUMB_24,

	.dumb_mode		= DUMB_MODE_RGB888,

	.active			= 1,

	.panel_rbswap		= 0,

	.invert_pixclock	= 0,

};



static const unsigned int aspenite_matrix_key_map[] = {

	KEY(0, 6, KEY_UP),	/* SW 4 */

	KEY(0, 7, KEY_DOWN),	/* SW 5 */

	KEY(1, 6, KEY_LEFT),	/* SW 6 */

	KEY(1, 7, KEY_RIGHT),	/* SW 7 */

	KEY(4, 6, KEY_ENTER),	/* SW 8 */

	KEY(4, 7, KEY_ESC),	/* SW 9 */

};



static struct matrix_keymap_data aspenite_matrix_keymap_data = {

	.keymap			= aspenite_matrix_key_map,

	.keymap_size		= ARRAY_SIZE(aspenite_matrix_key_map),

};



static struct pxa27x_keypad_platform_data aspenite_keypad_info __initdata = {

	.matrix_key_rows	= 5,

	.matrix_key_cols	= 8,

	.matrix_keymap_data	= &aspenite_matrix_keymap_data,

	.debounce_interval	= 30,

};



#if IS_ENABLED(CONFIG_USB_EHCI_MV)

static struct mv_usb_platform_data pxa168_sph_pdata = {

	.mode           = MV_USB_MODE_HOST,

	.phy_init	= pxa_usb_phy_init,

	.phy_deinit	= pxa_usb_phy_deinit,

	.set_vbus	= NULL,

};

#endif



static void __init common_init(void)

{

	mfp_config(ARRAY_AND_SIZE(common_pin_config));



	/* on-chip devices */

	pxa168_add_uart(1);

	pxa168_add_twsi(1, NULL, ARRAY_AND_SIZE(aspenite_i2c_info));

	pxa168_add_ssp(1);

	pxa168_add_nand(&aspenite_nand_info);

	pxa168_add_fb(&aspenite_lcd_info);

	pxa168_add_keypad(&aspenite_keypad_info);

	platform_device_add_data(&pxa168_device_gpio, &pxa168_gpio_pdata,

				 sizeof(struct pxa_gpio_platform_data));

	platform_device_register(&pxa168_device_gpio);



	/* off-chip devices */

	platform_device_register(&smc91x_device);



#if IS_ENABLED(CONFIG_USB_SUPPORT)

#if IS_ENABLED(CONFIG_PHY_PXA_USB)

	platform_device_register(&pxa168_device_usb_phy);

#endif



#if IS_ENABLED(CONFIG_USB_EHCI_MV)

	pxa168_add_usb_host(&pxa168_sph_pdata);

#endif

#endif

}



MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")

	.map_io		= mmp_map_io,

	.nr_irqs	= MMP_NR_IRQS,

	.init_irq       = pxa168_init_irq,

	.init_time	= pxa168_timer_init,

	.init_machine   = common_init,

	.restart	= pxa168_restart,

MACHINE_END



MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")

	.map_io		= mmp_map_io,

	.nr_irqs	= MMP_NR_IRQS,

	.init_irq       = pxa168_init_irq,

	.init_time	= pxa168_timer_init,

	.init_machine   = common_init,

	.restart	= pxa168_restart,

MACHINE_END