* [PATCH 0/4] HP iPAQ RX1950 patch series
@ 2010-03-20 18:20 Vasily Khoruzhick
2010-03-20 18:20 ` [PATCH 1/4] Add HP iPAQ RX1950 machine support Vasily Khoruzhick
` (5 more replies)
0 siblings, 6 replies; 14+ messages in thread
From: Vasily Khoruzhick @ 2010-03-20 18:20 UTC (permalink / raw)
To: linux-arm-kernel
Following patch series add support for iPAQ RX1950 PDA - another s3c2442-based
machine.
Almost all drivers for this machine are included in mainline kernel, and port
only lacks battery, WiFi and sound support, they will be added later.
Port still uses machine-specific GPIO API, as generic GPIO lacks GPJ
support and RX1950 actively uses GPJ port. However I do not see any benifits
in using generic GPIO API in machine support file, as it will not be used
with CPU different from s3c2442.
Denis: I hope you'll add your Signed-off at least under first patch.
I doubt that I can get Signed-off from Victor Chukhantsev, as he doesn't
work on port for a long time.
Regards,
Vasily
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 1/4] Add HP iPAQ RX1950 machine support 2010-03-20 18:20 [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick @ 2010-03-20 18:20 ` Vasily Khoruzhick 2010-03-21 22:42 ` denis grigoriev 2010-03-20 18:20 ` [PATCH 2/4] Locate kernel at 0x30108000 if PM_H1940 is enabled Vasily Khoruzhick ` (4 subsequent siblings) 5 siblings, 1 reply; 14+ messages in thread From: Vasily Khoruzhick @ 2010-03-20 18:20 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> --- arch/arm/mach-s3c2440/Kconfig | 12 + arch/arm/mach-s3c2440/Makefile | 1 + arch/arm/mach-s3c2440/mach-rx1950.c | 573 +++++++++++++++++++++++++++++++++++ 3 files changed, 586 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 7f46526..c8ddde3 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -187,4 +187,16 @@ 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 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..cef4603 --- /dev/null +++ b/arch/arm/mach-s3c2440/mach-rx1950.c @@ -0,0 +1,573 @@ +/* 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 <mach/ts.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> + +#define LCD_PWM_PERIOD 192960 +#define LCD_PWM_DUTY 127353 + +static struct map_desc rx1950_iodesc[] __initdata = { + /* ISA IO Space map (memory space selected by A24) */ + { + .virtual = (u32) S3C24XX_VA_ISA_WORD, + .pfn = __phys_to_pfn(S3C2410_CS2), + .length = 0x10000, + .type = MT_DEVICE, + }, + { + .virtual = (u32) S3C24XX_VA_ISA_WORD + 0x10000, + .pfn = __phys_to_pfn(S3C2410_CS2 + (1 << 24)), + .length = SZ_4M, + .type = MT_DEVICE, + }, +}; + +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) +{ + static int enabled; + if (enabled == enable) + return; + if (!enable) { + /* GPC11-GPC15->OUTPUT */ + s3c2410_gpio_cfgpin(S3C2410_GPC(11), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPC(12), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPC(13), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPC(14), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPC(15), S3C2410_GPIO_OUTPUT); + + /* GPC11-GPC15->1 */ + s3c2410_gpio_setpin(S3C2410_GPC(8), 1); + s3c2410_gpio_setpin(S3C2410_GPC(9), 1); + s3c2410_gpio_setpin(S3C2410_GPC(10), 1); + s3c2410_gpio_setpin(S3C2410_GPC(11), 1); + s3c2410_gpio_setpin(S3C2410_GPC(12), 1); + s3c2410_gpio_setpin(S3C2410_GPC(13), 1); + s3c2410_gpio_setpin(S3C2410_GPC(14), 1); + s3c2410_gpio_setpin(S3C2410_GPC(15), 1); + + /* Wait a bit here... */ + mdelay(100); + + /* GPD2-GPD7->OUTPUT */ + s3c2410_gpio_cfgpin(S3C2410_GPD(2), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPD(3), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPD(4), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPD(5), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPD(6), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPD(7), S3C2410_GPIO_OUTPUT); + + /* GPD11-GPD15->OUTPUT */ + s3c2410_gpio_cfgpin(S3C2410_GPD(11), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPD(12), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPD(13), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPD(14), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPD(15), S3C2410_GPIO_OUTPUT); + + /* GPD2-GPD7->1, GPD11-GPD15->1 */ + s3c2410_gpio_setpin(S3C2410_GPD(2), 1); + s3c2410_gpio_setpin(S3C2410_GPD(3), 1); + s3c2410_gpio_setpin(S3C2410_GPD(4), 1); + s3c2410_gpio_setpin(S3C2410_GPD(5), 1); + s3c2410_gpio_setpin(S3C2410_GPD(6), 1); + s3c2410_gpio_setpin(S3C2410_GPD(7), 1); + s3c2410_gpio_setpin(S3C2410_GPD(11), 1); + s3c2410_gpio_setpin(S3C2410_GPD(12), 1); + s3c2410_gpio_setpin(S3C2410_GPD(13), 1); + s3c2410_gpio_setpin(S3C2410_GPD(14), 1); + s3c2410_gpio_setpin(S3C2410_GPD(15), 1); + + /* Wait a bit here...*/ + mdelay(100); + + /* GPB0->OUTPUT, GPB0->0 */ + s3c2410_gpio_setpin(S3C2410_GPB(0), 0); + s3c2410_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPIO_OUTPUT); + + /* GPC1-GPC4->OUTPUT, GPC2->0 */ + s3c2410_gpio_cfgpin(S3C2410_GPC(1), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPC(2), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_setpin(S3C2410_GPC(2), 0); + s3c2410_gpio_cfgpin(S3C2410_GPC(3), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_cfgpin(S3C2410_GPC(4), S3C2410_GPIO_OUTPUT); + + /* GPC15-GPC11->0 */ + s3c2410_gpio_setpin(S3C2410_GPC(11), 0); + s3c2410_gpio_setpin(S3C2410_GPC(12), 0); + s3c2410_gpio_setpin(S3C2410_GPC(13), 0); + s3c2410_gpio_setpin(S3C2410_GPC(14), 0); + s3c2410_gpio_setpin(S3C2410_GPC(15), 0); + + /* GPD15-GPD11->0, GPD3->GPD8->0 */ + s3c2410_gpio_setpin(S3C2410_GPD(11), 0); + s3c2410_gpio_setpin(S3C2410_GPD(12), 0); + s3c2410_gpio_setpin(S3C2410_GPD(13), 0); + s3c2410_gpio_setpin(S3C2410_GPD(14), 0); + s3c2410_gpio_setpin(S3C2410_GPD(15), 0); + s3c2410_gpio_setpin(S3C2410_GPD(2), 0); + s3c2410_gpio_setpin(S3C2410_GPD(3), 0); + s3c2410_gpio_setpin(S3C2410_GPD(4), 0); + s3c2410_gpio_setpin(S3C2410_GPD(5), 0); + s3c2410_gpio_setpin(S3C2410_GPD(6), 0); + s3c2410_gpio_setpin(S3C2410_GPD(7), 0); + + /* GPC6->0, GPC7->0, GPC5->0 */ + s3c2410_gpio_setpin(S3C2410_GPC(6), 0); + s3c2410_gpio_setpin(S3C2410_GPC(7), 0); + s3c2410_gpio_setpin(S3C2410_GPC(5), 0); + + /* GPB1->OUTPUT, GPB1->0 */ + s3c2410_gpio_setpin(S3C2410_GPB(1), 0); + s3c2410_gpio_cfgpin(S3C2410_GPB(1), S3C2410_GPIO_OUTPUT); + pwm_config(lcd_pwm, 0, LCD_PWM_PERIOD); + pwm_disable(lcd_pwm); + + /* GPC0->0, GPC10->0 */ + s3c2410_gpio_setpin(S3C2410_GPC(0), 0); + s3c2410_gpio_setpin(S3C2410_GPC(10), 0); + } else { + pwm_config(lcd_pwm, LCD_PWM_DUTY, LCD_PWM_PERIOD); + pwm_enable(lcd_pwm); + + s3c2410_gpio_setpin(S3C2410_GPC(0), 1); + s3c2410_gpio_setpin(S3C2410_GPC(5), 1); + s3c2410_gpio_setpin(S3C2410_GPC(7), 1); + + s3c2410_gpio_cfgpin(S3C2410_GPB(1), S3C2410_GPB1_TOUT1); + + s3c2410_gpio_cfgpin(S3C2410_GPC(1), S3C2410_GPC1_VCLK); + s3c2410_gpio_cfgpin(S3C2410_GPC(2), S3C2410_GPC2_VLINE); + s3c2410_gpio_cfgpin(S3C2410_GPC(3), S3C2410_GPC3_VFRAME); + s3c2410_gpio_cfgpin(S3C2410_GPC(4), S3C2410_GPC4_VM); + s3c2410_gpio_cfgpin(S3C2410_GPC(11), S3C2410_GPC11_VD3); + s3c2410_gpio_cfgpin(S3C2410_GPC(12), S3C2410_GPC12_VD4); + s3c2410_gpio_cfgpin(S3C2410_GPC(13), S3C2410_GPC13_VD5); + s3c2410_gpio_cfgpin(S3C2410_GPC(14), S3C2410_GPC14_VD6); + s3c2410_gpio_cfgpin(S3C2410_GPC(15), S3C2410_GPC15_VD7); + + s3c2410_gpio_cfgpin(S3C2410_GPD(2), S3C2410_GPD2_VD10); + s3c2410_gpio_cfgpin(S3C2410_GPD(3), S3C2410_GPD3_VD11); + s3c2410_gpio_cfgpin(S3C2410_GPD(4), S3C2410_GPD4_VD12); + s3c2410_gpio_cfgpin(S3C2410_GPD(5), S3C2410_GPD5_VD13); + s3c2410_gpio_cfgpin(S3C2410_GPD(6), S3C2410_GPD6_VD14); + s3c2410_gpio_cfgpin(S3C2410_GPD(7), S3C2410_GPD7_VD15); + s3c2410_gpio_cfgpin(S3C2410_GPD(11), S3C2410_GPD11_VD19); + s3c2410_gpio_cfgpin(S3C2410_GPD(12), S3C2410_GPD12_VD20); + s3c2410_gpio_cfgpin(S3C2410_GPD(13), S3C2410_GPD13_VD21); + s3c2410_gpio_cfgpin(S3C2410_GPD(14), S3C2410_GPD14_VD22); + s3c2410_gpio_cfgpin(S3C2410_GPD(15), S3C2410_GPD15_VD23); + + msleep(10); + s3c2410_gpio_setpin(S3C2410_GPC(10), 1); + msleep(10); + s3c2410_gpio_setpin(S3C2410_GPC(6), 1); + } + enabled = enable; +} + +static void rx1950_bl_power(int enable) +{ + static int enabled; + if (enabled == enable) + return; + if (!enable) { + s3c2410_gpio_setpin(S3C2410_GPB(0), 0); + s3c2410_gpio_pullup(S3C2410_GPB(0), 0); + s3c2410_gpio_cfgpin(S3C2410_GPB(0), + S3C2410_GPIO_OUTPUT); + } else { + /* LED driver need a "push" to power on */ + s3c2410_gpio_setpin(S3C2410_GPB(0), 1); + s3c2410_gpio_pullup(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); + s3c2410_gpio_cfgpin(S3C2410_GPB(0), + S3C2410_GPB0_TOUT0); + } + enabled = enable; +} + + + +static int rx1950_backlight_init(struct device *dev) +{ + 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); +} + + +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: + s3c2410_gpio_setpin(S3C2440_GPJ1, 0); + break; + case MMC_POWER_UP: + case MMC_POWER_ON: + s3c2410_gpio_setpin(S3C2440_GPJ1, 1); + break; + default: + break; + } +} + +static struct s3c24xx_mci_pdata rx1950_mmc_cfg = { + .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: + s3c2410_gpio_setpin(S3C2440_GPJ5, 1); + break; + case S3C2410_UDC_P_DISABLE: + s3c2410_gpio_setpin(S3C2440_GPJ5, 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 = 5, +}; + +static struct gpio_keys_button rx1950_gpio_keys_table[] = { + {KEY_POWER, S3C2410_GPF(0), 1, "Power button"}, + {KEY_RECORD, S3C2410_GPF(7), 1, "Record button"}, + {KEY_CALENDAR, S3C2410_GPG(0), 1, "Calendar button"}, + {KEY_ADDRESSBOOK, S3C2410_GPG(2), 1, "Contacts button"}, + {KEY_MAIL, S3C2410_GPG(3), 1, "Mail button"}, + {KEY_WLAN, S3C2410_GPG(7), 1, "WLAN button"}, + {KEY_LEFT, S3C2410_GPG(10), 1, "Left button"}, + {KEY_RIGHT, S3C2410_GPG(11), 1, "Right button"}, + {KEY_UP, S3C2410_GPG(4), 1, "Up button"}, + {KEY_DOWN, S3C2410_GPG(6), 1, "Down button"}, + {KEY_ENTER, S3C2410_GPG(9), 1, "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 void __init rx1950_map_io(void) +{ + s3c24xx_init_io(rx1950_iodesc, ARRAY_SIZE(rx1950_iodesc)); + s3c24xx_init_clocks(16934000); + s3c24xx_init_uarts(rx1950_uartcfgs, ARRAY_SIZE(rx1950_uartcfgs)); +} + +static void __init rx1950_init_machine(void) +{ +#ifdef CONFIG_PM_H1940 + memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 8); +#endif + s3c24xx_fb_set_platdata(&rx1950_lcd_cfg); + s3c_nand_set_platdata(&rx1950_nand_info); + s3c_device_sdi.dev.platform_data = &rx1950_mmc_cfg; + s3c_i2c0_set_platdata(&rx1950_i2c_data); + + /* Configuring udc pullup */ + s3c2410_gpio_cfgpin(S3C2440_GPJ5, S3C2410_GPIO_OUTPUT); + + /* Configuring mmc power pin */ + s3c2410_gpio_setpin(S3C2440_GPJ1, S3C2410_GPIO_OUTPUT); + /* mmc power is disabled by default */ + s3c2410_gpio_setpin(S3C2440_GPJ1, 0); + + /* Some udc magic */ + s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | + S3C2410_MISCCR_USBSUSPND0 | + S3C2410_MISCCR_USBSUSPND1, 0x0); + + s3c24xx_udc_set_platdata(&rx1950_udc_cfg); + s3c24xx_ts_set_platdata(&rx1950_ts_cfg); + + platform_add_devices(rx1950_devices, ARRAY_SIZE(rx1950_devices)); + + s3c_pm_init(); + s3c_irq_wake(IRQ_EINT0, 1); +} + +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.2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 1/4] Add HP iPAQ RX1950 machine support 2010-03-20 18:20 ` [PATCH 1/4] Add HP iPAQ RX1950 machine support Vasily Khoruzhick @ 2010-03-21 22:42 ` denis grigoriev 0 siblings, 0 replies; 14+ messages in thread From: denis grigoriev @ 2010-03-21 22:42 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Denis Grigoriev <dgreendayl@gmail.com> 2010/3/20 Vasily Khoruzhick <anarsoul@gmail.com>: > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > --- > ?arch/arm/mach-s3c2440/Kconfig ? ? ? | ? 12 + > ?arch/arm/mach-s3c2440/Makefile ? ? ?| ? ?1 + > ?arch/arm/mach-s3c2440/mach-rx1950.c | ?573 +++++++++++++++++++++++++++++++++++ > ?3 files changed, 586 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 7f46526..c8ddde3 100644 > --- a/arch/arm/mach-s3c2440/Kconfig > +++ b/arch/arm/mach-s3c2440/Kconfig > @@ -187,4 +187,16 @@ 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 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..cef4603 > --- /dev/null > +++ b/arch/arm/mach-s3c2440/mach-rx1950.c > @@ -0,0 +1,573 @@ > +/* 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 <mach/ts.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> > + > +#define LCD_PWM_PERIOD 192960 > +#define LCD_PWM_DUTY 127353 > + > +static struct map_desc rx1950_iodesc[] __initdata = { > + ? ? ? /* ISA IO Space map (memory space selected by A24) */ > + ? ? ? { > + ? ? ? ?.virtual = (u32) S3C24XX_VA_ISA_WORD, > + ? ? ? ?.pfn = __phys_to_pfn(S3C2410_CS2), > + ? ? ? ?.length = 0x10000, > + ? ? ? ?.type = MT_DEVICE, > + ? ? ? }, > + ? ? ? { > + ? ? ? ?.virtual = (u32) S3C24XX_VA_ISA_WORD + 0x10000, > + ? ? ? ?.pfn = __phys_to_pfn(S3C2410_CS2 + (1 << 24)), > + ? ? ? ?.length = SZ_4M, > + ? ? ? ?.type = MT_DEVICE, > + ? ? ? }, > +}; > + > +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) > +{ > + ? ? ? static int enabled; > + ? ? ? if (enabled == enable) > + ? ? ? ? ? ? ? return; > + ? ? ? if (!enable) { > + ? ? ? ? ? ? ? /* GPC11-GPC15->OUTPUT */ > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(11), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(12), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(13), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(14), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(15), S3C2410_GPIO_OUTPUT); > + > + ? ? ? ? ? ? ? /* GPC11-GPC15->1 */ > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(8), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(9), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(10), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(11), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(12), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(13), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(14), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(15), 1); > + > + ? ? ? ? ? ? ? /* Wait a bit here... */ > + ? ? ? ? ? ? ? mdelay(100); > + > + ? ? ? ? ? ? ? /* GPD2-GPD7->OUTPUT */ > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(2), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(3), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(4), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(5), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(6), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(7), S3C2410_GPIO_OUTPUT); > + > + ? ? ? ? ? ? ? /* GPD11-GPD15->OUTPUT */ > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(11), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(12), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(13), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(14), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(15), S3C2410_GPIO_OUTPUT); > + > + ? ? ? ? ? ? ? /* GPD2-GPD7->1, GPD11-GPD15->1 */ > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(2), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(3), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(4), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(5), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(6), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(7), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(11), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(12), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(13), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(14), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(15), 1); > + > + ? ? ? ? ? ? ? /* Wait a bit here...*/ > + ? ? ? ? ? ? ? mdelay(100); > + > + ? ? ? ? ? ? ? /* GPB0->OUTPUT, GPB0->0 */ > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPB(0), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPIO_OUTPUT); > + > + ? ? ? ? ? ? ? /* GPC1-GPC4->OUTPUT, GPC2->0 */ > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(1), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(2), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(2), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(3), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(4), S3C2410_GPIO_OUTPUT); > + > + ? ? ? ? ? ? ? /* GPC15-GPC11->0 */ > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(11), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(12), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(13), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(14), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(15), 0); > + > + ? ? ? ? ? ? ? /* GPD15-GPD11->0, GPD3->GPD8->0 */ > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(11), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(12), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(13), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(14), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(15), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(2), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(3), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(4), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(5), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(6), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPD(7), 0); > + > + ? ? ? ? ? ? ? /* GPC6->0, GPC7->0, GPC5->0 */ > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(6), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(7), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(5), 0); > + > + ? ? ? ? ? ? ? /* GPB1->OUTPUT, GPB1->0 */ > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPB(1), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPB(1), S3C2410_GPIO_OUTPUT); > + ? ? ? ? ? ? ? pwm_config(lcd_pwm, 0, LCD_PWM_PERIOD); > + ? ? ? ? ? ? ? pwm_disable(lcd_pwm); > + > + ? ? ? ? ? ? ? /* GPC0->0, GPC10->0 */ > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(0), 0); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(10), 0); > + ? ? ? } else { > + ? ? ? ? ? ? ? pwm_config(lcd_pwm, LCD_PWM_DUTY, LCD_PWM_PERIOD); > + ? ? ? ? ? ? ? pwm_enable(lcd_pwm); > + > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(0), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(5), 1); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(7), 1); > + > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPB(1), S3C2410_GPB1_TOUT1); > + > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(1), S3C2410_GPC1_VCLK); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(2), S3C2410_GPC2_VLINE); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(3), S3C2410_GPC3_VFRAME); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(4), S3C2410_GPC4_VM); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(11), S3C2410_GPC11_VD3); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(12), S3C2410_GPC12_VD4); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(13), S3C2410_GPC13_VD5); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(14), S3C2410_GPC14_VD6); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPC(15), S3C2410_GPC15_VD7); > + > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(2), S3C2410_GPD2_VD10); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(3), S3C2410_GPD3_VD11); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(4), S3C2410_GPD4_VD12); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(5), S3C2410_GPD5_VD13); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(6), S3C2410_GPD6_VD14); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(7), S3C2410_GPD7_VD15); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(11), S3C2410_GPD11_VD19); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(12), S3C2410_GPD12_VD20); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(13), S3C2410_GPD13_VD21); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(14), S3C2410_GPD14_VD22); > + ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPD(15), S3C2410_GPD15_VD23); > + > + ? ? ? ? ? ? ? msleep(10); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(10), 1); > + ? ? ? ? ? ? ? msleep(10); > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPC(6), 1); > + ? ? ? } > + ? ? ? enabled = enable; > +} > + > +static void rx1950_bl_power(int enable) > +{ > + ? ? ? static int enabled; > + ? ? ? if (enabled == enable) > + ? ? ? ? ? ? ? return; > + ? ? ? if (!enable) { > + ? ? ? ? ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPB(0), 0); > + ? ? ? ? ? ? ? ? ? ? ? s3c2410_gpio_pullup(S3C2410_GPB(0), 0); > + ? ? ? ? ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPB(0), > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? S3C2410_GPIO_OUTPUT); > + ? ? ? } else { > + ? ? ? ? ? ? ? ? ? ? ? /* LED driver need a "push" to power on */ > + ? ? ? ? ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2410_GPB(0), 1); > + ? ? ? ? ? ? ? ? ? ? ? s3c2410_gpio_pullup(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); > + ? ? ? ? ? ? ? ? ? ? ? s3c2410_gpio_cfgpin(S3C2410_GPB(0), > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? S3C2410_GPB0_TOUT0); > + ? ? ? } > + ? ? ? enabled = enable; > +} > + > + > + > +static int rx1950_backlight_init(struct device *dev) > +{ > + ? ? ? 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); > +} > + > + > +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: > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2440_GPJ1, 0); > + ? ? ? ? ? ? ? break; > + ? ? ? case MMC_POWER_UP: > + ? ? ? case MMC_POWER_ON: > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2440_GPJ1, 1); > + ? ? ? ? ? ? ? break; > + ? ? ? default: > + ? ? ? ? ? ? ? break; > + ? ? ? } > +} > + > +static struct s3c24xx_mci_pdata rx1950_mmc_cfg = { > + ? ? ? .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: > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2440_GPJ5, 1); > + ? ? ? ? ? ? ? break; > + ? ? ? case S3C2410_UDC_P_DISABLE: > + ? ? ? ? ? ? ? s3c2410_gpio_setpin(S3C2440_GPJ5, 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 = 5, > +}; > + > +static struct gpio_keys_button rx1950_gpio_keys_table[] = { > + ? ? ? {KEY_POWER, S3C2410_GPF(0), 1, "Power button"}, > + ? ? ? {KEY_RECORD, S3C2410_GPF(7), 1, "Record button"}, > + ? ? ? {KEY_CALENDAR, S3C2410_GPG(0), 1, "Calendar button"}, > + ? ? ? {KEY_ADDRESSBOOK, S3C2410_GPG(2), 1, "Contacts button"}, > + ? ? ? {KEY_MAIL, S3C2410_GPG(3), 1, "Mail button"}, > + ? ? ? {KEY_WLAN, S3C2410_GPG(7), 1, "WLAN button"}, > + ? ? ? {KEY_LEFT, S3C2410_GPG(10), 1, "Left button"}, > + ? ? ? {KEY_RIGHT, S3C2410_GPG(11), 1, "Right button"}, > + ? ? ? {KEY_UP, S3C2410_GPG(4), 1, "Up button"}, > + ? ? ? {KEY_DOWN, S3C2410_GPG(6), 1, "Down button"}, > + ? ? ? {KEY_ENTER, S3C2410_GPG(9), 1, "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 void __init rx1950_map_io(void) > +{ > + ? ? ? s3c24xx_init_io(rx1950_iodesc, ARRAY_SIZE(rx1950_iodesc)); > + ? ? ? s3c24xx_init_clocks(16934000); > + ? ? ? s3c24xx_init_uarts(rx1950_uartcfgs, ARRAY_SIZE(rx1950_uartcfgs)); > +} > + > +static void __init rx1950_init_machine(void) > +{ > +#ifdef CONFIG_PM_H1940 > + ? ? ? memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 8); > +#endif > + ? ? ? s3c24xx_fb_set_platdata(&rx1950_lcd_cfg); > + ? ?s3c_nand_set_platdata(&rx1950_nand_info); > + ? ? ? s3c_device_sdi.dev.platform_data = &rx1950_mmc_cfg; > + ? ?s3c_i2c0_set_platdata(&rx1950_i2c_data); > + > + ? ? ? /* Configuring udc pullup */ > + ? ? ? s3c2410_gpio_cfgpin(S3C2440_GPJ5, S3C2410_GPIO_OUTPUT); > + > + ? ? ? /* Configuring mmc power pin */ > + ? ? ? s3c2410_gpio_setpin(S3C2440_GPJ1, S3C2410_GPIO_OUTPUT); > + ? ? ? /* mmc power is disabled by default */ > + ? ? ? s3c2410_gpio_setpin(S3C2440_GPJ1, 0); > + > + ? ? ? /* Some udc magic */ > + ? ? ? s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? S3C2410_MISCCR_USBSUSPND0 | > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? S3C2410_MISCCR_USBSUSPND1, 0x0); > + > + ? ? ? s3c24xx_udc_set_platdata(&rx1950_udc_cfg); > + ? ? ? s3c24xx_ts_set_platdata(&rx1950_ts_cfg); > + > + ? ? ? platform_add_devices(rx1950_devices, ARRAY_SIZE(rx1950_devices)); > + > + ? ? ? s3c_pm_init(); > + ? ? ? s3c_irq_wake(IRQ_EINT0, 1); > +} > + > +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.2 > > ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/4] Locate kernel at 0x30108000 if PM_H1940 is enabled 2010-03-20 18:20 [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick 2010-03-20 18:20 ` [PATCH 1/4] Add HP iPAQ RX1950 machine support Vasily Khoruzhick @ 2010-03-20 18:20 ` Vasily Khoruzhick 2010-03-20 18:20 ` [PATCH 3/4] s3c244x: configure GPG13-15 as input before suspend Vasily Khoruzhick ` (3 subsequent siblings) 5 siblings, 0 replies; 14+ messages in thread From: Vasily Khoruzhick @ 2010-03-20 18:20 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 2703222..58e4d8e 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.2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/4] s3c244x: configure GPG13-15 as input before suspend 2010-03-20 18:20 [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick 2010-03-20 18:20 ` [PATCH 1/4] Add HP iPAQ RX1950 machine support Vasily Khoruzhick 2010-03-20 18:20 ` [PATCH 2/4] Locate kernel at 0x30108000 if PM_H1940 is enabled Vasily Khoruzhick @ 2010-03-20 18:20 ` Vasily Khoruzhick 2010-03-31 1:13 ` Ben Dooks 2010-03-20 18:20 ` [PATCH 4/4] Add suspend/resume support for RX1950 Vasily Khoruzhick ` (2 subsequent siblings) 5 siblings, 1 reply; 14+ messages in thread From: Vasily Khoruzhick @ 2010-03-20 18:20 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-s3c2440/s3c244x.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c2440/s3c244x.c b/arch/arm/mach-s3c2440/s3c244x.c index 5e4a97e..b100e92 100644 --- a/arch/arm/mach-s3c2440/s3c244x.c +++ b/arch/arm/mach-s3c2440/s3c244x.c @@ -21,6 +21,7 @@ #include <linux/sysdev.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -146,6 +147,17 @@ static struct sleep_save s3c244x_sleep[] = { static int s3c244x_suspend(struct sys_device *dev, pm_message_t state) { s3c_pm_do_save(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep)); +#ifdef CONFIG_S3C_DEV_NAND + /* 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 + */ + 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); +#endif return 0; } -- 1.7.0.2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/4] s3c244x: configure GPG13-15 as input before suspend 2010-03-20 18:20 ` [PATCH 3/4] s3c244x: configure GPG13-15 as input before suspend Vasily Khoruzhick @ 2010-03-31 1:13 ` Ben Dooks 2010-03-31 6:15 ` Vasily Khoruzhick 0 siblings, 1 reply; 14+ messages in thread From: Ben Dooks @ 2010-03-31 1:13 UTC (permalink / raw) To: linux-arm-kernel On Sat, Mar 20, 2010 at 08:20:08PM +0200, Vasily Khoruzhick wrote: > 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-s3c2440/s3c244x.c | 12 ++++++++++++ > 1 files changed, 12 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-s3c2440/s3c244x.c b/arch/arm/mach-s3c2440/s3c244x.c > index 5e4a97e..b100e92 100644 > --- a/arch/arm/mach-s3c2440/s3c244x.c > +++ b/arch/arm/mach-s3c2440/s3c244x.c > @@ -21,6 +21,7 @@ > #include <linux/sysdev.h> > #include <linux/clk.h> > #include <linux/io.h> > +#include <linux/gpio.h> > > #include <asm/mach/arch.h> > #include <asm/mach/map.h> > @@ -146,6 +147,17 @@ static struct sleep_save s3c244x_sleep[] = { > static int s3c244x_suspend(struct sys_device *dev, pm_message_t state) > { > s3c_pm_do_save(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep)); > +#ifdef CONFIG_S3C_DEV_NAND > + /* 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 > + */ > + 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); Please don't do this conditionally, we can compile kernels supporting many machines, some of the machines might not be using this boot method. I'll think over the solution. 1) Make each machine add a relevant sysdev to hook suspend/resume. 2) Update the nand driver to do this, but would (a) need to check what else is s3c2440 compatible, and (b) it doesn't know if the system has booted from NAND or not. > +#endif > return 0; > } > > -- > 1.7.0.2 > > > _______________________________________________ > 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] 14+ messages in thread
* [PATCH 3/4] s3c244x: configure GPG13-15 as input before suspend 2010-03-31 1:13 ` Ben Dooks @ 2010-03-31 6:15 ` Vasily Khoruzhick 0 siblings, 0 replies; 14+ messages in thread From: Vasily Khoruzhick @ 2010-03-31 6:15 UTC (permalink / raw) To: linux-arm-kernel ? ????????? ?? 31 ????? 2010 04:13:37 ????? Ben Dooks ???????: > > +#ifdef CONFIG_S3C_DEV_NAND > > + /* 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 > > + */ > > + 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); > > Please don't do this conditionally, we can compile kernels supporting > many machines, some of the machines might not be using this boot method. > > I'll think over the solution. > > 1) Make each machine add a relevant sysdev to hook suspend/resume. > > 2) Update the nand driver to do this, but would (a) need to check what > else is s3c2440 compatible, and (b) it doesn't know if the system > has booted from NAND or not. Maybe it's better to do this in s3c2410_pm_prepare()? I see some machine- specific gpio configuration there. Regards Vasily -------------- 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/20100331/2da39d54/attachment.sig> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 4/4] Add suspend/resume support for RX1950 2010-03-20 18:20 [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick ` (2 preceding siblings ...) 2010-03-20 18:20 ` [PATCH 3/4] s3c244x: configure GPG13-15 as input before suspend Vasily Khoruzhick @ 2010-03-20 18:20 ` Vasily Khoruzhick 2010-03-25 6:28 ` [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick 2010-03-31 1:15 ` Ben Dooks 5 siblings, 0 replies; 14+ messages in thread From: Vasily Khoruzhick @ 2010-03-20 18:20 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 1708da8..b882f8c 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -864,9 +864,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.2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 0/4] HP iPAQ RX1950 patch series 2010-03-20 18:20 [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick ` (3 preceding siblings ...) 2010-03-20 18:20 ` [PATCH 4/4] Add suspend/resume support for RX1950 Vasily Khoruzhick @ 2010-03-25 6:28 ` Vasily Khoruzhick 2010-03-29 7:58 ` Vasily Khoruzhick 2010-03-31 1:15 ` Ben Dooks 5 siblings, 1 reply; 14+ messages in thread From: Vasily Khoruzhick @ 2010-03-25 6:28 UTC (permalink / raw) To: linux-arm-kernel ? ????????? ?? 20 ????? 2010 20:20:05 ????? Vasily Khoruzhick ???????: > Following patch series add support for iPAQ RX1950 PDA - another > s3c2442-based machine. > Almost all drivers for this machine are included in mainline kernel, and > port only lacks battery, WiFi and sound support, they will be added later. > > Port still uses machine-specific GPIO API, as generic GPIO lacks GPJ > support and RX1950 actively uses GPJ port. However I do not see any > benifits in using generic GPIO API in machine support file, as it will not > be used with CPU different from s3c2442. > > Denis: I hope you'll add your Signed-off at least under first patch. > > I doubt that I can get Signed-off from Victor Chukhantsev, as he doesn't > work on port for a long time. > > Regards, > Vasily Ping :) -------------- 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/20100325/51f2f5a3/attachment.sig> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/4] HP iPAQ RX1950 patch series 2010-03-25 6:28 ` [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick @ 2010-03-29 7:58 ` Vasily Khoruzhick 0 siblings, 0 replies; 14+ messages in thread From: Vasily Khoruzhick @ 2010-03-29 7:58 UTC (permalink / raw) To: linux-arm-kernel ? ????????? ?? 25 ????? 2010 08:28:34 ????? Vasily Khoruzhick ???????: > Ping :) Ping again... Regards Vasily -------------- 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/20100329/ef82192c/attachment.sig> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/4] HP iPAQ RX1950 patch series 2010-03-20 18:20 [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick ` (4 preceding siblings ...) 2010-03-25 6:28 ` [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick @ 2010-03-31 1:15 ` Ben Dooks 2010-03-31 6:38 ` Vasily Khoruzhick ` (2 more replies) 5 siblings, 3 replies; 14+ messages in thread From: Ben Dooks @ 2010-03-31 1:15 UTC (permalink / raw) To: linux-arm-kernel On Sat, Mar 20, 2010 at 08:20:05PM +0200, Vasily Khoruzhick wrote: > Following patch series add support for iPAQ RX1950 PDA - another s3c2442-based > machine. > Almost all drivers for this machine are included in mainline kernel, and port > only lacks battery, WiFi and sound support, they will be added later. > > Port still uses machine-specific GPIO API, as generic GPIO lacks GPJ > support and RX1950 actively uses GPJ port. However I do not see any benifits > in using generic GPIO API in machine support file, as it will not be used > with CPU different from s3c2442. The samsung specific bits mirroring the gpio API will be removed, I will add post a schedule for removal notice post the next kernel merge. > Denis: I hope you'll add your Signed-off at least under first patch. > > I doubt that I can get Signed-off from Victor Chukhantsev, as he doesn't > work on port for a long time. The patches look ok. I'm not sure if someone else can vouch for Victor's approval, or authenticty of patches. However if the main authours are willing to authenticate the code, then I'll accept this unless someone else objects. > Regards, > Vasily > > > _______________________________________________ > 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] 14+ messages in thread
* [PATCH 0/4] HP iPAQ RX1950 patch series 2010-03-31 1:15 ` Ben Dooks @ 2010-03-31 6:38 ` Vasily Khoruzhick 2010-04-01 12:45 ` Vasily Khoruzhick 2010-04-12 19:38 ` Vasily Khoruzhick 2 siblings, 0 replies; 14+ messages in thread From: Vasily Khoruzhick @ 2010-03-31 6:38 UTC (permalink / raw) To: linux-arm-kernel ? ????????? ?? 31 ????? 2010 04:15:42 ????? Ben Dooks ???????: > > Port still uses machine-specific GPIO API, as generic GPIO lacks GPJ > > support and RX1950 actively uses GPJ port. However I do not see any > > benifits in using generic GPIO API in machine support file, as it will > > not be used with CPU different from s3c2442. > > The samsung specific bits mirroring the gpio API will be removed, I will > add post a schedule for removal notice post the next kernel merge. Uh, but how to switch pin into function mode via gpiolib API? Regards Vasily -------------- 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/20100331/a55bfb0d/attachment.sig> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/4] HP iPAQ RX1950 patch series 2010-03-31 1:15 ` Ben Dooks 2010-03-31 6:38 ` Vasily Khoruzhick @ 2010-04-01 12:45 ` Vasily Khoruzhick 2010-04-12 19:38 ` Vasily Khoruzhick 2 siblings, 0 replies; 14+ messages in thread From: Vasily Khoruzhick @ 2010-04-01 12:45 UTC (permalink / raw) To: linux-arm-kernel ? ????????? ?? 31 ????? 2010 04:15:42 ????? Ben Dooks ???????: > On Sat, Mar 20, 2010 at 08:20:05PM +0200, Vasily Khoruzhick wrote: > > Following patch series add support for iPAQ RX1950 PDA - another > > s3c2442-based machine. > > Almost all drivers for this machine are included in mainline kernel, and > > port only lacks battery, WiFi and sound support, they will be added > > later. > > > > Port still uses machine-specific GPIO API, as generic GPIO lacks GPJ > > support and RX1950 actively uses GPJ port. However I do not see any > > benifits in using generic GPIO API in machine support file, as it will > > not be used with CPU different from s3c2442. > > The samsung specific bits mirroring the gpio API will be removed, I will > add post a schedule for removal notice post the next kernel merge. Btw, do you plan to merge Christians's patches to add GPJ bank support to gpiolib anytime soon? I'd like to modify mach-rx1950.c to use gpiolib instead of samsung-specific API, but can't do this without GPJ bank support. Regards Vasily -------------- 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/20100401/63081b96/attachment.sig> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/4] HP iPAQ RX1950 patch series 2010-03-31 1:15 ` Ben Dooks 2010-03-31 6:38 ` Vasily Khoruzhick 2010-04-01 12:45 ` Vasily Khoruzhick @ 2010-04-12 19:38 ` Vasily Khoruzhick 2 siblings, 0 replies; 14+ messages in thread From: Vasily Khoruzhick @ 2010-04-12 19:38 UTC (permalink / raw) To: linux-arm-kernel ? ????????? ?? 31 ????? 2010 04:15:42 ????? Ben Dooks ???????: > On Sat, Mar 20, 2010 at 08:20:05PM +0200, Vasily Khoruzhick wrote: > > Following patch series add support for iPAQ RX1950 PDA - another > > s3c2442-based machine. > > Almost all drivers for this machine are included in mainline kernel, and > > port only lacks battery, WiFi and sound support, they will be added > > later. > > > > Port still uses machine-specific GPIO API, as generic GPIO lacks GPJ > > support and RX1950 actively uses GPJ port. However I do not see any > > benifits in using generic GPIO API in machine support file, as it will > > not be used with CPU different from s3c2442. > > The samsung specific bits mirroring the gpio API will be removed, I will > add post a schedule for removal notice post the next kernel merge. > > > Denis: I hope you'll add your Signed-off at least under first patch. > > > > I doubt that I can get Signed-off from Victor Chukhantsev, as he doesn't > > work on port for a long time. > > The patches look ok. I'm not sure if someone else can vouch for Victor's > approval, or authenticty of patches. However if the main authours are > willing to authenticate the code, then I'll accept this unless someone > else objects. Hi, Ben What modifications are neccessary for these patches to get them into your tree? I can resend patch series if you want. Regards Vasily -------------- 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/20100412/bb3f6354/attachment.sig> ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2010-04-12 19:38 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-03-20 18:20 [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick 2010-03-20 18:20 ` [PATCH 1/4] Add HP iPAQ RX1950 machine support Vasily Khoruzhick 2010-03-21 22:42 ` denis grigoriev 2010-03-20 18:20 ` [PATCH 2/4] Locate kernel at 0x30108000 if PM_H1940 is enabled Vasily Khoruzhick 2010-03-20 18:20 ` [PATCH 3/4] s3c244x: configure GPG13-15 as input before suspend Vasily Khoruzhick 2010-03-31 1:13 ` Ben Dooks 2010-03-31 6:15 ` Vasily Khoruzhick 2010-03-20 18:20 ` [PATCH 4/4] Add suspend/resume support for RX1950 Vasily Khoruzhick 2010-03-25 6:28 ` [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick 2010-03-29 7:58 ` Vasily Khoruzhick 2010-03-31 1:15 ` Ben Dooks 2010-03-31 6:38 ` Vasily Khoruzhick 2010-04-01 12:45 ` Vasily Khoruzhick 2010-04-12 19:38 ` Vasily Khoruzhick
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).