Skip to contentSkip to conversation

arm: Remove unused ST-Ericsson u8500 arch

PATCH In review Stefan Roese 3 participants 3 messages Sep 14, 2015 – Sep 15, 2015

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: Remove unused ST-Ericsson u8500 arch

This arch does not seem to be supported / used at all in the current U-Boot mainline source tree any more. So lets remove the core u8500 code and code that was only referenced by this platform.

Please note that this patch also removes these config options:

- CONFIG_PL011_SERIAL_RLCR
- CONFIG_PL011_SERIAL_FLUSH_ON_INIT

As they only seem to be referenced by u8500 based boards. Without any such board in the current code, these config option don't make sense any more. Lets remove them as well.

If someone still wants to use this platform, then please send patches to re-enable support by adding at least one board that references this code.

Cc Mathieu Poirier <[email protected]>
Cc John Rigby <[email protected]>
Cc Simon Glass <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Tom Rini <[email protected]>
Cc Heiko Schocher <[email protected]>
Cc Albert Aribaud <[email protected]>
---
 README                                          |  12 -
 arch/arm/cpu/armv7/Makefile                     |   1 -
 arch/arm/cpu/armv7/u8500/Makefile               |   9 -
 arch/arm/cpu/armv7/u8500/clock.c                |  74 ---
 arch/arm/cpu/armv7/u8500/cpu.c                  | 176 -------
 arch/arm/cpu/armv7/u8500/lowlevel.S             |  21 -
 arch/arm/cpu/armv7/u8500/prcmu.c                | 214 ---------
 arch/arm/cpu/armv7/u8500/timer.c                | 135 ------
 arch/arm/include/asm/arch-u8500/clock.h         |  53 ---
 arch/arm/include/asm/arch-u8500/db8500_gpio.h   |  42 --
 arch/arm/include/asm/arch-u8500/db8500_pincfg.h | 170 -------
 arch/arm/include/asm/arch-u8500/gpio.h          | 231 ---------
 arch/arm/include/asm/arch-u8500/hardware.h      |  94 ----
 arch/arm/include/asm/arch-u8500/prcmu.h         |  64 ---
 arch/arm/include/asm/arch-u8500/sys_proto.h     |  12 -
 arch/arm/include/asm/arch-u8500/u8500.h         |  31 --
 drivers/i2c/Makefile                            |   1 -
 drivers/i2c/u8500_i2c.c                         | 601 ------------------------
 drivers/i2c/u8500_i2c.h                         | 178 -------
 drivers/serial/serial_pl01x.c                   |  22 -
 drivers/usb/musb-new/musb_core.c                |   2 +-
 21 files changed, 1 insertion(+), 2142 deletions(-)
 delete mode 100644 arch/arm/cpu/armv7/u8500/Makefile
 delete mode 100644 arch/arm/cpu/armv7/u8500/clock.c
 delete mode 100644 arch/arm/cpu/armv7/u8500/cpu.c
 delete mode 100644 arch/arm/cpu/armv7/u8500/lowlevel.S
 delete mode 100644 arch/arm/cpu/armv7/u8500/prcmu.c
 delete mode 100644 arch/arm/cpu/armv7/u8500/timer.c
 delete mode 100644 arch/arm/include/asm/arch-u8500/clock.h
 delete mode 100644 arch/arm/include/asm/arch-u8500/db8500_gpio.h
 delete mode 100644 arch/arm/include/asm/arch-u8500/db8500_pincfg.h
 delete mode 100644 arch/arm/include/asm/arch-u8500/gpio.h
 delete mode 100644 arch/arm/include/asm/arch-u8500/hardware.h
 delete mode 100644 arch/arm/include/asm/arch-u8500/prcmu.h
 delete mode 100644 arch/arm/include/asm/arch-u8500/sys_proto.h
 delete mode 100644 arch/arm/include/asm/arch-u8500/u8500.h
 delete mode 100644 drivers/i2c/u8500_i2c.c
 delete mode 100644 drivers/i2c/u8500_i2c.h
README +0 -12
index 1acc355..a13705a 100644
@@ -840,18 +840,6 @@ The following options need to be configured:
 		define this to a list of base addresses for each (supported)
 		port. See e.g. include/configs/versatile.h
 
-		CONFIG_PL011_SERIAL_RLCR
-
-		Some vendor versions of PL011 serial ports (e.g. ST-Ericsson U8500)
-		have separate receive and transmit line control registers.  Set
-		this variable to initialize the extra register.
-
-		CONFIG_PL011_SERIAL_FLUSH_ON_INIT
-
-		On some platforms (e.g. U8500) U-Boot is loaded by a second stage
-		boot loader that has already initialized the UART.  Define this
-		variable to flush the UART at init time.
-
 		CONFIG_SERIAL_HW_FLOW_CONTROL
 
 		Define this variable to enable hw flow control in serial driver.
