* [PATCH v2 0/5] HP iPAQ RX1950 patch series
@ 2010-05-11 6:55 Vasily Khoruzhick
2010-05-11 6:55 ` [PATCH v2 1/5] Add HP iPAQ RX1950 machine support Vasily Khoruzhick
` (5 more replies)
0 siblings, 6 replies; 12+ messages in thread
From: Vasily Khoruzhick @ 2010-05-11 6:55 UTC (permalink / raw)
To: linux-arm-kernel
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()
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v2 1/5] Add HP iPAQ RX1950 machine support 2010-05-11 6:55 [PATCH v2 0/5] HP iPAQ RX1950 patch series Vasily Khoruzhick @ 2010-05-11 6:55 ` Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 2/5] MAINTAINERS: Add entry for HP iPAQ rx1950 Vasily Khoruzhick ` (4 subsequent siblings) 5 siblings, 0 replies; 12+ messages in thread From: Vasily Khoruzhick @ 2010-05-11 6:55 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Denis Grigoriev <dgreenday@gmail.com> --- 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 diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 9d102b9..cd8e7de 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -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 diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile index c85ba32..d5440fa 100644 --- a/arch/arm/mach-s3c2440/Makefile +++ b/arch/arm/mach-s3c2440/Makefile @@ -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 diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c new file mode 100644 index 0000000..2221e99 --- /dev/null +++ b/arch/arm/mach-s3c2440/mach-rx1950.c @@ -0,0 +1,582 @@ +/* linux/arch/arm/mach-s3c2440/mach-rx1950.c + * + * Copyright (c) 2006-2009 Victor Chukhantsev, Denis Grigoriev, + * Copyright (c) 2007-2010 Vasily Khoruzhick + * + * based on smdk2440 written by Ben Dooks + * + * 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. + * +*/ + +#include <linux/kernel.h> +#include <linux/types.h> +#include <linux/interrupt.h> +#include <linux/list.h> +#include <linux/delay.h> +#include <linux/timer.h> +#include <linux/init.h> +#include <linux/gpio.h> +#include <linux/platform_device.h> +#include <linux/serial_core.h> +#include <linux/input.h> +#include <linux/gpio_keys.h> +#include <linux/sysdev.h> +#include <linux/pwm_backlight.h> +#include <linux/pwm.h> + +#include <linux/mtd/mtd.h> +#include <linux/mtd/partitions.h> + +#include <linux/mmc/host.h> + +#include <asm/mach/arch.h> +#include <asm/mach/map.h> +#include <asm/mach-types.h> + +#include <mach/regs-gpio.h> +#include <mach/regs-gpioj.h> +#include <mach/h1940.h> +#include <mach/fb.h> + +#include <plat/clock.h> +#include <plat/regs-serial.h> +#include <plat/regs-iic.h> +#include <plat/mci.h> +#include <plat/udc.h> +#include <plat/nand.h> +#include <plat/iic.h> +#include <plat/devs.h> +#include <plat/cpu.h> +#include <plat/pm.h> +#include <plat/irq.h> +#include <plat/ts.h> + +#define LCD_PWM_PERIOD 192960 +#define LCD_PWM_DUTY 127353 + +static struct map_desc rx1950_iodesc[] __initdata = { +}; + +static struct s3c24xx_uart_clksrc rx1950_serial_clocks[] = { + [0] = { + .name = "fclk", + .divisor = 0x0a, + .min_baud = 0, + .max_baud = 0, + }, +}; + +static struct s3c2410_uartcfg rx1950_uartcfgs[] __initdata = { + [0] = { + .hwport = 0, + .flags = 0, + .ucon = 0x3c5, + .ulcon = 0x03, + .ufcon = 0x51, + .clocks = rx1950_serial_clocks, + .clocks_size = ARRAY_SIZE(rx1950_serial_clocks), + }, + [1] = { + .hwport = 1, + .flags = 0, + .ucon = 0x3c5, + .ulcon = 0x03, + .ufcon = 0x51, + .clocks = rx1950_serial_clocks, + .clocks_size = ARRAY_SIZE(rx1950_serial_clocks), + }, + /* IR port */ + [2] = { + .hwport = 2, + .flags = 0, + .ucon = 0x3c5, + .ulcon = 0x43, + .ufcon = 0xf1, + .clocks = rx1950_serial_clocks, + .clocks_size = ARRAY_SIZE(rx1950_serial_clocks), + }, +}; + +static struct s3c2410fb_display rx1950_display = { + .type = S3C2410_LCDCON1_TFT, + .width = 240, + .height = 320, + .xres = 240, + .yres = 320, + .bpp = 16, + + .pixclock = 260000, + .left_margin = 10, + .right_margin = 20, + .hsync_len = 10, + .upper_margin = 2, + .lower_margin = 2, + .vsync_len = 2, + + .lcdcon5 = S3C2410_LCDCON5_FRM565 | + S3C2410_LCDCON5_INVVCLK | + S3C2410_LCDCON5_INVVLINE | + S3C2410_LCDCON5_INVVFRAME | + S3C2410_LCDCON5_HWSWP | + (0x02 << 13) | + (0x02 << 15), + +}; + +static struct s3c2410fb_mach_info rx1950_lcd_cfg = { + .displays = &rx1950_display, + .num_displays = 1, + .default_display = 0, + + .lpcsel = 0x02, + .gpccon = 0xaa9556a9, + .gpccon_mask = 0xffc003fc, + .gpcup = 0x0000ffff, + .gpcup_mask = 0xffffffff, + + .gpdcon = 0xaa90aaa1, + .gpdcon_mask = 0xffc0fff0, + .gpdup = 0x0000fcfd, + .gpdup_mask = 0xffffffff, + +}; + +static struct pwm_device *lcd_pwm; + +void rx1950_lcd_power(int enable) +{ + int i; + static int enabled; + if (enabled == enable) + return; + if (!enable) { + + /* GPC11-GPC15->OUTPUT */ + for (i = 11; i < 16; i++) + gpio_direction_output(S3C2410_GPC(i), 1); + + /* Wait a bit here... */ + mdelay(100); + + /* GPD2-GPD7->OUTPUT */ + /* GPD11-GPD15->OUTPUT */ + /* GPD2-GPD7->1, GPD11-GPD15->1 */ + for (i = 2; i < 8; i++) + gpio_direction_output(S3C2410_GPD(i), 1); + for (i = 11; i < 16; i++) + gpio_direction_output(S3C2410_GPD(i), 1); + + /* Wait a bit here...*/ + mdelay(100); + + /* GPB0->OUTPUT, GPB0->0 */ + gpio_direction_output(S3C2410_GPB(0), 0); + + /* GPC1-GPC4->OUTPUT, GPC1-4->0 */ + for (i = 1; i < 5; i++) + gpio_direction_output(S3C2410_GPC(i), 0); + + /* GPC15-GPC11->0 */ + for (i = 11; i < 16; i++) + gpio_direction_output(S3C2410_GPC(i), 0); + + /* GPD15-GPD11->0, GPD2->GPD7->0 */ + for (i = 11; i < 16; i++) + gpio_direction_output(S3C2410_GPD(i), 0); + + for (i = 2; i < 8; i++) + gpio_direction_output(S3C2410_GPD(i), 0); + + /* GPC6->0, GPC7->0, GPC5->0 */ + gpio_direction_output(S3C2410_GPC(6), 0); + gpio_direction_output(S3C2410_GPC(7), 0); + gpio_direction_output(S3C2410_GPC(5), 0); + + /* GPB1->OUTPUT, GPB1->0 */ + gpio_direction_output(S3C2410_GPB(1), 0); + pwm_config(lcd_pwm, 0, LCD_PWM_PERIOD); + pwm_disable(lcd_pwm); + + /* GPC0->0, GPC10->0 */ + gpio_direction_output(S3C2410_GPC(0), 0); + gpio_direction_output(S3C2410_GPC(10), 0); + } else { + pwm_config(lcd_pwm, LCD_PWM_DUTY, LCD_PWM_PERIOD); + pwm_enable(lcd_pwm); + + gpio_direction_output(S3C2410_GPC(0), 1); + gpio_direction_output(S3C2410_GPC(5), 1); + + s3c_gpio_cfgpin(S3C2410_GPB(1), S3C2410_GPB1_TOUT1); + gpio_direction_output(S3C2410_GPC(7), 1); + + for (i = 1; i < 5; i++) + s3c_gpio_cfgpin(S3C2410_GPC(i), S3C_GPIO_SFN(2)); + + for (i = 11; i < 16; i++) + s3c_gpio_cfgpin(S3C2410_GPC(i), S3C_GPIO_SFN(2)); + + for (i = 2; i < 8; i++) + s3c_gpio_cfgpin(S3C2410_GPD(i), S3C_GPIO_SFN(2)); + + for (i = 11; i < 16; i++) + s3c_gpio_cfgpin(S3C2410_GPD(i), S3C_GPIO_SFN(2)); + + gpio_direction_output(S3C2410_GPC(10), 1); + gpio_direction_output(S3C2410_GPC(6), 1); + } + enabled = enable; +} + +static void rx1950_bl_power(int enable) +{ + static int enabled; + if (enabled == enable) + return; + if (!enable) { + gpio_direction_output(S3C2410_GPB(0), 0); + } else { + /* LED driver need a "push" to power on */ + gpio_direction_output(S3C2410_GPB(0), 1); + /* Warm up backlight for one period of PWM. + * Without this trick its almost impossible to + * enable backlight with low brightness value + */ + ndelay(48000); + s3c_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPB0_TOUT0); + } + enabled = enable; +} + +static int rx1950_backlight_init(struct device *dev) +{ + WARN_ON(gpio_request(S3C2410_GPB(0), "Backlight")); + lcd_pwm = pwm_request(1, "RX1950 LCD"); + if (IS_ERR(lcd_pwm)) { + dev_err(dev, "Unable to request PWM for LCD power!\n"); + return PTR_ERR(lcd_pwm); + } + + rx1950_lcd_power(1); + rx1950_bl_power(1); + + return 0; +} + +static void rx1950_backlight_exit(struct device *dev) +{ + rx1950_bl_power(0); + rx1950_lcd_power(0); + + pwm_free(lcd_pwm); + gpio_free(S3C2410_GPB(0)); +} + + +static int rx1950_backlight_notify(struct device *dev, int brightness) +{ + if (!brightness) { + rx1950_bl_power(0); + rx1950_lcd_power(0); + } else { + rx1950_lcd_power(1); + rx1950_bl_power(1); + } + return brightness; +} + +static struct platform_pwm_backlight_data rx1950_backlight_data = { + .pwm_id = 0, + .max_brightness = 24, + .dft_brightness = 4, + .pwm_period_ns = 48000, + .init = rx1950_backlight_init, + .notify = rx1950_backlight_notify, + .exit = rx1950_backlight_exit, +}; + +static struct platform_device rx1950_backlight = { + .name = "pwm-backlight", + .dev = { + .parent = &s3c_device_timer[0].dev, + .platform_data = &rx1950_backlight_data, + }, +}; + +static void rx1950_set_mmc_power(unsigned char power_mode, unsigned short vdd) +{ + switch (power_mode) { + case MMC_POWER_OFF: + gpio_direction_output(S3C2410_GPJ(1), 0); + break; + case MMC_POWER_UP: + case MMC_POWER_ON: + gpio_direction_output(S3C2410_GPJ(1), 1); + break; + default: + break; + } +} + +static struct s3c24xx_mci_pdata rx1950_mmc_cfg __initdata = { + .gpio_detect = S3C2410_GPF(5), + .gpio_wprotect = S3C2410_GPH(8), + .set_power = rx1950_set_mmc_power, + .ocr_avail = MMC_VDD_32_33, +}; + +static struct mtd_partition rx1950_nand_part[] = { + [0] = { + .name = "Boot0", + .offset = 0, + .size = 0x4000, + .mask_flags = MTD_WRITEABLE, + }, + [1] = { + .name = "Boot1", + .offset = MTDPART_OFS_APPEND, + .size = 0x40000, + .mask_flags = MTD_WRITEABLE, + }, + [2] = { + .name = "Kernel", + .offset = MTDPART_OFS_APPEND, + .size = 0x300000, + .mask_flags = 0, + }, + [3] = { + .name = "Filesystem", + .offset = MTDPART_OFS_APPEND, + .size = MTDPART_SIZ_FULL, + .mask_flags = 0, + }, +}; + +static struct s3c2410_nand_set rx1950_nand_sets[] = { + [0] = { + .name = "Internal", + .nr_chips = 1, + .nr_partitions = ARRAY_SIZE(rx1950_nand_part), + .partitions = rx1950_nand_part, + }, +}; + +static struct s3c2410_platform_nand rx1950_nand_info = { + .tacls = 25, + .twrph0 = 50, + .twrph1 = 15, + .nr_sets = ARRAY_SIZE(rx1950_nand_sets), + .sets = rx1950_nand_sets, +}; + +static void rx1950_udc_pullup(enum s3c2410_udc_cmd_e cmd) +{ + switch (cmd) { + case S3C2410_UDC_P_ENABLE: + gpio_direction_output(S3C2410_GPJ(5), 1); + break; + case S3C2410_UDC_P_DISABLE: + gpio_direction_output(S3C2410_GPJ(5), 0); + break; + case S3C2410_UDC_P_RESET: + break; + default: + break; + } +} + +static struct s3c2410_udc_mach_info rx1950_udc_cfg __initdata = { + .udc_command = rx1950_udc_pullup, + .vbus_pin = S3C2410_GPG(5), + .vbus_pin_inverted = 1, +}; + +static struct s3c2410_ts_mach_info rx1950_ts_cfg __initdata = { + .delay = 10000, + .presc = 49, + .oversampling_shift = 3, +}; + +static struct gpio_keys_button rx1950_gpio_keys_table[] = { + { + .code = KEY_POWER, + .gpio = S3C2410_GPF(0), + .active_low = 1, + .desc = "Power button", + .wakeup = 1, + }, + { + .code = KEY_F5, + .gpio = S3C2410_GPF(7), + .active_low = 1, + .desc = "Record button", + }, + { + .code = KEY_F1, + .gpio = S3C2410_GPG(0), + .active_low = 1, + .desc = "Calendar button", + }, + { + .code = KEY_F2, + .gpio = S3C2410_GPG(2), + .active_low = 1, + .desc = "Contacts button", + }, + { + .code = KEY_F3, + .gpio = S3C2410_GPG(3), + .active_low = 1, + .desc = "Mail button", + }, + { + .code = KEY_F4, + .gpio = S3C2410_GPG(7), + .active_low = 1, + .desc = "WLAN button", + }, + { + .code = KEY_LEFT, + .gpio = S3C2410_GPG(10), + .active_low = 1, + .desc = "Left button", + }, + { + .code = KEY_RIGHT, + .gpio = S3C2410_GPG(11), + .active_low = 1, + .desc = "Right button", + }, + { + .code = KEY_UP, + .gpio = S3C2410_GPG(4), + .active_low = 1, + .desc = "Up button", + }, + { + .code = KEY_DOWN, + .gpio = S3C2410_GPG(6), + .active_low = 1, + .desc = "Down button", + }, + { + .code = KEY_ENTER, + .gpio = S3C2410_GPG(9), + .active_low = 1, + .desc = "Ok button" + }, +}; + +static struct gpio_keys_platform_data rx1950_gpio_keys_data = { + .buttons = rx1950_gpio_keys_table, + .nbuttons = ARRAY_SIZE(rx1950_gpio_keys_table), +}; + +static struct platform_device rx1950_device_gpiokeys = { + .name = "gpio-keys", + .dev.platform_data = &rx1950_gpio_keys_data, +}; + +static struct s3c2410_platform_i2c rx1950_i2c_data = { + .flags = 0, + .slave_addr = 0x42, + .frequency = 400 * 1000, + .sda_delay = S3C2410_IICLC_SDA_DELAY5 | S3C2410_IICLC_FILTER_ON, +}; + +static struct platform_device *rx1950_devices[] __initdata = { + &s3c_device_lcd, + &s3c_device_wdt, + &s3c_device_i2c0, + &s3c_device_iis, + &s3c_device_usbgadget, + &s3c_device_rtc, + &s3c_device_nand, + &s3c_device_sdi, + &s3c_device_adc, + &s3c_device_ts, + &s3c_device_timer[0], + &s3c_device_timer[1], + &rx1950_backlight, + &rx1950_device_gpiokeys, +}; + +static struct clk *rx1950_clocks[] __initdata = { + &s3c24xx_clkout0, + &s3c24xx_clkout1, +}; + +static void __init rx1950_map_io(void) +{ + s3c24xx_clkout0.parent = &clk_h; + s3c24xx_clkout1.parent = &clk_f; + + s3c24xx_register_clocks(rx1950_clocks, ARRAY_SIZE(rx1950_clocks)); + + s3c24xx_init_io(rx1950_iodesc, ARRAY_SIZE(rx1950_iodesc)); + s3c24xx_init_clocks(16934000); + s3c24xx_init_uarts(rx1950_uartcfgs, ARRAY_SIZE(rx1950_uartcfgs)); + + /* setup PM */ + +#ifdef CONFIG_PM_H1940 + memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 8); +#endif + + s3c_pm_init(); +} + +static void __init rx1950_init_machine(void) +{ + int i; + + s3c24xx_fb_set_platdata(&rx1950_lcd_cfg); + s3c24xx_udc_set_platdata(&rx1950_udc_cfg); + s3c24xx_ts_set_platdata(&rx1950_ts_cfg); + s3c24xx_mci_set_platdata(&rx1950_mmc_cfg); + s3c_i2c0_set_platdata(&rx1950_i2c_data); + s3c_nand_set_platdata(&rx1950_nand_info); + + /* Turn off suspend on both USB ports, and switch the + * selectable USB port to USB device mode. */ + s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | + S3C2410_MISCCR_USBSUSPND0 | + S3C2410_MISCCR_USBSUSPND1, 0x0); + + WARN_ON(gpio_request(S3C2410_GPJ(5), "UDC pullup")); + gpio_direction_output(S3C2410_GPJ(5), 0); + + /* mmc power is disabled by default */ + WARN_ON(gpio_request(S3C2410_GPJ(1), "MMC power")); + gpio_direction_output(S3C2410_GPJ(1), 0); + + for (i = 0; i < 8; i++) + WARN_ON(gpio_request(S3C2410_GPC(i), "LCD power")); + + for (i = 10; i < 16; i++) + WARN_ON(gpio_request(S3C2410_GPC(i), "LCD power")); + + for (i = 2; i < 8; i++) + WARN_ON(gpio_request(S3C2410_GPD(i), "LCD power")); + + for (i = 11; i < 16; i++) + WARN_ON(gpio_request(S3C2410_GPD(i), "LCD power")); + + WARN_ON(gpio_request(S3C2410_GPB(1), "LCD power")); + + platform_add_devices(rx1950_devices, ARRAY_SIZE(rx1950_devices)); +} + +MACHINE_START(RX1950, "HP iPAQ RX1950") + /* Maintainers: Vasily Khoruzhick */ + .phys_io = S3C2410_PA_UART, + .io_pg_offst = (((u32) S3C24XX_VA_UART) >> 18) & 0xfffc, + .boot_params = S3C2410_SDRAM_PA + 0x100, + .map_io = rx1950_map_io, + .init_irq = s3c24xx_init_irq, + .init_machine = rx1950_init_machine, + .timer = &s3c24xx_timer, +MACHINE_END -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 2/5] MAINTAINERS: Add entry for HP iPAQ rx1950 2010-05-11 6:55 [PATCH v2 0/5] HP iPAQ RX1950 patch series Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 1/5] Add HP iPAQ RX1950 machine support Vasily Khoruzhick @ 2010-05-11 6:55 ` Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 3/5] Locate kernel at 0x30108000 if PM_H1940 is enabled Vasily Khoruzhick ` (3 subsequent siblings) 5 siblings, 0 replies; 12+ messages in thread From: Vasily Khoruzhick @ 2010-05-11 6:55 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> --- MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d5b0b1b..9f48b68 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 <anarsoul@gmail.com> +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 <alex@shark-linux.de> W: http://www.shark-linux.de/shark.html -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 3/5] Locate kernel at 0x30108000 if PM_H1940 is enabled 2010-05-11 6:55 [PATCH v2 0/5] HP iPAQ RX1950 patch series Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 1/5] Add HP iPAQ RX1950 machine support Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 2/5] MAINTAINERS: Add entry for HP iPAQ rx1950 Vasily Khoruzhick @ 2010-05-11 6:55 ` Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 4/5] Add suspend/resume support for RX1950 Vasily Khoruzhick ` (2 subsequent siblings) 5 siblings, 0 replies; 12+ messages in thread From: Vasily Khoruzhick @ 2010-05-11 6:55 UTC (permalink / raw) To: linux-arm-kernel 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. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> --- arch/arm/Makefile | 2 ++ arch/arm/mach-s3c2410/Makefile.boot | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ed820e7..eddcbba 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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 diff --git a/arch/arm/mach-s3c2410/Makefile.boot b/arch/arm/mach-s3c2410/Makefile.boot index 7dab2a0..58c1dd7 100644 --- a/arch/arm/mach-s3c2410/Makefile.boot +++ b/arch/arm/mach-s3c2410/Makefile.boot @@ -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 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 4/5] Add suspend/resume support for RX1950 2010-05-11 6:55 [PATCH v2 0/5] HP iPAQ RX1950 patch series Vasily Khoruzhick ` (2 preceding siblings ...) 2010-05-11 6:55 ` [PATCH v2 3/5] Locate kernel at 0x30108000 if PM_H1940 is enabled Vasily Khoruzhick @ 2010-05-11 6:55 ` Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 5/5] rx1950: configure GPG13-15 as input before suspend Vasily Khoruzhick 2010-05-12 0:48 ` [PATCH v2 0/5] HP iPAQ RX1950 patch series Ben Dooks 5 siblings, 0 replies; 12+ messages in thread From: Vasily Khoruzhick @ 2010-05-11 6:55 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> --- arch/arm/mach-s3c2410/pm.c | 4 ++-- arch/arm/mm/mmu.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c index 966119c..6a61486 100644 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c @@ -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; diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 241c24a..45a1bc2 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -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, -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 5/5] rx1950: configure GPG13-15 as input before suspend 2010-05-11 6:55 [PATCH v2 0/5] HP iPAQ RX1950 patch series Vasily Khoruzhick ` (3 preceding siblings ...) 2010-05-11 6:55 ` [PATCH v2 4/5] Add suspend/resume support for RX1950 Vasily Khoruzhick @ 2010-05-11 6:55 ` Vasily Khoruzhick 2010-05-12 0:48 ` [PATCH v2 0/5] HP iPAQ RX1950 patch series Ben Dooks 5 siblings, 0 replies; 12+ messages in thread From: Vasily Khoruzhick @ 2010-05-11 6:55 UTC (permalink / raw) To: linux-arm-kernel According to datasheet GPG13-15 must be configured as input in NAND boot mode, otherwise device will not be able to wake up Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> --- arch/arm/mach-s3c2410/pm.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c index 6a61486..725636f 100644 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c @@ -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) -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 0/5] HP iPAQ RX1950 patch series 2010-05-11 6:55 [PATCH v2 0/5] HP iPAQ RX1950 patch series Vasily Khoruzhick ` (4 preceding siblings ...) 2010-05-11 6:55 ` [PATCH v2 5/5] rx1950: configure GPG13-15 as input before suspend Vasily Khoruzhick @ 2010-05-12 0:48 ` Ben Dooks 2010-05-12 7:18 ` Vasily Khoruzhick 5 siblings, 1 reply; 12+ messages in thread From: Ben Dooks @ 2010-05-12 0:48 UTC (permalink / raw) To: linux-arm-kernel On Tue, May 11, 2010 at 09:55:06AM +0300, Vasily Khoruzhick wrote: > 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. -- Ben Q: What's a light-year? A: One-third less calories than a regular year. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 0/5] HP iPAQ RX1950 patch series 2010-05-12 0:48 ` [PATCH v2 0/5] HP iPAQ RX1950 patch series Ben Dooks @ 2010-05-12 7:18 ` Vasily Khoruzhick 0 siblings, 0 replies; 12+ messages in thread From: Vasily Khoruzhick @ 2010-05-12 7:18 UTC (permalink / raw) To: linux-arm-kernel ? ????????? ?? 12 ??? 2010 03:48:41 ????? Ben Dooks ???????: > 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> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 4/5] Add suspend/resume support for rx1950 @ 2009-09-26 21:04 Vasily Khoruzhick 2009-09-27 6:19 ` Ben Dooks 0 siblings, 1 reply; 12+ messages in thread From: Vasily Khoruzhick @ 2009-09-26 21:04 UTC (permalink / raw) To: linux-arm-kernel -------------- next part -------------- A non-text attachment was scrubbed... Name: 0004-Add-suspend-resume-support-for-rx1950.patch Type: text/x-patch Size: 2784 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20090927/b9b8e42a/attachment.bin> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 4/5] Add suspend/resume support for rx1950 2009-09-26 21:04 [PATCH v2 4/5] Add suspend/resume support for rx1950 Vasily Khoruzhick @ 2009-09-27 6:19 ` Ben Dooks 2009-09-27 7:01 ` Vasily Khoruzhick 0 siblings, 1 reply; 12+ messages in thread From: Ben Dooks @ 2009-09-27 6:19 UTC (permalink / raw) To: linux-arm-kernel On Sun, Sep 27, 2009 at 12:04:57AM +0300, Vasily Khoruzhick wrote: > > From d80afd66257a726995981c5376ab2d4854e8b120 Mon Sep 17 00:00:00 2001 > From: Vasily Khoruzhick <anarsoul@gmail.com> > Date: Tue, 22 Sep 2009 20:59:04 +0300 > Subject: [PATCH v2 4/5] Add suspend/resume support for rx1950 > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > --- > arch/arm/mach-s3c2410/pm.c | 23 +++++++++++++++++++++-- > arch/arm/mm/mmu.c | 5 +++-- > 2 files changed, 24 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c > index 966119c..f2f3235 100644 > --- a/arch/arm/mach-s3c2410/pm.c > +++ b/arch/arm/mach-s3c2410/pm.c > @@ -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; > @@ -74,6 +74,19 @@ static void s3c2410_pm_prepare(void) > calc += __raw_readl(base+ptr); > > __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM)); > + 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 */ given this is generic to the s3c2442, why put this here? it also holds for the s3c2440 too... think about an implementation for the cpu's sysdev for all nand-booting systems. > + s3c2410_gpio_cfgpin(S3C2410_GPG(15), > + S3C2410_GPIO_INPUT); > + s3c2410_gpio_cfgpin(S3C2410_GPG(14), > + S3C2410_GPIO_INPUT); > + s3c2410_gpio_cfgpin(S3C2410_GPG(13), > + S3C2410_GPIO_INPUT); > + } > } > > if ( machine_is_aml_m5900() ) > @@ -94,6 +107,12 @@ static int s3c2410_pm_resume(struct sys_device *dev) > if ( machine_is_aml_m5900() ) > s3c2410_gpio_setpin(S3C2410_GPF(2), 0); > > + if (machine_is_rx1950()) { > + s3c2410_gpio_cfgpin(S3C2410_GPG(15), S3C2410_GPG15_EINT23); > + s3c2410_gpio_cfgpin(S3C2410_GPG(14), S3C2410_GPG14_EINT22); > + s3c2410_gpio_cfgpin(S3C2410_GPG(13), S3C2410_GPG13_EINT21); > + } > + > return 0; > } > > diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c > index 4426ee6..a13923e 100644 > --- a/arch/arm/mm/mmu.c > +++ b/arch/arm/mm/mmu.c > @@ -827,9 +827,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, > -- > 1.6.5.rc1 > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- -- Ben Q: What's a light-year? A: One-third less calories than a regular year. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 4/5] Add suspend/resume support for rx1950 2009-09-27 6:19 ` Ben Dooks @ 2009-09-27 7:01 ` Vasily Khoruzhick 2009-09-27 7:08 ` Ben Dooks 0 siblings, 1 reply; 12+ messages in thread From: Vasily Khoruzhick @ 2009-09-27 7:01 UTC (permalink / raw) To: linux-arm-kernel ? ????????? ?? 27 ???????? 2009 09:19:51 ????? Ben Dooks ???????: > > __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM)); > > + 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 */ > > given this is generic to the s3c2442, why put this here? it also holds > for the s3c2440 too... think about an implementation for the cpu's > sysdev for all nand-booting systems. Well, actually I thought that suspend for h1940 and rx3000 works without these tricks... Ok, I'll make it generic for s3c2442 CPU. -------------- 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/20090927/1a0fe903/attachment.sig> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 4/5] Add suspend/resume support for rx1950 2009-09-27 7:01 ` Vasily Khoruzhick @ 2009-09-27 7:08 ` Ben Dooks 0 siblings, 0 replies; 12+ messages in thread From: Ben Dooks @ 2009-09-27 7:08 UTC (permalink / raw) To: linux-arm-kernel On Sun, Sep 27, 2009 at 10:01:08AM +0300, Vasily Khoruzhick wrote: > ?? ?????????????????? ???? 27 ???????????????? 2009 09:19:51 ?????????? Ben Dooks ??????????????: > > > __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM)); > > > + 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 */ > > > > given this is generic to the s3c2442, why put this here? it also holds > > for the s3c2440 too... think about an implementation for the cpu's > > sysdev for all nand-booting systems. > > Well, actually I thought that suspend for h1940 and rx3000 works without these > tricks... Ok, I'll make it generic for s3c2442 CPU. The h1940 is a s3c2410 and all the boot pins on it are specific function for boot. No idea if the rx3xxx series use the upper EINT lines for anything. Anyway, please include the s3c2440 in this change as I belive it also has the saem note. -- Ben Q: What's a light-year? A: One-third less calories than a regular year. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2010-05-12 7:18 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-05-11 6:55 [PATCH v2 0/5] HP iPAQ RX1950 patch series Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 1/5] Add HP iPAQ RX1950 machine support Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 2/5] MAINTAINERS: Add entry for HP iPAQ rx1950 Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 3/5] Locate kernel at 0x30108000 if PM_H1940 is enabled Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 4/5] Add suspend/resume support for RX1950 Vasily Khoruzhick 2010-05-11 6:55 ` [PATCH v2 5/5] rx1950: configure GPG13-15 as input before suspend Vasily Khoruzhick 2010-05-12 0:48 ` [PATCH v2 0/5] HP iPAQ RX1950 patch series Ben Dooks 2010-05-12 7:18 ` Vasily Khoruzhick -- strict thread matches above, loose matches on Subject: below -- 2009-09-26 21:04 [PATCH v2 4/5] Add suspend/resume support for rx1950 Vasily Khoruzhick 2009-09-27 6:19 ` Ben Dooks 2009-09-27 7:01 ` Vasily Khoruzhick 2009-09-27 7:08 ` Ben Dooks
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).