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

Commit b5ead1cd authored by Peter Korsgaard's avatar Peter Korsgaard Committed by Ben Dooks
Browse files

ARM: S3C: move timer/pwm handling from plat-s3c24xx to plat-s3c 



The s3c64xx devices use the same hardware core as s3c24xx, so move
the timer/pwm handling to plat-s3c so it can be used by both.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 14077ea6

arch/arm/plat-s3c/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ obj-$(CONFIG_PM) += pm.o 
obj-$(CONFIG_PM)		+= pm-gpio.o

obj-$(CONFIG_S3C2410_PM_CHECK)	+= pm-check.o



# PWM support



obj-$(CONFIG_HAVE_PWM)		+= pwm.o



# devices



obj-$(CONFIG_S3C_DEV_HSMMC)	+= dev-hsmmc.o

arch/arm/plat-s3c24xx/pwm.c→arch/arm/plat-s3c/pwm.c

+3 −2
Original line number Diff line number Diff line 
/* arch/arm/plat-s3c24xx/pwm.c

/* arch/arm/plat-s3c/pwm.c

 *

 * Copyright (c) 2007 Ben Dooks

 * Copyright (c) 2008 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>, <ben-linux@fluff.org>

 *

 * S3C24XX PWM device core

 * S3C series PWM device core

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@ 
#include <linux/pwm.h>



#include <mach/irqs.h>

#include <mach/map.h>



#include <plat/devs.h>

#include <plat/regs-timer.h>

arch/arm/plat-s3c24xx/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o 
obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_PM)		+= irq-pm.o

obj-$(CONFIG_PM)		+= sleep.o

obj-$(CONFIG_S3C24XX_PWM)	+= pwm.o

obj-$(CONFIG_S3C2410_CLOCK)	+= s3c2410-clock.o

obj-$(CONFIG_S3C2410_DMA)	+= dma.o

obj-$(CONFIG_S3C24XX_ADC)	+= adc.o