This patch adds another machine, the FIC HXD8 Index: linux-2.6.21-moko/arch/arm/mach-s3c2440/Kconfig =================================================================== --- linux-2.6.21-moko.orig/arch/arm/mach-s3c2440/Kconfig +++ linux-2.6.21-moko/arch/arm/mach-s3c2440/Kconfig @@ -66,6 +66,12 @@ default y if ARCH_S3C2440 select CPU_S3C2440 +config MACH_HXD8 + bool "FIC HXD8" + select CPU_S3C2440 + select SENSORS_PCF50606 + help + Say Y here if you are using the FIC Neo1973 GSM Phone endmenu Index: linux-2.6.21-moko/arch/arm/mach-s3c2440/Makefile =================================================================== --- linux-2.6.21-moko.orig/arch/arm/mach-s3c2440/Makefile +++ linux-2.6.21-moko/arch/arm/mach-s3c2440/Makefile @@ -21,3 +21,4 @@ obj-$(CONFIG_MACH_RX3715) += mach-rx3715.o obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o +obj-$(CONFIG_MACH_HXD8) += mach-hxd8.o Index: linux-2.6.21-moko/arch/arm/mach-s3c2440/mach-hxd8.c =================================================================== --- /dev/null +++ linux-2.6.21-moko/arch/arm/mach-s3c2440/mach-hxd8.c @@ -0,0 +1,403 @@ +/* linux/arch/arm/mach-s3c2440/mach-hxd8.c + * + * S3C2440 Machine Support for the FIC HXD8 + * + * Copyright (c) 2007 OpenMoko, Inc. + * Author: Harald Welte + * All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +//#include "s3c2410.h" +//#include "s3c2440.h" +//#include "clock.h" +#include +#include +#include + +static struct map_desc hxd8_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, + }, { + .virtual = (u32)S3C24XX_VA_ISA_BYTE, + .pfn = __phys_to_pfn(S3C2410_CS2), + .length = 0x10000, + .type = MT_DEVICE, + }, { + .virtual = (u32)S3C24XX_VA_ISA_BYTE + 0x10000, + .pfn = __phys_to_pfn(S3C2410_CS2 + (1<<24)), + .length = SZ_4M, + .type = MT_DEVICE, + } +}; + +#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK +#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB +#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE + +static struct s3c2410_uartcfg hxd8_uartcfgs[] __initdata = { + [0] = { + .hwport = 0, + .flags = 0, + .ucon = 0x3c5, + .ulcon = 0x03, + .ufcon = 0x51, + }, + [1] = { + .hwport = 1, + .flags = 0, + .ucon = 0x3c5, + .ulcon = 0x03, + .ufcon = 0x51, + }, + [2] = { + .hwport = 2, + .flags = 0, + .ucon = 0x3c5, + .ulcon = 0x03, + .ufcon = 0x51, + } +}; + +static struct s3c2410_nand_set hxd8_nand_sets[] = { + [0] = { + .name = "hxd8-nand", + .nr_chips = 1, + }, + [1] = { + .name = "hxd8-nand-1", + .nr_chips = 1, + }, + [2] = { + .name = "hxd8-nand-2", + .nr_chips = 1, + }, +}; + +/* choose a set of timings which should suit most 512Mbit + * chips and beyond. +*/ + +static struct s3c2410_platform_nand hxd8_nand_info = { + .tacls = 20, + .twrph0 = 60, + .twrph1 = 20, + .nr_sets = ARRAY_SIZE(hxd8_nand_sets), + .sets = hxd8_nand_sets, +}; + +/* PMU configuration */ + +static struct pcf50606_platform_data hxd8_pcf_pdata = { + .used_features = PCF50606_FEAT_EXTON | + PCF50606_FEAT_BBC | + PCF50606_FEAT_WDT | + PCF50606_FEAT_RTC | + PCF50606_FEAT_PWM | + PCF50606_FEAT_PWM_BL | + PCF50606_FEAT_BATVOLT, + .onkey_seconds_required = 5, + .init_brightness = 8, + .rails = { + [PCF50606_REGULATOR_D1REG] = { + .name = "rc_3v3", + .voltage = { + .init = 3300, + .max = 3300, + }, + }, + [PCF50606_REGULATOR_D2REG] = { + .name = "gps_3v3", + .voltage = { + .init = 3300, + .max = 3300, + }, + }, + [PCF50606_REGULATOR_D3REG] = { + .name = "io2_3v3", + .voltage = { + .init = 3300, + .max = 3300, + }, + }, + [PCF50606_REGULATOR_DCD] = { + .name = "core_1v3", + .voltage = { + .init = 1300, + .max = 1500, + }, + }, + [PCF50606_REGULATOR_DCDE] = { + .name = "io1_3v3", + .voltage = { + .init = 3300, + .max = 3300, + }, + }, + [PCF50606_REGULATOR_DCUD] = { + .name = "rf_3v3", + .voltage = { + .init = 3300, + .max = 3300, + }, + }, + [PCF50606_REGULATOR_IOREG] = { + .name = "audio_3v3", + .voltage = { + .init = 3300, + .max = 3300, + }, + }, + [PCF50606_REGULATOR_LPREG] = { + .name = "lcm_3v3", + .voltage = { + .init = 3300, + .max = 3300, + }, + }, + }, +}; + +static struct resource hxd8_pmu_resources[] = { + [0] = { + .flags = IORESOURCE_IRQ, + .start = HXD8_IRQ_PCF50606, + .end = HXD8_IRQ_PCF50606, + }, +}; + +static struct platform_device hxd8_pmu_dev = { + .name = "pcf50606", + .num_resources = ARRAY_SIZE(hxd8_pmu_resources), + .resource = hxd8_pmu_resources, + .dev = { + .platform_data = &hxd8_pcf_pdata, + }, +}; + +/* LCD driver info */ + +static struct s3c2410fb_mach_info hxd8_lcd_cfg __initdata = { + .regs = { + + .lcdcon1 = S3C2410_LCDCON1_TFT24BPP | + S3C2410_LCDCON1_TFT | + S3C2410_LCDCON1_CLKVAL(0x05), + + .lcdcon2 = S3C2410_LCDCON2_VBPD(1) | + S3C2410_LCDCON2_LINEVAL(271) | + S3C2410_LCDCON2_VFPD(1) | + S3C2410_LCDCON2_VSPW(9), + + .lcdcon3 = S3C2410_LCDCON3_HBPD(1) | + S3C2410_LCDCON3_HOZVAL(479) | + S3C2410_LCDCON3_HFPD(1), + + .lcdcon4 = S3C2410_LCDCON4_MVAL(0) | + S3C2410_LCDCON4_HSPW(40), + + .lcdcon5 = S3C2410_LCDCON5_FRM565 | + S3C2410_LCDCON5_INVVLINE | + S3C2410_LCDCON5_INVVFRAME, + }, + + .lpcsel = ((0xCE6) & ~7), + .type = S3C2410_LCDCON1_TFT, + + .width = 480, + .height = 272, + + .xres = { + .min = 480, + .max = 480, + .defval = 480, + }, + + .yres = { + .min = 272, + .max = 272, + .defval = 272, + }, + + .bpp = { + .min = 16, + .max = 32, + .defval = 32, + }, +}; + +static struct platform_device hxd8_pm_gsm_dev = { + .name = "gta01-pm-gsm", +}; + +static void gta01_udc_command(enum s3c2410_udc_cmd_e cmd) +{ + printk(KERN_DEBUG "%s(%d)\n", __func__, cmd); + + switch (cmd) { + case S3C2410_UDC_P_ENABLE: + s3c2410_gpio_setpin(HXD8_GPIO_USB_PULLUP, 1); + break; + case S3C2410_UDC_P_DISABLE: + s3c2410_gpio_setpin(HXD8_GPIO_USB_PULLUP, 0); + break; + case S3C2410_UDC_P_RESET: + /* FIXME! */ + break; + default: + break; + } +} + +/* USB Charger */ + +static int hxd8_udc_vbus_draw(unsigned int ma) +{ + if (ma >= 500) { + /* enable fast charge */ + printk(KERN_DEBUG "udc: enabling fast charge\n"); + s3c2410_gpio_setpin(HXD8_GPIO_USB_CUR_SEL, 1); + } else { + /* disable fast charge */ + printk(KERN_DEBUG "udc: disabling fast charge\n"); + s3c2410_gpio_setpin(HXD8_GPIO_USB_CUR_SEL, 0); + } + + return 0; +} + +static struct s3c2410_udc_mach_info hxd8_udc_cfg = { + .vbus_draw = hxd8_udc_vbus_draw, +}; + +/* Touch Screen */ +static struct s3c2410_ts_mach_info hxd8_ts_cfg = { + .delay = 10000, + .presc = 49, + .oversampling_shift = 4, +}; + +static struct platform_device *hxd8_devices[] __initdata = { + &s3c_device_usb, + &s3c_device_lcd, + &s3c_device_wdt, + &s3c_device_i2c, + &s3c_device_iis, + &s3c_device_sdi, + &s3c_device_usbgadget, + &s3c_device_nand, + &s3c_device_ts, +}; + +static struct s3c24xx_board hxd8_board __initdata = { + .devices = hxd8_devices, + .devices_count = ARRAY_SIZE(hxd8_devices) +}; + +static void __init hxd8_map_io(void) +{ + s3c24xx_init_io(hxd8_iodesc, ARRAY_SIZE(hxd8_iodesc)); + s3c24xx_init_clocks(16934400); + s3c24xx_init_uarts(hxd8_uartcfgs, ARRAY_SIZE(hxd8_uartcfgs)); + s3c24xx_set_board(&hxd8_board); +} + +static void __init hxd8_machine_init(void) +{ + hxd8_udc_cfg.udc_command = gta01_udc_command; + s3c_device_nand.dev.platform_data = &hxd8_nand_info; + + s3c24xx_fb_set_platdata(&hxd8_lcd_cfg); + + s3c24xx_udc_set_platdata(&hxd8_udc_cfg); + set_s3c2410ts_info(&hxd8_ts_cfg); + + //platform_device_register(>a01_button_dev); + platform_device_register(&hxd8_pm_gsm_dev); + + platform_device_register(&hxd8_pmu_dev); + + s3c2410_pm_init(); +} + +MACHINE_START(HXD8, "HXD8") + /* Maintainer: Harald Welte */ + .phys_io = S3C2410_PA_UART, + .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, + .boot_params = S3C2410_SDRAM_PA + 0x100, + + .init_irq = s3c24xx_init_irq, + .map_io = hxd8_map_io, + .init_machine = hxd8_machine_init, + .timer = &s3c24xx_timer, +MACHINE_END Index: linux-2.6.21-moko/include/asm-arm/arch-s3c2440/hxd8.h =================================================================== --- /dev/null +++ linux-2.6.21-moko/include/asm-arm/arch-s3c2440/hxd8.h @@ -0,0 +1,16 @@ +#ifndef _HXD8_H +#define _HXD8_H + +#include +#include + +#define HXD8v1_SYSTEM_REV 0x00000110 + +#define HXD8_GPIO_USB_CUR_SEL S3C2410_GPA0 +#define HXD8_GPIO_BACKLIGHT S3C2410_GPB0 +#define HXD8_GPIO_USB_PULLUP S3C2410_GPB9 +#define HXD8_GPIO_PCF50606 S3C2410_GPF6 + +#define HXD8_IRQ_PCF50606 IRQ_EINT6 + +#endif