Merge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into devel (f5f0e17a) · Commits · jan.koester / Linux

Documentation/arm/Samsung-S3C24XX/Suspend.txt

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -40,13 +40,13 @@ Resuming
	Machine Support		Machine Support
	---------------		---------------

	The machine specific functions must call the s3c2410_pm_init() function		The machine specific functions must call the s3c_pm_init() function
	to say that its bootloader is capable of resuming. This can be as		to say that its bootloader is capable of resuming. This can be as
	simple as adding the following to the machine's definition:		simple as adding the following to the machine's definition:

	INITMACHINE(s3c2410_pm_init)		INITMACHINE(s3c_pm_init)

	A board can do its own setup before calling s3c2410_pm_init, if it		A board can do its own setup before calling s3c_pm_init, if it
	needs to setup anything else for power management support.		needs to setup anything else for power management support.

	There is currently no support for over-riding the default method of		There is currently no support for over-riding the default method of
	@@ -74,7 +74,7 @@ statuc void __init machine_init(void)

	enable_irq_wake(IRQ_EINT0);		enable_irq_wake(IRQ_EINT0);

	s3c2410_pm_init();		s3c_pm_init();
	}		}

0 → 100644

+23 −0

Original line number	Original line	Diff line number	Diff line
			/* arch/arm/mach-s3c2410/include/mach/gpio-nrs.h
			*
			* Copyright (c) 2008 Simtec Electronics
			* http://armlinux.simtec.co.uk/
			* Ben Dooks <ben@simtec.co.uk>
			*
			* S3C2410 - GPIO bank numbering
			*
			* This program is free software; you can redistribute it and/or modify
			* it under the terms of the GNU General Public License version 2 as
			* published by the Free Software Foundation.
			*/

			#define S3C2410_GPIONO(bank,offset) ((bank) + (offset))

			#define S3C2410_GPIO_BANKA (32*0)
			#define S3C2410_GPIO_BANKB (32*1)
			#define S3C2410_GPIO_BANKC (32*2)
			#define S3C2410_GPIO_BANKD (32*3)
			#define S3C2410_GPIO_BANKE (32*4)
			#define S3C2410_GPIO_BANKF (32*5)
			#define S3C2410_GPIO_BANKG (32*6)
			#define S3C2410_GPIO_BANKH (32*7)

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,3 +23,6 @@
	#define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA)		#define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA)

	#include <asm-generic/gpio.h>		#include <asm-generic/gpio.h>
			#include <mach/gpio-nrs.h>

			#define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32)

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -80,7 +80,7 @@
	#define IRQ_EINT22 S3C2410_IRQ(50)		#define IRQ_EINT22 S3C2410_IRQ(50)
	#define IRQ_EINT23 S3C2410_IRQ(51)		#define IRQ_EINT23 S3C2410_IRQ(51)

			#define IRQ_EINT_BIT(x) ((x) - IRQ_EINT4 + 4)
	#define IRQ_EINT(x) (((x) >= 4) ? (IRQ_EINT4 + (x) - 4) : (IRQ_EINT0 + (x)))		#define IRQ_EINT(x) (((x) >= 4) ? (IRQ_EINT4 + (x) - 4) : (IRQ_EINT0 + (x)))

	#define IRQ_LCD_FIFO S3C2410_IRQ(52)		#define IRQ_LCD_FIFO S3C2410_IRQ(52)

+1 −10

Original line number	Original line	Diff line number	Diff line
	@@ -14,16 +14,7 @@
	#ifndef __ASM_ARCH_REGS_GPIO_H		#ifndef __ASM_ARCH_REGS_GPIO_H
	#define __ASM_ARCH_REGS_GPIO_H		#define __ASM_ARCH_REGS_GPIO_H

	#define S3C2410_GPIONO(bank,offset) ((bank) + (offset))		#include <mach/gpio-nrs.h>

	#define S3C2410_GPIO_BANKA (32*0)
	#define S3C2410_GPIO_BANKB (32*1)
	#define S3C2410_GPIO_BANKC (32*2)
	#define S3C2410_GPIO_BANKD (32*3)
	#define S3C2410_GPIO_BANKE (32*4)
	#define S3C2410_GPIO_BANKF (32*5)
	#define S3C2410_GPIO_BANKG (32*6)
	#define S3C2410_GPIO_BANKH (32*7)

	#ifdef CONFIG_CPU_S3C2400		#ifdef CONFIG_CPU_S3C2400
	#define S3C24XX_GPIO_BASE(x) S3C2400_GPIO_BASE(x)		#define S3C24XX_GPIO_BASE(x) S3C2400_GPIO_BASE(x)