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

Commit 5fcdb16b authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635/rx1950 

Merge branch 'for-2635/rx1950' into for-linus/samsung2
parents 5a5c419f 192ff91f

arch/arm/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -110,6 +110,8 @@ CHECKFLAGS += -D__arm__ 
head-y		:= arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o

head-y		:= arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o

textofs-y	:= 0x00008000

textofs-y	:= 0x00008000

textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000

textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000

# We don't want the htc bootloader to corrupt kernel during resume

textofs-$(CONFIG_PM_H1940)      := 0x00108000

# SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory

# SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory

ifeq ($(CONFIG_ARCH_SA1100),y)

ifeq ($(CONFIG_ARCH_SA1100),y)

textofs-$(CONFIG_SA1111) := 0x00208000

textofs-$(CONFIG_SA1111) := 0x00208000

arch/arm/mach-s3c2410/Makefile.boot

+7 −3
Original line number Original line Diff line number Diff line 
ifeq ($(CONFIG_PM_H1940),y)

	zreladdr-y		:= 0x30108000

	params_phys-y	:= 0x30100100

else

	zreladdr-y		:= 0x30008000

	zreladdr-y		:= 0x30008000

	params_phys-y	:= 0x30000100

	params_phys-y	:= 0x30000100

endif

arch/arm/mach-s3c2410/pm.c

+13 −2
Original line number Original line Diff line number Diff line
@@ -60,10 +60,10 @@ static void s3c2410_pm_prepare(void) 
		__raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));

		__raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));

	}

	}





	/* the RX3715 uses similar code and the same H1940 and the

	/* RX3715 and RX1950 use similar to H1940 code and the

	 * same offsets for resume and checksum pointers */

	 * same offsets for resume and checksum pointers */





	if (machine_is_rx3715()) {

	if (machine_is_rx3715() || machine_is_rx1950()) {

		void *base = phys_to_virt(H1940_SUSPEND_CHECK);

		void *base = phys_to_virt(H1940_SUSPEND_CHECK);

		unsigned long ptr;

		unsigned long ptr;

		unsigned long calc = 0;

		unsigned long calc = 0;
@@ -79,6 +79,17 @@ static void s3c2410_pm_prepare(void) 
	if ( machine_is_aml_m5900() )

	if ( machine_is_aml_m5900() )

		s3c2410_gpio_setpin(S3C2410_GPF(2), 1);

		s3c2410_gpio_setpin(S3C2410_GPF(2), 1);





	if (machine_is_rx1950()) {

		/* According to S3C2442 user's manual, page 7-17,

		 * when the system is operating in NAND boot mode,

		 * the hardware pin configuration - EINT[23:21] –

		 * must be set as input for starting up after

		 * wakeup from sleep mode

		 */

		s3c_gpio_cfgpin(S3C2410_GPG(13), S3C2410_GPIO_INPUT);

		s3c_gpio_cfgpin(S3C2410_GPG(14), S3C2410_GPIO_INPUT);

		s3c_gpio_cfgpin(S3C2410_GPG(15), S3C2410_GPIO_INPUT);

	}

}

}





static int s3c2410_pm_resume(struct sys_device *dev)

static int s3c2410_pm_resume(struct sys_device *dev)

arch/arm/mach-s3c2440/Kconfig

+13 −0
Original line number Original line Diff line number Diff line
@@ -187,4 +187,17 @@ config MACH_MINI2440 
	  Say Y here to select support for the MINI2440. Is a 10cm x 10cm board

	  Say Y here to select support for the MINI2440. Is a 10cm x 10cm board

	  available via various sources. It can come with a 3.5" or 7" touch LCD.

	  available via various sources. It can come with a 3.5" or 7" touch LCD.





config MACH_RX1950

	bool "HP iPAQ rx1950"

	select CPU_S3C2442

	select S3C24XX_DCLK

	select PM_H1940 if PM

	select I2C

	select S3C2410_PWM

	select S3C_DEV_NAND

	select S3C2410_IOTIMING if S3C2440_CPUFREQ

	select S3C2440_XTAL_16934400

	help

	   Say Y here if you're using HP iPAQ rx1950



endmenu
 
endmenu

arch/arm/mach-s3c2440/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o 
obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o

obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o

obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o

obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o

obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o

obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o

obj-$(CONFIG_MACH_RX1950) += mach-rx1950.o





# extra machine support

# extra machine support