From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A51D5560AAF; Tue, 8 Sep 2026 15:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788881375; cv=none; b=u5llZ3Cs6Hy2pE0FTE6PaZ3jNGIUBCrCV1QIQcB0YOk8mCHnc4zYO3MvGJPl7x9so4jb7hzQJNRjcxAMmksTIK+7aCiifwCc4Okl4vUqEc6sPY4/2m8JSJUdFoRytULBBSbDq454DQpPtPlQPnsaeoc4ur7YAg9DieSn0yTvfp4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788881375; c=relaxed/simple; bh=TFDDKj6QgutQvPcWV60rk78zNism3Xn23i1WqoZHKP8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nvoq380LFkMDgPZ/Y40PzdK6Lvloy7yebJXuCcr80DcIzcqmeFoqi9hSBXA2kz1HRnYq0X9DnbWu+V8VRYFaMLZXAaKBuLNAazN/Up+OI33GfmP0BuAaHIQx4SOlCw+jtYuTGcxESAlzCScQaazOX6XqdoXxgy7gM+uhKQ6jM/0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JvrlpqG/; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JvrlpqG/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 812E01F00A3F; Tue, 8 Sep 2026 15:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788881354; bh=yzv/Nwy97ppDqJRzRnLfPz4gRlPsC1f/yQ0/46s1+Rk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JvrlpqG/lSUcuq5xuN6uWk1qmuuT+Wzt90APZ01TLxi2JidivsXNcAVVYB3ER6pvK FYO7OYezj6qu88ItkbGJ+fx/lQ+RuFvd9ZQlZ/9HtQVgfngXUbNIawfBnoMm4Ko157 Fiql0c2+KmNcHqEVNP1KfmeQPgHFaQP5IVKJENMVV1hHImS5GGDRAmO8GUXw+T2W53 IKDU6yVBAulqcRR9M7g53Gs1TjrBXF5/OfUuakLdjzi7qlmSKHaZf4vnxEk592WMpv 4P/zCq/YR/cwMIHDdnMOVLLt3qLBT+hs/UpUawG4G5FZUWq0K5hf2Eb0So71CLUUH2 XlAM1tM9TmuEA== From: Arnd Bergmann To: Krzysztof Kozlowski , Alexandre Belloni , Linus Walleij , Russell King Cc: Drew Fustini , Arnd Bergmann , Rob Herring , Conor Dooley , Liviu Dudau , Sudeep Holla , Lorenzo Pieralisi , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Vladimir Zapolskiy , Stefan Agner , Maxime Coquelin , Alexandre Torgue , Aaro Koskinen , Andreas Kemnade , Kevin Hilman , Roger Quadros , Tony Lindgren , Nicolas Ferre , Claudiu Beznea , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Robert Jarzmik , Kristoffer Ericson , Ethan Nelson-Moore , Geert Uytterhoeven , Alexander Sverdlin , Shawn Guo , Karl Mehltretter , "David Hildenbrand (Arm)" , Nicolas Pitre , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-stm32@st-md-mailman.stormreply.com, linux-omap@vger.kernel.org, Daniel Mack , Haojian Zhuang , Bartosz Golaszewski Subject: [PATCH 04/13] ARM: remove legacy pxa board files Date: Tue, 8 Sep 2026 17:27:54 +0200 Message-ID: <20260908152808.3928630-5-arnd@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260908152808.3928630-1-arnd@kernel.org> References: <20260908152808.3928630-1-arnd@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arnd Bergmann The PXA platform supports devicetree based booting, but still has a few traditional board files, which were left as a starting point for a possible conversion to devicetree during the last mass purge of board files in 2022. None of these boards were actually converted, so drop support for these now, along with the 'scoop' support chip that was used on some PDAs that are no longer usable now. The only remaining board support is for the "Raumfeld" speaker system based on PXA300 SoC, though basic support for PXA250 and PXA270 is still there and may work with external dts files. Cc: Daniel Mack Cc: Haojian Zhuang Cc: Robert Jarzmik Cc: Linus Walleij Cc: Bartosz Golaszewski Cc: Ethan Nelson-Moore Signed-off-by: Arnd Bergmann --- arch/arm/boot/compressed/Makefile | 4 - arch/arm/boot/compressed/head-sharpsl.S | 151 --- arch/arm/common/Kconfig | 6 - arch/arm/common/Makefile | 2 - arch/arm/common/scoop.c | 269 ----- arch/arm/common/sharpsl_param.c | 63 -- arch/arm/configs/am200epdkit_defconfig | 91 -- arch/arm/configs/spitz_defconfig | 237 ----- arch/arm/include/asm/hardware/scoop.h | 67 -- arch/arm/include/asm/mach/sharpsl_param.h | 33 - arch/arm/mach-pxa/Kconfig | 89 -- arch/arm/mach-pxa/Makefile | 8 - arch/arm/mach-pxa/am200epd.c | 395 ------- arch/arm/mach-pxa/am300epd.c | 296 ------ arch/arm/mach-pxa/devices.c | 705 ------------- arch/arm/mach-pxa/devices.h | 68 -- arch/arm/mach-pxa/generic.h | 5 - arch/arm/mach-pxa/gumstix.c | 237 ----- arch/arm/mach-pxa/gumstix.h | 89 -- arch/arm/mach-pxa/pxa25x.c | 59 -- arch/arm/mach-pxa/pxa27x.c | 77 -- arch/arm/mach-pxa/pxa300.c | 1 - arch/arm/mach-pxa/pxa320.c | 1 - arch/arm/mach-pxa/pxa3xx.c | 6 - arch/arm/mach-pxa/sharpsl_pm.c | 941 ----------------- arch/arm/mach-pxa/sharpsl_pm.h | 108 -- arch/arm/mach-pxa/spitz.c | 1174 --------------------- arch/arm/mach-pxa/spitz.h | 185 ---- arch/arm/mach-pxa/spitz_pm.c | 257 ----- 29 files changed, 5624 deletions(-) delete mode 100644 arch/arm/boot/compressed/head-sharpsl.S delete mode 100644 arch/arm/common/scoop.c delete mode 100644 arch/arm/common/sharpsl_param.c delete mode 100644 arch/arm/configs/am200epdkit_defconfig delete mode 100644 arch/arm/configs/spitz_defconfig delete mode 100644 arch/arm/include/asm/hardware/scoop.h delete mode 100644 arch/arm/include/asm/mach/sharpsl_param.h delete mode 100644 arch/arm/mach-pxa/am200epd.c delete mode 100644 arch/arm/mach-pxa/am300epd.c delete mode 100644 arch/arm/mach-pxa/devices.h delete mode 100644 arch/arm/mach-pxa/gumstix.c delete mode 100644 arch/arm/mach-pxa/gumstix.h delete mode 100644 arch/arm/mach-pxa/sharpsl_pm.c delete mode 100644 arch/arm/mach-pxa/sharpsl_pm.h delete mode 100644 arch/arm/mach-pxa/spitz.c delete mode 100644 arch/arm/mach-pxa/spitz.h delete mode 100644 arch/arm/mach-pxa/spitz_pm.c diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 32def10f5e03..232b646bfd26 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -29,10 +29,6 @@ ifeq ($(CONFIG_CPU_XSCALE),y) OBJS += head-xscale.o endif -ifeq ($(CONFIG_PXA_SHARPSL_DETECT_MACH_ID),y) -OBJS += head-sharpsl.o -endif - ifeq ($(CONFIG_CPU_ENDIAN_BE32),y) ifeq ($(CONFIG_CPU_CP15),y) OBJS += big-endian.o diff --git a/arch/arm/boot/compressed/head-sharpsl.S b/arch/arm/boot/compressed/head-sharpsl.S deleted file mode 100644 index 992e784500fa..000000000000 --- a/arch/arm/boot/compressed/head-sharpsl.S +++ /dev/null @@ -1,151 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * linux/arch/arm/boot/compressed/head-sharpsl.S - * - * Copyright (C) 2004-2005 Richard Purdie - * - * Sharp's bootloader doesn't pass any kind of machine ID - * so we have to figure out the machine for ourselves... - * - * Support for Poodle, Corgi (SL-C700), Shepherd (SL-C750) - * Husky (SL-C760), Tosa (SL-C6000), Spitz (SL-C3000), - * Akita (SL-C1000) and Borzoi (SL-C3100). - * - */ - -#include -#include - -#ifndef CONFIG_PXA_SHARPSL -#error What am I doing here... -#endif - - .section ".start", "ax" - -__SharpSL_start: - -/* Check for TC6393 - if found we have a Tosa */ - ldr r7, .TOSAID - mov r1, #0x10000000 @ Base address of TC6393 chip - mov r6, #0x03 - ldrh r3, [r1, #8] @ Load TC6393XB Revison: This is 0x0003 - cmp r6, r3 - beq .SHARPEND @ Success -> tosa - -/* Check for pxa270 - if found, branch */ - mrc p15, 0, r4, c0, c0 @ Get Processor ID - and r4, r4, #0xffffff00 - ldr r3, .PXA270ID - cmp r4, r3 - beq .PXA270 - -/* Check for w100 - if not found we have a Poodle */ - ldr r1, .W100ADDR @ Base address of w100 chip + regs offset - - mov r6, #0x31 @ Load Magic Init value - str r6, [r1, #0x280] @ to SCRATCH_UMSK - mov r5, #0x3000 -.W100LOOP: - subs r5, r5, #1 - bne .W100LOOP - mov r6, #0x30 @ Load 2nd Magic Init value - str r6, [r1, #0x280] @ to SCRATCH_UMSK - - ldr r6, [r1, #0] @ Load Chip ID - ldr r3, .W100ID - ldr r7, .POODLEID - cmp r6, r3 - bne .SHARPEND @ We have no w100 - Poodle - -/* Check for pxa250 - if found we have a Corgi */ - ldr r7, .CORGIID - ldr r3, .PXA255ID - cmp r4, r3 - blo .SHARPEND @ We have a PXA250 - Corgi - -/* Check for 64MiB flash - if found we have a Shepherd */ - bl get_flash_ids - ldr r7, .SHEPHERDID - cmp r3, #0x76 @ 64MiB flash - beq .SHARPEND @ We have Shepherd - -/* Must be a Husky */ - ldr r7, .HUSKYID @ Must be Husky - b .SHARPEND - -.PXA270: -/* Check for 16MiB flash - if found we have Spitz */ - bl get_flash_ids - ldr r7, .SPITZID - cmp r3, #0x73 @ 16MiB flash - beq .SHARPEND @ We have Spitz - -/* Check for a second SCOOP chip - if found we have Borzoi */ - ldr r1, .SCOOP2ADDR - ldr r7, .BORZOIID - mov r6, #0x0140 - strh r6, [r1] - ldrh r6, [r1] - cmp r6, #0x0140 - beq .SHARPEND @ We have Borzoi - -/* Must be Akita */ - ldr r7, .AKITAID - b .SHARPEND @ We have Borzoi - -.PXA255ID: - .word 0x69052d00 @ PXA255 Processor ID -.PXA270ID: - .word 0x69054100 @ PXA270 Processor ID -.W100ID: - .word 0x57411002 @ w100 Chip ID -.W100ADDR: - .word 0x08010000 @ w100 Chip ID Reg Address -.SCOOP2ADDR: - .word 0x08800040 -.POODLEID: - .word MACH_TYPE_POODLE -.CORGIID: - .word MACH_TYPE_CORGI -.SHEPHERDID: - .word MACH_TYPE_SHEPHERD -.HUSKYID: - .word MACH_TYPE_HUSKY -.TOSAID: - .word MACH_TYPE_TOSA -.SPITZID: - .word MACH_TYPE_SPITZ -.AKITAID: - .word MACH_TYPE_AKITA -.BORZOIID: - .word MACH_TYPE_BORZOI - -/* - * Return: r2 - NAND Manufacturer ID - * r3 - NAND Chip ID - * Corrupts: r1 - */ -get_flash_ids: - mov r1, #0x0c000000 @ Base address of NAND chip - ldrb r3, [r1, #24] @ Load FLASHCTL - bic r3, r3, #0x11 @ SET NCE - orr r3, r3, #0x0a @ SET CLR + FLWP - strb r3, [r1, #24] @ Save to FLASHCTL - mov r2, #0x90 @ Command "readid" - strb r2, [r1, #20] @ Save to FLASHIO - bic r3, r3, #2 @ CLR CLE - orr r3, r3, #4 @ SET ALE - strb r3, [r1, #24] @ Save to FLASHCTL - mov r2, #0 @ Address 0x00 - strb r2, [r1, #20] @ Save to FLASHIO - bic r3, r3, #4 @ CLR ALE - strb r3, [r1, #24] @ Save to FLASHCTL -.fids1: - ldrb r3, [r1, #24] @ Load FLASHCTL - tst r3, #32 @ Is chip ready? - beq .fids1 - ldrb r2, [r1, #20] @ NAND Manufacturer ID - ldrb r3, [r1, #20] @ NAND Chip ID - mov pc, lr - -.SHARPEND: diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index d72dccf6f3c2..cf75be68d05c 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig @@ -1,9 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 config KRAIT_L2_ACCESSORS bool - -config SHARP_PARAM - bool - -config SHARP_SCOOP - bool diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index e1bcc250874f..1935b23700b0 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -6,8 +6,6 @@ obj-y += firmware.o obj-$(CONFIG_KRAIT_L2_ACCESSORS) += krait-l2-accessors.o -obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o -obj-$(CONFIG_SHARP_SCOOP) += scoop.o obj-$(CONFIG_CPU_V7) += secure_cntvoff.o obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o CFLAGS_REMOVE_mcpm_entry.o = -pg diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c deleted file mode 100644 index 90474994757c..000000000000 --- a/arch/arm/common/scoop.c +++ /dev/null @@ -1,269 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Support code for the SCOOP interface found on various Sharp PDAs - * - * Copyright (c) 2004 Richard Purdie - * - * Based on code written by Sharp/Lineo for 2.4 kernels - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -/* PCMCIA to Scoop linkage - - There is no easy way to link multiple scoop devices into one - single entity for the pxa2xx_pcmcia device so this structure - is used which is setup by the platform code. - - This file is never modular so this symbol is always - accessile to the board support files. -*/ -struct scoop_pcmcia_config *platform_scoop_config; -EXPORT_SYMBOL(platform_scoop_config); - -struct scoop_dev { - void __iomem *base; - struct gpio_chip gpio; - spinlock_t scoop_lock; - unsigned short suspend_clr; - unsigned short suspend_set; - u32 scoop_gpwr; -}; - -void reset_scoop(struct device *dev) -{ - struct scoop_dev *sdev = dev_get_drvdata(dev); - - iowrite16(0x0100, sdev->base + SCOOP_MCR); /* 00 */ - iowrite16(0x0000, sdev->base + SCOOP_CDR); /* 04 */ - iowrite16(0x0000, sdev->base + SCOOP_CCR); /* 10 */ - iowrite16(0x0000, sdev->base + SCOOP_IMR); /* 18 */ - iowrite16(0x00FF, sdev->base + SCOOP_IRM); /* 14 */ - iowrite16(0x0000, sdev->base + SCOOP_ISR); /* 1C */ - iowrite16(0x0000, sdev->base + SCOOP_IRM); -} - -static void __scoop_gpio_set(struct scoop_dev *sdev, - unsigned offset, int value) -{ - unsigned short gpwr; - - gpwr = ioread16(sdev->base + SCOOP_GPWR); - if (value) - gpwr |= 1 << (offset + 1); - else - gpwr &= ~(1 << (offset + 1)); - iowrite16(gpwr, sdev->base + SCOOP_GPWR); -} - -static int scoop_gpio_set(struct gpio_chip *chip, unsigned int offset, - int value) -{ - struct scoop_dev *sdev = gpiochip_get_data(chip); - unsigned long flags; - - spin_lock_irqsave(&sdev->scoop_lock, flags); - - __scoop_gpio_set(sdev, offset, value); - - spin_unlock_irqrestore(&sdev->scoop_lock, flags); - - return 0; -} - -static int scoop_gpio_get(struct gpio_chip *chip, unsigned offset) -{ - struct scoop_dev *sdev = gpiochip_get_data(chip); - - /* XXX: I'm unsure, but it seems so */ - return !!(ioread16(sdev->base + SCOOP_GPRR) & (1 << (offset + 1))); -} - -static int scoop_gpio_direction_input(struct gpio_chip *chip, - unsigned offset) -{ - struct scoop_dev *sdev = gpiochip_get_data(chip); - unsigned long flags; - unsigned short gpcr; - - spin_lock_irqsave(&sdev->scoop_lock, flags); - - gpcr = ioread16(sdev->base + SCOOP_GPCR); - gpcr &= ~(1 << (offset + 1)); - iowrite16(gpcr, sdev->base + SCOOP_GPCR); - - spin_unlock_irqrestore(&sdev->scoop_lock, flags); - - return 0; -} - -static int scoop_gpio_direction_output(struct gpio_chip *chip, - unsigned offset, int value) -{ - struct scoop_dev *sdev = gpiochip_get_data(chip); - unsigned long flags; - unsigned short gpcr; - - spin_lock_irqsave(&sdev->scoop_lock, flags); - - __scoop_gpio_set(sdev, offset, value); - - gpcr = ioread16(sdev->base + SCOOP_GPCR); - gpcr |= 1 << (offset + 1); - iowrite16(gpcr, sdev->base + SCOOP_GPCR); - - spin_unlock_irqrestore(&sdev->scoop_lock, flags); - - return 0; -} - -unsigned short read_scoop_reg(struct device *dev, unsigned short reg) -{ - struct scoop_dev *sdev = dev_get_drvdata(dev); - return ioread16(sdev->base + reg); -} - -void write_scoop_reg(struct device *dev, unsigned short reg, unsigned short data) -{ - struct scoop_dev *sdev = dev_get_drvdata(dev); - iowrite16(data, sdev->base + reg); -} - -EXPORT_SYMBOL(reset_scoop); -EXPORT_SYMBOL(read_scoop_reg); -EXPORT_SYMBOL(write_scoop_reg); - -#ifdef CONFIG_PM -static void check_scoop_reg(struct scoop_dev *sdev) -{ - unsigned short mcr; - - mcr = ioread16(sdev->base + SCOOP_MCR); - if ((mcr & 0x100) == 0) - iowrite16(0x0101, sdev->base + SCOOP_MCR); -} - -static int scoop_suspend(struct platform_device *dev, pm_message_t state) -{ - struct scoop_dev *sdev = platform_get_drvdata(dev); - - check_scoop_reg(sdev); - sdev->scoop_gpwr = ioread16(sdev->base + SCOOP_GPWR); - iowrite16((sdev->scoop_gpwr & ~sdev->suspend_clr) | sdev->suspend_set, sdev->base + SCOOP_GPWR); - - return 0; -} - -static int scoop_resume(struct platform_device *dev) -{ - struct scoop_dev *sdev = platform_get_drvdata(dev); - - check_scoop_reg(sdev); - iowrite16(sdev->scoop_gpwr, sdev->base + SCOOP_GPWR); - - return 0; -} -#else -#define scoop_suspend NULL -#define scoop_resume NULL -#endif - -static int scoop_probe(struct platform_device *pdev) -{ - struct scoop_dev *devptr; - struct scoop_config *inf; - struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - int ret; - - if (!mem) - return -EINVAL; - - devptr = kzalloc_obj(struct scoop_dev); - if (!devptr) - return -ENOMEM; - - spin_lock_init(&devptr->scoop_lock); - - inf = pdev->dev.platform_data; - devptr->base = ioremap(mem->start, resource_size(mem)); - - if (!devptr->base) { - ret = -ENOMEM; - goto err_ioremap; - } - - platform_set_drvdata(pdev, devptr); - - printk("Sharp Scoop Device found at 0x%08x -> 0x%8p\n",(unsigned int)mem->start, devptr->base); - - iowrite16(0x0140, devptr->base + SCOOP_MCR); - reset_scoop(&pdev->dev); - iowrite16(0x0000, devptr->base + SCOOP_CPR); - iowrite16(inf->io_dir & 0xffff, devptr->base + SCOOP_GPCR); - iowrite16(inf->io_out & 0xffff, devptr->base + SCOOP_GPWR); - - devptr->suspend_clr = inf->suspend_clr; - devptr->suspend_set = inf->suspend_set; - - devptr->gpio.base = -1; - - if (inf->gpio_base != 0) { - devptr->gpio.label = dev_name(&pdev->dev); - devptr->gpio.base = inf->gpio_base; - devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */ - devptr->gpio.set = scoop_gpio_set; - devptr->gpio.get = scoop_gpio_get; - devptr->gpio.direction_input = scoop_gpio_direction_input; - devptr->gpio.direction_output = scoop_gpio_direction_output; - - ret = gpiochip_add_data(&devptr->gpio, devptr); - if (ret) - goto err_gpio; - } - - return 0; - -err_gpio: - platform_set_drvdata(pdev, NULL); -err_ioremap: - iounmap(devptr->base); - kfree(devptr); - - return ret; -} - -static void scoop_remove(struct platform_device *pdev) -{ - struct scoop_dev *sdev = platform_get_drvdata(pdev); - - if (sdev->gpio.base != -1) - gpiochip_remove(&sdev->gpio); - - platform_set_drvdata(pdev, NULL); - iounmap(sdev->base); - kfree(sdev); -} - -static struct platform_driver scoop_driver = { - .probe = scoop_probe, - .remove = scoop_remove, - .suspend = scoop_suspend, - .resume = scoop_resume, - .driver = { - .name = "sharp-scoop", - }, -}; - -static int __init scoop_init(void) -{ - return platform_driver_register(&scoop_driver); -} - -subsys_initcall(scoop_init); diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c deleted file mode 100644 index 1ca26c063f80..000000000000 --- a/arch/arm/common/sharpsl_param.c +++ /dev/null @@ -1,63 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Hardware parameter area specific to Sharp SL series devices - * - * Copyright (c) 2005 Richard Purdie - * - * Based on Sharp's 2.4 kernel patches - */ - -#include -#include -#include -#include -#include - -/* - * Certain hardware parameters determined at the time of device manufacture, - * typically including LCD parameters are loaded by the bootloader at the - * address PARAM_BASE. As the kernel will overwrite them, we need to store - * them early in the boot process, then pass them to the appropriate drivers. - * Not all devices use all parameters but the format is common to all. - */ -#ifdef CONFIG_ARCH_SA1100 -#define PARAM_BASE 0xe8ffc000 -#define param_start(x) (void *)(x) -#else -#define PARAM_BASE 0xa0000a00 -#define param_start(x) __va(x) -#endif -#define MAGIC_CHG(a,b,c,d) ( ( d << 24 ) | ( c << 16 ) | ( b << 8 ) | a ) - -#define COMADJ_MAGIC MAGIC_CHG('C','M','A','D') -#define UUID_MAGIC MAGIC_CHG('U','U','I','D') -#define TOUCH_MAGIC MAGIC_CHG('T','U','C','H') -#define AD_MAGIC MAGIC_CHG('B','V','A','D') -#define PHAD_MAGIC MAGIC_CHG('P','H','A','D') - -struct sharpsl_param_info sharpsl_param; -EXPORT_SYMBOL(sharpsl_param); - -void sharpsl_save_param(void) -{ - struct sharpsl_param_info *params = param_start(PARAM_BASE); - - memcpy(&sharpsl_param, params, sizeof(*params)); - - if (sharpsl_param.comadj_keyword != COMADJ_MAGIC) - sharpsl_param.comadj=-1; - - if (sharpsl_param.phad_keyword != PHAD_MAGIC) - sharpsl_param.phadadj=-1; - - if (sharpsl_param.uuid_keyword != UUID_MAGIC) - sharpsl_param.uuid[0]=-1; - - if (sharpsl_param.touch_keyword != TOUCH_MAGIC) - sharpsl_param.touch_xp=-1; - - if (sharpsl_param.adadj_keyword != AD_MAGIC) - sharpsl_param.adadj=-1; -} - - diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig deleted file mode 100644 index 61beac88e863..000000000000 --- a/arch/arm/configs/am200epdkit_defconfig +++ /dev/null @@ -1,91 +0,0 @@ -CONFIG_LOCALVERSION="gum" -CONFIG_SYSVIPC=y -CONFIG_PREEMPT=y -CONFIG_EXPERT=y -# CONFIG_EPOLL is not set -# CONFIG_SHMEM is not set -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_PXA=y -CONFIG_ARCH_GUMSTIX=y -CONFIG_ATAGS=y -CONFIG_CMDLINE="console=ttyS0,115200n8 root=1f01 rootfstype=jffs2" -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_PARTITION_ADVANCED=y -# CONFIG_SWAP is not set -# CONFIG_VM_EVENT_COUNTERS is not set -CONFIG_NET=y -CONFIG_PACKET=m -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_BT=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_PCCARD=y -CONFIG_MTD=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PXA2XX=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_SD=m -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ATA=m -CONFIG_PATA_PCMCIA=m -CONFIG_NETDEVICES=y -CONFIG_SMC91X=m -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_SA1100_WATCHDOG=m -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FB_PXA=y -CONFIG_FB_PXA_PARAMETERS=y -CONFIG_FB_MBX=m -CONFIG_FB_VIRTUAL=m -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -# CONFIG_SND_VERBOSE_PROCFS is not set -CONFIG_SND_PXA2XX_AC97=m -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_MMC=y -CONFIG_MMC_PXA=y -# CONFIG_DNOTIFY is not set -CONFIG_VFAT_FS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_RUBIN=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -CONFIG_CRYPTO=y -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_ARC4=m -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig deleted file mode 100644 index c7cf089001bf..000000000000 --- a/arch/arm/configs/spitz_defconfig +++ /dev/null @@ -1,237 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_PREEMPT=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y -CONFIG_PROFILING=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_PXA=y -CONFIG_PXA_SHARPSL=y -CONFIG_MACH_AKITA=y -CONFIG_MACH_BORZOI=y -CONFIG_ATAGS=y -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_BINFMT_MISC=m -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_SYN_COOKIES=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_TUNNEL=m -CONFIG_NETFILTER=y -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_BT=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -CONFIG_PCCARD=y -CONFIG_PCMCIA_PXA2XX=y -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_ROM=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_RAW_NAND=y -CONFIG_MTD_NAND_SHARPSL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_CHR_DEV_SG=m -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ATA=y -CONFIG_PATA_PCMCIA=y -CONFIG_NETDEVICES=y -CONFIG_PCMCIA_PCNET=m -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_ASYNC=m -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -# CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_NET_PCMCIA=y -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_SPI=y -CONFIG_SPI_PXA2XX=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_CORGI=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_HID_A4TECH=m -CONFIG_HID_APPLE=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_EZKEY=m -CONFIG_HID_GYRATION=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_PANTHERLORD=m -CONFIG_HID_PETALYNX=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m -CONFIG_USB=m -CONFIG_USB_MON=m -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_STORAGE=m -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_SAFE=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_GADGET=m -CONFIG_USB_GADGET_DUMMY_HCD=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_MMC=y -CONFIG_MMC_PXA=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT4_FS=y -# CONFIG_EXT4_FS_XATTR is not set -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=m -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_NFS_V4=m -CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y -CONFIG_DEBUG_KERNEL=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_BENCHMARK=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_MAGIC_SYSRQ=y -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_FTRACE is not set diff --git a/arch/arm/include/asm/hardware/scoop.h b/arch/arm/include/asm/hardware/scoop.h deleted file mode 100644 index 505453315287..000000000000 --- a/arch/arm/include/asm/hardware/scoop.h +++ /dev/null @@ -1,67 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Definitions for the SCOOP interface found on various Sharp PDAs - * - * Copyright (c) 2004 Richard Purdie - */ - -#define SCOOP_MCR 0x00 -#define SCOOP_CDR 0x04 -#define SCOOP_CSR 0x08 -#define SCOOP_CPR 0x0C -#define SCOOP_CCR 0x10 -#define SCOOP_IRR 0x14 -#define SCOOP_IRM 0x14 -#define SCOOP_IMR 0x18 -#define SCOOP_ISR 0x1C -#define SCOOP_GPCR 0x20 -#define SCOOP_GPWR 0x24 -#define SCOOP_GPRR 0x28 - -#define SCOOP_CPR_OUT (1 << 7) -#define SCOOP_CPR_SD_3V (1 << 2) -#define SCOOP_CPR_CF_XV (1 << 1) -#define SCOOP_CPR_CF_3V (1 << 0) - -#define SCOOP_GPCR_PA22 (1 << 12) -#define SCOOP_GPCR_PA21 (1 << 11) -#define SCOOP_GPCR_PA20 (1 << 10) -#define SCOOP_GPCR_PA19 (1 << 9) -#define SCOOP_GPCR_PA18 (1 << 8) -#define SCOOP_GPCR_PA17 (1 << 7) -#define SCOOP_GPCR_PA16 (1 << 6) -#define SCOOP_GPCR_PA15 (1 << 5) -#define SCOOP_GPCR_PA14 (1 << 4) -#define SCOOP_GPCR_PA13 (1 << 3) -#define SCOOP_GPCR_PA12 (1 << 2) -#define SCOOP_GPCR_PA11 (1 << 1) - -struct scoop_config { - unsigned short io_out; - unsigned short io_dir; - unsigned short suspend_clr; - unsigned short suspend_set; - int gpio_base; -}; - -/* Structure for linking scoop devices to PCMCIA sockets */ -struct scoop_pcmcia_dev { - struct device *dev; /* Pointer to this socket's scoop device */ - int irq; /* irq for socket */ - int cd_irq; - const char *cd_irq_str; - unsigned char keep_vs; - unsigned char keep_rd; -}; - -struct scoop_pcmcia_config { - struct scoop_pcmcia_dev *devs; - int num_devs; - void (*power_ctrl)(struct device *scoop, unsigned short cpr, int nr); -}; - -extern struct scoop_pcmcia_config *platform_scoop_config; - -void reset_scoop(struct device *dev); -unsigned short read_scoop_reg(struct device *dev, unsigned short reg); -void write_scoop_reg(struct device *dev, unsigned short reg, unsigned short data); diff --git a/arch/arm/include/asm/mach/sharpsl_param.h b/arch/arm/include/asm/mach/sharpsl_param.h deleted file mode 100644 index 700a377c20bf..000000000000 --- a/arch/arm/include/asm/mach/sharpsl_param.h +++ /dev/null @@ -1,33 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Hardware parameter area specific to Sharp SL series devices - * - * Copyright (c) 2005 Richard Purdie - * - * Based on Sharp's 2.4 kernel patches - */ - -struct sharpsl_param_info { - unsigned int comadj_keyword; - unsigned int comadj; - - unsigned int uuid_keyword; - unsigned char uuid[16]; - - unsigned int touch_keyword; - unsigned int touch_xp; - unsigned int touch_yp; - unsigned int touch_xd; - unsigned int touch_yd; - - unsigned int adadj_keyword; - unsigned int adadj; - - unsigned int phad_keyword; - unsigned int phadadj; -} __attribute__((packed)); - - -extern struct sharpsl_param_info sharpsl_param; -extern void sharpsl_save_param(void); - diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 2fb29b9ef744..354e3dc17776 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -50,77 +50,6 @@ config MACH_PXA3XX_DT the device tree. Needn't select any other machine while MACH_PXA3XX_DT is enabled. -if ATAGS - -comment "Legacy board files" - -config ARCH_GUMSTIX - bool "Gumstix XScale 255 boards (DEPRECATED)" - select PXA25x - help - Say Y here if you intend to run this kernel on - Basix, Connex, ws-200ax, ws-400ax systems - - Support for this machine will go away in early 2027, - unless it gets converted to device tree. - -choice - prompt "Gumstix Carrier/Expansion Board" - depends on ARCH_GUMSTIX - -config GUMSTIX_AM200EPD - bool "Enable AM200EPD board support" - -config GUMSTIX_AM300EPD - bool "Enable AM300EPD board support" - -endchoice - -config PXA_SHARPSL - bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models (DEPRECATED)" - select SHARP_PARAM - select SHARP_SCOOP - help - Say Y here if you intend to run this kernel on a - Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi), - SL-C750 (Shepherd), SL-C760 (Husky), SL-C1000 (Akita), - SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) - handheld computer. - - Support for these machines will go away in early 2027, - unless they get converted to device tree. - -config PXA_SHARPSL_DETECT_MACH_ID - bool "Detect machine ID at run-time in the decompressor" - depends on PXA_SHARPSL - help - Say Y here if you want the zImage decompressor to detect - the Zaurus machine ID at run-time. For latest kexec-based - boot loader, this is not necessary. - -config MACH_AKITA - bool "Enable Sharp SL-1000 (Akita) Support" - depends on PXA_SHARPSL - select I2C - select I2C_PXA - select MACH_SPITZ - select PXA27x - select PXA_SHARP_Cxx00 - -config MACH_SPITZ - bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" - depends on PXA_SHARPSL - select PXA27x - select PXA_SHARP_Cxx00 - -config MACH_BORZOI - bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" - depends on PXA_SHARPSL - select PXA27x - select PXA_SHARP_Cxx00 - -endif # ATAGS - config PXA25x bool select CPU_XSCALE @@ -157,22 +86,4 @@ config CPU_PXA320 help PXA320 (codename Monahans-P) -config PXA_SHARP_Cxx00 - bool - select SHARPSL_PM - help - Enable common support for Sharp Cxx00 models - -config SHARPSL_PM - bool - select APM_EMULATION - select SHARPSL_PM_MAX1111 - -config SHARPSL_PM_MAX1111 - bool - select HWMON - select SENSORS_MAX1111 - select SPI - select SPI_MASTER - endif diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index faccdd356482..3bc3b2e56afe 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -22,11 +22,3 @@ obj-$(CONFIG_CPU_PXA320) += pxa320.o obj-$(CONFIG_MACH_PXA25X_DT) += pxa-dt.o obj-$(CONFIG_MACH_PXA27X_DT) += pxa-dt.o obj-$(CONFIG_MACH_PXA3XX_DT) += pxa-dt.o - -# 3rd Party Dev Platforms -obj-$(CONFIG_ARCH_GUMSTIX) += gumstix.o -obj-$(CONFIG_GUMSTIX_AM200EPD) += am200epd.o -obj-$(CONFIG_GUMSTIX_AM300EPD) += am300epd.o - -# End-user Products -obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c deleted file mode 100644 index 4814f3cfe775..000000000000 --- a/arch/arm/mach-pxa/am200epd.c +++ /dev/null @@ -1,395 +0,0 @@ -/* - * am200epd.c -- Platform device for AM200 EPD kit - * - * Copyright (C) 2008, Jaya Kumar - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive for - * more details. - * - * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven. - * - * This work was made possible by help and equipment support from E-Ink - * Corporation. http://support.eink.com/community - * - * This driver is written to be used with the Metronome display controller. - * on the AM200 EPD prototype kit/development kit with an E-Ink 800x600 - * Vizplex EPD on a Gumstix board using the Lyre interface board. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "pxa25x.h" -#include "gumstix.h" -#include - -#include "generic.h" - -#include