Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ddc1d34 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-cleanup' of... 

Merge tag 'samsung-cleanup' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

Samsung cleanup for v3.15 from Kukjin Kim:
- Use generic uncompress.h for exynos and
  remove exynos <mach/uncompress.h> accordingly
  (other uncompress.h files will be removed)
- move <plat/rtc-core.h> into s3c24xx <mach/rtc-core.h>
- remove unused header files
- cleanup exynos related non-DT stuffs
- use inclusion <linux/serial_s3c.h> instead of
  <plat/regs-serial.h>
- remove unneeded Kconfig entries:
  S3C24XX_GPIO_EXTRA64 and S3C24XX_GPIO_EXTRA128
- remove unneeded function s3c24xx_init_cpu()
- remove obsolete s3c24xx <mach/tick.h>

* tag 'samsung-cleanup' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: Remove uncompress.h
  ARM: debug: Use generic uncompress.h for exynos
  ARM: S3C24XX: Move rtc-core.h from plat to mach
  ARM: EXYNOS: Remove unused header file from pm_domains.c
  ARM: SAMSUNG: Remove Exynos specific code from devs, s5p-pm-irq and pm-gpio.c
  ARM: SAMSUNG: Delete unused plat/regs-serial.h header file
  ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file
  ARM: SAMSUNG: Remove platform dependency from samsung.S
  ARM: S3C24XX: get rid of unneeded selects
  ARM: SAMSUNG: remove unneeded s3c24xx_init_cpu()
  ARM: SAMSUNG: remove obsolete tick.h

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 687fb3c8 d9671ca9

arch/arm/Kconfig.debug

+3 −2
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ config DEBUG_UART_8250_FLOW_CONTROL 


config DEBUG_UNCOMPRESS

	bool

	depends on ARCH_MULTIPLATFORM || ARCH_MSM

	depends on ARCH_MULTIPLATFORM || ARCH_MSM || ARCH_EXYNOS

	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \

		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)

	help
@@ -1161,7 +1161,8 @@ config DEBUG_UNCOMPRESS 


config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \

					ARCH_EXYNOS

	default "mach/uncompress.h"



config EARLY_PRINTK

arch/arm/include/debug/samsung.S

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * published by the Free Software Foundation.

*/



#include <plat/regs-serial.h>

#include <linux/serial_s3c.h>



/* The S5PV210/S5PC110 implementations are as belows. */

arch/arm/mach-exynos/common.c

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <clocksource/samsung_pwm.h>

#include <linux/sched.h>

#include <linux/serial_core.h>

#include <linux/serial_s3c.h>

#include <linux/of.h>

#include <linux/of_fdt.h>

#include <linux/of_irq.h>
@@ -40,7 +41,6 @@ 


#include <plat/cpu.h>

#include <plat/pm.h>

#include <plat/regs-serial.h>



#include "common.h"

#include "regs-pmu.h"

arch/arm/mach-exynos/include/mach/uncompress.h

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010-2012 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * EXYNOS - 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 __FILE__



#include <asm/mach-types.h>



#include <mach/map.h>

#include <plat/uncompress.h>



static unsigned int __raw_readl(unsigned int ptr)

{

	return *((volatile unsigned int *)ptr);

}



static void arch_detect_cpu(void)

{

	u32 chip_id = __raw_readl(EXYNOS_PA_CHIPID);



	/*

	 * product_id is bits 31:12

	 * bits 23:20 describe the exynosX family

	 * bits 27:24 describe the exynosX family in exynos5420

	 */

	chip_id >>= 20;



	if ((chip_id & 0x0f) == 0x5 || (chip_id & 0xf0) == 0x50)

		uart_base = (volatile u8 *)EXYNOS5_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);

	else

		uart_base = (volatile u8 *)EXYNOS4_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);



	/*

	 * For preventing FIFO overrun or infinite loop of UART console,

	 * fifo_max should be the minimum fifo size of all of the UART channels

	 */

	fifo_mask = S5PV210_UFSTAT_TXMASK;

	fifo_max = 15 << S5PV210_UFSTAT_TXSHIFT;

}

#endif /* __ASM_ARCH_UNCOMPRESS_H */

arch/arm/mach-exynos/pm_domains.c

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <linux/of_platform.h>

#include <linux/sched.h>



#include <plat/devs.h>



#include "regs-pmu.h"



/*