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

Commit 7169ff4a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'rtc-sa1100' of git://github.com/hzhuang1/linux into next/drivers 

* 'rtc-sa1100' of git://github.com/hzhuang1/linux:
  ARM: mmp: enable rtc in pxa910
  rtc: sa1100: enable clk support
  ARM: pxa: add rtc dummy clock
  ARM: sa1100: clean up clock support
  rtc: sa1100: declare irq in resource
  rtc: sa1100: remove verification code of alarm
  rtc: sa1100: remove periodic code
parents e135e450 4128e275

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ config ARCH_SA1100 
	select ARCH_HAS_CPUFREQ

	select CPU_FREQ

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select ARCH_REQUIRE_GPIOLIB

arch/arm/mach-mmp/include/mach/pxa910.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ extern struct pxa_device_desc pxa910_device_pwm4; 
extern struct pxa_device_desc pxa910_device_nand;



extern struct platform_device pxa910_device_gpio;

extern struct platform_device pxa910_device_rtc;



static inline int pxa910_add_uart(int id)

{

arch/arm/mach-mmp/include/mach/regs-apbc.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#define APBC_PXA910_SSP1	APBC_REG(0x01c)

#define APBC_PXA910_SSP2	APBC_REG(0x020)

#define APBC_PXA910_IPC		APBC_REG(0x024)

#define APBC_PXA910_RTC		APBC_REG(0x028)

#define APBC_PXA910_TWSI0	APBC_REG(0x02c)

#define APBC_PXA910_KPC		APBC_REG(0x030)

#define APBC_PXA910_TIMERS	APBC_REG(0x034)

arch/arm/mach-mmp/include/mach/regs-rtc.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_REGS_RTC_H

#define __ASM_MACH_REGS_RTC_H



#include <mach/addr-map.h>



#define RTC_VIRT_BASE	(APB_VIRT_BASE + 0x10000)

#define RTC_REG(x)	(*((volatile u32 __iomem *)(RTC_VIRT_BASE + (x))))



/*

 * Real Time Clock

 */



#define RCNR		RTC_REG(0x00)	/* RTC Count Register */

#define RTAR		RTC_REG(0x04)	/* RTC Alarm Register */

#define RTSR		RTC_REG(0x08)	/* RTC Status Register */

#define RTTR		RTC_REG(0x0C)	/* RTC Timer Trim Register */



#define RTSR_HZE	(1 << 3)	/* HZ interrupt enable */

#define RTSR_ALE	(1 << 2)	/* RTC alarm interrupt enable */

#define RTSR_HZ		(1 << 1)	/* HZ rising-edge detected */

#define RTSR_AL		(1 << 0)	/* RTC alarm detected */



#endif /* __ASM_MACH_REGS_RTC_H */

arch/arm/mach-mmp/pxa910.c

+27 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ static APBC_CLK(pwm2, PXA910_PWM2, 1, 13000000); 
static APBC_CLK(pwm3, PXA910_PWM3, 1, 13000000);

static APBC_CLK(pwm4, PXA910_PWM4, 1, 13000000);

static APBC_CLK(gpio, PXA910_GPIO, 0, 13000000);

static APBC_CLK(rtc, PXA910_RTC, 8, 32768);



static APMU_CLK(nand, NAND, 0x19b, 156000000);

static APMU_CLK(u2o, USB, 0x1b, 480000000);
@@ -109,6 +110,7 @@ static struct clk_lookup pxa910_clkregs[] = { 
	INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),

	INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),

	INIT_CLKREG(&clk_u2o, "pxa-u2o", "U2OCLK"),

	INIT_CLKREG(&clk_rtc, "sa1100-rtc", NULL),

};



static int __init pxa910_init(void)
@@ -183,3 +185,28 @@ struct platform_device pxa910_device_gpio = { 
	.num_resources	= ARRAY_SIZE(pxa910_resource_gpio),

	.resource	= pxa910_resource_gpio,

};



static struct resource pxa910_resource_rtc[] = {

	{

		.start	= 0xd4010000,

		.end	= 0xd401003f,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= IRQ_PXA910_RTC_INT,

		.end	= IRQ_PXA910_RTC_INT,

		.name	= "rtc 1Hz",

		.flags	= IORESOURCE_IRQ,

	}, {

		.start	= IRQ_PXA910_RTC_ALARM,

		.end	= IRQ_PXA910_RTC_ALARM,

		.name	= "rtc alarm",

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device pxa910_device_rtc = {

	.name		= "sa1100-rtc",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(pxa910_resource_rtc),

	.resource	= pxa910_resource_rtc,

};