Skip to contentSkip to conversation

HP iPAQ RX1950 patch series

PATCH Superseded Vasily Khoruzhick 2 participants 8 messages May 11, 2010 – May 12, 2010

Subsystems (2)

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v2 cover HP iPAQ RX1950 patch series

Following patch series add suport for iPAQ RX1950 PDA - another s3c2442-based machine. Almost all drivers for this machine are included in mainline kernel, and port only lacks battery, LED, WiFi and sound support, they will be added later.

v2: removed unnecessary mappings
use loop for gpio pin configuration
fix key table formating
WARN_ON() the result of gpio_request()

#1 lore raw

PATCH v2 1/5 Add HP iPAQ RX1950 machine support

---
 arch/arm/mach-s3c2440/Kconfig       |   13 +
 arch/arm/mach-s3c2440/Makefile      |    1 +
 arch/arm/mach-s3c2440/mach-rx1950.c |  582 +++++++++++++++++++++++++++++++++++
 3 files changed, 596 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-s3c2440/mach-rx1950.c
arch/arm/mach-s3c2440/Kconfig +13 -0
index 9d102b9..cd8e7de 100644
@@ -188,4 +188,17 @@ config MACH_MINI2440
 	  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.
 
+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
arch/arm/mach-s3c2440/Makefile +1 -0
index c85ba32..d5440fa 100644
@@ -34,6 +34,7 @@ obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
 obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o
 obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o
 obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
+obj-$(CONFIG_MACH_RX1950) += mach-rx1950.o
 
 # extra machine support
 
arch/arm/mach-s3c2440/mach-rx1950.c new file +582 -0

582 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#2 lore raw

PATCH v2 2/5 MAINTAINERS: Add entry for HP iPAQ rx1950

In reply to Vasily Khoruzhick
---
 MAINTAINERS |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
MAINTAINERS +6 -0
index d5b0b1b..9f48b68 100644
@@ -890,6 +890,12 @@ F:	arch/arm/mach-rpc/
 F:	drivers/net/arm/ether*
 F:	drivers/scsi/arm/
 
+ARM/RX1950 (HP iPAQ rx1950) MACHINE SUPPORT
+M:	Vasily Khoruzhick <[email protected]>
+W:	http://handhelds.org/moin/moin.cgi/HpIpaqRx1950
+S:	Maintained
+F:	arch/arm/mach-s3c2440/mach-rx1950.c
+
 ARM/SHARK MACHINE SUPPORT
 M:	Alexander Schulz <[email protected]>
 W:	http://www.shark-linux.de/shark.html
Signature · 1 line
1.7.0.4
#3 lore raw

PATCH v2 3/5 Locate kernel at 0x30108000 if PM_H1940 is enabled

In reply to Vasily Khoruzhick

If PM_H1940 is enabled, kernel _must_ be located upper then 0x30008000, because this area (0x30000000-0x30100000) can be used by bootloader. If kernel is located at 0x30008000, bootloader will corrupt kernel's code during resume.

---
 arch/arm/Makefile                   |    2 ++
 arch/arm/mach-s3c2410/Makefile.boot |   10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
arch/arm/Makefile +2 -0
index ed820e7..eddcbba 100644
@@ -110,6 +110,8 @@ CHECKFLAGS	+= -D__arm__
 head-y		:= arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o
 textofs-y	:= 0x00008000
 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
 ifeq ($(CONFIG_ARCH_SA1100),y)
 textofs-$(CONFIG_SA1111) := 0x00208000
arch/arm/mach-s3c2410/Makefile.boot +7 -3
index 7dab2a0..58c1dd7 100644
@@ -1,3 +1,7 @@
-   zreladdr-y	:= 0x30008000
-params_phys-y	:= 0x30000100
-
+ifeq ($(CONFIG_PM_H1940),y)
+	zreladdr-y		:= 0x30108000
+	params_phys-y	:= 0x30100100
+else
+	zreladdr-y		:= 0x30008000
+	params_phys-y	:= 0x30000100
+endif
Signature · 1 line
1.7.0.4
#4 lore raw

PATCH v2 4/5 Add suspend/resume support for RX1950

In reply to Vasily Khoruzhick
---
 arch/arm/mach-s3c2410/pm.c |    4 ++--
 arch/arm/mm/mmu.c          |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
arch/arm/mach-s3c2410/pm.c +2 -2
index 966119c..6a61486 100644
@@ -60,10 +60,10 @@ static void s3c2410_pm_prepare(void)
 		__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 */
 
-	if (machine_is_rx3715()) {
+	if (machine_is_rx3715() || machine_is_rx1950()) {
 		void *base = phys_to_virt(H1940_SUSPEND_CHECK);
 		unsigned long ptr;
 		unsigned long calc = 0;
arch/arm/mm/mmu.c +3 -2
index 241c24a..45a1bc2 100644
@@ -869,9 +869,10 @@ void __init reserve_node_zero(pg_data_t *pgdat)
 	if (machine_is_p720t())
 		res_size = 0x00014000;
 
-	/* H1940 and RX3715 need to reserve this for suspend */
+	/* H1940, RX3715 and RX1950 need to reserve this for suspend */
 
-	if (machine_is_h1940() || machine_is_rx3715()) {
+	if (machine_is_h1940() || machine_is_rx3715()
+		|| machine_is_rx1950()) {
 		reserve_bootmem_node(pgdat, 0x30003000, 0x1000,
 				BOOTMEM_DEFAULT);
 		reserve_bootmem_node(pgdat, 0x30081000, 0x1000,
Signature · 1 line
1.7.0.4
#5 lore raw

PATCH v2 5/5 rx1950: configure GPG13-15 as input before suspend

In reply to Vasily Khoruzhick

According to datasheet GPG13-15 must be configured as input in NAND boot mode, otherwise device will not be able to wake up

---
 arch/arm/mach-s3c2410/pm.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
arch/arm/mach-s3c2410/pm.c +11 -0
index 6a61486..725636f 100644
@@ -79,6 +79,17 @@ static void s3c2410_pm_prepare(void)
 	if ( machine_is_aml_m5900() )
 		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)
Signature · 1 line
1.7.0.4
Applied
#6 lore raw

v2 cover HP iPAQ RX1950 patch series

In reply to Vasily Khoruzhick
Quoted 9 lines · Vasily Khoruzhick

Following patch series add suport for iPAQ RX1950 PDA - another s3c2442-based machine. Almost all drivers for this machine are included in mainline kernel, and port only lacks battery, LED, WiFi and sound support, they will be added later.

v2: removed unnecessary mappings
use loop for gpio pin configuration
fix key table formating
WARN_ON() the result of gpio_request()

Merged into for-2635/rx1950 and into next-samsung from there.

Have not merged the mainatainers update as it should probably go to linux-kernel list.

Signature · 4 lines
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#7 lore raw

v2 cover HP iPAQ RX1950 patch series

? ????????? ?? 12 ??? 2010 03:48:41 ????? Ben Dooks ???????:

Quoted 2 lines

Have not merged the mainatainers update as it should probably go to linux-kernel list.

Hmmm, but I saw maintainers patches [1] to linux-arm-kernel list only that was merged through rmk's tree without a problem. Btw, it's OK for me, I'll resend it to lkml :)

Thank you.

Regards
Vasily

[1]
http://lists.arm.linux.org.uk/lurker/message/20090528.050714.03c6dfec.en.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100512/9e09e144/attachment.sig>