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

Commit 15db3e82 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'drivers/rtc-sa1100' into next/drivers 

* drivers/rtc-sa1100:
  ARM: sa1100: clean up of the clock support
  ARM: pxa: add dummy clock for sa1100-rtc
  RTC: sa1100: support sa1100, pxa and mmp soc families
  RTC: sa1100: remove redundant code of setting alarm
  RTC: sa1100: Clean out ost register

Conflicts:
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
parents d7bd1b8a edf3ff5b

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,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-pxa/devices.c

+20 −0
Original line number Diff line number Diff line
@@ -415,9 +415,29 @@ static struct resource pxa_rtc_resources[] = { 
	},

};



static struct resource sa1100_rtc_resources[] = {

	[0] = {

		.start  = 0x40900000,

		.end	= 0x409000ff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = IRQ_RTC1Hz,

		.end    = IRQ_RTC1Hz,

		.flags  = IORESOURCE_IRQ,

	},

	[2] = {

		.start  = IRQ_RTCAlrm,

		.end    = IRQ_RTCAlrm,

		.flags  = IORESOURCE_IRQ,

	},

};



struct platform_device sa1100_device_rtc = {

	.name		= "sa1100-rtc",

	.id		= -1,

	.num_resources  = ARRAY_SIZE(sa1100_rtc_resources),

	.resource       = sa1100_rtc_resources,

};



struct platform_device pxa_device_rtc = {

arch/arm/mach-pxa/pxa25x.c

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ static struct clk_lookup pxa25x_clkregs[] = { 
	INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),

	INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),

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

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

};



static struct clk_lookup pxa25x_hwuart_clkreg =

arch/arm/mach-pxa/pxa27x.c

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ static struct clk_lookup pxa27x_clkregs[] = { 
	INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),

	INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),

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

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

};



#ifdef CONFIG_PM

arch/arm/mach-pxa/pxa300.c

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0); 
static struct clk_lookup common_clkregs[] = {

	INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),

	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),

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

};



static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);