arch/arm/cpu/armv7/Makefile +0 -1
index 79a38df..c8d1422 100644
@@ -52,5 +52,4 @@ obj-$(CONFIG_RMOBILE) += rmobile/
 obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/
 obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/
 obj-$(CONFIG_ARCH_SUNXI) += sunxi/
-obj-$(CONFIG_U8500) += u8500/
 obj-$(CONFIG_VF610) += vf610/
arch/arm/cpu/armv7/u8500/Makefile deleted +0 -9
deleted file mode 100644
index fad9d4a..0000000
@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y	:= timer.o clock.o prcmu.o cpu.o
-obj-y	+= lowlevel.o
arch/arm/cpu/armv7/u8500/clock.c deleted +0 -74

74 lines not on this page · raw message

arch/arm/cpu/armv7/u8500/cpu.c deleted +0 -176

176 lines not on this page · raw message

arch/arm/cpu/armv7/u8500/lowlevel.S deleted +0 -21
deleted file mode 100644
index d3e3920..0000000
@@ -1,21 +0,0 @@
-/*
- * (C) Copyright 2011 ST-Ericsson
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <config.h>
-#include <linux/linkage.h>
-
-ENTRY(lowlevel_init)
-	mov	pc, lr
-ENDPROC(lowlevel_init)
-
-	.align	5
-ENTRY(reset_cpu)
-	ldr r0, =CFG_PRCMU_BASE
-	ldr r1, =0x1
-	str r1, [r0, #0x228]
-_loop_forever:
-	b	_loop_forever
-ENDPROC(reset_cpu)
arch/arm/cpu/armv7/u8500/prcmu.c deleted +0 -214

214 lines not on this page · raw message

arch/arm/cpu/armv7/u8500/timer.c deleted +0 -135

135 lines not on this page · raw message

arch/arm/include/asm/arch-u8500/clock.h deleted +0 -53

53 lines not on this page · raw message

arch/arm/include/asm/arch-u8500/db8500_gpio.h deleted +0 -42

42 lines not on this page · raw message

arch/arm/include/asm/arch-u8500/db8500_pincfg.h deleted +0 -170

170 lines not on this page · raw message

arch/arm/include/asm/arch-u8500/gpio.h deleted +0 -231

231 lines not on this page · raw message

arch/arm/include/asm/arch-u8500/hardware.h deleted +0 -94

94 lines not on this page · raw message

arch/arm/include/asm/arch-u8500/prcmu.h deleted +0 -64

64 lines not on this page · raw message

arch/arm/include/asm/arch-u8500/sys_proto.h deleted +0 -12
deleted file mode 100644
index 03a3cd3..0000000
@@ -1,12 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-#ifndef _SYS_PROTO_H_
-#define _SYS_PROTO_H_
-
-void gpio_init(void);
-int u8500_mmc_power_init(void);
-
-#endif  /* _SYS_PROTO_H_ */
arch/arm/include/asm/arch-u8500/u8500.h deleted +0 -31
deleted file mode 100644
index 16ad081..0000000
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2009
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __U8500_H
-#define __U8500_H
-
-/*
- * base register values for U8500
- */
-#define CFG_PRCMU_BASE		0x80157000	/* Power, reset and clock
-						   Management Unit */
-#define CFG_SDRAMC_BASE		0x903CF000	/* SDRAMC cnf registers */
-#define CFG_FSMC_BASE		0x80000000	/* FSMC Controller */
-
-/*
- * U8500 GPIO register base for 9 banks
- */
-#define U8500_GPIO_0_BASE			0x8012E000
-#define U8500_GPIO_1_BASE			0x8012E080
-#define U8500_GPIO_2_BASE			0x8000E000
-#define U8500_GPIO_3_BASE			0x8000E080
-#define U8500_GPIO_4_BASE			0x8000E100
-#define U8500_GPIO_5_BASE			0x8000E180
-#define U8500_GPIO_6_BASE			0x8011E000
-#define U8500_GPIO_7_BASE			0x8011E080
-#define U8500_GPIO_8_BASE			0xA03FE000
-
-#endif	/* __U8500_H */
drivers/i2c/Makefile +0 -1
index 8ce294b..32198bd 100644
@@ -14,7 +14,6 @@ obj-$(CONFIG_SYS_I2C_ADI) += adi_i2c.o
 obj-$(CONFIG_I2C_MV) += mv_i2c.o
 obj-$(CONFIG_PCA9564_I2C) += pca9564_i2c.o
 obj-$(CONFIG_TSI108_I2C) += tsi108_i2c.o
