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: Olof Johansson <olof@lixom.net>
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <mach/map.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <linux/serial_s3c.h>
|
||||
|
||||
#define S3C2410_UART1_OFF (0x4000)
|
||||
#define SHIFT_2440TXF (14-9)
|
||||
|
26
arch/arm/mach-s3c24xx/include/mach/rtc-core.h
Normal file
26
arch/arm/mach-s3c24xx/include/mach/rtc-core.h
Normal file
@@ -0,0 +1,26 @@
|
||||
/*
|
||||
* Copyright (c) 2011 Heiko Stuebner <heiko@sntech.de>
|
||||
*
|
||||
* Samsung RTC Controller core functions
|
||||
*
|
||||
* 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 __RTC_CORE_H
|
||||
#define __RTC_CORE_H __FILE__
|
||||
|
||||
/* These functions are only for use with the core support code, such as
|
||||
* the cpu specific initialisation code
|
||||
*/
|
||||
|
||||
extern struct platform_device s3c_device_rtc;
|
||||
|
||||
/* re-define device name depending on support. */
|
||||
static inline void s3c_rtc_setname(char *name)
|
||||
{
|
||||
s3c_device_rtc.name = name;
|
||||
}
|
||||
|
||||
#endif /* __RTC_CORE_H */
|
@@ -1,15 +0,0 @@
|
||||
/* linux/arch/arm/mach-s3c2410/include/mach/tick.h
|
||||
*
|
||||
* Copyright 2008 Simtec Electronics
|
||||
* Ben Dooks <ben@simtec.co.uk>
|
||||
* http://armlinux.simtec.co.uk/
|
||||
*
|
||||
* S3C2410 - timer tick support
|
||||
*/
|
||||
|
||||
#define SRCPND_TIMER4 (1<<(IRQ_TIMER4 - IRQ_EINT0))
|
||||
|
||||
static inline int s3c24xx_ostimer_pending(void)
|
||||
{
|
||||
return __raw_readl(S3C2410_SRCPND) & SRCPND_TIMER4;
|
||||
}
|
Reference in New Issue
Block a user