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

Commit 02a0456b authored Jul 19, 2010 by Joonyoung Shim Committed by Kukjin Kim Aug 05, 2010

ARM: S5P: Add PMU device



This patch adds an initcall for the s5p platforms so that they register
their PMU IRQs with the PMU framework in the Kernel.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

parent 9fe6206f

arch/arm/mach-s5p6440/include/mach/irqs.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,7 @@
	#define IRQ_DISPCON3 S5P_IRQ_VIC1(19)		#define IRQ_DISPCON3 S5P_IRQ_VIC1(19)
	#define IRQ_FIMGVG S5P_IRQ_VIC1(20)		#define IRQ_FIMGVG S5P_IRQ_VIC1(20)
	#define IRQ_EINT_GROUPS S5P_IRQ_VIC1(21)		#define IRQ_EINT_GROUPS S5P_IRQ_VIC1(21)
	#define IRQ_PMUIRQ S5P_IRQ_VIC1(23)		#define IRQ_PMU S5P_IRQ_VIC1(23)
	#define IRQ_HSMMC0 S5P_IRQ_VIC1(24)		#define IRQ_HSMMC0 S5P_IRQ_VIC1(24)
	#define IRQ_HSMMC1 S5P_IRQ_VIC1(25)		#define IRQ_HSMMC1 S5P_IRQ_VIC1(25)
	#define IRQ_HSMMC2 IRQ_SPI1 /* shared with SPI1 */		#define IRQ_HSMMC2 IRQ_SPI1 /* shared with SPI1 */

arch/arm/mach-s5p6442/include/mach/irqs.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@
	#define IRQ_GPIOINT S5P_IRQ_VIC0(30)		#define IRQ_GPIOINT S5P_IRQ_VIC0(30)

	/* VIC1 */		/* VIC1 */
	#define IRQ_nPMUIRQ S5P_IRQ_VIC1(0)		#define IRQ_PMU S5P_IRQ_VIC1(0)
	#define IRQ_ONENAND S5P_IRQ_VIC1(7)		#define IRQ_ONENAND S5P_IRQ_VIC1(7)
	#define IRQ_UART0 S5P_IRQ_VIC1(10)		#define IRQ_UART0 S5P_IRQ_VIC1(10)
	#define IRQ_UART1 S5P_IRQ_VIC1(11)		#define IRQ_UART1 S5P_IRQ_VIC1(11)

arch/arm/mach-s5pc100/include/mach/irqs.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@
	#define IRQ_GPIOINT S5P_IRQ_VIC0(30)		#define IRQ_GPIOINT S5P_IRQ_VIC0(30)

	/* VIC1: ARM, power, memory, connectivity */		/* VIC1: ARM, power, memory, connectivity */
	#define IRQ_CORTEX0 S5P_IRQ_VIC1(0)		#define IRQ_PMU S5P_IRQ_VIC1(0)
	#define IRQ_CORTEX1 S5P_IRQ_VIC1(1)		#define IRQ_CORTEX1 S5P_IRQ_VIC1(1)
	#define IRQ_CORTEX2 S5P_IRQ_VIC1(2)		#define IRQ_CORTEX2 S5P_IRQ_VIC1(2)
	#define IRQ_CORTEX3 S5P_IRQ_VIC1(3)		#define IRQ_CORTEX3 S5P_IRQ_VIC1(3)

arch/arm/mach-s5pv210/include/mach/irqs.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@

	/* VIC1: ARM, Power, Memory, Connectivity, Storage */		/* VIC1: ARM, Power, Memory, Connectivity, Storage */

	#define IRQ_CORTEX0 S5P_IRQ_VIC1(0)		#define IRQ_PMU S5P_IRQ_VIC1(0)
	#define IRQ_CORTEX1 S5P_IRQ_VIC1(1)		#define IRQ_CORTEX1 S5P_IRQ_VIC1(1)
	#define IRQ_CORTEX2 S5P_IRQ_VIC1(2)		#define IRQ_CORTEX2 S5P_IRQ_VIC1(2)
	#define IRQ_CORTEX3 S5P_IRQ_VIC1(3)		#define IRQ_CORTEX3 S5P_IRQ_VIC1(3)

arch/arm/plat-s5p/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,7 @@ obj- :=

	# Core files		# Core files

			obj-y += dev-pmu.o
	obj-y += dev-uart.o		obj-y += dev-uart.o
	obj-y += cpu.o		obj-y += cpu.o
	obj-y += clock.o		obj-y += clock.o