ARM: sa1100, mmp: drop unused board files
Subsystems (11)
cover ARM: sa1100, mmp: drop unused board files
From: Arnd Bergmann <[email protected]>
A number of board files were marked as 'unused' in 2022 and can get removed in linux-6.2 at the beginning of 2023.
I wanted to group these two platforms with the PXA series, but that one is already too big.
MMP is now DT-only, which allows removing most of the platform specific source code.
On SA1100, four boards that have no apparent users get removed, while another four boards each had one person saying they would like to keep it around.
Arnd Bergmann (11):
ARM: sa1100: un-deprecate jornada720
ARM: sa1100: remove unused board files
ARM: sa1100: remove irda references
ARM: sa1100: make cpufreq driver build standalone
cpufreq: remove sa1100 driver
mtd: remove lart flash driver
ARM: mmp: select specific CPU implementation
ARM: mmp: remove all board files
ARM: mmp: remove custom sram code
ARM: mmp: remove device definitions
ARM: mmp: remove old PM support
MAINTAINERS | 11 - arch/arm/Kconfig | 6 - arch/arm/boot/compressed/head-sa1100.S | 4 - arch/arm/configs/badge4_defconfig | 105 --- arch/arm/configs/cerfcube_defconfig | 73 -- arch/arm/configs/hackkit_defconfig | 48 -- arch/arm/configs/jornada720_defconfig | 1 - arch/arm/configs/lart_defconfig | 64 -- arch/arm/configs/pleb_defconfig | 53 -- arch/arm/configs/pxa168_defconfig | 3 - arch/arm/configs/pxa910_defconfig | 2 - arch/arm/configs/shannon_defconfig | 45 -- arch/arm/configs/simpad_defconfig | 100 --- arch/arm/mach-mmp/Kconfig | 96 --- arch/arm/mach-mmp/Makefile | 21 +- arch/arm/mach-mmp/aspenite.c | 284 -------- arch/arm/mach-mmp/avengers_lite.c | 55 -- arch/arm/mach-mmp/brownstone.c | 237 ------ arch/arm/mach-mmp/common.c | 5 - arch/arm/mach-mmp/common.h | 2 - arch/arm/mach-mmp/devices.c | 359 --------- arch/arm/mach-mmp/devices.h | 57 -- arch/arm/mach-mmp/flint.c | 131 ---- arch/arm/mach-mmp/gplugd.c | 206 ------ arch/arm/mach-mmp/irqs.h | 240 ------ arch/arm/mach-mmp/jasper.c | 185 ----- arch/arm/mach-mmp/mfp-mmp2.h | 396 ---------- arch/arm/mach-mmp/mfp-pxa168.h | 355 --------- arch/arm/mach-mmp/mfp-pxa910.h | 170 ----- arch/arm/mach-mmp/mfp.h | 35 - arch/arm/mach-mmp/mmp2.c | 175 ----- arch/arm/mach-mmp/mmp2.h | 104 --- arch/arm/mach-mmp/pm-mmp2.c | 248 ------- arch/arm/mach-mmp/pm-mmp2.h | 59 -- arch/arm/mach-mmp/pm-pxa910.c | 272 ------- arch/arm/mach-mmp/pm-pxa910.h | 75 -- arch/arm/mach-mmp/pxa168.c | 175 ----- arch/arm/mach-mmp/pxa168.h | 139 ---- arch/arm/mach-mmp/pxa910.c | 190 ----- arch/arm/mach-mmp/pxa910.h | 90 --- arch/arm/mach-mmp/regs-apbc.h | 19 - arch/arm/mach-mmp/regs-apmu.h | 28 - arch/arm/mach-mmp/regs-icu.h | 69 -- arch/arm/mach-mmp/regs-timers.h | 5 - arch/arm/mach-mmp/regs-usb.h | 155 ---- arch/arm/mach-mmp/sram.c | 167 ----- arch/arm/mach-mmp/teton_bga.c | 100 --- arch/arm/mach-mmp/teton_bga.h | 22 - arch/arm/mach-mmp/time.c | 9 +- arch/arm/mach-mmp/ttc_dkb.c | 315 -------- arch/arm/mach-sa1100/Kconfig | 112 --- arch/arm/mach-sa1100/Makefile | 21 - arch/arm/mach-sa1100/assabet.c | 1 - arch/arm/mach-sa1100/badge4.c | 338 --------- arch/arm/mach-sa1100/cerf.c | 181 ----- arch/arm/mach-sa1100/collie.c | 1 - arch/arm/mach-sa1100/generic.c | 32 - arch/arm/mach-sa1100/generic.h | 4 - arch/arm/mach-sa1100/h3100.c | 140 ---- arch/arm/mach-sa1100/h3600.c | 1 - arch/arm/mach-sa1100/hackkit.c | 184 ----- arch/arm/mach-sa1100/include/mach/badge4.h | 71 -- arch/arm/mach-sa1100/include/mach/cerf.h | 20 - arch/arm/mach-sa1100/include/mach/generic.h | 1 - .../arm/mach-sa1100/include/mach/nanoengine.h | 48 -- arch/arm/mach-sa1100/include/mach/shannon.h | 40 - arch/arm/mach-sa1100/include/mach/simpad.h | 159 ---- arch/arm/mach-sa1100/lart.c | 177 ----- arch/arm/mach-sa1100/nanoengine.c | 136 ---- arch/arm/mach-sa1100/pci-nanoengine.c | 191 ----- arch/arm/mach-sa1100/pleb.c | 148 ---- arch/arm/mach-sa1100/shannon.c | 157 ---- arch/arm/mach-sa1100/simpad.c | 423 ----------- drivers/cpufreq/Kconfig | 2 +- drivers/cpufreq/Kconfig.arm | 3 - drivers/cpufreq/Makefile | 1 - drivers/cpufreq/sa1100-cpufreq.c | 206 ------ drivers/cpufreq/sa1110-cpufreq.c | 38 +- drivers/dma/mmp_tdma.c | 7 +- drivers/mfd/Kconfig | 2 +- drivers/mtd/devices/Kconfig | 8 - drivers/mtd/devices/Makefile | 1 - drivers/mtd/devices/lart.c | 682 ------------------ drivers/pcmcia/sa1100_generic.c | 5 +- drivers/pcmcia/sa1100_h3600.c | 2 +- drivers/pcmcia/sa1111_generic.c | 4 - drivers/usb/host/ohci-sa1111.c | 5 +- drivers/video/fbdev/sa1100fb.c | 1 - include/linux/platform_data/dma-mmp_tdma.h | 36 - include/linux/platform_data/irda-sa11x0.h | 17 - include/linux/soc/mmp/cputype.h | 24 +- 91 files changed, 43 insertions(+), 9352 deletions(-) delete mode 100644 arch/arm/configs/badge4_defconfig delete mode 100644 arch/arm/configs/cerfcube_defconfig delete mode 100644 arch/arm/configs/hackkit_defconfig delete mode 100644 arch/arm/configs/lart_defconfig delete mode 100644 arch/arm/configs/pleb_defconfig delete mode 100644 arch/arm/configs/shannon_defconfig delete mode 100644 arch/arm/configs/simpad_defconfig delete mode 100644 arch/arm/mach-mmp/aspenite.c delete mode 100644 arch/arm/mach-mmp/avengers_lite.c delete mode 100644 arch/arm/mach-mmp/brownstone.c delete mode 100644 arch/arm/mach-mmp/devices.c delete mode 100644 arch/arm/mach-mmp/devices.h delete mode 100644 arch/arm/mach-mmp/flint.c delete mode 100644 arch/arm/mach-mmp/gplugd.c delete mode 100644 arch/arm/mach-mmp/irqs.h delete mode 100644 arch/arm/mach-mmp/jasper.c delete mode 100644 arch/arm/mach-mmp/mfp-mmp2.h delete mode 100644 arch/arm/mach-mmp/mfp-pxa168.h delete mode 100644 arch/arm/mach-mmp/mfp-pxa910.h delete mode 100644 arch/arm/mach-mmp/mfp.h delete mode 100644 arch/arm/mach-mmp/mmp2.c delete mode 100644 arch/arm/mach-mmp/mmp2.h delete mode 100644 arch/arm/mach-mmp/pm-mmp2.c delete mode 100644 arch/arm/mach-mmp/pm-mmp2.h delete mode 100644 arch/arm/mach-mmp/pm-pxa910.c delete mode 100644 arch/arm/mach-mmp/pm-pxa910.h delete mode 100644 arch/arm/mach-mmp/pxa168.c delete mode 100644 arch/arm/mach-mmp/pxa168.h delete mode 100644 arch/arm/mach-mmp/pxa910.c delete mode 100644 arch/arm/mach-mmp/pxa910.h delete mode 100644 arch/arm/mach-mmp/regs-apbc.h delete mode 100644 arch/arm/mach-mmp/regs-apmu.h delete mode 100644 arch/arm/mach-mmp/regs-icu.h delete mode 100644 arch/arm/mach-mmp/regs-usb.h delete mode 100644 arch/arm/mach-mmp/sram.c delete mode 100644 arch/arm/mach-mmp/teton_bga.c delete mode 100644 arch/arm/mach-mmp/teton_bga.h delete mode 100644 arch/arm/mach-mmp/ttc_dkb.c delete mode 100644 arch/arm/mach-sa1100/badge4.c delete mode 100644 arch/arm/mach-sa1100/cerf.c delete mode 100644 arch/arm/mach-sa1100/h3100.c delete mode 100644 arch/arm/mach-sa1100/hackkit.c delete mode 100644 arch/arm/mach-sa1100/include/mach/badge4.h delete mode 100644 arch/arm/mach-sa1100/include/mach/cerf.h delete mode 100644 arch/arm/mach-sa1100/include/mach/generic.h delete mode 100644 arch/arm/mach-sa1100/include/mach/nanoengine.h delete mode 100644 arch/arm/mach-sa1100/include/mach/shannon.h delete mode 100644 arch/arm/mach-sa1100/include/mach/simpad.h delete mode 100644 arch/arm/mach-sa1100/lart.c delete mode 100644 arch/arm/mach-sa1100/nanoengine.c delete mode 100644 arch/arm/mach-sa1100/pci-nanoengine.c delete mode 100644 arch/arm/mach-sa1100/pleb.c delete mode 100644 arch/arm/mach-sa1100/shannon.c delete mode 100644 arch/arm/mach-sa1100/simpad.c delete mode 100644 drivers/cpufreq/sa1100-cpufreq.c delete mode 100644 drivers/mtd/devices/lart.c delete mode 100644 include/linux/platform_data/dma-mmp_tdma.h delete mode 100644 include/linux/platform_data/irda-sa11x0.h
Signature · 1 line
2.29.2
PATCH 1/11 ARM: sa1100: un-deprecate jornada720
From: Arnd Bergmann <[email protected]>
Stefan is still trying to get this machine working again, so it won't be removed in this round.
--- arch/arm/configs/jornada720_defconfig | 1 - arch/arm/mach-sa1100/Kconfig | 1 - 2 files changed, 2 deletions(-)
arch/arm/configs/jornada720_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_ARCH_MULTI_V4=y CONFIG_ARCH_SA1100=y CONFIG_SA1100_JORNADA720=y CONFIG_SA1100_JORNADA720_SSP=y -CONFIG_UNUSED_BOARD_FILES=y CONFIG_FPE_NWFPE=y CONFIG_PM=y CONFIG_MODULES=y
arch/arm/mach-sa1100/Kconfig +0 -1
@@ -109,7 +109,6 @@ config SA1100_BADGE4 config SA1100_JORNADA720 bool "HP Jornada 720" - depends on UNUSED_BOARD_FILES # FIXME: select ARM_SA11x0_CPUFREQ select SA1111 help
Signature · 1 line
2.29.2
PATCH 2/11 ARM: sa1100: remove unused board files
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The Cerf, H3100, Badge4, Hackkit, LART, NanoEngine, PLEB, Shannon and Simpad machines were all marked as unused as there are no known users left. Remove all of these, along with references to them in defconfig files and drivers.
Four machines remain now: Assabet, Collie (Zaurus SL5500), iPAQ H3600 and Jornada 720, each of which had one person still using them, with Collie also being supported in Qemu.
--- MAINTAINERS | 11 - arch/arm/Kconfig | 6 - arch/arm/boot/compressed/head-sa1100.S | 4 - arch/arm/configs/badge4_defconfig | 105 ----- arch/arm/configs/cerfcube_defconfig | 73 --- arch/arm/configs/hackkit_defconfig | 48 -- arch/arm/configs/lart_defconfig | 64 --- arch/arm/configs/pleb_defconfig | 53 --- arch/arm/configs/shannon_defconfig | 45 -- arch/arm/configs/simpad_defconfig | 100 ----- arch/arm/mach-sa1100/Kconfig | 111 ----- arch/arm/mach-sa1100/Makefile | 21 - arch/arm/mach-sa1100/badge4.c | 338 -------------- arch/arm/mach-sa1100/cerf.c | 181 -------- arch/arm/mach-sa1100/h3100.c | 140 ------ arch/arm/mach-sa1100/hackkit.c | 184 -------- arch/arm/mach-sa1100/include/mach/badge4.h | 71 --- arch/arm/mach-sa1100/include/mach/cerf.h | 20 - .../arm/mach-sa1100/include/mach/nanoengine.h | 48 -- arch/arm/mach-sa1100/include/mach/shannon.h | 40 -- arch/arm/mach-sa1100/include/mach/simpad.h | 159 ------- arch/arm/mach-sa1100/lart.c | 177 -------- arch/arm/mach-sa1100/nanoengine.c | 136 ------ arch/arm/mach-sa1100/pci-nanoengine.c | 191 -------- arch/arm/mach-sa1100/pleb.c | 148 ------ arch/arm/mach-sa1100/shannon.c | 157 ------- arch/arm/mach-sa1100/simpad.c | 423 ------------------ drivers/cpufreq/sa1110-cpufreq.c | 6 - drivers/mfd/Kconfig | 2 +- drivers/pcmcia/sa1100_generic.c | 5 +- drivers/pcmcia/sa1100_h3600.c | 2 +- drivers/pcmcia/sa1111_generic.c | 4 - drivers/usb/host/ohci-sa1111.c | 5 +- drivers/video/fbdev/sa1100fb.c | 1 - 34 files changed, 4 insertions(+), 3075 deletions(-) delete mode 100644 arch/arm/configs/badge4_defconfig delete mode 100644 arch/arm/configs/cerfcube_defconfig delete mode 100644 arch/arm/configs/hackkit_defconfig delete mode 100644 arch/arm/configs/lart_defconfig delete mode 100644 arch/arm/configs/pleb_defconfig delete mode 100644 arch/arm/configs/shannon_defconfig delete mode 100644 arch/arm/configs/simpad_defconfig delete mode 100644 arch/arm/mach-sa1100/badge4.c delete mode 100644 arch/arm/mach-sa1100/cerf.c delete mode 100644 arch/arm/mach-sa1100/h3100.c delete mode 100644 arch/arm/mach-sa1100/hackkit.c delete mode 100644 arch/arm/mach-sa1100/include/mach/badge4.h delete mode 100644 arch/arm/mach-sa1100/include/mach/cerf.h delete mode 100644 arch/arm/mach-sa1100/include/mach/nanoengine.h delete mode 100644 arch/arm/mach-sa1100/include/mach/shannon.h delete mode 100644 arch/arm/mach-sa1100/include/mach/simpad.h delete mode 100644 arch/arm/mach-sa1100/lart.c delete mode 100644 arch/arm/mach-sa1100/nanoengine.c delete mode 100644 arch/arm/mach-sa1100/pci-nanoengine.c delete mode 100644 arch/arm/mach-sa1100/pleb.c delete mode 100644 arch/arm/mach-sa1100/shannon.c delete mode 100644 arch/arm/mach-sa1100/simpad.c
MAINTAINERS +0 -11
@@ -2486,17 +2486,6 @@ F: arch/arm/mach-oxnas/ F: drivers/power/reset/oxnas-restart.c N: oxnas -ARM/PLEB SUPPORT -M: Peter Chubb <[email protected]> -S: Maintained -W: http://www.disy.cse.unsw.edu.au/Hardware/PLEB - -ARM/PT DIGITAL BOARD PORT -M: Stefan Eletzhofer <[email protected]> -L: [email protected] (moderated for non-subscribers) -S: Maintained -W: http://www.armlinux.org.uk/ - ARM/QUALCOMM SUPPORT M: Andy Gross <[email protected]> M: Bjorn Andersson <[email protected]>
arch/arm/Kconfig +0 -6
@@ -922,12 +922,6 @@ config ISA config ISA_DMA_API bool -config PCI_NANOENGINE - bool "BSE nanoEngine PCI support" - depends on SA1100_NANOENGINE - help - Enable PCI on the BSE nanoEngine board. - config ARM_ERRATA_814220 bool "ARM errata: Cache maintenance by set/way operations can execute out of order" depends on CPU_V7
arch/arm/boot/compressed/head-sa1100.S +0 -4
@@ -19,10 +19,6 @@ __SA1100_start: @ Preserve r8/r7 i.e. kernel entry values #ifdef CONFIG_SA1100_COLLIE mov r7, #MACH_TYPE_COLLIE -#endif -#ifdef CONFIG_SA1100_SIMPAD - @ UNTIL we've something like an open bootldr - mov r7, #MACH_TYPE_SIMPAD @should be 87 #endif mrc p15, 0, r0, c1, c0, 0 @ read control reg ands r0, r0, #0x0d
arch/arm/configs/badge4_defconfig deleted +0 -105
105 lines not on this page · raw message
arch/arm/configs/cerfcube_defconfig deleted +0 -73
73 lines not on this page · raw message
arch/arm/configs/hackkit_defconfig deleted +0 -48
48 lines not on this page · raw message
arch/arm/configs/lart_defconfig deleted +0 -64
64 lines not on this page · raw message
arch/arm/configs/pleb_defconfig deleted +0 -53
53 lines not on this page · raw message
arch/arm/configs/shannon_defconfig deleted +0 -45
45 lines not on this page · raw message
arch/arm/configs/simpad_defconfig deleted +0 -100
100 lines not on this page · raw message
arch/arm/mach-sa1100/Kconfig +0 -111
137 lines not on this page · raw message
arch/arm/mach-sa1100/Makefile +0 -21
@@ -9,32 +9,11 @@ obj-y := clock.o generic.o #nmi-oopser.o # Specific board support obj-$(CONFIG_SA1100_ASSABET) += assabet.o obj-$(CONFIG_ASSABET_NEPONSET) += neponset.o - -obj-$(CONFIG_SA1100_BADGE4) += badge4.o - -obj-$(CONFIG_SA1100_CERF) += cerf.o - obj-$(CONFIG_SA1100_COLLIE) += collie.o - -obj-$(CONFIG_SA1100_H3100) += h3100.o h3xxx.o obj-$(CONFIG_SA1100_H3600) += h3600.o h3xxx.o - -obj-$(CONFIG_SA1100_HACKKIT) += hackkit.o - obj-$(CONFIG_SA1100_JORNADA720) += jornada720.o obj-$(CONFIG_SA1100_JORNADA720_SSP) += jornada720_ssp.o -obj-$(CONFIG_SA1100_LART) += lart.o - -obj-$(CONFIG_SA1100_NANOENGINE) += nanoengine.o -obj-$(CONFIG_PCI_NANOENGINE) += pci-nanoengine.o - -obj-$(CONFIG_SA1100_PLEB) += pleb.o - -obj-$(CONFIG_SA1100_SHANNON) += shannon.o - -obj-$(CONFIG_SA1100_SIMPAD) += simpad.o - # Miscellaneous functions obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_SA1100_SSP) += ssp.o
arch/arm/mach-sa1100/badge4.c deleted +0 -338
338 lines not on this page · raw message
arch/arm/mach-sa1100/cerf.c deleted +0 -181
181 lines not on this page · raw message
arch/arm/mach-sa1100/h3100.c deleted +0 -140
140 lines not on this page · raw message
arch/arm/mach-sa1100/hackkit.c deleted +0 -184
184 lines not on this page · raw message
arch/arm/mach-sa1100/include/mach/badge4.h deleted +0 -71
71 lines not on this page · raw message
arch/arm/mach-sa1100/include/mach/cerf.h deleted +0 -20
@@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* arch/arm/mach-sa1100/include/mach/cerf.h -* -* Apr-2003 : Removed some old PDA crud [FB] -*/ -#ifndef _INCLUDE_CERF_H_ -#define _INCLUDE_CERF_H_ - - -#define CERF_ETH_IO 0xf0000000 -#define CERF_ETH_IRQ IRQ_GPIO26 - -#define CERF_GPIO_CF_BVD2 19 -#define CERF_GPIO_CF_BVD1 20 -#define CERF_GPIO_CF_RESET 21 -#define CERF_GPIO_CF_IRQ 22 -#define CERF_GPIO_CF_CD 23 - -#endif // _INCLUDE_CERF_H_
arch/arm/mach-sa1100/include/mach/nanoengine.h deleted +0 -48
48 lines not on this page · raw message
arch/arm/mach-sa1100/include/mach/shannon.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _INCLUDE_SHANNON_H -#define _INCLUDE_SHANNON_H - -/* taken from comp.os.inferno Tue, 12 Sep 2000 09:21:50 GMT, -* written by <[email protected]> */ - -#define SHANNON_GPIO_SPI_FLASH GPIO_GPIO (0)/* Output - Driven low, enables SPI to flash */ -#define SHANNON_GPIO_SPI_DSP GPIO_GPIO (1)/* Output - Driven low, enables SPI to DSP */ -/* lcd lower = GPIO 2-9 */ -#define SHANNON_GPIO_SPI_OUTPUT GPIO_GPIO (10)/* Output - SPI output to DSP */ -#define SHANNON_GPIO_SPI_INPUT GPIO_GPIO (11)/* Input - SPI input from DSP */ -#define SHANNON_GPIO_SPI_CLOCK GPIO_GPIO (12)/* Output - Clock for SPI */ -#define SHANNON_GPIO_SPI_FRAME GPIO_GPIO (13)/* Output - Frame marker - not used */ -#define SHANNON_GPIO_SPI_RTS GPIO_GPIO (14)/* Input - SPI Ready to Send */ -#define SHANNON_IRQ_GPIO_SPI_RTS IRQ_GPIO14 -#define SHANNON_GPIO_SPI_CTS GPIO_GPIO (15)/* Output - SPI Clear to Send */ -#define SHANNON_GPIO_IRQ_CODEC GPIO_GPIO (16)/* in, irq from ucb1200 */ -#define SHANNON_IRQ_GPIO_IRQ_CODEC IRQ_GPIO16 -#define SHANNON_GPIO_DSP_RESET GPIO_GPIO (17)/* Output - Drive low to reset the DSP */ -#define SHANNON_GPIO_CODEC_RESET GPIO_GPIO (18)/* Output - Drive low to reset the UCB1x00 */ -#define SHANNON_GPIO_U3_RTS GPIO_GPIO (19)/* ?? */ -#define SHANNON_GPIO_U3_CTS GPIO_GPIO (20)/* ?? */ -#define SHANNON_GPIO_SENSE_12V GPIO_GPIO (21)/* Input, 12v flash unprotect detected */ -#define SHANNON_GPIO_DISP_EN 22/* out */ -/* XXX GPIO 23 unaccounted for */ -#define SHANNON_GPIO_EJECT_0 24/* in */ -#define SHANNON_GPIO_EJECT_1 25/* in */ -#define SHANNON_GPIO_RDY_0 26/* in */ -#define SHANNON_GPIO_RDY_1 27/* in */ - -/* MCP UCB codec GPIO pins... */ - -#define SHANNON_UCB_GPIO_BACKLIGHT 9 -#define SHANNON_UCB_GPIO_BRIGHT_MASK 7 -#define SHANNON_UCB_GPIO_BRIGHT 6 -#define SHANNON_UCB_GPIO_CONTRAST_MASK 0x3f -#define SHANNON_UCB_GPIO_CONTRAST 0 - -#endif
arch/arm/mach-sa1100/include/mach/simpad.h deleted +0 -159
159 lines not on this page · raw message
arch/arm/mach-sa1100/lart.c deleted +0 -177
177 lines not on this page · raw message
arch/arm/mach-sa1100/nanoengine.c deleted +0 -136
136 lines not on this page · raw message
arch/arm/mach-sa1100/pci-nanoengine.c deleted +0 -191
191 lines not on this page · raw message
arch/arm/mach-sa1100/pleb.c deleted +0 -148
148 lines not on this page · raw message
arch/arm/mach-sa1100/shannon.c deleted +0 -157
157 lines not on this page · raw message
arch/arm/mach-sa1100/simpad.c deleted +0 -423
314 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.29.2
Part of the diff is not shown here. View the raw message.
Re: [PATCH 02/11] ARM: sa1100: remove unused board files
Quoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The Cerf, H3100, Badge4, Hackkit, LART, NanoEngine, PLEB, Shannon and Simpad machines were all marked as unused as there are no known users left. Remove all of these, along with references to them in defconfig files and drivers.
Quoted 7 lines
Four machines remain now: Assabet, Collie (Zaurus SL5500), iPAQ H3600 and Jornada 720, each of which had one person still using them, with Collie also being supported in Qemu.
Cc Peter Chubb <[email protected]>Cc Stefan Eletzhofer <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>
Re: [PATCH 02/11] ARM: sa1100: remove unused board files
In reply to Arnd BergmannQuoted 9 lines · Arnd Bergmann
drivers/cpufreq/sa1110-cpufreq.c +0
-1@@ -344,14 +344,8 @@ static int __init sa1110_clk_init(void)if (!name[0 ]) {if (machine_is_assabet ()) name ="TC59SM716-CL3" ; -if (machine_is_pt_system3 ())
drivers/cpufreq/sa1110-cpufreq.c static int __init sa1110_clk_init(void) · line 351
Quoted 10 lines
drivers/cpufreq/sa1110-cpufreq.c +0
-5- name ="K4S641632D" ; -if (machine_is_h3100 ()) - name ="KM416S4030CT" ;if (machine_is_jornada720 () ||machine_is_h3600 ()) name ="K4S281632B-1H" ; -if (machine_is_nanoengine ()) - name ="MT48LC8M16A2TG-75" ; } sdram =sa1110_find_sdram (name);
Signature · 1 line
viresh
Re: [PATCH 02/11] ARM: sa1100: remove unused board files
In reply to Arnd BergmannQuoted 36 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The Cerf, H3100, Badge4, Hackkit, LART, NanoEngine, PLEB, Shannon and Simpad machines were all marked as unused as there are no known users left. Remove all of these, along with references to them in defconfig files and drivers.
Four machines remain now: Assabet, Collie (Zaurus SL5500), iPAQ H3600 and Jornada 720, each of which had one person still using them, with Collie also being supported in Qemu.
Cc Peter Chubb <[email protected]>Cc Stefan Eletzhofer <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>--- MAINTAINERS | 11 - arch/arm/Kconfig | 6 - arch/arm/boot/compressed/head-sa1100.S | 4 - arch/arm/configs/badge4_defconfig | 105 ----- arch/arm/configs/cerfcube_defconfig | 73 --- arch/arm/configs/hackkit_defconfig | 48 -- arch/arm/configs/lart_defconfig | 64 --- arch/arm/configs/pleb_defconfig | 53 --- arch/arm/configs/shannon_defconfig | 45 -- arch/arm/configs/simpad_defconfig | 100 ----- arch/arm/mach-sa1100/Kconfig | 111 ----- arch/arm/mach-sa1100/Makefile | 21 - arch/arm/mach-sa1100/badge4.c | 338 -------------- arch/arm/mach-sa1100/cerf.c | 181 -------- arch/arm/mach-sa1100/h3100.c | 140 ------ arch/arm/mach-sa1100/hackkit.c | 184 -------- arch/arm/mach-sa1100/include/mach/badge4.h | 71 --- arch/arm/mach-sa1100/include/mach/cerf.h | 20 - .../arm/mach-sa1100/include/mach/nanoengine.h | 48 -- arch/arm/mach-sa1100/include/mach/shannon.h | 40 -- arch/arm/mach-sa1100/include/mach/simpad.h | 159 -------
Quoted 8 lines
arch/arm/mach-sa1100/lart.c | 177 -------- arch/arm/mach-sa1100/nanoengine.c | 136 ------ arch/arm/mach-sa1100/pci-nanoengine.c | 191 -------- arch/arm/mach-sa1100/pleb.c | 148 ------ arch/arm/mach-sa1100/shannon.c | 157 ------- arch/arm/mach-sa1100/simpad.c | 423 ------------------ drivers/cpufreq/sa1110-cpufreq.c | 6 - drivers/mfd/Kconfig | 2 +-
Quoted 28 lines
drivers/pcmcia/sa1100_generic.c | 5 +- drivers/pcmcia/sa1100_h3600.c | 2 +- drivers/pcmcia/sa1111_generic.c | 4 - drivers/usb/host/ohci-sa1111.c | 5 +- drivers/video/fbdev/sa1100fb.c | 1 - 34 files changed, 4 insertions(+), 3075 deletions(-) delete mode 100644 arch/arm/configs/badge4_defconfig delete mode 100644 arch/arm/configs/cerfcube_defconfig delete mode 100644 arch/arm/configs/hackkit_defconfig delete mode 100644 arch/arm/configs/lart_defconfig delete mode 100644 arch/arm/configs/pleb_defconfig delete mode 100644 arch/arm/configs/shannon_defconfig delete mode 100644 arch/arm/configs/simpad_defconfig delete mode 100644 arch/arm/mach-sa1100/badge4.c delete mode 100644 arch/arm/mach-sa1100/cerf.c delete mode 100644 arch/arm/mach-sa1100/h3100.c delete mode 100644 arch/arm/mach-sa1100/hackkit.c delete mode 100644 arch/arm/mach-sa1100/include/mach/badge4.h delete mode 100644 arch/arm/mach-sa1100/include/mach/cerf.h delete mode 100644 arch/arm/mach-sa1100/include/mach/nanoengine.h delete mode 100644 arch/arm/mach-sa1100/include/mach/shannon.h delete mode 100644 arch/arm/mach-sa1100/include/mach/simpad.h delete mode 100644 arch/arm/mach-sa1100/lart.c delete mode 100644 arch/arm/mach-sa1100/nanoengine.c delete mode 100644 arch/arm/mach-sa1100/pci-nanoengine.c delete mode 100644 arch/arm/mach-sa1100/pleb.c delete mode 100644 arch/arm/mach-sa1100/shannon.c delete mode 100644 arch/arm/mach-sa1100/simpad.c
Signature · 1 line
Lee Jones [李琼斯]
Re: [PATCH 02/11] ARM: sa1100: remove unused board files
In reply to Arnd BergmannQuoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The Cerf, H3100, Badge4, Hackkit, LART, NanoEngine, PLEB, Shannon and Simpad machines were all marked as unused as there are no known users left. Remove all of these, along with references to them in defconfig files and drivers.
Quoted 7 lines
Four machines remain now: Assabet, Collie (Zaurus SL5500), iPAQ H3600 and Jornada 720, each of which had one person still using them, with Collie also being supported in Qemu.
Cc Peter Chubb <[email protected]>Cc Stefan Eletzhofer <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>
Yours,
Linus Walleij
PATCH 3/11 ARM: sa1100: remove irda references
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
IRDA support is long gone, so there is no need to declare the platform device structure.
See-also: d64c2a76123f ("staging: irda: remove the irda network stack and drivers")
--- arch/arm/mach-sa1100/assabet.c | 1 - arch/arm/mach-sa1100/collie.c | 1 - arch/arm/mach-sa1100/h3600.c | 1 - include/linux/platform_data/irda-sa11x0.h | 17 ----------------- 4 files changed, 20 deletions(-) delete mode 100644 include/linux/platform_data/irda-sa11x0.h
arch/arm/mach-sa1100/assabet.c +0 -1
@@ -38,7 +38,6 @@#include <asm/mach/arch.h> #include <asm/mach/flash.h> -#include <linux/platform_data/irda-sa11x0.h> #include <asm/mach/map.h> #include <mach/assabet.h> #include <linux/platform_data/mfd-mcp-sa11x0.h>
arch/arm/mach-sa1100/collie.c +0 -1
@@ -44,7 +44,6 @@#include <asm/mach/arch.h> #include <asm/mach/flash.h> #include <asm/mach/map.h> -#include <linux/platform_data/irda-sa11x0.h> #include <asm/hardware/scoop.h> #include <asm/mach/sharpsl_param.h>
arch/arm/mach-sa1100/h3600.c +0 -1
@@ -14,7 +14,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <linux/platform_data/irda-sa11x0.h> #include <mach/h3xxx.h> #include <mach/irqs.h>
include/linux/platform_data/irda-sa11x0.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* arch/arm/include/asm/mach/irda.h -* -* Copyright (C) 2004 Russell King. -*/ -#ifndef __ASM_ARM_MACH_IRDA_H -#define __ASM_ARM_MACH_IRDA_H - -struct irda_platform_data { -int (*startup)(struct device *); -void (*shutdown)(struct device *); -int (*set_power)(struct device *,unsigned int state); -void (*set_speed)(struct device *,unsigned int speed); -}; - -#endif
Signature · 1 line
2.29.2
PATCH 4/11 ARM: sa1100: make cpufreq driver build standalone
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Commit 59a2e613d07f ("cpufreq: sa11x0: move cpufreq driver to drivers/cpufreq") added an unnecessary reference to mach/generic.h. Just remove it again after moving the code into the corresponding driver.
--- arch/arm/mach-sa1100/generic.c | 32 --------------------- arch/arm/mach-sa1100/generic.h | 4 --- arch/arm/mach-sa1100/include/mach/generic.h | 1 - drivers/cpufreq/sa1110-cpufreq.c | 32 +++++++++++++++++++++ 4 files changed, 32 insertions(+), 37 deletions(-) delete mode 100644 arch/arm/mach-sa1100/include/mach/generic.h
arch/arm/mach-sa1100/generic.c +0 -32
@@ -39,38 +39,6 @@#include "generic.h" #include <clocksource/pxa.h> -#define NR_FREQS 16 - -/* -* This table is setup for a 3.6864MHz Crystal. -*/ -struct cpufreq_frequency_table sa11x0_freq_table[NR_FREQS +1 ] = { - { .frequency =59000 ,/* 59.0 MHz */ }, - { .frequency =73700 ,/* 73.7 MHz */ }, - { .frequency =88500 ,/* 88.5 MHz */ }, - { .frequency =103200 ,/* 103.2 MHz */ }, - { .frequency =118000 ,/* 118.0 MHz */ }, - { .frequency =132700 ,/* 132.7 MHz */ }, - { .frequency =147500 ,/* 147.5 MHz */ }, - { .frequency =162200 ,/* 162.2 MHz */ }, - { .frequency =176900 ,/* 176.9 MHz */ }, - { .frequency =191700 ,/* 191.7 MHz */ }, - { .frequency =206400 ,/* 206.4 MHz */ }, - { .frequency =221200 ,/* 221.2 MHz */ }, - { .frequency =235900 ,/* 235.9 MHz */ }, - { .frequency =250700 ,/* 250.7 MHz */ }, - { .frequency =265400 ,/* 265.4 MHz */ }, - { .frequency =280200 ,/* 280.2 MHz */ }, - { .frequency =CPUFREQ_TABLE_END , }, -}; - -unsigned int sa11x0_getspeed (unsigned int cpu) -{ -if (cpu) -return 0 ; -return sa11x0_freq_table[PPCR &0xf ].frequency; -} -/* * Default power-off for SA1100 */
arch/arm/mach-sa1100/generic.h +0 -4
@@ -4,7 +4,6 @@* * Author: Nicolas Pitre */ -#include <linux/cpufreq.h> #include <linux/reboot.h> extern void sa1100_timer_init (void );
@@ -21,9 +20,6 @@ extern void sa11x0_init_late(void);extern void sa1110_mb_enable (void );extern void sa1110_mb_disable (void ); -extern struct cpufreq_frequency_table sa11x0_freq_table[]; -extern unsigned int sa11x0_getspeed (unsigned int cpu); -struct flash_platform_data ;struct resource ;
arch/arm/mach-sa1100/include/mach/generic.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../../generic.h"
drivers/cpufreq/sa1110-cpufreq.c +32 -0
@@ -29,6 +29,38 @@#undef DEBUG +#define NR_FREQS 16 + +/* +* This table is setup for a 3.6864MHz Crystal. +*/ +static struct cpufreq_frequency_table sa11x0_freq_table[NR_FREQS +1 ] = { + { .frequency =59000 ,/* 59.0 MHz */ }, + { .frequency =73700 ,/* 73.7 MHz */ }, + { .frequency =88500 ,/* 88.5 MHz */ }, + { .frequency =103200 ,/* 103.2 MHz */ }, + { .frequency =118000 ,/* 118.0 MHz */ }, + { .frequency =132700 ,/* 132.7 MHz */ }, + { .frequency =147500 ,/* 147.5 MHz */ }, + { .frequency =162200 ,/* 162.2 MHz */ }, + { .frequency =176900 ,/* 176.9 MHz */ }, + { .frequency =191700 ,/* 191.7 MHz */ }, + { .frequency =206400 ,/* 206.4 MHz */ }, + { .frequency =221200 ,/* 221.2 MHz */ }, + { .frequency =235900 ,/* 235.9 MHz */ }, + { .frequency =250700 ,/* 250.7 MHz */ }, + { .frequency =265400 ,/* 265.4 MHz */ }, + { .frequency =280200 ,/* 280.2 MHz */ }, + { .frequency =CPUFREQ_TABLE_END , }, +}; + +static unsigned int sa11x0_getspeed (unsigned int cpu) +{ +if (cpu) +return 0 ; +return sa11x0_freq_table[PPCR &0xf ].frequency; +} +struct sdram_params {const char name[20 ];u_char rows;/* bits */
Signature · 1 line
2.29.2
Re: [PATCH 04/11] ARM: sa1100: make cpufreq driver build standalone
Quoted 31 lines · Arnd Bergmann
drivers/cpufreq/sa1110-cpufreq.c +25
-0@@ -29,6 +29,38 @@#undef DEBUG +#define NR_FREQS 16 + +/* +* This table is setup for a 3.6864MHz Crystal. +*/ +static struct cpufreq_frequency_table sa11x0_freq_table[NR_FREQS +1 ] = { + { .frequency =59000 ,/* 59.0 MHz */ }, + { .frequency =73700 ,/* 73.7 MHz */ }, + { .frequency =88500 ,/* 88.5 MHz */ }, + { .frequency =103200 ,/* 103.2 MHz */ }, + { .frequency =118000 ,/* 118.0 MHz */ }, + { .frequency =132700 ,/* 132.7 MHz */ }, + { .frequency =147500 ,/* 147.5 MHz */ }, + { .frequency =162200 ,/* 162.2 MHz */ }, + { .frequency =176900 ,/* 176.9 MHz */ }, + { .frequency =191700 ,/* 191.7 MHz */ }, + { .frequency =206400 ,/* 206.4 MHz */ }, + { .frequency =221200 ,/* 221.2 MHz */ }, + { .frequency =235900 ,/* 235.9 MHz */ }, + { .frequency =250700 ,/* 250.7 MHz */ }, + { .frequency =265400 ,/* 265.4 MHz */ }, + { .frequency =280200 ,/* 280.2 MHz */ }, + { .frequency =CPUFREQ_TABLE_END , }, +}; +
drivers/cpufreq/sa1110-cpufreq.c line 66
Quoted 10 lines
drivers/cpufreq/sa1110-cpufreq.c +7
-0+static unsigned int sa11x0_getspeed (unsigned int cpu) +{ +if (cpu) +return 0 ; +return sa11x0_freq_table[PPCR &0xf ].frequency; +} +struct sdram_params {const char name[20 ];u_char rows;/* bits */
Signature · 1 line
viresh
Russell King (Oracle)
maintainerRe: [PATCH 04/11] ARM: sa1100: make cpufreq driver build standalone
In reply to Arnd BergmannQuoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Commit
59a2e613d07f("cpufreq: sa11x0: move cpufreq driver todrivers/cpufreq") added an unnecessary reference tomach/generic.h. Just remove it again after moving the code into the corresponding driver.
So how does arch/arm/mach-sa1100/clock.c get the MPLL rate with this change?
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
Re: [PATCH 04/11] ARM: sa1100: make cpufreq driver build standalone
Quoted 10 lines · Russell King (Oracle)
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Commit
59a2e613d07f("cpufreq: sa11x0: move cpufreq driver todrivers/cpufreq") added an unnecessary reference tomach/generic.h. Just remove it again after moving the code into the corresponding driver.So how does
arch/arm/mach-sa1100/clock.cget the MPLL rate with this change?
You are right, that's broken. It works for the defconfigs that enable the cpufreq driver, but it seems I need to improve my randconfig build testing to make sure I find problems like this sooner.
I don't think anything depends on this patch, so I've dropped it from my series now.
Thanks,
Arnd
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Russell King (Oracle)
maintainerRe: [PATCH 04/11] ARM: sa1100: make cpufreq driver build standalone
Quoted 9 lines · Arnd Bergmann
Quoted 8 lines · Russell King (Oracle)
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Commit
59a2e613d07f("cpufreq: sa11x0: move cpufreq driver todrivers/cpufreq") added an unnecessary reference tomach/generic.h. Just remove it again after moving the code into the corresponding driver.
Quoted 5 lines
Quoted 2 lines
So how does
arch/arm/mach-sa1100/clock.cget the MPLL rate with this change?You are right, that's broken. It works for the defconfigs that enable the cpufreq driver,
Umm. How? I think your testing must be seriously flawed!
You add sa11x0_getspeed() to the sa1110 cpufreq driver as a static function, which means it won't be visible to clock.c - and clock.c is always built, and always references sa11x0_getspeed()... so you should be getting an unconditional build failure at link time and a compiler warning that sa11x0_getspeed() is not declared.
Are you not seeing that?
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
PATCH 5/11 cpufreq: remove sa1100 driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The sa11xx platform has two cpufreq drivers, one for the older StrongARM1100 SoC, and a second one for StrongARM1110. After the removal of most SA1100 based machines, this driver is unused, and only the sa1110-cpufreq driver remains.
--- drivers/cpufreq/Kconfig | 2 +- drivers/cpufreq/Kconfig.arm | 3 - drivers/cpufreq/Makefile | 1 - drivers/cpufreq/sa1100-cpufreq.c | 206 ------------------------------- 4 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 drivers/cpufreq/sa1100-cpufreq.c
drivers/cpufreq/Kconfig +1 -1
@@ -37,7 +37,7 @@ config CPU_FREQ_STAT choice prompt "Default CPUFreq governor" - default CPU_FREQ_DEFAULT_GOV_USERSPACE if ARM_SA1100_CPUFREQ || ARM_SA1110_CPUFREQ + default CPU_FREQ_DEFAULT_GOV_USERSPACE if ARM_SA1110_CPUFREQ default CPU_FREQ_DEFAULT_GOV_SCHEDUTIL if ARM64 || ARM default CPU_FREQ_DEFAULT_GOV_SCHEDUTIL if X86_INTEL_PSTATE && SMP default CPU_FREQ_DEFAULT_GOV_PERFORMANCE
drivers/cpufreq/Kconfig.arm +0 -3
@@ -277,9 +277,6 @@ config ARM_S5PV210_CPUFREQ If in doubt, say N. -config ARM_SA1100_CPUFREQ - bool - config ARM_SA1110_CPUFREQ bool
drivers/cpufreq/Makefile +0 -1
@@ -78,7 +78,6 @@ obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += s3c24xx-cpufreq.o obj-$(CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS) += s3c24xx-cpufreq-debugfs.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o -obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o obj-$(CONFIG_ARM_SCMI_CPUFREQ) += scmi-cpufreq.o obj-$(CONFIG_ARM_SCPI_CPUFREQ) += scpi-cpufreq.o
drivers/cpufreq/sa1100-cpufreq.c deleted +0 -206
206 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 05/11] cpufreq: remove sa1100 driver
Quoted 257 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The sa11xx platform has two cpufreq drivers, one for the older StrongARM1100 SoC, and a second one for StrongARM1110. After the removal of most SA1100 based machines, this driver is unused, and only the sa1110-cpufreq driver remains.
Signed-off-by Arnd Bergmann <[email protected]>--- drivers/cpufreq/Kconfig | 2 +- drivers/cpufreq/Kconfig.arm | 3 - drivers/cpufreq/Makefile | 1 - drivers/cpufreq/sa1100-cpufreq.c | 206 ------------------------------- 4 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 drivers/cpufreq/sa1100-cpufreq.cdrivers/cpufreq/Kconfig +1
-1@@ -37,7 +37,7 @@ config CPU_FREQ_STAT choice prompt "Default CPUFreq governor" - default CPU_FREQ_DEFAULT_GOV_USERSPACE if ARM_SA1100_CPUFREQ || ARM_SA1110_CPUFREQ + default CPU_FREQ_DEFAULT_GOV_USERSPACE if ARM_SA1110_CPUFREQ default CPU_FREQ_DEFAULT_GOV_SCHEDUTIL if ARM64 || ARM default CPU_FREQ_DEFAULT_GOV_SCHEDUTIL if X86_INTEL_PSTATE && SMP default CPU_FREQ_DEFAULT_GOV_PERFORMANCEdrivers/cpufreq/Kconfig.arm +0
-3@@ -277,9 +277,6 @@ config ARM_S5PV210_CPUFREQ If in doubt, say N. -config ARM_SA1100_CPUFREQ - bool - config ARM_SA1110_CPUFREQ booldrivers/cpufreq/Makefile +0
-1@@ -78,7 +78,6 @@ obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += s3c24xx-cpufreq.o obj-$(CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS) += s3c24xx-cpufreq-debugfs.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o -obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o obj-$(CONFIG_ARM_SCMI_CPUFREQ) += scmi-cpufreq.o obj-$(CONFIG_ARM_SCPI_CPUFREQ) += scpi-cpufreq.odrivers/cpufreq/sa1100-cpufreq.c deleted +0
-196@@ -1,206 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* cpu-sa1100.c: clock scaling for the SA1100 -* -* Copyright (C) 2000 2001, The Delft University of Technology -* -* Authors: -* - Johan Pouwelse ([email protected]): initial version -* - Erik Mouw ([email protected]): -* - major rewrite for linux-2.3.99 -* - rewritten for the more generic power management scheme in -* linux-2.4.5-rmk1 -* -* This software has been developed while working on the LART -* computing board (http://www.lartmaker.nl/), which is -* sponsored by the Mobile Multi-media Communications -* (http://www.mobimedia.org/) and Ubiquitous Communications -* (http://www.ubicom.tudelft.nl/) projects. -* -* The authors can be reached at: -* -* Erik Mouw -* Information and Communication Theory Group -* Faculty of Information Technology and Systems -* Delft University of Technology -* P.O. Box 5031 -* 2600 GA Delft -* The Netherlands -* -* Theory of operations -* ==================== -* -* Clock scaling can be used to lower the power consumption of the CPU -* core. This will give you a somewhat longer running time. -* -* The SA-1100 has a single register to change the core clock speed: -* -* PPCR 0x90020014 PLL config -* -* However, the DRAM timings are closely related to the core clock -* speed, so we need to change these, too. The used registers are: -* -* MDCNFG 0xA0000000 DRAM config -* MDCAS0 0xA0000004 Access waveform -* MDCAS1 0xA0000008 Access waveform -* MDCAS2 0xA000000C Access waveform -* -* Care must be taken to change the DRAM parameters the correct way, -* because otherwise the DRAM becomes unusable and the kernel will -* crash. -* -* The simple solution to avoid a kernel crash is to put the actual -* clock change in ROM and jump to that code from the kernel. The main -* disadvantage is that the ROM has to be modified, which is not -* possible on all SA-1100 platforms. Another disadvantage is that -* jumping to ROM makes clock switching unnecessary complicated. -* -* The idea behind this driver is that the memory configuration can be -* changed while running from DRAM (even with interrupts turned on!) -* as long as all re-configuration steps yield a valid DRAM -* configuration. The advantages are clear: it will run on all SA-1100 -* platforms, and the code is very simple. -* -* If you really want to understand what is going on in -* sa1100_update_dram_timings(), you'll have to read sections 8.2, -* 9.5.7.3, and 10.2 from the "Intel StrongARM SA-1100 Microprocessor -* Developers Manual" (available for free from Intel). -*/ - -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/init.h> -#include <linux/cpufreq.h> -#include <linux/io.h> - -#include <asm/cputype.h> - -#include <mach/generic.h> -#include <mach/hardware.h> - -struct sa1100_dram_regs { -int speed; -u32 mdcnfg; -u32 mdcas0; -u32 mdcas1; -u32 mdcas2; -}; - - -static struct cpufreq_driver sa1100_driver; - -static struct sa1100_dram_regs sa1100_dram_settings[] = { -/*speed, mdcnfg, mdcas0, mdcas1, mdcas2, clock freq */ - {59000 ,0x00dc88a3 ,0xcccccccf ,0xfffffffc ,0xffffffff },/* 59.0 MHz */ - {73700 ,0x011490a3 ,0xcccccccf ,0xfffffffc ,0xffffffff },/* 73.7 MHz */ - {88500 ,0x014e90a3 ,0xcccccccf ,0xfffffffc ,0xffffffff },/* 88.5 MHz */ - {103200 ,0x01889923 ,0xcccccccf ,0xfffffffc ,0xffffffff },/* 103.2 MHz */ - {118000 ,0x01c29923 ,0x9999998f ,0xfffffff9 ,0xffffffff },/* 118.0 MHz */ - {132700 ,0x01fb2123 ,0x9999998f ,0xfffffff9 ,0xffffffff },/* 132.7 MHz */ - {147500 ,0x02352123 ,0x3333330f ,0xfffffff3 ,0xffffffff },/* 147.5 MHz */ - {162200 ,0x026b29a3 ,0x38e38e1f ,0xfff8e38e ,0xffffffff },/* 162.2 MHz */ - {176900 ,0x02a329a3 ,0x71c71c1f ,0xfff1c71c ,0xffffffff },/* 176.9 MHz */ - {191700 ,0x02dd31a3 ,0xe38e383f ,0xffe38e38 ,0xffffffff },/* 191.7 MHz */ - {206400 ,0x03153223 ,0xc71c703f ,0xffc71c71 ,0xffffffff },/* 206.4 MHz */ - {221200 ,0x034fba23 ,0xc71c703f ,0xffc71c71 ,0xffffffff },/* 221.2 MHz */ - {235900 ,0x03853a23 ,0xe1e1e07f ,0xe1e1e1e1 ,0xffffffe1 },/* 235.9 MHz */ - {250700 ,0x03bf3aa3 ,0xc3c3c07f ,0xc3c3c3c3 ,0xffffffc3 },/* 250.7 MHz */ - {265400 ,0x03f7c2a3 ,0xc3c3c07f ,0xc3c3c3c3 ,0xffffffc3 },/* 265.4 MHz */ - {280200 ,0x0431c2a3 ,0x878780ff ,0x87878787 ,0xffffff87 },/* 280.2 MHz */ - {0 ,0 ,0 ,0 ,0 }/* last entry */ -}; - -static void sa1100_update_dram_timings (int current_speed,int new_speed) -{ -struct sa1100_dram_regs *settings = sa1100_dram_settings; - -/* find speed */ -while (settings->speed !=0 ) { -if (new_speed == settings->speed) -break ; - - settings++; - } - -if (settings->speed ==0 ) { -panic ("%s: couldn't find dram setting for speed %d\n" , - __func__, new_speed); - } - -/* No risk, no fun: run with interrupts on! */ -if (new_speed > current_speed) { -/* We're going FASTER, so first relax the memory -* timings before changing the core frequency -*/ - -/* Half the memory access clock */ -MDCNFG |=MDCNFG_CDB2 ; - -/* The order of these statements IS important, keep 8 -* pulses!! -*/ -MDCAS2 = settings->mdcas2; -MDCAS1 = settings->mdcas1; -MDCAS0 = settings->mdcas0; -MDCNFG = settings->mdcnfg; - }else { -/* We're going SLOWER: first decrease the core -* frequency and then tighten the memory settings. -*/ - -/* Half the memory access clock */ -MDCNFG |=MDCNFG_CDB2 ; - -/* The order of these statements IS important, keep 8 -* pulses!! -*/ -MDCAS0 = settings->mdcas0; -MDCAS1 = settings->mdcas1; -MDCAS2 = settings->mdcas2; -MDCNFG = settings->mdcnfg; - } -} - -static int sa1100_target (struct cpufreq_policy *policy,unsigned int ppcr) -{ -unsigned int cur =sa11x0_getspeed (0 ); -unsigned int new_freq; - - new_freq = sa11x0_freq_table[ppcr].frequency; - -if (new_freq > cur) -sa1100_update_dram_timings (cur, new_freq); - -PPCR = ppcr; - -if (new_freq < cur) -sa1100_update_dram_timings (cur, new_freq); - -return 0 ; -} - -static int __init sa1100_cpu_init (struct cpufreq_policy *policy) -{ -cpufreq_generic_init (policy, sa11x0_freq_table,0 ); -return 0 ; -} - -static struct cpufreq_driver sa1100_driver__refdata = { - .flags =CPUFREQ_NEED_INITIAL_FREQ_CHECK | -CPUFREQ_NO_AUTO_DYNAMIC_SWITCHING , - .verify = cpufreq_generic_frequency_table_verify, - .target_index = sa1100_target, - .get = sa11x0_getspeed, - .init = sa1100_cpu_init, - .name ="sa1100" , -};
drivers/cpufreq/sa1100-cpufreq.c line 206
Quoted 10 lines
drivers/cpufreq/sa1100-cpufreq.c deleted +0
-10- -static int __init sa1100_dram_init (void ) -{ -if (cpu_is_sa1100 ()) -return cpufreq_register_driver (&sa1100_driver); -else -return -ENODEV ; -} - -arch_initcall (sa1100_dram_init);
Signature · 1 line
viresh
PATCH 6/11 mtd: remove lart flash driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The sa1100 lart platform was removed, so its flash driver is no longer useful.
--- drivers/mtd/devices/Kconfig | 8 - drivers/mtd/devices/Makefile | 1 - drivers/mtd/devices/lart.c | 682 ----------------------------------- 3 files changed, 691 deletions(-) delete mode 100644 drivers/mtd/devices/lart.c
drivers/mtd/devices/Kconfig +0 -8
@@ -136,14 +136,6 @@ config MTD_PHRAM doesn't have access to, memory beyond the mem=xxx limit, nvram, memory on the video card, etc... -config MTD_LART - tristate "28F160xx flash driver for LART" - depends on SA1100_LART - help - This enables the flash driver for LART. Please note that you do - not need any mapping/chip driver for LART. This one does it all - for you, so go disable all of those if you enabled some of them (: - config MTD_MTDRAM tristate "Test driver using RAM" help
drivers/mtd/devices/Makefile +0 -1
@@ -9,7 +9,6 @@ obj-$(CONFIG_MTD_PHRAM) += phram.o obj-$(CONFIG_MTD_PMC551) += pmc551.o obj-$(CONFIG_MTD_MS02NV) += ms02-nv.o obj-$(CONFIG_MTD_MTDRAM) += mtdram.o -obj-$(CONFIG_MTD_LART) += lart.o obj-$(CONFIG_MTD_BLOCK2MTD) += block2mtd.o obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o obj-$(CONFIG_MTD_MCHP23K256) += mchp23k256.o
drivers/mtd/devices/lart.c deleted +0 -682
682 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 06/11] mtd: remove lart flash driver
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The sa1100 lart platform was removed, so its flash driver is no longer useful.
Signed-off-by Arnd Bergmann <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.
Miquel
PATCH 7/11 ARM: mmp: select specific CPU implementation
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The behavior of the MMP platform code depends on whether the CPU_PXA168/CPU_PXA910/CPU_MMP2 symbols are enabled or not.
I believe the intention here was that these can be left disabled for a pure DT-only build, but it's not clear if that actually works. At the minimum, the cpu_is_pxa168() and cpu_is_pxa910() checks behave differently, which causes changes in the power management code.
For the moment, make the behavior depend on whether CONFIG_ATAGS is set or not, to make it easier to bisect the removal of the old code later.
--- arch/arm/mach-mmp/Kconfig | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mach-mmp/Kconfig +3 -0
@@ -113,6 +113,8 @@ config MACH_MMP_DT select PINCTRL_SINGLE select ARCH_HAS_RESET_CONTROLLER select CPU_MOHAWK + select CPU_PXA168 if ATAGS + select CPU_PXA910 if ATAGS help Include support for Marvell MMP2 based platforms using the device tree. Needn't select any other machine while
@@ -125,6 +127,7 @@ config MACH_MMP2_DT select PINCTRL_SINGLE select ARCH_HAS_RESET_CONTROLLER select CPU_PJ4 + select CPU_MMP2 if ATAGS select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS_OF if PM && OF help
Signature · 1 line
2.29.2
PATCH 8/11 ARM: mmp: remove all board files
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
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.
--- arch/arm/configs/pxa168_defconfig | 3 - arch/arm/configs/pxa910_defconfig | 2 - arch/arm/mach-mmp/Kconfig | 96 -------- arch/arm/mach-mmp/Makefile | 9 - arch/arm/mach-mmp/aspenite.c | 284 --------------------- arch/arm/mach-mmp/avengers_lite.c | 55 ----- arch/arm/mach-mmp/brownstone.c | 237 ------------------ arch/arm/mach-mmp/flint.c | 131 ---------- arch/arm/mach-mmp/gplugd.c | 206 ---------------- arch/arm/mach-mmp/jasper.c | 185 -------------- arch/arm/mach-mmp/mfp-mmp2.h | 396 ------------------------------ arch/arm/mach-mmp/mfp-pxa168.h | 355 -------------------------- arch/arm/mach-mmp/mfp-pxa910.h | 170 ------------- arch/arm/mach-mmp/teton_bga.c | 100 -------- arch/arm/mach-mmp/teton_bga.h | 22 -- arch/arm/mach-mmp/ttc_dkb.c | 315 ------------------------ 16 files changed, 2566 deletions(-) delete mode 100644 arch/arm/mach-mmp/aspenite.c delete mode 100644 arch/arm/mach-mmp/avengers_lite.c delete mode 100644 arch/arm/mach-mmp/brownstone.c delete mode 100644 arch/arm/mach-mmp/flint.c delete mode 100644 arch/arm/mach-mmp/gplugd.c delete mode 100644 arch/arm/mach-mmp/jasper.c delete mode 100644 arch/arm/mach-mmp/mfp-mmp2.h delete mode 100644 arch/arm/mach-mmp/mfp-pxa168.h delete mode 100644 arch/arm/mach-mmp/mfp-pxa910.h delete mode 100644 arch/arm/mach-mmp/teton_bga.c delete mode 100644 arch/arm/mach-mmp/teton_bga.h delete mode 100644 arch/arm/mach-mmp/ttc_dkb.c
arch/arm/configs/pxa168_defconfig +0 -3
@@ -1,9 +1,6 @@ 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
@@ -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
106 lines not on this page · raw message
arch/arm/mach-mmp/Makefile +0 -9
@@ -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 deleted +0 -284
284 lines not on this page · raw message
arch/arm/mach-mmp/avengers_lite.c deleted +0 -55
55 lines not on this page · raw message
arch/arm/mach-mmp/brownstone.c deleted +0 -237
237 lines not on this page · raw message
arch/arm/mach-mmp/flint.c deleted +0 -131
131 lines not on this page · raw message
arch/arm/mach-mmp/gplugd.c deleted +0 -206
206 lines not on this page · raw message
arch/arm/mach-mmp/jasper.c deleted +0 -185
185 lines not on this page · raw message
arch/arm/mach-mmp/mfp-mmp2.h deleted +0 -396
396 lines not on this page · raw message
arch/arm/mach-mmp/mfp-pxa168.h deleted +0 -355
355 lines not on this page · raw message
arch/arm/mach-mmp/mfp-pxa910.h deleted +0 -170
170 lines not on this page · raw message
arch/arm/mach-mmp/teton_bga.c deleted +0 -100
100 lines not on this page · raw message
arch/arm/mach-mmp/teton_bga.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Support for the Marvell PXA168 Teton BGA Development Platform. -*/ -#ifndef __ASM_MACH_TETON_BGA_H -#define __ASM_MACH_TETON_BGA_H - -/* GPIOs */ -#define MMC_PWENA_GPIO 27 -#define USBHPENB_GPIO 55 -#define RTC_INT_GPIO 78 -#define LCD_VBLK_EN_GPIO 79 -#define LCD_DVDD_EN_GPIO 80 -#define RST_WIFI_GPIO 81 -#define CF_PWEN_GPIO 82 -#define USB_OC_GPIO 83 -#define PWM_GPIO 84 -#define USBHPENA_GPIO 85 -#define TS_INT_GPIO 86 -#define CIR_GPIO 108 - -#endif /* __ASM_MACH_TETON_BGA_H */
arch/arm/mach-mmp/ttc_dkb.c deleted +0 -315
315 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH 9/11 ARM: mmp: remove custom sram code
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The MMP_SRAM code is no longer used by the tdma driver because the Kconfig symbol is not selected, so remove it along with its former callsite.
--- arch/arm/mach-mmp/Makefile | 1 - arch/arm/mach-mmp/mmp2.h | 13 -- arch/arm/mach-mmp/sram.c | 167 --------------------- drivers/dma/mmp_tdma.c | 7 +- include/linux/platform_data/dma-mmp_tdma.h | 36 ----- 5 files changed, 2 insertions(+), 222 deletions(-) delete mode 100644 arch/arm/mach-mmp/sram.c delete mode 100644 include/linux/platform_data/dma-mmp_tdma.h
arch/arm/mach-mmp/Makefile +0 -1
@@ -8,7 +8,6 @@ obj-y += common.o devices.o time.o obj-$(CONFIG_CPU_PXA168) += pxa168.o obj-$(CONFIG_CPU_PXA910) += pxa910.o obj-$(CONFIG_CPU_MMP2) += mmp2.o -obj-$(CONFIG_MMP_SRAM) += sram.o ifeq ($(CONFIG_PM),y) obj-$(CONFIG_CPU_PXA910) += pm-pxa910.o
arch/arm/mach-mmp/mmp2.h +0 -13
@@ -10,7 +10,6 @@ extern void mmp2_clear_pmic_int(void);#include <linux/i2c.h> #include <linux/platform_data/i2c-pxa.h> -#include <linux/platform_data/dma-mmp_tdma.h> #include <linux/irqchip/mmp.h> #include "devices.h"
@@ -29,8 +28,6 @@ extern struct mmp_device_desc mmp2_device_sdh0;extern struct mmp_device_desc mmp2_device_sdh1;extern struct mmp_device_desc mmp2_device_sdh2;extern struct mmp_device_desc mmp2_device_sdh3; -extern struct mmp_device_desc mmp2_device_asram; -extern struct mmp_device_desc mmp2_device_isram;extern struct platform_device mmp2_device_gpio;
@@ -90,15 +87,5 @@ static inline int mmp2_add_sdhost(int id, struct sdhci_pxa_platdata *data) return mmp_register_device(d, data, sizeof(*data)); } -static inline int mmp2_add_asram (struct sram_platdata *data) -{ -return mmp_register_device (&mmp2_device_asram, data,sizeof (*data)); -} - -static inline int mmp2_add_isram (struct sram_platdata *data) -{ -return mmp_register_device (&mmp2_device_isram, data,sizeof (*data)); -} -#endif /* __ASM_MACH_MMP2_H */
arch/arm/mach-mmp/sram.c deleted +0 -167
167 lines not on this page · raw message
drivers/dma/mmp_tdma.c +2 -5
@@ -15,7 +15,7 @@#include <linux/dmaengine.h> #include <linux/platform_device.h> #include <linux/device.h> -#include <linux/platform_data/dma-mmp_tdma.h> +#include <linux/genalloc.h> #include <linux/of_device.h> #include <linux/of_dma.h>
@@ -670,10 +670,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)INIT_LIST_HEAD (&tdev->device.channels); -if (pdev->dev.of_node) - pool =of_gen_pool_get (pdev->dev.of_node,"asram" ,0 ); -else - pool =sram_get_gpool ("asram" ); + pool =of_gen_pool_get (pdev->dev.of_node,"asram" ,0 );if (!pool) {dev_err (&pdev->dev,"asram pool not available\n" );return -ENOMEM ;
include/linux/platform_data/dma-mmp_tdma.h deleted +0 -36
@@ -1,36 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* SRAM Memory Management -* -* Copyright (c) 2011 Marvell Semiconductors Inc. -*/ - -#ifndef __DMA_MMP_TDMA_H -#define __DMA_MMP_TDMA_H - -#include <linux/genalloc.h> - -/* ARBITRARY: SRAM allocations are multiples of this 2^N size */ -#define SRAM_GRANULARITY 512 - -enum sram_type { -MMP_SRAM_UNDEFINED =0 , -MMP_ASRAM , -MMP_ISRAM , -}; - -struct sram_platdata { -char *pool_name; -int granularity; -}; - -#ifdef CONFIG_MMP_SRAM -extern struct gen_pool *sram_get_gpool (char *pool_name); -#else -static inline struct gen_pool *sram_get_gpool (char *pool_name) -{ -return NULL ; -} -#endif - -#endif /* __DMA_MMP_TDMA_H */
Signature · 1 line
2.29.2
Re: [PATCH 09/11] ARM: mmp: remove custom sram code
Quoted 5 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The
MMP_SRAMcode is no longer used by the tdma driver because theKconfigsymbol is not selected, so remove it along with its former callsite.
Signature · 1 line
~Vinod
PATCH 10/11 ARM: mmp: remove device definitions
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Since all board support is now gone, a lot of code in the platform is no longer called and can be removed as well. The remaining parts are:
* The interrupt numbers for pxa910 are still needed for the power management support.
* The 'mfp' device is still statically initialized from platform code, though this could be moved into the pinctrl code
* The CPU identification code is used for the cpu_is_mmp*() macros.
--- arch/arm/mach-mmp/Makefile | 2 +- arch/arm/mach-mmp/common.c | 5 - arch/arm/mach-mmp/common.h | 2 - arch/arm/mach-mmp/devices.c | 359 -------------------------------- arch/arm/mach-mmp/devices.h | 57 ----- arch/arm/mach-mmp/irqs.h | 173 --------------- arch/arm/mach-mmp/mfp.h | 35 ---- arch/arm/mach-mmp/mmp2.c | 71 +------ arch/arm/mach-mmp/mmp2.h | 83 -------- arch/arm/mach-mmp/pm-mmp2.c | 34 --- arch/arm/mach-mmp/pm-mmp2.h | 2 +- arch/arm/mach-mmp/pm-pxa910.c | 106 ---------- arch/arm/mach-mmp/pxa168.c | 126 +---------- arch/arm/mach-mmp/pxa168.h | 123 ----------- arch/arm/mach-mmp/pxa910.c | 99 +-------- arch/arm/mach-mmp/pxa910.h | 79 ------- arch/arm/mach-mmp/regs-apbc.h | 19 -- arch/arm/mach-mmp/regs-apmu.h | 28 --- arch/arm/mach-mmp/regs-timers.h | 5 - arch/arm/mach-mmp/regs-usb.h | 155 -------------- arch/arm/mach-mmp/time.c | 9 +- 21 files changed, 7 insertions(+), 1565 deletions(-) delete mode 100644 arch/arm/mach-mmp/devices.c delete mode 100644 arch/arm/mach-mmp/devices.h delete mode 100644 arch/arm/mach-mmp/mfp.h delete mode 100644 arch/arm/mach-mmp/regs-apbc.h delete mode 100644 arch/arm/mach-mmp/regs-apmu.h delete mode 100644 arch/arm/mach-mmp/regs-usb.h
arch/arm/mach-mmp/Makefile +1 -1
@@ -2,7 +2,7 @@ # # Makefile for Marvell's PXA168 processors line # -obj-y += common.o devices.o time.o +obj-y += common.o time.o # SoC support obj-$(CONFIG_CPU_PXA168) += pxa168.o
arch/arm/mach-mmp/common.c +0 -5
@@ -58,8 +58,3 @@ void __init mmp2_map_io(void)mmp_map_io ();iotable_init (mmp2_io_desc,ARRAY_SIZE (mmp2_io_desc)); } - -void mmp_restart (enum reboot_mode mode,const char *cmd) -{ -soft_restart (0 ); -}
arch/arm/mach-mmp/common.h +0 -2
@@ -1,9 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ #include <linux/reboot.h> -#define ARRAY_AND_SIZE (x) (x), ARRAY_SIZE(x)extern void mmp_timer_init (int irq,unsigned long rate);extern void __init mmp_map_io (void );extern void __init mmp2_map_io (void ); -extern void mmp_restart (enum reboot_mode ,const char *);
arch/arm/mach-mmp/devices.c deleted +0 -359
359 lines not on this page · raw message
arch/arm/mach-mmp/devices.h deleted +0 -57
57 lines not on this page · raw message
arch/arm/mach-mmp/irqs.h +0 -173
183 lines not on this page · raw message
arch/arm/mach-mmp/mfp.h deleted +0 -35
@@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_MACH_MFP_H -#define __ASM_MACH_MFP_H - -#include <linux/soc/pxa/mfp.h> - -/* -* NOTE: the MFPR register bit definitions on PXA168 processor lines are a -* bit different from those on PXA3xx. Bit [7:10] are now reserved, which -* were SLEEP_OE_N, SLEEP_DATA, SLEEP_SEL and the LSB of DRIVE bits. -* -* To cope with this difference and re-use the pxa3xx mfp code as much as -* possible, we make the following compromise: -* -* 1. SLEEP_OE_N will always be programmed to '1' (by MFP_LPM_FLOAT) -* 2. DRIVE strength definitions redefined to include the reserved bit -* - the reserved bit differs between pxa168 and pxa910, and the -* MFP_DRIVE_* macros are individually defined in mfp-pxa{168,910}.h -* 3. Override MFP_CFG() and MFP_CFG_DRV() -* 4. Drop the use of MFP_CFG_LPM() and MFP_CFG_X() -*/ - -#undef MFP_CFG -#undef MFP_CFG_DRV -#undef MFP_CFG_LPM -#undef MFP_CFG_X -#undef MFP_CFG_DEFAULT - -#define MFP_CFG (pin, af) \ - (MFP_LPM_FLOAT | MFP_PIN(MFP_PIN_##pin) | MFP_##af | MFP_DRIVE_MEDIUM) - -#define MFP_CFG_DRV (pin, af, drv) \ - (MFP_LPM_FLOAT | MFP_PIN(MFP_PIN_##pin) | MFP_##af | MFP_DRIVE_##drv) - -#endif /* __ASM_MACH_MFP_H */
arch/arm/mach-mmp/mmp2.c +1 -70
87 lines not on this page · raw message
arch/arm/mach-mmp/mmp2.h +0 -83
90 lines not on this page · raw message
arch/arm/mach-mmp/pm-mmp2.c +0 -34
@@ -21,40 +21,6 @@#include "addr-map.h" #include "pm-mmp2.h" #include "regs-icu.h" -#include "irqs.h" - -int mmp2_set_wake (struct irq_data *d,unsigned int on) -{ -unsigned long data =0 ; -int irq = d->irq; - -/* enable wakeup sources */ -switch (irq) { -case IRQ_MMP2_RTC : -case IRQ_MMP2_RTC_ALARM : - data =MPMU_WUCRM_PJ_WAKEUP (4 ) |MPMU_WUCRM_PJ_RTC_ALARM ; -break ; -case IRQ_MMP2_PMIC : - data =MPMU_WUCRM_PJ_WAKEUP (7 ); -break ; -case IRQ_MMP2_MMC2 : -/* mmc use WAKEUP2, same as GPIO wakeup source */ - data =MPMU_WUCRM_PJ_WAKEUP (2 ); -break ; - } -if (on) { -if (data) { - data |=__raw_readl (MPMU_WUCRM_PJ ); -__raw_writel (data,MPMU_WUCRM_PJ ); - } - }else { -if (data) { - data = ~data &__raw_readl (MPMU_WUCRM_PJ ); -__raw_writel (data,MPMU_WUCRM_PJ ); - } - } -return 0 ; -}static void pm_scu_clk_disable (void ) {
arch/arm/mach-mmp/pm-mmp2.h +1 -1
@@ -55,5 +55,5 @@ enum { };extern void mmp2_pm_enter_lowpower_mode (int state); -extern int mmp2_set_wake (struct irq_data *d,unsigned int on); +#endif
arch/arm/mach-mmp/pm-pxa910.c +0 -106
112 lines not on this page · raw message
arch/arm/mach-mmp/pxa168.c +1 -125
149 lines not on this page · raw message
arch/arm/mach-mmp/pxa168.h +0 -123
130 lines not on this page · raw message
arch/arm/mach-mmp/pxa910.c +1 -98
117 lines not on this page · raw message
arch/arm/mach-mmp/pxa910.h +0 -79
85 lines not on this page · raw message
arch/arm/mach-mmp/regs-apbc.h deleted +0 -19
@@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Application Peripheral Bus Clock Unit -*/ - -#ifndef __ASM_MACH_REGS_APBC_H -#define __ASM_MACH_REGS_APBC_H - -#include "addr-map.h" - -/* Common APB clock register bit definitions */ -#define APBC_APBCLK (1 << 0)/* APB Bus Clock Enable */ -#define APBC_FNCLK (1 << 1)/* Functional Clock Enable */ -#define APBC_RST (1 << 2)/* Reset Generation */ - -/* Functional Clock Selection Mask */ -#define APBC_FNCLKSEL (x) (((x) & 0xf) << 4) - -#endif /* __ASM_MACH_REGS_APBC_H */
arch/arm/mach-mmp/regs-apmu.h deleted +0 -28
@@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Application Subsystem Power Management Unit -*/ - -#ifndef __ASM_MACH_REGS_APMU_H -#define __ASM_MACH_REGS_APMU_H - -#include "addr-map.h" - -#define APMU_FNCLK_EN (1 << 4) -#define APMU_AXICLK_EN (1 << 3) -#define APMU_FNRST_DIS (1 << 1) -#define APMU_AXIRST_DIS (1 << 0) - -/* Wake Clear Register */ -#define APMU_WAKE_CLR APMU_REG(0x07c) - -#define APMU_PXA168_KP_WAKE_CLR (1 << 7) -#define APMU_PXA168_CFI_WAKE_CLR (1 << 6) -#define APMU_PXA168_XD_WAKE_CLR (1 << 5) -#define APMU_PXA168_MSP_WAKE_CLR (1 << 4) -#define APMU_PXA168_SD4_WAKE_CLR (1 << 3) -#define APMU_PXA168_SD3_WAKE_CLR (1 << 2) -#define APMU_PXA168_SD2_WAKE_CLR (1 << 1) -#define APMU_PXA168_SD1_WAKE_CLR (1 << 0) - -#endif /* __ASM_MACH_REGS_APMU_H */
arch/arm/mach-mmp/regs-timers.h +0 -5
@@ -6,11 +6,6 @@#ifndef __ASM_MACH_REGS_TIMERS_H#define __ASM_MACH_REGS_TIMERS_H -#include "addr-map.h" - -#define TIMERS1_VIRT_BASE (APB_VIRT_BASE + 0x14000) -#define TIMERS2_VIRT_BASE (APB_VIRT_BASE + 0x16000) -#define TMR_CCR (0x0000)#define TMR_TN_MM (n, m) (0x0004 + ((n) << 3) + (((n) + (m)) << 2))#define TMR_CR (n) (0x0028 + ((n) << 2))
arch/arm/mach-mmp/regs-usb.h deleted +0 -155
155 lines not on this page · raw message
arch/arm/mach-mmp/time.c +2 -7
@@ -29,18 +29,13 @@#include <linux/sched_clock.h> #include <asm/mach/time.h> -#include "addr-map.h" #include "regs-timers.h" -#include "regs-apbc.h" -#include "irqs.h" #include <linux/soc/mmp/cputype.h> -#define TIMERS_VIRT_BASE TIMERS1_VIRT_BASE -#define MAX_DELTA (0xfffffffe)#define MIN_DELTA (16) -static void __iomem *mmp_timer_base =TIMERS_VIRT_BASE ; +static void __iomem *mmp_timer_base;/* * FIXME: the timer needs some delay to stablize the counter capture
@@ -174,7 +169,7 @@ static void __init timer_config(void)__raw_writel (0x2 , mmp_timer_base +TMR_CER ); } -void __init mmp_timer_init (int irq,unsigned long rate) +static void __init mmp_timer_init (int irq,unsigned long rate) {timer_config ();
Signature · 1 line
2.29.2
PATCH 11/11 ARM: mmp: remove old PM support
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Assuming that we don't actually want the old-style pm-mmp2.c and pm-pxa910.c implementation, all these files can go away as well.
--- arch/arm/mach-mmp/Kconfig | 3 - arch/arm/mach-mmp/Makefile | 9 -- arch/arm/mach-mmp/irqs.h | 67 ---------- arch/arm/mach-mmp/mmp2.c | 106 ---------------- arch/arm/mach-mmp/mmp2.h | 8 -- arch/arm/mach-mmp/pm-mmp2.c | 214 -------------------------------- arch/arm/mach-mmp/pm-mmp2.h | 59 --------- arch/arm/mach-mmp/pm-pxa910.c | 166 ------------------------- arch/arm/mach-mmp/pm-pxa910.h | 75 ----------- arch/arm/mach-mmp/pxa168.c | 51 -------- arch/arm/mach-mmp/pxa168.h | 16 --- arch/arm/mach-mmp/pxa910.c | 93 -------------- arch/arm/mach-mmp/pxa910.h | 11 -- arch/arm/mach-mmp/regs-icu.h | 69 ---------- include/linux/soc/mmp/cputype.h | 24 +--- 15 files changed, 1 insertion(+), 970 deletions(-) delete mode 100644 arch/arm/mach-mmp/irqs.h delete mode 100644 arch/arm/mach-mmp/mmp2.c delete mode 100644 arch/arm/mach-mmp/mmp2.h delete mode 100644 arch/arm/mach-mmp/pm-mmp2.c delete mode 100644 arch/arm/mach-mmp/pm-mmp2.h delete mode 100644 arch/arm/mach-mmp/pm-pxa910.c delete mode 100644 arch/arm/mach-mmp/pm-pxa910.h delete mode 100644 arch/arm/mach-mmp/pxa168.c delete mode 100644 arch/arm/mach-mmp/pxa168.h delete mode 100644 arch/arm/mach-mmp/pxa910.c delete mode 100644 arch/arm/mach-mmp/pxa910.h delete mode 100644 arch/arm/mach-mmp/regs-icu.h
arch/arm/mach-mmp/Kconfig +0 -3
@@ -20,8 +20,6 @@ config MACH_MMP_DT select PINCTRL_SINGLE select ARCH_HAS_RESET_CONTROLLER select CPU_MOHAWK - select CPU_PXA168 if ATAGS - select CPU_PXA910 if ATAGS help Include support for Marvell MMP2 based platforms using the device tree. Needn't select any other machine while
@@ -34,7 +32,6 @@ config MACH_MMP2_DT select PINCTRL_SINGLE select ARCH_HAS_RESET_CONTROLLER select CPU_PJ4 - select CPU_MMP2 if ATAGS select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS_OF if PM && OF help
arch/arm/mach-mmp/Makefile +0 -9
@@ -4,15 +4,6 @@ # obj-y += common.o time.o -# SoC support -obj-$(CONFIG_CPU_PXA168) += pxa168.o -obj-$(CONFIG_CPU_PXA910) += pxa910.o -obj-$(CONFIG_CPU_MMP2) += mmp2.o - -ifeq ($(CONFIG_PM),y) -obj-$(CONFIG_CPU_PXA910) += pm-pxa910.o -obj-$(CONFIG_CPU_MMP2) += pm-mmp2.o -endif ifeq ($(CONFIG_SMP),y) obj-$(CONFIG_MACH_MMP3_DT) += platsmp.o endif
arch/arm/mach-mmp/irqs.h deleted +0 -67
67 lines not on this page · raw message
arch/arm/mach-mmp/mmp2.c deleted +0 -106
106 lines not on this page · raw message
arch/arm/mach-mmp/mmp2.h deleted +0 -8
@@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_MACH_MMP2_H -#define __ASM_MACH_MMP2_H - -extern void mmp2_clear_pmic_int (void ); - -#endif /* __ASM_MACH_MMP2_H */ -
arch/arm/mach-mmp/pm-mmp2.c deleted +0 -214
214 lines not on this page · raw message
arch/arm/mach-mmp/pm-mmp2.h deleted +0 -59
59 lines not on this page · raw message
arch/arm/mach-mmp/pm-pxa910.c deleted +0 -166
166 lines not on this page · raw message
arch/arm/mach-mmp/pm-pxa910.h deleted +0 -75
75 lines not on this page · raw message
arch/arm/mach-mmp/pxa168.c deleted +0 -51
51 lines not on this page · raw message
arch/arm/mach-mmp/pxa168.h deleted +0 -16
@@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_MACH_PXA168_H -#define __ASM_MACH_PXA168_H - -#include <linux/reboot.h> - -extern void pxa168_timer_init (void ); -extern void __init pxa168_init_irq (void ); -extern void pxa168_restart (enum reboot_mode ,const char *); -extern void pxa168_clear_keypad_wakeup (void ); - -#include <linux/i2c.h> -#include <linux/soc/mmp/cputype.h> -#include <linux/irqchip/mmp.h> - -#endif /* __ASM_MACH_PXA168_H */
arch/arm/mach-mmp/pxa910.c deleted +0 -93
93 lines not on this page · raw message
arch/arm/mach-mmp/pxa910.h deleted +0 -11
@@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_MACH_PXA910_H -#define __ASM_MACH_PXA910_H - -extern void pxa910_timer_init (void ); -extern void __init pxa910_init_irq (void ); - -#include <linux/i2c.h> -#include <linux/irqchip/mmp.h> - -#endif /* __ASM_MACH_PXA910_H */
arch/arm/mach-mmp/regs-icu.h deleted +0 -69
69 lines not on this page · raw message
include/linux/soc/mmp/cputype.h +1 -23
@@ -26,29 +26,7 @@extern unsigned int mmp_chip_id; -#ifdef CONFIG_CPU_PXA168 -static inline int cpu_is_pxa168 (void ) -{ -return (((read_cpuid_id () >>8 ) &0xff ) ==0x84 ) && - ((mmp_chip_id &0xfff ) ==0x168 ); -} -#else -#define cpu_is_pxa168 () (0) -#endif - -/* cpu_is_pxa910() is shared on both pxa910 and pxa920 */ -#ifdef CONFIG_CPU_PXA910 -static inline int cpu_is_pxa910 (void ) -{ -return (((read_cpuid_id () >>8 ) &0xff ) ==0x84 ) && - (((mmp_chip_id &0xfff ) ==0x910 ) || - ((mmp_chip_id &0xfff ) ==0x920 )); -} -#else -#define cpu_is_pxa910 () (0) -#endif - -#if defined(CONFIG_CPU_MMP2 ) || defined(CONFIG_MACH_MMP2_DT ) +#if defined(CONFIG_MACH_MMP2_DT )static inline int cpu_is_mmp2 (void ) { return (((read_cpuid_id() >> 8) & 0xff) == 0x58) &&
Signature · 1 line
2.29.2