Commit 77e2782f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3815/1: headers_install support for ARM
  [ARM] 3794/1: S3C24XX: do not defined set_irq_wake when no CONFIG_PM
  [ARM] 3793/1: S3C2412: fix wrong serial info struct
  [ARM] 3780/1: Fix iop321 cpuid
  [ARM] 3786/1: pnx4008: update defconfig
  [ARM] 3785/1: S3C2412: Fix idle code as default uses wrong clocks
  [ARM] 3784/1: S3C2413: fix config for MACH_S3C2413/MACH_SMDK2413
parents 803db244 e40b1074

arch/arm/configs/pnx4008_defconfig

+154 −561

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-s3c2410/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -81,9 +81,17 @@ config SMDK2440_CPU2442 
	depends on ARCH_S3C2440

	select CPU_S3C2442



config MACH_S3C2413

	bool

	help

	  Internal node for S3C2413 verison of SMDK2413, so that

	  machine_is_s3c2413() will work when MACH_SMDK2413 is

	  selected



config MACH_SMDK2413

	bool "SMDK2413"

	select CPU_S3C2412

	select MACH_S3C2413

	select MACH_SMDK

	help

	  Say Y here if you are using an SMDK2413

arch/arm/mach-s3c2410/irq.h

+5 −0
Original line number Diff line number Diff line
@@ -100,5 +100,10 @@ s3c_irqsub_ack(unsigned int irqno, unsigned int parentmask, unsigned int group) 


/* exported for use in arch/arm/mach-s3c2410 */



#ifdef CONFIG_PM

extern int s3c_irq_wake(unsigned int irqno, unsigned int state);

#else

#define s3c_irq_wake NULL

#endif



extern int s3c_irqext_type(unsigned int irq, unsigned int type);

arch/arm/mach-s3c2410/s3c2412.c

+29 −0
Original line number Diff line number Diff line
@@ -35,11 +35,15 @@ 
#include <asm/mach/irq.h>



#include <asm/hardware.h>

#include <asm/proc-fns.h>

#include <asm/io.h>

#include <asm/irq.h>



#include <asm/arch/idle.h>



#include <asm/arch/regs-clock.h>

#include <asm/arch/regs-serial.h>

#include <asm/arch/regs-power.h>

#include <asm/arch/regs-gpio.h>

#include <asm/arch/regs-gpioj.h>

#include <asm/arch/regs-dsc.h>
@@ -75,6 +79,27 @@ void __init s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no) 
	s3c_device_nand.name = "s3c2412-nand";

}



/* s3c2412_idle

 *

 * use the standard idle call by ensuring the idle mode

 * in power config, then issuing the idle co-processor

 * instruction

*/



static void s3c2412_idle(void)

{

	unsigned long tmp;



	/* ensure our idle mode is to go to idle */



	tmp = __raw_readl(S3C2412_PWRCFG);

	tmp &= ~S3C2412_PWRCFG_STANDBYWFI_MASK;

	tmp |= S3C2412_PWRCFG_STANDBYWFI_IDLE;

	__raw_writel(tmp, S3C2412_PWRCFG);



	cpu_do_idle();

}



/* s3c2412_map_io

 *

 * register the standard cpu IO areas, and any passed in from the
@@ -87,6 +112,10 @@ void __init s3c2412_map_io(struct map_desc *mach_desc, int mach_size) 


	s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10;



	/* set our idle function */



	s3c24xx_idle = s3c2412_idle;



	/* register our io-tables */



	iotable_init(s3c2412_iodesc, ARRAY_SIZE(s3c2412_iodesc));

arch/arm/mm/proc-xscale.S

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ __80219_proc_info: 
	.type	__8032x_proc_info,#object

__8032x_proc_info:

	.long	0x69052420

	.long	0xffffffe0

	.long	0xfffff7e0

	.long   PMD_TYPE_SECT | \

		PMD_SECT_BUFFERABLE | \

		PMD_SECT_CACHEABLE | \

CRA Git | Maintained and supported by SUSTech CRA and CCSE