-obj-$(CONFIG_U8500_I2C) += u8500_i2c.o
 obj-$(CONFIG_SH_SH7734_I2C) += sh_sh7734_i2c.o
 obj-$(CONFIG_SYS_I2C) += i2c_core.o
 obj-$(CONFIG_SYS_I2C_DAVINCI) += davinci_i2c.o
drivers/i2c/u8500_i2c.c deleted +0 -601

601 lines not on this page · raw message

drivers/i2c/u8500_i2c.h deleted +0 -178

178 lines not on this page · raw message

drivers/serial/serial_pl01x.c +0 -22
index ecf3bc0..3a5c1d0 100644
@@ -80,13 +80,6 @@ static int pl01x_generic_serial_init(struct pl01x_regs *regs,
 		writel(0, &regs->pl010_cr);
 		break;
 	case TYPE_PL011:
-#ifdef CONFIG_PL011_SERIAL_FLUSH_ON_INIT
-		/* Empty RX fifo if necessary */
-		if (readl(&regs->pl011_cr) & UART_PL011_CR_UARTEN) {
-			while (!(readl(&regs->fr) & UART_PL01x_FR_RXFE))
-				readl(&regs->dr);
-		}
-#endif
 		/* disable everything */
 		writel(0, &regs->pl011_cr);
 		break;
@@ -105,21 +98,6 @@ static int pl011_set_line_control(struct pl01x_regs *regs)
 	 * control register write
 	 */
 	lcr = UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN;
-#ifdef CONFIG_PL011_SERIAL_RLCR
-	{
-		int i;
-
-		/*
-		 * Program receive line control register after waiting
-		 * 10 bus cycles.  Delay be writing to readonly register
-		 * 10 times
-		 */
-		for (i = 0; i < 10; i++)
-			writel(lcr, &regs->fr);
-
-		writel(lcr, &regs->pl011_rlcr);
-	}
-#endif
 	writel(lcr, &regs->pl011_lcrh);
 	return 0;
 }
drivers/usb/musb-new/musb_core.c +1 -1
index 411e5a0..d1b6d15 100644
@@ -1550,7 +1550,7 @@ static int __devinit musb_core_init(u16 musb_type, struct musb *musb)
 /*-------------------------------------------------------------------------*/
 
 #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \
-	defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500)
+	defined(CONFIG_ARCH_OMAP4)
 
 static irqreturn_t generic_interrupt(int irq, void *__hci)
 {
Signature · 1 line
2.5.2
#1 lore raw

PATCH 1/1 arm: Remove unused ST-Ericsson u8500 arch

Hi Stefan,

2015-09-14 16:17 GMT+09:00 Stefan Roese <[email protected]>:

Quoted 9 lines

This arch does not seem to be supported / used at all in the current U-Boot mainline source tree any more. So lets remove the core u8500 code and code that was only referenced by this platform.

Please note that this patch also removes these config options:

- CONFIG_PL011_SERIAL_RLCR
- CONFIG_PL011_SERIAL_FLUSH_ON_INIT

Quoted 8 lines

As they only seem to be referenced by u8500 based boards. Without any such board in the current code, these config option don't make sense any more. Lets remove them as well.

If someone still wants to use this platform, then please send patches to re-enable support by adding at least one board that references this code.

Good cleanup!

The last boards, snowball and u8500_href,
were deleted recently by Simon.

So,

Signature · 2 lines
Best Regards
Masahiro Yamada
#2 lore raw
In reply to Stefan Roese
Quoted 17 lines · Stefan Roese

This arch does not seem to be supported / used at all in the current U-Boot mainline source tree any more. So lets remove the core u8500 code and code that was only referenced by this platform.

Please note that this patch also removes these config options:

- CONFIG_PL011_SERIAL_RLCR
- CONFIG_PL011_SERIAL_FLUSH_ON_INIT

As they only seem to be referenced by u8500 based boards. Without any such board in the current code, these config option don't make sense any more. Lets remove them as well.

If someone still wants to use this platform, then please send patches to re-enable support by adding at least one board that references this code.

Quoted 9 lines
Cc Mathieu Poirier <[email protected]>
Cc John Rigby <[email protected]>
Cc Simon Glass <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Tom Rini <[email protected]>
Cc Heiko Schocher <[email protected]>
Cc Albert Aribaud <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150915/c65456cd/attachment.sig>