Samsung cleanup-2 for v3.15
- use generic uncompress.h and remove all custom uncompress.h in mach-s3c24xx, s3c64xx, s5p64x0, s5pc100, s5pv210 and plat-samsung directories. Note that based on previous tags/samsung-cleanup -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJTKE/jAAoJEA0Cl+kVi2xqqfcP+gIeoH+d6hpgQyz27/N2Xk6X TB7/TA4YEa+JU2xI+wiMsmNbWATSAeUOvgAw+VpiQH2cQo/9kptY/c9HY/kmRQMO Js2XEAAzWThUM9PFDwIVv0tMPpKaqHYaIlstPx2L8gwpPvsabpzzpLAorSrYLehn F83AttiqCK88aZchzBjNFC+pVuvpzbdh9EZVYH72XD2zJATi+aX+RYvDnzoRkRr2 YKQKM3bHUZmLbq5MaY+yeJJws5Me1IuJ4psRrfqmGOs+SEEYAglJutszgBA+Td6t WP/GqYfEPAusf5J/cmNIPJ0jcsMLCbAaM+AgPufZxaBE4C9KloveENAA28Mk1QWE uVIvrkIl3OguARfarT9JMDiR7rnvhFoPrfuQ9s3Il280AsxF0lwokcZtJQ3t4I8B WJW9sROE/JB7oW6ZPuwBbCwOZeXPcQ2mUg9NpGv3HisAv4JS0M8UjI8NwN44y2DE k1xYoIQxeL5FOOiTPyn59TRdHR5IsQ7dB4dw1HDgbc97gmDTDdgiwlrn0h/Ffjh8 BdFVa4nh45n3arGim+PrdE+QGwCsGBKjMRY6//gCSzJDOkP+vN5tGSTEyL11aAxD ewIK14z41a7K5A4PRRM0DVBM+23SiuwMyTyA3RlfBywYwL7r7/HHReLg1Lz6IY7m d9WeWMQAIwIcbGFy3LZK =fYmL -----END PGP SIGNATURE----- Merge tag 'samsung-cleanup-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup3 Merge "Samsung cleanup-2 for v3.15" from Kukjin Kim: - use generic uncompress.h and remove all custom uncompress.h in mach-s3c24xx, s3c64xx, s5p64x0, s5pc100, s5pv210 and plat-samsung directories. Note that based on previous tags/samsung-cleanup * tag 'samsung-cleanup-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: SAMSUNG: remove all custom uncompress.h ARM: SAMSUNG: use generic uncompress.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
Коммит
2b23e9a51d
|
|
@ -1145,7 +1145,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
|
||||||
|
|
||||||
config DEBUG_UNCOMPRESS
|
config DEBUG_UNCOMPRESS
|
||||||
bool
|
bool
|
||||||
depends on ARCH_MULTIPLATFORM || ARCH_MSM || ARCH_EXYNOS
|
depends on ARCH_MULTIPLATFORM || ARCH_MSM || PLAT_SAMSUNG
|
||||||
default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
|
default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
|
||||||
(!DEBUG_TEGRA_UART || !ZBOOT_ROM)
|
(!DEBUG_TEGRA_UART || !ZBOOT_ROM)
|
||||||
help
|
help
|
||||||
|
|
@ -1162,7 +1162,7 @@ config DEBUG_UNCOMPRESS
|
||||||
config UNCOMPRESS_INCLUDE
|
config UNCOMPRESS_INCLUDE
|
||||||
string
|
string
|
||||||
default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
|
default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
|
||||||
ARCH_EXYNOS
|
PLAT_SAMSUNG
|
||||||
default "mach/uncompress.h"
|
default "mach/uncompress.h"
|
||||||
|
|
||||||
config EARLY_PRINTK
|
config EARLY_PRINTK
|
||||||
|
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
/* arch/arm/mach-s3c2410/include/mach/uncompress.h
|
|
||||||
*
|
|
||||||
* Copyright (c) 2003-2007 Simtec Electronics
|
|
||||||
* http://armlinux.simtec.co.uk/
|
|
||||||
* Ben Dooks <ben@simtec.co.uk>
|
|
||||||
*
|
|
||||||
* S3C2410 - uncompress code
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ASM_ARCH_UNCOMPRESS_H
|
|
||||||
#define __ASM_ARCH_UNCOMPRESS_H
|
|
||||||
|
|
||||||
#include <mach/regs-gpio.h>
|
|
||||||
#include <mach/map.h>
|
|
||||||
|
|
||||||
/* working in physical space... */
|
|
||||||
#undef S3C2410_GPIOREG
|
|
||||||
#define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x)))
|
|
||||||
|
|
||||||
#include <plat/uncompress.h>
|
|
||||||
|
|
||||||
static inline int is_arm926(void)
|
|
||||||
{
|
|
||||||
unsigned int cpuid;
|
|
||||||
|
|
||||||
asm volatile ("mrc p15, 0, %0, c1, c0, 0" : "=r" (cpuid));
|
|
||||||
|
|
||||||
return ((cpuid & 0xff0) == 0x260);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void arch_detect_cpu(void)
|
|
||||||
{
|
|
||||||
unsigned int cpuid;
|
|
||||||
|
|
||||||
cpuid = *((volatile unsigned int *)S3C2410_GSTATUS1);
|
|
||||||
cpuid &= S3C2410_GSTATUS1_IDMASK;
|
|
||||||
|
|
||||||
if (is_arm926() || cpuid == S3C2410_GSTATUS1_2440 ||
|
|
||||||
cpuid == S3C2410_GSTATUS1_2442 ||
|
|
||||||
cpuid == S3C2410_GSTATUS1_2416 ||
|
|
||||||
cpuid == S3C2410_GSTATUS1_2450) {
|
|
||||||
fifo_mask = S3C2440_UFSTAT_TXMASK;
|
|
||||||
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
|
|
||||||
} else {
|
|
||||||
fifo_mask = S3C2410_UFSTAT_TXMASK;
|
|
||||||
fifo_max = 15 << S3C2410_UFSTAT_TXSHIFT;
|
|
||||||
}
|
|
||||||
|
|
||||||
uart_base = (volatile u8 *) S3C_PA_UART +
|
|
||||||
(S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
/* arch/arm/mach-s3c6400/include/mach/uncompress.h
|
|
||||||
*
|
|
||||||
* Copyright 2008 Openmoko, Inc.
|
|
||||||
* Copyright 2008 Simtec Electronics
|
|
||||||
* http://armlinux.simtec.co.uk/
|
|
||||||
* Ben Dooks <ben@simtec.co.uk>
|
|
||||||
*
|
|
||||||
* S3C6400 - uncompress code
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ASM_ARCH_UNCOMPRESS_H
|
|
||||||
#define __ASM_ARCH_UNCOMPRESS_H
|
|
||||||
|
|
||||||
#include <mach/map.h>
|
|
||||||
#include <plat/uncompress.h>
|
|
||||||
|
|
||||||
static void arch_detect_cpu(void)
|
|
||||||
{
|
|
||||||
/* we do not need to do any cpu detection here at the moment. */
|
|
||||||
fifo_mask = S3C2440_UFSTAT_TXMASK;
|
|
||||||
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
|
|
||||||
|
|
||||||
uart_base = (volatile u8 *)S3C_PA_UART +
|
|
||||||
(S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
/* linux/arch/arm/mach-s5p64x0/include/mach/uncompress.h
|
|
||||||
*
|
|
||||||
* Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
|
|
||||||
* http://www.samsung.com
|
|
||||||
*
|
|
||||||
* S5P64X0 - uncompress code
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ASM_ARCH_UNCOMPRESS_H
|
|
||||||
#define __ASM_ARCH_UNCOMPRESS_H
|
|
||||||
|
|
||||||
#include <mach/map.h>
|
|
||||||
#include <plat/uncompress.h>
|
|
||||||
|
|
||||||
static void arch_detect_cpu(void)
|
|
||||||
{
|
|
||||||
unsigned int chipid;
|
|
||||||
|
|
||||||
chipid = *(const volatile unsigned int __force *) 0xE0100118;
|
|
||||||
|
|
||||||
if ((chipid & 0xff000) == 0x50000)
|
|
||||||
uart_base = (volatile u8 *)S5P6450_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
|
|
||||||
else
|
|
||||||
uart_base = (volatile u8 *)S5P6440_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
|
|
||||||
|
|
||||||
fifo_mask = S3C2440_UFSTAT_TXMASK;
|
|
||||||
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
/* arch/arm/mach-s5pc100/include/mach/uncompress.h
|
|
||||||
*
|
|
||||||
* Copyright 2009 Samsung Electronics Co.
|
|
||||||
* Byungho Min <bhmin@samsung.com>
|
|
||||||
*
|
|
||||||
* S5PC100 - uncompress code
|
|
||||||
*
|
|
||||||
* Based on mach-s3c6400/include/mach/uncompress.h
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ASM_ARCH_UNCOMPRESS_H
|
|
||||||
#define __ASM_ARCH_UNCOMPRESS_H
|
|
||||||
|
|
||||||
#include <mach/map.h>
|
|
||||||
#include <plat/uncompress.h>
|
|
||||||
|
|
||||||
static void arch_detect_cpu(void)
|
|
||||||
{
|
|
||||||
/* we do not need to do any cpu detection here at the moment. */
|
|
||||||
fifo_mask = S3C2440_UFSTAT_TXMASK;
|
|
||||||
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
|
|
||||||
|
|
||||||
uart_base = (volatile u8 *)S5P_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
/* linux/arch/arm/mach-s5pv210/include/mach/uncompress.h
|
|
||||||
*
|
|
||||||
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
|
|
||||||
* http://www.samsung.com/
|
|
||||||
*
|
|
||||||
* S5PV210 - uncompress code
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ASM_ARCH_UNCOMPRESS_H
|
|
||||||
#define __ASM_ARCH_UNCOMPRESS_H
|
|
||||||
|
|
||||||
#include <mach/map.h>
|
|
||||||
#include <plat/uncompress.h>
|
|
||||||
|
|
||||||
static void arch_detect_cpu(void)
|
|
||||||
{
|
|
||||||
/* we do not need to do any cpu detection here at the moment. */
|
|
||||||
fifo_mask = S5PV210_UFSTAT_TXMASK;
|
|
||||||
fifo_max = 63 << S5PV210_UFSTAT_TXSHIFT;
|
|
||||||
|
|
||||||
uart_base = (volatile u8 *)S5P_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_UNCOMPRESS_H */
|
|
||||||
|
|
@ -1,175 +0,0 @@
|
||||||
/* arch/arm/plat-samsung/include/plat/uncompress.h
|
|
||||||
*
|
|
||||||
* Copyright 2003, 2007 Simtec Electronics
|
|
||||||
* http://armlinux.simtec.co.uk/
|
|
||||||
* Ben Dooks <ben@simtec.co.uk>
|
|
||||||
*
|
|
||||||
* S3C - uncompress code
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ASM_PLAT_UNCOMPRESS_H
|
|
||||||
#define __ASM_PLAT_UNCOMPRESS_H
|
|
||||||
|
|
||||||
typedef unsigned int upf_t; /* cannot include linux/serial_core.h */
|
|
||||||
|
|
||||||
/* uart setup */
|
|
||||||
|
|
||||||
unsigned int fifo_mask;
|
|
||||||
unsigned int fifo_max;
|
|
||||||
|
|
||||||
volatile u8 *uart_base;
|
|
||||||
|
|
||||||
/* forward declerations */
|
|
||||||
|
|
||||||
static void arch_detect_cpu(void);
|
|
||||||
|
|
||||||
/* defines for UART registers */
|
|
||||||
|
|
||||||
#include <linux/serial_s3c.h>
|
|
||||||
|
|
||||||
/* working in physical space... */
|
|
||||||
#define S3C_WDOGREG(x) ((S3C_PA_WDT + (x)))
|
|
||||||
|
|
||||||
#define S3C2410_WTCON S3C_WDOGREG(0x00)
|
|
||||||
#define S3C2410_WTDAT S3C_WDOGREG(0x04)
|
|
||||||
#define S3C2410_WTCNT S3C_WDOGREG(0x08)
|
|
||||||
|
|
||||||
#define S3C2410_WTCON_RSTEN (1 << 0)
|
|
||||||
#define S3C2410_WTCON_ENABLE (1 << 5)
|
|
||||||
|
|
||||||
#define S3C2410_WTCON_DIV128 (3 << 3)
|
|
||||||
|
|
||||||
#define S3C2410_WTCON_PRESCALE(x) ((x) << 8)
|
|
||||||
|
|
||||||
/* how many bytes we allow into the FIFO at a time in FIFO mode */
|
|
||||||
#define FIFO_MAX (14)
|
|
||||||
|
|
||||||
static __inline__ void
|
|
||||||
uart_wr(unsigned int reg, unsigned int val)
|
|
||||||
{
|
|
||||||
volatile unsigned int *ptr;
|
|
||||||
|
|
||||||
ptr = (volatile unsigned int *)(reg + uart_base);
|
|
||||||
*ptr = val;
|
|
||||||
}
|
|
||||||
|
|
||||||
static __inline__ unsigned int
|
|
||||||
uart_rd(unsigned int reg)
|
|
||||||
{
|
|
||||||
volatile unsigned int *ptr;
|
|
||||||
|
|
||||||
ptr = (volatile unsigned int *)(reg + uart_base);
|
|
||||||
return *ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* we can deal with the case the UARTs are being run
|
|
||||||
* in FIFO mode, so that we don't hold up our execution
|
|
||||||
* waiting for tx to happen...
|
|
||||||
*/
|
|
||||||
|
|
||||||
static void putc(int ch)
|
|
||||||
{
|
|
||||||
if (!config_enabled(CONFIG_DEBUG_LL))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (uart_rd(S3C2410_UFCON) & S3C2410_UFCON_FIFOMODE) {
|
|
||||||
int level;
|
|
||||||
|
|
||||||
while (1) {
|
|
||||||
level = uart_rd(S3C2410_UFSTAT);
|
|
||||||
level &= fifo_mask;
|
|
||||||
|
|
||||||
if (level < fifo_max)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
/* not using fifos */
|
|
||||||
|
|
||||||
while ((uart_rd(S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE) != S3C2410_UTRSTAT_TXE)
|
|
||||||
barrier();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* write byte to transmission register */
|
|
||||||
uart_wr(S3C2410_UTXH, ch);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void flush(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#define __raw_writel(d, ad) \
|
|
||||||
do { \
|
|
||||||
*((volatile unsigned int __force *)(ad)) = (d); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#ifdef CONFIG_S3C_BOOT_ERROR_RESET
|
|
||||||
|
|
||||||
static void arch_decomp_error(const char *x)
|
|
||||||
{
|
|
||||||
putstr("\n\n");
|
|
||||||
putstr(x);
|
|
||||||
putstr("\n\n -- System resetting\n");
|
|
||||||
|
|
||||||
__raw_writel(0x4000, S3C2410_WTDAT);
|
|
||||||
__raw_writel(0x4000, S3C2410_WTCNT);
|
|
||||||
__raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x40), S3C2410_WTCON);
|
|
||||||
|
|
||||||
while(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define arch_error arch_decomp_error
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO
|
|
||||||
static inline void arch_enable_uart_fifo(void)
|
|
||||||
{
|
|
||||||
u32 fifocon;
|
|
||||||
|
|
||||||
if (!config_enabled(CONFIG_DEBUG_LL))
|
|
||||||
return;
|
|
||||||
|
|
||||||
fifocon = uart_rd(S3C2410_UFCON);
|
|
||||||
|
|
||||||
if (!(fifocon & S3C2410_UFCON_FIFOMODE)) {
|
|
||||||
fifocon |= S3C2410_UFCON_RESETBOTH;
|
|
||||||
uart_wr(S3C2410_UFCON, fifocon);
|
|
||||||
|
|
||||||
/* wait for fifo reset to complete */
|
|
||||||
while (1) {
|
|
||||||
fifocon = uart_rd(S3C2410_UFCON);
|
|
||||||
if (!(fifocon & S3C2410_UFCON_RESETBOTH))
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
uart_wr(S3C2410_UFCON, S3C2410_UFCON_FIFOMODE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
#define arch_enable_uart_fifo() do { } while(0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
static void
|
|
||||||
arch_decomp_setup(void)
|
|
||||||
{
|
|
||||||
/* we may need to setup the uart(s) here if we are not running
|
|
||||||
* on an BAST... the BAST will have left the uarts configured
|
|
||||||
* after calling linux.
|
|
||||||
*/
|
|
||||||
|
|
||||||
arch_detect_cpu();
|
|
||||||
|
|
||||||
/* Enable the UART FIFOs if they where not enabled and our
|
|
||||||
* configuration says we should turn them on.
|
|
||||||
*/
|
|
||||||
|
|
||||||
arch_enable_uart_fifo();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* __ASM_PLAT_UNCOMPRESS_H */
|
|
||||||
Загрузка…
Ссылка в новой задаче