diff options
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 53 | ||||
-rw-r--r-- | arch/arm/mach-pxa/corgi.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/icontrol.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/littleton.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/magician.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/z2.c | 4 |
8 files changed, 62 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index a5df1d9f3360..b90d98bae68d 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -54,14 +54,18 @@ config MACH_PXA3XX_DT the device tree. Needn't select any other machine while MACH_PXA3XX_DT is enabled. +if ATAGS + config ARCH_LUBBOCK bool "Intel DBPXA250 Development Platform (aka Lubbock)" + depends on UNUSED_BOARD_FILES select GPIO_REG select PXA25x select SA1111 config MACH_MAINSTONE bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)" + depends on UNUSED_BOARD_FILES select GPIO_REG select PXA27x @@ -71,23 +75,27 @@ config MACH_ZYLONITE config MACH_ZYLONITE300 bool "PXA3xx Development Platform (aka Zylonite) PXA300/310" + depends on UNUSED_BOARD_FILES select CPU_PXA300 select CPU_PXA310 select MACH_ZYLONITE config MACH_ZYLONITE320 bool "PXA3xx Development Platform (aka Zylonite) PXA320" + depends on UNUSED_BOARD_FILES select CPU_PXA320 select MACH_ZYLONITE config MACH_LITTLETON bool "PXA3xx Form Factor Platform (aka Littleton)" + depends on UNUSED_BOARD_FILES select CPU_PXA300 select CPU_PXA310 select PXA3xx config MACH_TAVOREVB bool "PXA930 Evaluation Board (aka TavorEVB)" + depends on UNUSED_BOARD_FILES select CPU_PXA930 select CPU_PXA935 select PXA3xx @@ -96,6 +104,7 @@ config MACH_TAVOREVB config MACH_SAAR bool "PXA930 Handheld Platform (aka SAAR)" + depends on UNUSED_BOARD_FILES select CPU_PXA930 select CPU_PXA935 select PXA3xx @@ -106,10 +115,12 @@ comment "Third Party Dev Platforms (sorted by vendor name)" config ARCH_PXA_IDP bool "Accelent Xscale IDP" + depends on UNUSED_BOARD_FILES select PXA25x config ARCH_VIPER bool "Arcom/Eurotech VIPER SBC" + depends on UNUSED_BOARD_FILES select ARCOM_PCMCIA select I2C_GPIO if I2C=y select ISA @@ -117,17 +128,20 @@ config ARCH_VIPER config MACH_ARCOM_ZEUS bool "Arcom/Eurotech ZEUS SBC" + depends on UNUSED_BOARD_FILES select ARCOM_PCMCIA select ISA select PXA27x config MACH_BALLOON3 bool "Balloon 3 board" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x config MACH_CSB726 bool "Enable Cogent CSB726 System On a Module" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x help @@ -136,16 +150,19 @@ config MACH_CSB726 config CSB726_CSB701 bool "Enable support for CSB701 baseboard" + depends on UNUSED_BOARD_FILES depends on MACH_CSB726 config MACH_CM_X300 bool "CompuLab CM-X300 modules" + depends on UNUSED_BOARD_FILES select CPU_PXA300 select CPU_PXA310 select PXA3xx config MACH_CAPC7117 bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM" + depends on UNUSED_BOARD_FILES select CPU_PXA320 select PXA3xx @@ -170,6 +187,7 @@ endchoice config MACH_XCEP bool "Iskratel Electronics XCEP" + depends on UNUSED_BOARD_FILES select MTD select MTD_CFI select MTD_CFI_INTELEXT @@ -181,6 +199,7 @@ config MACH_XCEP config TRIZEPS_PXA bool "PXA based Keith und Koep Trizeps DIMM-Modules" + depends on UNUSED_BOARD_FILES config MACH_TRIZEPS4 bool "Keith und Koep Trizeps4 DIMM-Module" @@ -222,15 +241,18 @@ config TRIZEPS_PCMCIA config MACH_LOGICPD_PXA270 bool "LogicPD PXA270 Card Engine Development Platform" + depends on UNUSED_BOARD_FILES select PXA27x config MACH_PCM027 bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x config MACH_PCM990_BASEBOARD bool "PHYTEC PCM-990 development board" + depends on UNUSED_BOARD_FILES depends on MACH_PCM027 choice @@ -250,30 +272,36 @@ endchoice config MACH_COLIBRI bool "Toradex Colibri PXA270" + depends on UNUSED_BOARD_FILES select PXA27x config MACH_COLIBRI_PXA270_INCOME bool "Income s.r.o. PXA270 SBC" + depends on UNUSED_BOARD_FILES depends on MACH_COLIBRI select PXA27x config MACH_COLIBRI300 bool "Toradex Colibri PXA300/310" + depends on UNUSED_BOARD_FILES select CPU_PXA300 select CPU_PXA310 select PXA3xx config MACH_COLIBRI320 bool "Toradex Colibri PXA320" + depends on UNUSED_BOARD_FILES select CPU_PXA320 select PXA3xx config MACH_COLIBRI_EVALBOARD bool "Toradex Colibri Evaluation Carrier Board support" + depends on UNUSED_BOARD_FILES depends on MACH_COLIBRI || MACH_COLIBRI300 || MACH_COLIBRI320 config MACH_VPAC270 bool "Voipac PXA270" + depends on UNUSED_BOARD_FILES select HAVE_PATA_PLATFORM select PXA27x help @@ -283,24 +311,29 @@ comment "End-user Products (sorted by vendor name)" config MACH_H4700 bool "HP iPAQ hx4700" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x config MACH_H5000 bool "HP iPAQ h5000" + depends on UNUSED_BOARD_FILES select PXA25x config MACH_HIMALAYA bool "HTC Himalaya Support" + depends on UNUSED_BOARD_FILES select CPU_PXA26x config MACH_MAGICIAN bool "Enable HTC Magician Support" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x config MACH_MIOA701 bool "Mitac Mio A701 Support" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x help @@ -310,6 +343,7 @@ config MACH_MIOA701 config PXA_EZX bool "Motorola EZX Platform" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x @@ -345,16 +379,19 @@ config MACH_EZX_E2 config MACH_MP900C bool "Nec Mobilepro 900/c" + depends on UNUSED_BOARD_FILES select PXA25x config ARCH_PXA_PALM bool "PXA based Palm PDAs" + depends on UNUSED_BOARD_FILES config MACH_PALM27X bool config MACH_PALMTE2 bool "Palm Tungsten|E2" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select PXA25x @@ -373,6 +410,7 @@ config MACH_PALMTC config MACH_PALMT5 bool "Palm Tungsten|T5" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -384,6 +422,7 @@ config MACH_PALMT5 config MACH_PALMTX bool "Palm T|X" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -395,6 +434,7 @@ config MACH_PALMTX config MACH_PALMZ72 bool "Palm Zire 72" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -406,6 +446,7 @@ config MACH_PALMZ72 config MACH_PALMLD bool "Palm LifeDrive" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -421,6 +462,7 @@ config PALM_TREO config MACH_CENTRO bool "Palm Centro 685 (GSM)" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -433,6 +475,7 @@ config MACH_CENTRO config MACH_TREO680 bool "Palm Treo 680" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -465,24 +508,28 @@ config PXA_SHARPSL_DETECT_MACH_ID config MACH_POODLE bool "Enable Sharp SL-5600 (Poodle) Support" depends on PXA_SHARPSL + depends on UNUSED_BOARD_FILES select PXA25x select SHARP_LOCOMO config MACH_CORGI bool "Enable Sharp SL-C700 (Corgi) Support" depends on PXA_SHARPSL + depends on UNUSED_BOARD_FILES select PXA25x select PXA_SHARP_C7xx config MACH_SHEPHERD bool "Enable Sharp SL-C750 (Shepherd) Support" depends on PXA_SHARPSL + depends on UNUSED_BOARD_FILES select PXA25x select PXA_SHARP_C7xx config MACH_HUSKY bool "Enable Sharp SL-C760 (Husky) Support" depends on PXA_SHARPSL + depends on UNUSED_BOARD_FILES select PXA25x select PXA_SHARP_C7xx @@ -509,6 +556,7 @@ config MACH_BORZOI config MACH_TOSA bool "Enable Sharp SL-6000x (Tosa) Support" + depends on UNUSED_BOARD_FILES depends on PXA_SHARPSL select PXA25x @@ -532,11 +580,13 @@ config TOSA_USE_EXT_KEYCODES config MACH_ICONTROL bool "TMT iControl/SafeTCam based on the MXM-8x10 CoM" + depends on UNUSED_BOARD_FILES select CPU_PXA320 select PXA3xx config ARCH_PXA_ESERIES bool "PXA based Toshiba e-series PDAs" + depends on UNUSED_BOARD_FILES select FB_W100 select FB select PXA25x @@ -591,7 +641,10 @@ config MACH_E800 config MACH_ZIPIT2 bool "Zipit Z2 Handheld" + depends on UNUSED_BOARD_FILES select PXA27x + +endif # ATAGS endmenu config PXA25x diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index c546356d0f02..5738496717e2 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c @@ -549,7 +549,7 @@ static struct pxa2xx_spi_controller corgi_spi_info = { }; static struct gpiod_lookup_table corgi_spi_gpio_table = { - .dev_id = "pxa2xx-spi.1", + .dev_id = "spi1", .table = { GPIO_LOOKUP_IDX("gpio-pxa", CORGI_GPIO_ADS7846_CS, "cs", 0, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("gpio-pxa", CORGI_GPIO_LCDCON_CS, "cs", 1, GPIO_ACTIVE_LOW), diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index 2ae06edf413c..2fd665944103 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c @@ -635,7 +635,7 @@ static struct pxa2xx_spi_controller pxa_ssp2_master_info = { }; static struct gpiod_lookup_table pxa_ssp2_gpio_table = { - .dev_id = "pxa2xx-spi.2", + .dev_id = "spi2", .table = { GPIO_LOOKUP_IDX("gpio-pxa", GPIO88_HX4700_TSC2046_CS, "cs", 0, GPIO_ACTIVE_LOW), { }, diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c index 753fe166ab68..624088257cfc 100644 --- a/arch/arm/mach-pxa/icontrol.c +++ b/arch/arm/mach-pxa/icontrol.c @@ -140,7 +140,7 @@ struct platform_device pxa_spi_ssp4 = { }; static struct gpiod_lookup_table pxa_ssp3_gpio_table = { - .dev_id = "pxa2xx-spi.3", + .dev_id = "spi3", .table = { GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS1, "cs", 0, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS2, "cs", 1, GPIO_ACTIVE_LOW), @@ -149,7 +149,7 @@ static struct gpiod_lookup_table pxa_ssp3_gpio_table = { }; static struct gpiod_lookup_table pxa_ssp4_gpio_table = { - .dev_id = "pxa2xx-spi.4", + .dev_id = "spi4", .table = { GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS3, "cs", 0, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS4, "cs", 1, GPIO_ACTIVE_LOW), diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c index f98dc61e87af..98423a96f440 100644 --- a/arch/arm/mach-pxa/littleton.c +++ b/arch/arm/mach-pxa/littleton.c @@ -207,7 +207,7 @@ static struct spi_board_info littleton_spi_devices[] __initdata = { }; static struct gpiod_lookup_table littleton_spi_gpio_table = { - .dev_id = "pxa2xx-spi.2", + .dev_id = "spi2", .table = { GPIO_LOOKUP_IDX("gpio-pxa", LITTLETON_GPIO_LCD_CS, "cs", 0, GPIO_ACTIVE_LOW), { }, diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 20456a55c4c5..0827ebca1d38 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c @@ -994,7 +994,7 @@ static struct pxa2xx_spi_controller magician_spi_info = { }; static struct gpiod_lookup_table magician_spi_gpio_table = { - .dev_id = "pxa2xx-spi.2", + .dev_id = "spi2", .table = { /* NOTICE must be GPIO, incompatibility with hw PXA SPI framing */ GPIO_LOOKUP_IDX("gpio-pxa", GPIO14_MAGICIAN_TSC2046_CS, "cs", 0, GPIO_ACTIVE_LOW), diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index dd88953adc9d..9964729cd428 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -578,7 +578,7 @@ static struct pxa2xx_spi_controller spitz_spi_info = { }; static struct gpiod_lookup_table spitz_spi_gpio_table = { - .dev_id = "pxa2xx-spi.2", + .dev_id = "spi2", .table = { GPIO_LOOKUP_IDX("gpio-pxa", SPITZ_GPIO_ADS7846_CS, "cs", 0, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("gpio-pxa", SPITZ_GPIO_LCDCON_CS, "cs", 1, GPIO_ACTIVE_LOW), diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c index d03520555497..c4d4162a7e6e 100644 --- a/arch/arm/mach-pxa/z2.c +++ b/arch/arm/mach-pxa/z2.c @@ -623,7 +623,7 @@ static struct pxa2xx_spi_controller pxa_ssp2_master_info = { }; static struct gpiod_lookup_table pxa_ssp1_gpio_table = { - .dev_id = "pxa2xx-spi.1", + .dev_id = "spi1", .table = { GPIO_LOOKUP_IDX("gpio-pxa", GPIO24_ZIPITZ2_WIFI_CS, "cs", 0, GPIO_ACTIVE_LOW), { }, @@ -631,7 +631,7 @@ static struct gpiod_lookup_table pxa_ssp1_gpio_table = { }; static struct gpiod_lookup_table pxa_ssp2_gpio_table = { - .dev_id = "pxa2xx-spi.2", + .dev_id = "spi2", .table = { GPIO_LOOKUP_IDX("gpio-pxa", GPIO88_ZIPITZ2_LCD_CS, "cs", 0, GPIO_ACTIVE_LOW), { }, |