mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
ARM: global cleanups
Quite a bit of code gets removed, and some stuff moved around, mostly the old samsung s3c24xx stuff. There should be no functional changes in this series otherwise. Some cleanups have dependencies on other arm-soc branches and will be sent in the second round. Signed-off-by: Arnd Bergmann <[email protected]> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUAT2pCjGCrR//JCVInAQLd8RAAqCxhzSc4ewTUP/974gVhujj3TrpiEQcS FKvYWF76yP38Lbf3CJZBZaONRtrQNOhYpVQ0jb3WCV4F8mEH9PCes2q9RObeBYiY TNX8VdcuVjX2U9HaH0+RQtBUdujNLHpEOqtO57un7T5UDNssR5JOive1tNAooRv1 pL0Hgx3AVqUbNOPpqQqHzy/MDdd67S6dX80yysANjFGMX87Nvp/ztYAdNnIdta+Z pDJt+DPlmK8LvjoSL3SEUN0p3Thk75621cCuauGq88PLIB2w62tzF0NFFbvIAgJT 3aMlHM2flOiTJAWkUvA8zJiUzwv/0vYvH3xPoTo84abve3lVfZcY+fHNcfxE/Gge ri2MmkHyimVP3rNeyM0GbN1RTej1TN1MezeQW3nq2wP6nvS2k0/t32ObLLtWU7XA 6iA0hKVMSnhqj4ln6jPAmyaDkaWHyYz97urhgetHqGadvLTiGPXCSBPalSiFmyMo 11tvuqwUNz9tw4nsvGboFQwS2ZoVquC5inoHp5seqZETkGCB67JyeRGxtAM4gbP/ wIRa3OBLY99yo1on6QovWNnSOMC6X4cOvBI/qHIjSEY/T9JVkslY87gRg3LkxCBR XpXfZ6iuLHoSRUGcIjE8D6KHjMgWIDPRnLkIliK4H+3Jn08g0R1MxCplevFCRtis egswZ8C24Xw= =o5Xl -----END PGP SIGNATURE----- Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: global cleanups" from Arnd Bergmann: "Quite a bit of code gets removed, and some stuff moved around, mostly the old samsung s3c24xx stuff. There should be no functional changes in this series otherwise. Some cleanups have dependencies on other arm-soc branches and will be sent in the second round. Signed-off-by: Arnd Bergmann <[email protected]>" Fixed up trivial conflicts mainly due to #include's being changes on both sides. * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits) ep93xx: Remove unnecessary includes of ep93xx-regs.h ep93xx: Move EP93XX_SYSCON defines to SoC private header ep93xx: Move crunch code to mach-ep93xx directory ep93xx: Make syscon access functions private to SoC ep93xx: Configure GPIO ports in core code ep93xx: Move peripheral defines to local SoC header ep93xx: Convert the watchdog driver into a platform device. ep93xx: Use ioremap for backlight driver ep93xx: Move GPIO defines to gpio-ep93xx.h ep93xx: Don't use system controller defines in audio drivers ep93xx: Move PHYS_BASE defines to local SoC header file ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver ARM: EXYNOS: add clock registers for exynos4x12-cpufreq PM / devfreq: update the name of EXYNOS clock registers that were omitted PM / devfreq: update the name of EXYNOS clock register ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock ARM: EXYNOS: use static declaration on regarding clock ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs ARM: OMAP2+: Fix build error after merge ARM: S3C24XX: remove call to s3c24xx_setup_clocks ...
This commit is contained in:
Linus Torvalds
commit
d61b7a572b
379 changed files with 4783 additions and 7606 deletions
|
|
@ -170,7 +170,7 @@ config HAVE_S3C2410_WATCHDOG
|
|||
|
||||
config S3C2410_WATCHDOG
|
||||
tristate "S3C2410 Watchdog"
|
||||
depends on ARCH_S3C2410 || HAVE_S3C2410_WATCHDOG
|
||||
depends on HAVE_S3C2410_WATCHDOG
|
||||
select WATCHDOG_CORE
|
||||
help
|
||||
Watchdog timer block in the Samsung SoCs. This will reboot
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
* - Add a few missing ioctls
|
||||
*/
|
||||
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/miscdevice.h>
|
||||
|
|
@ -30,7 +31,6 @@
|
|||
#include <linux/timer.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/io.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#define WDT_VERSION "0.3"
|
||||
#define PFX "ep93xx_wdt: "
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
static int nowayout = WATCHDOG_NOWAYOUT;
|
||||
static int timeout = WDT_TIMEOUT;
|
||||
|
||||
static void __iomem *mmio_base;
|
||||
static struct timer_list timer;
|
||||
static unsigned long next_heartbeat;
|
||||
static unsigned long wdt_status;
|
||||
|
|
@ -49,26 +50,25 @@ static unsigned long boot_status;
|
|||
#define WDT_IN_USE 0
|
||||
#define WDT_OK_TO_CLOSE 1
|
||||
|
||||
#define EP93XX_WDT_REG(x) (EP93XX_WATCHDOG_BASE + (x))
|
||||
#define EP93XX_WDT_WATCHDOG EP93XX_WDT_REG(0x00)
|
||||
#define EP93XX_WDT_WDSTATUS EP93XX_WDT_REG(0x04)
|
||||
#define EP93XX_WATCHDOG 0x00
|
||||
#define EP93XX_WDSTATUS 0x04
|
||||
|
||||
/* reset the wdt every ~200ms */
|
||||
#define WDT_INTERVAL (HZ/5)
|
||||
|
||||
static void wdt_enable(void)
|
||||
{
|
||||
__raw_writew(0xaaaa, EP93XX_WDT_WATCHDOG);
|
||||
writel(0xaaaa, mmio_base + EP93XX_WATCHDOG);
|
||||
}
|
||||
|
||||
static void wdt_disable(void)
|
||||
{
|
||||
__raw_writew(0xaa55, EP93XX_WDT_WATCHDOG);
|
||||
writel(0xaa55, mmio_base + EP93XX_WATCHDOG);
|
||||
}
|
||||
|
||||
static inline void wdt_ping(void)
|
||||
{
|
||||
__raw_writew(0x5555, EP93XX_WDT_WATCHDOG);
|
||||
writel(0x5555, mmio_base + EP93XX_WATCHDOG);
|
||||
}
|
||||
|
||||
static void wdt_startup(void)
|
||||
|
|
@ -206,18 +206,32 @@ static void ep93xx_timer_ping(unsigned long data)
|
|||
mod_timer(&timer, jiffies + WDT_INTERVAL);
|
||||
}
|
||||
|
||||
static int __init ep93xx_wdt_init(void)
|
||||
static int __devinit ep93xx_wdt_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct resource *res;
|
||||
unsigned long val;
|
||||
int err;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res)
|
||||
return -ENXIO;
|
||||
|
||||
if (!devm_request_mem_region(&pdev->dev, res->start,
|
||||
resource_size(res), pdev->name))
|
||||
return -EBUSY;
|
||||
|
||||
mmio_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
|
||||
if (!mmio_base)
|
||||
return -ENXIO;
|
||||
|
||||
err = misc_register(&ep93xx_wdt_miscdev);
|
||||
|
||||
boot_status = __raw_readl(EP93XX_WDT_WATCHDOG) & 0x01 ? 1 : 0;
|
||||
val = readl(mmio_base + EP93XX_WATCHDOG);
|
||||
boot_status = val & 0x01 ? 1 : 0;
|
||||
|
||||
printk(KERN_INFO PFX "EP93XX watchdog, driver version "
|
||||
WDT_VERSION "%s\n",
|
||||
(__raw_readl(EP93XX_WDT_WATCHDOG) & 0x08)
|
||||
? " (nCS1 disable detected)" : "");
|
||||
(val & 0x08) ? " (nCS1 disable detected)" : "");
|
||||
|
||||
if (timeout < 1 || timeout > 3600) {
|
||||
timeout = WDT_TIMEOUT;
|
||||
|
|
@ -230,14 +244,23 @@ static int __init ep93xx_wdt_init(void)
|
|||
return err;
|
||||
}
|
||||
|
||||
static void __exit ep93xx_wdt_exit(void)
|
||||
static int __devexit ep93xx_wdt_remove(struct platform_device *pdev)
|
||||
{
|
||||
wdt_shutdown();
|
||||
misc_deregister(&ep93xx_wdt_miscdev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
module_init(ep93xx_wdt_init);
|
||||
module_exit(ep93xx_wdt_exit);
|
||||
static struct platform_driver ep93xx_wdt_driver = {
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "ep93xx-wdt",
|
||||
},
|
||||
.probe = ep93xx_wdt_probe,
|
||||
.remove = __devexit_p(ep93xx_wdt_remove),
|
||||
};
|
||||
|
||||
module_platform_driver(ep93xx_wdt_driver);
|
||||
|
||||
module_param(nowayout, int, 0);
|
||||
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
|
||||
|
|
|
|||
Loading…
Reference in a new issue