HP iPAQ RX1950 patch series
Subsystems (2)
cover HP iPAQ RX1950 patch series
Following patch series add suport for iPAQ RX1950 PDA - another s3c2442-based machine. Almost all drivers for this machine are included in mainline kernel, and port only lacks battery, LED, WiFi and sound support, they will be added later.
Ben, if you don't like 5th patch - just drop it, but I think that simplier solution is almost always the best :)
PATCH 1/5 Add HP iPAQ RX1950 machine support
--- arch/arm/mach-s3c2440/Kconfig | 13 + arch/arm/mach-s3c2440/Makefile | 1 + arch/arm/mach-s3c2440/mach-rx1950.c | 550 +++++++++++++++++++++++++++++++++++ 3 files changed, 564 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-s3c2440/mach-rx1950.c
arch/arm/mach-s3c2440/Kconfig +13 -0
@@ -188,4 +188,17 @@ config MACH_MINI2440 Say Y here to select support for the MINI2440. Is a 10cm x 10cm board available via various sources. It can come with a 3.5" or 7" touch LCD. +config MACH_RX1950 + bool "HP iPAQ rx1950" + select CPU_S3C2442 + select S3C24XX_DCLK + select PM_H1940 if PM + select I2C + select S3C2410_PWM + select S3C_DEV_NAND + select S3C2410_IOTIMING if S3C2440_CPUFREQ + select S3C2440_XTAL_16934400 + help + Say Y here if you're using HP iPAQ rx1950 + endmenu
arch/arm/mach-s3c2440/Makefile +1 -0
@@ -34,6 +34,7 @@ obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o +obj-$(CONFIG_MACH_RX1950) += mach-rx1950.o # extra machine support
arch/arm/mach-s3c2440/mach-rx1950.c new file +550 -0
550 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 1/5 Add HP iPAQ RX1950 machine support
Quoted 113 lines · Vasily Khoruzhick
Signed-off-by Vasily Khoruzhick <[email protected]>Signed-off-by Denis Grigoriev <[email protected]>--- arch/arm/mach-s3c2440/Kconfig | 13 + arch/arm/mach-s3c2440/Makefile | 1 + arch/arm/mach-s3c2440/mach-rx1950.c | 550 +++++++++++++++++++++++++++++++++++ 3 files changed, 564 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-s3c2440/mach-rx1950.carch/arm/mach-s3c2440/Kconfig +13
-0@@ -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 + endmenuarch/arm/mach-s3c2440/Makefile +1
-0@@ -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 supportarch/arm/mach-s3c2440/mach-rx1950.c new file +64
-0@@ -0,0 +1,550 @@ +/* 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 = { +/* ISA IO Space map (memory space selected by A24) */ + { + .virtual = (u32 )S3C24XX_VA_ISA_WORD , + .pfn =__phys_to_pfn (S3C2410_CS2 ),
arch/arm/mach-s3c2440/mach-rx1950.c line 74
Quoted 10 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +10
-0+ .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, + }, +};
firstly, do you need this mapping for anything and secondly can you check the indentation on it if it is staying.
Quoted 31 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +31
-0+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 ,
arch/arm/mach-s3c2440/mach-rx1950.c line 116
Quoted 10 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +10
-0+ .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 __initdata = {
don't think this is allowed to be __initdata at the moment.
Quoted 49 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +49
-0+ .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__initdata = { + .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;
arch/arm/mach-s3c2440/mach-rx1950.c line 175
Quoted 10 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +10
-0+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 );
would msleep() be a better thing to do herer.
Quoted 63 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +63
-0+/* 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 ); + +s3c_gpio_cfgpin (S3C2410_GPC (1 ),S3C2410_GPC1_VCLK ); +s3c_gpio_cfgpin (S3C2410_GPC (2 ),S3C2410_GPC2_VLINE ); +s3c_gpio_cfgpin (S3C2410_GPC (3 ),S3C2410_GPC3_VFRAME ); +s3c_gpio_cfgpin (S3C2410_GPC (4 ),S3C2410_GPC4_VM ); +s3c_gpio_cfgpin (S3C2410_GPC (11 ),S3C2410_GPC11_VD3 ); +s3c_gpio_cfgpin (S3C2410_GPC (12 ),S3C2410_GPC12_VD4 ); +s3c_gpio_cfgpin (S3C2410_GPC (13 ),S3C2410_GPC13_VD5 ); +s3c_gpio_cfgpin (S3C2410_GPC (14 ),S3C2410_GPC14_VD6 ); +s3c_gpio_cfgpin (S3C2410_GPC (15 ),S3C2410_GPC15_VD7 ); + +s3c_gpio_cfgpin (S3C2410_GPD (2 ),S3C2410_GPD2_VD10 );
arch/arm/mach-s3c2440/mach-rx1950.c line 249
Quoted 10 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +10
-0+s3c_gpio_cfgpin (S3C2410_GPD (3 ),S3C2410_GPD3_VD11 ); +s3c_gpio_cfgpin (S3C2410_GPD (4 ),S3C2410_GPD4_VD12 ); +s3c_gpio_cfgpin (S3C2410_GPD (5 ),S3C2410_GPD5_VD13 ); +s3c_gpio_cfgpin (S3C2410_GPD (6 ),S3C2410_GPD6_VD14 ); +s3c_gpio_cfgpin (S3C2410_GPD (7 ),S3C2410_GPD7_VD15 ); +s3c_gpio_cfgpin (S3C2410_GPD (11 ),S3C2410_GPD11_VD19 ); +s3c_gpio_cfgpin (S3C2410_GPD (12 ),S3C2410_GPD12_VD20 ); +s3c_gpio_cfgpin (S3C2410_GPD (13 ),S3C2410_GPD13_VD21 ); +s3c_gpio_cfgpin (S3C2410_GPD (14 ),S3C2410_GPD14_VD22 ); +s3c_gpio_cfgpin (S3C2410_GPD (15 ),S3C2410_GPD15_VD23 );
i think S3C_GPIO_SFN(2) would do for all of these, and would allow you to loop over the range.
Quoted 178 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +178
-0+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) +{ +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[] = { + {KEY_POWER ,S3C2410_GPF (0 ),1 ,"Power button" }, + {KEY_F5 ,S3C2410_GPF (7 ),1 ,"Record button" },
arch/arm/mach-s3c2440/mach-rx1950.c line 438
Quoted 10 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +10
-0+ {KEY_F1, S3C2410_GPG(0), 1, "Calendar button"}, + {KEY_F2, S3C2410_GPG(2), 1, "Contacts button"}, + {KEY_F3, S3C2410_GPG(3), 1, "Mail button"}, + {KEY_F4, 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"}, +};
at-least get a space between { and KEY_
would prefer to see properly named initialisers.
Quoted 49 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +49
-0+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));
arch/arm/mach-s3c2440/mach-rx1950.c line 498
Quoted 10 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +10
-0+ +/* setup PM */ + +#ifdef CONFIG_PM_H1940 +memcpy (phys_to_virt (H1940_SUSPEND_RESUMEAT ), h1940_pm_return,8 ); +#endif + +s3c_pm_init (); +s3c_irq_wake (IRQ_EINT0 ,1 ); +}
surely this should be propertyu of a key in the keys table?
Quoted 13 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +13
-0+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. */
arch/arm/mach-s3c2440/mach-rx1950.c line 522
Quoted 10 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +10
-0+s3c2410_modify_misccr (S3C2410_MISCCR_USBHOST | +S3C2410_MISCCR_USBSUSPND0 | +S3C2410_MISCCR_USBSUSPND1 ,0x0 ); + +gpio_request (S3C2410_GPJ (5 ),"UDC pullup" ); +gpio_direction_output (S3C2410_GPJ (5 ),0 ); + +/* mmc power is disabled by default */ +gpio_request (S3C2410_GPJ (1 ),"MMC power" ); +gpio_direction_output (S3C2410_GPJ (1 ),0 );
you might want to WARN_ON() the result of gpio_request().
Quoted 35 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +27
-0+for (i =0 ; i <8 ; i++) +gpio_request (S3C2410_GPC (i),"LCD power" ); + +for (i =10 ; i <16 ; i++) +gpio_request (S3C2410_GPC (i),"LCD power" ); + +for (i =2 ; i <8 ; i++) +gpio_request (S3C2410_GPD (i),"LCD power" ); + +for (i =11 ; i <16 ; i++) +gpio_request (S3C2410_GPD (i),"LCD power" ); + +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 Signature · 7 lines
1.7.0.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 5 lines
-- Ben Q: What's a light-year? A: One-third less calories than a regular year.
PATCH 1/5 Add HP iPAQ RX1950 machine support
? ????????? ?? 11 ??? 2010 03:15:42 ????? Ben Dooks ???????:
Quoted 3 lines
firstly, do you need this mapping for anything and secondly can you check the indentation on it if it is staying.
Ok, I don't need them.
Quoted 3 lines
Quoted 1 line
+static struct
s3c2410fb_displayrx1950_display__initdata= {don't think this is allowed to be
__initdataat the moment.
Ok
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ /* Wait a bit here... */ + mdelay(100);would
msleep()be a better thing to do herer.
Nope, I prefer to use mdelay here, msleep doesn't do well for some reason (there's a garbage on screen in case of msleep usage). And actually wait for hsync/vsync should replace
this mdelay, but it isn't implemented at the moment.
Quoted 3 lines
i think
S3C_GPIO_SFN(2)would do for all of these, and would allow you to loop over the range.
Ok
Quoted 3 lines
at-least get a space between { and
KEY_
would prefer to see properly named initialisers.
Ok
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ s3c_irq_wake(IRQ_EINT0, 1); +}surely this should be propertyu of a key in the keys table?
Ok
Quoted 4 lines
arch/arm/mach-s3c2440/mach-rx1950.c line 522
Quoted 2 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +2
-0+gpio_request (S3C2410_GPJ (1 ),"MMC power" ); +gpio_direction_output (S3C2410_GPJ (1 ),0 );you might want to
WARN_ON()the result ofgpio_request().
Ok
Thanks for review.
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/20100511/75e3d1ce/attachment.sig>
PATCH 1/5 Add HP iPAQ RX1950 machine support
Quoted 16 lines · Vasily Khoruzhick
?? ?????????????????? ???? 11 ?????? 2010 03:15:42 ?????????? Ben Dooks ??????????????:
Quoted 3 lines
firstly, do you need this mapping for anything and secondly can you check the indentation on it if it is staying.
Ok, I don't need them.
Quoted 3 lines
Quoted 1 line
+static struct
s3c2410fb_displayrx1950_display__initdata= {don't think this is allowed to be
__initdataat the moment.Ok
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ /* Wait a bit here... */ + mdelay(100);would
msleep()be a better thing to do herer.
Quoted 4 lines
Nope, I prefer to use mdelay here, msleep doesn't do well for some reason (there's a garbage on screen in case of msleep usage). And actually wait for hsync/vsync should replace
this mdelay, but it isn't implemented at the moment.
Can you add a comment to this effect? I'm a little conecrned that the mdelay() and msleep() produce such differing output...
Quoted 19 lines
Quoted 3 lines
i think
S3C_GPIO_SFN(2)would do for all of these, and would allow you to loop over the range.Ok
Quoted 3 lines
at-least get a space between { and
KEY_
would prefer to see properly named initialisers.Ok
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ s3c_irq_wake(IRQ_EINT0, 1); +}surely this should be propertyu of a key in the keys table?
Ok
Quoted 8 lines
Quoted 4 lines
arch/arm/mach-s3c2440/mach-rx1950.c line 522
Quoted 2 lines
arch/arm/mach-s3c2440/mach-rx1950.c new file +2
-0+gpio_request (S3C2410_GPJ (1 ),"MMC power" ); +gpio_direction_output (S3C2410_GPJ (1 ),0 );you might want to
WARN_ON()the result ofgpio_request().Ok
Thanks for review.
No problem.
Signature · 4 lines
Ben Q: What's a light-year? A: One-third less calories than a regular year.
PATCH 1/5 Add HP iPAQ RX1950 machine support
? ????????? ?? 11 ??? 2010 11:55:35 ????? Ben Dooks ???????:
Quoted 2 lines · Vasily Khoruzhick
Quoted 1 line
?? ?????????????????? ???? 11 ?????? 2010 03:15:42 ?????????? Ben Dooks
??????????????:
Quoted 16 lines
Quoted 16 lines
Quoted 2 lines
firstly, do you need this mapping for anything and secondly can you check the indentation on it if it is staying.
Ok, I don't need them.
Quoted 3 lines
Quoted 1 line
+static struct
s3c2410fb_displayrx1950_display__initdata= {don't think this is allowed to be
__initdataat the moment.Ok
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ /* Wait a bit here... */ + mdelay(100);would
msleep()be a better thing to do herer.
Quoted 7 lines
Quoted 4 lines
Nope, I prefer to use mdelay here, msleep doesn't do well for some reason (there's a garbage on screen in case of msleep usage). And actually wait for hsync/vsync should replace
this mdelay, but it isn't implemented at the moment.Can you add a comment to this effect? I'm a little conecrned that the
mdelay()andmsleep()produce such differing output...
Even more, backlight notify callback can be called in atomic context (in suspend handler of pwm_bl driver), and notify callback calls lcd_power functions so using msleep is impossible - device doesn't wake up. So I think comment is not necessary, but if you insist
I can add it and send v3 of patch series.
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/20100511/03f29721/attachment.sig>
PATCH 2/5 MAINTAINERS: Add entry for HP iPAQ rx1950
In reply to Vasily Khoruzhick--- MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
MAINTAINERS +6 -0
@@ -890,6 +890,12 @@ F: arch/arm/mach-rpc/ F: drivers/net/arm/ether* F: drivers/scsi/arm/ +ARM/RX1950 (HP iPAQ rx1950) MACHINE SUPPORT +M: Vasily Khoruzhick <[email protected]> +W: http://handhelds.org/moin/moin.cgi/HpIpaqRx1950 +S: Maintained +F: arch/arm/mach-s3c2440/mach-rx1950.c + ARM/SHARK MACHINE SUPPORT M: Alexander Schulz <[email protected]> W: http://www.shark-linux.de/shark.html
Signature · 1 line
1.7.0.4
PATCH 3/5 Locate kernel at 0x30108000 if PM_H1940 is enabled
In reply to Vasily KhoruzhickIf PM_H1940 is enabled, kernel _must_ be located upper then 0x30008000, because this area (0x30000000-0x30100000) can be used by bootloader. If kernel is located at 0x30008000, bootloader will corrupt kernel's code during resume.
--- arch/arm/Makefile | 2 ++ arch/arm/mach-s3c2410/Makefile.boot | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)
arch/arm/Makefile +2 -0
@@ -110,6 +110,8 @@ CHECKFLAGS += -D__arm__ head-y := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o textofs-y := 0x00008000 textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000 +# We don't want the htc bootloader to corrupt kernel during resume +textofs-$(CONFIG_PM_H1940) := 0x00108000 # SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory ifeq ($(CONFIG_ARCH_SA1100),y) textofs-$(CONFIG_SA1111) := 0x00208000
arch/arm/mach-s3c2410/Makefile.boot +7 -3
@@ -1,3 +1,7 @@ - zreladdr-y := 0x30008000 -params_phys-y := 0x30000100 - +ifeq ($(CONFIG_PM_H1940),y) + zreladdr-y := 0x30108000 + params_phys-y := 0x30100100 +else + zreladdr-y := 0x30008000 + params_phys-y := 0x30000100 +endif
Signature · 1 line
1.7.0.4
PATCH 4/5 Add suspend/resume support for RX1950
In reply to Vasily Khoruzhick--- arch/arm/mach-s3c2410/pm.c | 4 ++-- arch/arm/mm/mmu.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
arch/arm/mach-s3c2410/pm.c +2 -2
@@ -60,10 +60,10 @@ static void s3c2410_pm_prepare(void)__raw_writel (calc,phys_to_virt (H1940_SUSPEND_CHECKSUM )); } -/* the RX3715 uses similar code and the same H1940 and the +/* RX3715 and RX1950 use similar to H1940 code and the * same offsets for resume and checksum pointers */ -if (machine_is_rx3715 ()) { +if (machine_is_rx3715 () ||machine_is_rx1950 ()) {void *base =phys_to_virt (H1940_SUSPEND_CHECK );unsigned long ptr;unsigned long calc =0 ;
arch/arm/mm/mmu.c +3 -2
@@ -869,9 +869,10 @@ void __init reserve_node_zero(pg_data_t *pgdat)if (machine_is_p720t ()) res_size =0x00014000 ; -/* H1940 and RX3715 need to reserve this for suspend */ +/* H1940, RX3715 and RX1950 need to reserve this for suspend */ -if (machine_is_h1940 () ||machine_is_rx3715 ()) { +if (machine_is_h1940 () ||machine_is_rx3715 () + ||machine_is_rx1950 ()) {reserve_bootmem_node (pgdat,0x30003000 ,0x1000 ,BOOTMEM_DEFAULT ); reserve_bootmem_node(pgdat, 0x30081000, 0x1000,
Signature · 1 line
1.7.0.4
PATCH 5/5 rx1950: configure GPG13-15 as input before suspend
In reply to Vasily KhoruzhickAccording to datasheet GPG13-15 must be configured as input in NAND boot mode, otherwise device will not be able to wake up
--- arch/arm/mach-s3c2410/pm.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
arch/arm/mach-s3c2410/pm.c +11 -0
@@ -79,6 +79,17 @@ static void s3c2410_pm_prepare(void)if (machine_is_aml_m5900 () )s3c2410_gpio_setpin (S3C2410_GPF (2 ),1 ); +if (machine_is_rx1950 ()) { +/* According to S3C2442 user's manual, page 7-17, +* when the system is operating in NAND boot mode, +* the hardware pin configuration - EINT[23:21] ??? +* must be set as input for starting up after +* wakeup from sleep mode +*/ +s3c_gpio_cfgpin (S3C2410_GPG (13 ),S3C2410_GPIO_INPUT ); +s3c_gpio_cfgpin (S3C2410_GPG (14 ),S3C2410_GPIO_INPUT ); +s3c_gpio_cfgpin (S3C2410_GPG (15 ),S3C2410_GPIO_INPUT ); + } }static int s3c2410_pm_resume (struct sys_device *dev)
Signature · 1 line
1.7.0.4