diff --git a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/gpio.h b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/gpio.h index 914867282..8723d4214 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/gpio.h +++ b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/gpio.h @@ -16,6 +16,8 @@ #ifndef _JZ_GPIO_H #define _JZ_GPIO_H +#include + enum jz_gpio_function { JZ_GPIO_FUNC_NONE, JZ_GPIO_FUNC1, diff --git a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/platform.h b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/platform.h new file mode 100644 index 000000000..b9b0eab73 --- /dev/null +++ b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/platform.h @@ -0,0 +1,19 @@ + +#ifndef __JZ4740_PLATFORM_H +#define __JZ4740_PLATFORM_H + +#include + +extern struct platform_device jz4740_usb_ohci_device; +extern struct platform_device jz4740_usb_gdt_device; +extern struct platform_device jz4740_mmc_device; +extern struct platform_device jz4740_rtc_device; +extern struct platform_device jz4740_i2c_device; +extern struct platform_device jz4740_nand_device; +extern struct platform_device jz4740_framebuffer_device; +extern struct platform_device jz4740_i2s_device; +extern struct platform_device jz4740_codec_device; +extern struct platform_device jz4740_adc_device; +extern struct platform_device jz4740_battery_device; + +#endif diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c index f686d8f67..e4820fdd1 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c @@ -16,21 +16,358 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +/* NAND */ +#ifdef QI_LB60_1GB_NAND +static struct nand_ecclayout qi_lb60_ecclayout = { + .eccbytes = 36, + .eccpos = { + 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41}, + .oobfree = { + {.offset = 2, + .length = 4}, + {.offset = 42, + .length = 22}} +}; + +static struct mtd_partition qi_lb60_partitions[] = { + { .name = "NAND BOOT partition", + .offset = 0 * 0x100000, + .size = 4 * 0x100000, + }, + { .name = "NAND KERNEL partition", + .offset = 4 * 0x100000, + .size = 4 * 0x100000, + }, + { .name = "NAND ROOTFS partition", + .offset = 8 * 0x100000, + .size = 504 * 0x100000, + }, + { .name = "NAND DATA partition", + .offset = 512 * 0x100000, + .size = 512 * 0x100000, + }, +}; +#else +static struct nand_ecclayout qi_lb60_ecclayout = { + .eccbytes = 72, + .eccpos = { + 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83}, + .oobfree = { + {.offset = 2, + .length = 10}, + {.offset = 84, + .length = 44}} +}; + +static struct mtd_partition qi_lb60_partitions[] = { + { .name = "NAND BOOT partition", + .offset = 0 * 0x100000, + .size = 4 * 0x100000, + }, + { .name = "NAND KERNEL partition", + .offset = 4 * 0x100000, + .size = 4 * 0x100000, + }, + { .name = "NAND ROOTFS partition", + .offset = 8 * 0x100000, + .size = 504 * 0x100000, + }, + { .name = "NAND DATA partition", + .offset = 512 * 0x100000, + .size = (512 + 1024) * 0x100000, + }, +}; +#endif /* QI_LB60_1GB_NAND */ + +/* Keyboard*/ + +/* #define KEEP_UART_ALIVE + * don't define this. the keyboard and keyboard both work + */ + +#define KEY_QI_QI KEY_F13 +#define KEY_QI_UPRED KEY_RIGHTSHIFT +#define KEY_QI_VOLUP KEY_F15 +#define KEY_QI_VOLDOWN KEY_F16 +#define KEY_QI_FN KEY_RIGHTCTRL + +static const uint32_t qi_lb60_keymap[] = { + KEY(0, 0, KEY_F1), /* S2 */ + KEY(0, 1, KEY_F2), /* S3 */ + KEY(0, 2, KEY_F3), /* S4 */ + KEY(0, 3, KEY_F4), /* S5 */ + KEY(0, 4, KEY_F5), /* S6 */ + KEY(0, 5, KEY_F6), /* S7 */ + KEY(0, 6, KEY_F7), /* S8 */ + + KEY(1, 0, KEY_Q), /* S10 */ + KEY(1, 1, KEY_W), /* S11 */ + KEY(1, 2, KEY_E), /* S12 */ + KEY(1, 3, KEY_R), /* S13 */ + KEY(1, 4, KEY_T), /* S14 */ + KEY(1, 5, KEY_Y), /* S15 */ + KEY(1, 6, KEY_U), /* S16 */ + KEY(1, 7, KEY_I), /* S17 */ + KEY(2, 0, KEY_A), /* S18 */ + KEY(2, 1, KEY_S), /* S19 */ + KEY(2, 2, KEY_D), /* S20 */ + KEY(2, 3, KEY_F), /* S21 */ + KEY(2, 4, KEY_G), /* S22 */ + KEY(2, 5, KEY_H), /* S23 */ + KEY(2, 6, KEY_J), /* S24 */ + KEY(2, 7, KEY_K), /* S25 */ + KEY(3, 0, KEY_ESC), /* S26 */ + KEY(3, 1, KEY_Z), /* S27 */ + KEY(3, 2, KEY_X), /* S28 */ + KEY(3, 3, KEY_C), /* S29 */ + KEY(3, 4, KEY_V), /* S30 */ + KEY(3, 5, KEY_B), /* S31 */ + KEY(3, 6, KEY_N), /* S32 */ + KEY(3, 7, KEY_M), /* S33 */ + KEY(4, 0, KEY_TAB), /* S34 */ + KEY(4, 1, KEY_CAPSLOCK), /* S35 */ + KEY(4, 2, KEY_BACKSLASH), /* S36 */ + KEY(4, 3, KEY_APOSTROPHE), /* S37 */ + KEY(4, 4, KEY_COMMA), /* S38 */ + KEY(4, 5, KEY_DOT), /* S39 */ + KEY(4, 6, KEY_SLASH), /* S40 */ + KEY(4, 7, KEY_UP), /* S41 */ + KEY(5, 0, KEY_O), /* S42 */ + KEY(5, 1, KEY_L), /* S43 */ + KEY(5, 2, KEY_EQUAL), /* S44 */ + KEY(5, 3, KEY_QI_UPRED), /* S45 */ + KEY(5, 4, KEY_SPACE), /* S46 */ + KEY(5, 5, KEY_QI_QI), /* S47 */ + KEY(5, 6, KEY_LEFTCTRL), /* S48 */ + KEY(5, 7, KEY_LEFT), /* S49 */ + KEY(6, 0, KEY_F8), /* S50 */ + KEY(6, 1, KEY_P), /* S51 */ + KEY(6, 2, KEY_BACKSPACE),/* S52 */ + KEY(6, 3, KEY_ENTER), /* S53 */ + KEY(6, 4, KEY_QI_VOLUP), /* S54 */ + KEY(6, 5, KEY_QI_VOLDOWN), /* S55 */ + KEY(6, 6, KEY_DOWN), /* S56 */ + KEY(6, 7, KEY_RIGHT), /* S57 */ + +#ifndef KEEP_UART_ALIVE + KEY(7, 0, KEY_LEFTSHIFT), /* S58 */ + KEY(7, 1, KEY_LEFTALT), /* S59 */ + KEY(7, 2, KEY_QI_FN), /* S60 */ +#endif +}; + +static const struct matrix_keymap_data qi_lb60_keymap_data = { + .keymap = qi_lb60_keymap, + .keymap_size = ARRAY_SIZE(qi_lb60_keymap), +}; + +static const unsigned int qi_lb60_keypad_cols[] = { + 74, 75, 76, 77, 78, 79, 80, 81, +}; + +static const unsigned int qi_lb60_keypad_rows[] = { + 114, 115, 116, 117, 118, 119, 120, +#ifndef KEEP_UART_ALIVE + 122, +#endif +}; + +static struct matrix_keypad_platform_data qi_lb60_pdata = { + .keymap_data = &qi_lb60_keymap_data, + .col_gpios = qi_lb60_keypad_cols, + .row_gpios = qi_lb60_keypad_rows, + .num_col_gpios = ARRAY_SIZE(qi_lb60_keypad_cols), + .num_row_gpios = ARRAY_SIZE(qi_lb60_keypad_rows), + .col_scan_delay_us = 10, + .debounce_ms = 10, + .wakeup = 1, + .active_low = 1, +}; + +static struct platform_device qi_lb60_keypad = { + .name = "matrix-keypad", + .id = -1, + .dev = { + .platform_data = &qi_lb60_pdata, + }, +}; + +/* Display */ +static struct fb_videomode qi_lb60_video_modes[] = { + { + .name = "320x240", + .xres = 320, + .yres = 240, + .pixclock = 700000, + .left_margin = 140, + .right_margin = 273, + .upper_margin = 20, + .lower_margin = 2, + .hsync_len = 1, + .vsync_len = 1, + .sync = 0, + .vmode = FB_VMODE_NONINTERLACED, + }, +}; + +static struct jz4740_fb_platform_data qi_lb60_fb_pdata = { + .width = 60, + .height = 45, + .num_modes = ARRAY_SIZE(qi_lb60_video_modes), + .modes = qi_lb60_video_modes, + .bpp = 24, + .lcd_type = JZ_LCD_TYPE_8BIT_SERIAL, +}; + + +static struct jz_nand_platform_data qi_lb60_nand_pdata = { + .num_partitions = ARRAY_SIZE(qi_lb60_partitions), + .partitions = qi_lb60_partitions, + .ecc_layout = &qi_lb60_ecclayout, + .busy_gpio = 94, +}; + +struct spi_gpio_platform_data spigpio_platform_data = { + .sck = JZ_GPIO_PORTC(23), + .mosi = JZ_GPIO_PORTC(22), + .miso = JZ_GPIO_PORTC(22), + .num_chipselect = 1, +}; + +static struct platform_device spigpio_device = { + .name = "spi_gpio", + .id = 1, + .dev = { + .platform_data = &spigpio_platform_data, + }, +}; + +static struct spi_board_info qi_lb60_spi_board_info[] = { + { + .modalias = "gpm940b0", + .controller_data = (void*)JZ_GPIO_PORTC(21), + .chip_select = 0, + .bus_num = 1, + .max_speed_hz = 30 * 1000, + }, +}; + +/* Battery */ +static struct jz_batt_info qi_lb60_battery_pdata = { + .dc_dect_gpio = GPIO_DC_DETE_N, + .usb_dect_gpio = GPIO_USB_DETE, + .charg_stat_gpio = GPIO_CHARG_STAT_N, + + .min_voltag = 3600000, + .max_voltag = 4200000, + .batt_tech = POWER_SUPPLY_TECHNOLOGY_LIPO, +}; + +/* GPIO Key: power */ +static struct gpio_keys_button qi_lb60_gpio_keys_buttons[] = { + [0] = { + .code = KEY_POWER, + .gpio = GPIO_WAKEUP_N, + .active_low = 1, + .desc = "Power", + }, +}; + +static struct gpio_keys_platform_data qi_lb60_gpio_keys_data = { + .nbuttons = ARRAY_SIZE(qi_lb60_gpio_keys_buttons), + .buttons = qi_lb60_gpio_keys_buttons, +}; + +static struct platform_device qi_lb60_gpio_keys = { + .name = "gpio-keys", + .id = -1, + .dev = { + .platform_data = &qi_lb60_gpio_keys_data, + } +}; +/* +static struct jz_mmc_platform_data jz_mmc_pdata = { + .card_detect_gpio = JZ_GPIO_PORTD(0), + .read_only_gpio = JZ_GPIO_PORTD(16), + .power_gpio = JZ_GPIO_PORTD(2), +};*/ + +static struct platform_device *jz_platform_devices[] __initdata = { + &jz4740_usb_ohci_device, + &jz4740_usb_gdt_device, + &jz4740_mmc_device, + &jz4740_nand_device, + &qi_lb60_keypad, + &spigpio_device, + &jz4740_framebuffer_device, + &jz4740_i2s_device, + &jz4740_codec_device, + &jz4740_rtc_device, + &jz4740_adc_device, + &jz4740_battery_device, + &qi_lb60_gpio_keys, +}; static void __init board_gpio_setup(void) { - /* We only need to enable/disable pullup here for pins used in generic - * drivers. Everything else is done by the drivers themselfs. */ + /* We only need to enable/disable pullup here for pins used in generic + * drivers. Everything else is done by the drivers themselfs. */ jz_gpio_disable_pullup(GPIO_SD_VCC_EN_N); jz_gpio_disable_pullup(GPIO_SD_CD_N); jz_gpio_disable_pullup(GPIO_SD_WP); } -void __init jz_board_setup(void) +static int __init qi_lb60_init_platform_devices(void) { - printk("Qi Hardware JZ4740 QI_LB60 setup\n"); + jz4740_framebuffer_device.dev.platform_data = &qi_lb60_fb_pdata; + jz4740_nand_device.dev.platform_data = &qi_lb60_nand_pdata; + jz4740_battery_device.dev.platform_data = &qi_lb60_battery_pdata; - board_gpio_setup(); + spi_register_board_info(qi_lb60_spi_board_info, + ARRAY_SIZE(qi_lb60_spi_board_info)); + + return platform_add_devices(jz_platform_devices, + ARRAY_SIZE(jz_platform_devices)); } +extern int jz_gpiolib_init(void); + +static void __init qi_lb60_board_setup(void) +{ + printk("Qi Hardware JZ4740 QI_LB60 setup\n"); + if (jz_gpiolib_init()) + panic("Failed to initalize jz gpio\n"); + + board_gpio_setup(); + + if (qi_lb60_init_platform_devices()) + panic("Failed to initalize platform devices\n"); +} + +arch_initcall(qi_lb60_board_setup); diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/gpio.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/gpio.c index a33d7e56d..67126e1c1 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/gpio.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/gpio.c @@ -343,7 +343,7 @@ static struct jz_gpio_chip jz_gpio_chips[] = { JZ_GPIO_CHIP(D), }; -__init int jz_gpiolib_init(void) +int __init jz_gpiolib_init(void) { struct jz_gpio_chip *chip = jz_gpio_chips; int i, irq; @@ -362,6 +362,3 @@ __init int jz_gpiolib_init(void) return 0; } - -arch_initcall(jz_gpiolib_init); - diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/platform.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/platform.c index 9cace9945..e20e36512 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/platform.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/platform.c @@ -13,22 +13,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include /* OHCI (USB full speed host controller) */ -static struct resource jz_usb_ohci_resources[] = { +static struct resource jz4740_usb_ohci_resources[] = { [0] = { .start = CPHYSADDR(UHC_BASE), .end = CPHYSADDR(UHC_BASE) + 0x10000 - 1, @@ -44,20 +34,19 @@ static struct resource jz_usb_ohci_resources[] = { /* The dmamask must be set for OHCI to work */ static u64 ohci_dmamask = ~(u32)0; -static struct platform_device jz_usb_ohci_device = { +struct platform_device jz4740_usb_ohci_device = { .name = "jz-ohci", .id = 0, .dev = { .dma_mask = &ohci_dmamask, .coherent_dma_mask = 0xffffffff, }, - .num_resources = ARRAY_SIZE(jz_usb_ohci_resources), - .resource = jz_usb_ohci_resources, + .num_resources = ARRAY_SIZE(jz4740_usb_ohci_resources), + .resource = jz4740_usb_ohci_resources, }; - /* UDC (USB gadget controller) */ -static struct resource jz_usb_gdt_resources[] = { +static struct resource jz4740_usb_gdt_resources[] = { [0] = { .start = CPHYSADDR(UDC_BASE), .end = CPHYSADDR(UDC_BASE) + 0x10000 - 1, @@ -70,27 +59,21 @@ static struct resource jz_usb_gdt_resources[] = { }, }; -static u64 udc_dmamask = ~(u32)0; +static u64 jz4740_udc_dmamask = ~(u32)0; -static struct platform_device jz_usb_gdt_device = { +struct platform_device jz4740_usb_gdt_device = { .name = "jz-udc", .id = -1, .dev = { - .dma_mask = &udc_dmamask, + .dma_mask = &jz4740_udc_dmamask, .coherent_dma_mask = 0xffffffff, }, - .num_resources = ARRAY_SIZE(jz_usb_gdt_resources), - .resource = jz_usb_gdt_resources, + .num_resources = ARRAY_SIZE(jz4740_usb_gdt_resources), + .resource = jz4740_usb_gdt_resources, }; -/* -static struct jz_mmc_platform_data jz_mmc_pdata = { - .card_detect_gpio = JZ_GPIO_PORTD(0), - .read_only_gpio = JZ_GPIO_PORTD(16), - .power_gpio = JZ_GPIO_PORTD(2), -};*/ /** MMC/SD controller **/ -static struct resource jz_mmc_resources[] = { +static struct resource jz4740_mmc_resources[] = { [0] = { .start = CPHYSADDR(MSC_BASE), .end = CPHYSADDR(MSC_BASE) + 0x10000 - 1, @@ -103,21 +86,20 @@ static struct resource jz_mmc_resources[] = { } }; -static u64 jz_mmc_dmamask = ~(u32)0; +static u64 jz4740_mmc_dmamask = ~(u32)0; -static struct platform_device jz_mmc_device = { +struct platform_device jz4740_mmc_device = { .name = "jz-mmc", .id = 0, .dev = { - .dma_mask = &jz_mmc_dmamask, - .coherent_dma_mask = 0xffffffff, -/* .platform_data = &jz_mmc_pdata,*/ + .dma_mask = &jz4740_mmc_dmamask, + .coherent_dma_mask = 0xffffffff, }, - .num_resources = ARRAY_SIZE(jz_mmc_resources), - .resource = jz_mmc_resources, + .num_resources = ARRAY_SIZE(jz4740_mmc_resources), + .resource = jz4740_mmc_resources, }; -static struct resource jz_rtc_resources[] = { +static struct resource jz4740_rtc_resources[] = { [0] = { .start = CPHYSADDR(RTC_BASE), .end = CPHYSADDR(RTC_BASE) + 0x10, @@ -130,15 +112,15 @@ static struct resource jz_rtc_resources[] = { }, }; -static struct platform_device jz_rtc_device = { +struct platform_device jz4740_rtc_device = { .name = "jz4740-rtc", .id = -1, - .num_resources = ARRAY_SIZE(jz_rtc_resources), - .resource = jz_rtc_resources, + .num_resources = ARRAY_SIZE(jz4740_rtc_resources), + .resource = jz4740_rtc_resources, }; /** I2C controller **/ -static struct resource jz_i2c_resources[] = { +static struct resource jz4740_i2c_resources[] = { [0] = { .start = CPHYSADDR(I2C_BASE), .end = CPHYSADDR(I2C_BASE) + 0x10000 - 1, @@ -151,20 +133,20 @@ static struct resource jz_i2c_resources[] = { } }; -static u64 jz_i2c_dmamask = ~(u32)0; +static u64 jz4740_i2c_dmamask = ~(u32)0; -static struct platform_device jz_i2c_device = { +struct platform_device jz4740_i2c_device = { .name = "jz_i2c", .id = 0, .dev = { - .dma_mask = &jz_i2c_dmamask, - .coherent_dma_mask = 0xffffffff, + .dma_mask = &jz4740_i2c_dmamask, + .coherent_dma_mask = 0xffffffff, }, - .num_resources = ARRAY_SIZE(jz_i2c_resources), - .resource = jz_i2c_resources, + .num_resources = ARRAY_SIZE(jz4740_i2c_resources), + .resource = jz4740_i2c_resources, }; -static struct resource jz_nand_resources[] = { +static struct resource jz4740_nand_resources[] = { [0] = { .start = CPHYSADDR(EMC_BASE), .end = CPHYSADDR(EMC_BASE) + 0x10000 - 1, @@ -172,234 +154,13 @@ static struct resource jz_nand_resources[] = { }, }; - -#ifdef QI_LB60_1GB_NAND -static struct nand_ecclayout qi_lb60_ecclayout = { - .eccbytes = 36, - .eccpos = { - 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41}, - .oobfree = { - {.offset = 2, - .length = 4}, - {.offset = 42, - .length = 22}} -}; - -static struct mtd_partition qi_lb60_partitions[] = { - { .name = "NAND BOOT partition", - .offset = 0 * 0x100000, - .size = 4 * 0x100000, - }, - { .name = "NAND KERNEL partition", - .offset = 4 * 0x100000, - .size = 4 * 0x100000, - }, - { .name = "NAND ROOTFS partition", - .offset = 8 * 0x100000, - .size = 504 * 0x100000, - }, - { .name = "NAND DATA partition", - .offset = 512 * 0x100000, - .size = 512 * 0x100000, - }, -}; -#else -static struct nand_ecclayout qi_lb60_ecclayout = { - .eccbytes = 72, - .eccpos = { - 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, - 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83}, - .oobfree = { - {.offset = 2, - .length = 10}, - {.offset = 84, - .length = 44}} -}; - -static struct mtd_partition qi_lb60_partitions[] = { - { .name = "NAND BOOT partition", - .offset = 0 * 0x100000, - .size = 4 * 0x100000, - }, - { .name = "NAND KERNEL partition", - .offset = 4 * 0x100000, - .size = 4 * 0x100000, - }, - { .name = "NAND ROOTFS partition", - .offset = 8 * 0x100000, - .size = 504 * 0x100000, - }, - { .name = "NAND DATA partition", - .offset = 512 * 0x100000, - .size = (512 + 1024) * 0x100000, - }, -}; -#endif /* QI_LB60_1GB_NAND */ - -static struct jz_nand_platform_data jz_nand_platform_data = { - .num_partitions = ARRAY_SIZE(qi_lb60_partitions), - .partitions = qi_lb60_partitions, - .ecc_layout = &qi_lb60_ecclayout, - .busy_gpio = 94, -}; - -static struct platform_device jz_nand_device = { +struct platform_device jz4740_nand_device = { .name = "jz4740-nand", - .num_resources = ARRAY_SIZE(jz_nand_resources), - .resource = jz_nand_resources, - .dev = { - .platform_data = &jz_nand_platform_data, - } -}; -/* #define KEEP_UART_ALIVE - * don't define this. the keyboard and keyboard both work - */ - -#define KEY_QI_QI KEY_F13 -#define KEY_QI_UPRED KEY_RIGHTSHIFT -#define KEY_QI_VOLUP KEY_F15 -#define KEY_QI_VOLDOWN KEY_F16 -#define KEY_QI_FN KEY_RIGHTCTRL - -static const uint32_t qi_lb60_keymap[] = { - KEY(0, 0, KEY_F1), /* S2 */ - KEY(0, 1, KEY_F2), /* S3 */ - KEY(0, 2, KEY_F3), /* S4 */ - KEY(0, 3, KEY_F4), /* S5 */ - KEY(0, 4, KEY_F5), /* S6 */ - KEY(0, 5, KEY_F6), /* S7 */ - KEY(0, 6, KEY_F7), /* S8 */ - - KEY(1, 0, KEY_Q), /* S10 */ - KEY(1, 1, KEY_W), /* S11 */ - KEY(1, 2, KEY_E), /* S12 */ - KEY(1, 3, KEY_R), /* S13 */ - KEY(1, 4, KEY_T), /* S14 */ - KEY(1, 5, KEY_Y), /* S15 */ - KEY(1, 6, KEY_U), /* S16 */ - KEY(1, 7, KEY_I), /* S17 */ - KEY(2, 0, KEY_A), /* S18 */ - KEY(2, 1, KEY_S), /* S19 */ - KEY(2, 2, KEY_D), /* S20 */ - KEY(2, 3, KEY_F), /* S21 */ - KEY(2, 4, KEY_G), /* S22 */ - KEY(2, 5, KEY_H), /* S23 */ - KEY(2, 6, KEY_J), /* S24 */ - KEY(2, 7, KEY_K), /* S25 */ - KEY(3, 0, KEY_ESC), /* S26 */ - KEY(3, 1, KEY_Z), /* S27 */ - KEY(3, 2, KEY_X), /* S28 */ - KEY(3, 3, KEY_C), /* S29 */ - KEY(3, 4, KEY_V), /* S30 */ - KEY(3, 5, KEY_B), /* S31 */ - KEY(3, 6, KEY_N), /* S32 */ - KEY(3, 7, KEY_M), /* S33 */ - KEY(4, 0, KEY_TAB), /* S34 */ - KEY(4, 1, KEY_CAPSLOCK), /* S35 */ - KEY(4, 2, KEY_BACKSLASH), /* S36 */ - KEY(4, 3, KEY_APOSTROPHE), /* S37 */ - KEY(4, 4, KEY_COMMA), /* S38 */ - KEY(4, 5, KEY_DOT), /* S39 */ - KEY(4, 6, KEY_SLASH), /* S40 */ - KEY(4, 7, KEY_UP), /* S41 */ - KEY(5, 0, KEY_O), /* S42 */ - KEY(5, 1, KEY_L), /* S43 */ - KEY(5, 2, KEY_EQUAL), /* S44 */ - KEY(5, 3, KEY_QI_UPRED), /* S45 */ - KEY(5, 4, KEY_SPACE), /* S46 */ - KEY(5, 5, KEY_QI_QI), /* S47 */ - KEY(5, 6, KEY_LEFTCTRL), /* S48 */ - KEY(5, 7, KEY_LEFT), /* S49 */ - KEY(6, 0, KEY_F8), /* S50 */ - KEY(6, 1, KEY_P), /* S51 */ - KEY(6, 2, KEY_BACKSPACE),/* S52 */ - KEY(6, 3, KEY_ENTER), /* S53 */ - KEY(6, 4, KEY_QI_VOLUP), /* S54 */ - KEY(6, 5, KEY_QI_VOLDOWN), /* S55 */ - KEY(6, 6, KEY_DOWN), /* S56 */ - KEY(6, 7, KEY_RIGHT), /* S57 */ - -#ifndef KEEP_UART_ALIVE - KEY(7, 0, KEY_LEFTSHIFT), /* S58 */ - KEY(7, 1, KEY_LEFTALT), /* S59 */ - KEY(7, 2, KEY_QI_FN), /* S60 */ -#endif + .num_resources = ARRAY_SIZE(jz4740_nand_resources), + .resource = jz4740_nand_resources, }; -static const struct matrix_keymap_data qi_lb60_keymap_data = { - .keymap = qi_lb60_keymap, - .keymap_size = ARRAY_SIZE(qi_lb60_keymap), -}; - -static const unsigned int qi_lb60_keypad_cols[] = { - 74, 75, 76, 77, 78, 79, 80, 81, -}; - -static const unsigned int qi_lb60_keypad_rows[] = { - 114, 115, 116, 117, 118, 119, 120, -#ifndef KEEP_UART_ALIVE - 122, -#endif -}; - -static struct matrix_keypad_platform_data qi_lb60_pdata = { - .keymap_data = &qi_lb60_keymap_data, - .col_gpios = qi_lb60_keypad_cols, - .row_gpios = qi_lb60_keypad_rows, - .num_col_gpios = ARRAY_SIZE(qi_lb60_keypad_cols), - .num_row_gpios = ARRAY_SIZE(qi_lb60_keypad_rows), - .col_scan_delay_us = 10, - .debounce_ms = 10, - .wakeup = 1, - .active_low = 1, -}; - -static struct platform_device qi_lb60_keypad = { - .name = "matrix-keypad", - .id = -1, - .dev = { - .platform_data = &qi_lb60_pdata, - }, -}; - -static struct fb_videomode qi_lb60_video_modes[] = { - { - .name = "320x240", - .xres = 320, - .yres = 240, - .pixclock = 700000, - .left_margin = 140, - .right_margin = 273, - .upper_margin = 20, - .lower_margin = 2, - .hsync_len = 1, - .vsync_len = 1, - .sync = 0, - .vmode = FB_VMODE_NONINTERLACED, - }, -}; - -static struct jz4740_fb_platform_data qi_lb60_fb_data = { - .width = 60, - .height = 45, - .num_modes = ARRAY_SIZE(qi_lb60_video_modes), - .modes = qi_lb60_video_modes, - .bpp = 24, - .lcd_type = JZ_LCD_TYPE_8BIT_SERIAL, -}; - -static struct resource fb_resources[] = { +static struct resource jz4740_framebuffer_resources[] = { [0] = { .start = CPHYSADDR(LCD_BASE), .end = CPHYSADDR(LCD_BASE) + 0x10000 - 1, @@ -407,46 +168,20 @@ static struct resource fb_resources[] = { }, }; -static u64 jz_fb_dmamask = ~(u32)0; +static u64 jz4740_fb_dmamask = ~(u32)0; -static struct platform_device qi_lb60_fb = { +struct platform_device jz4740_framebuffer_device = { .name = "jz4740-fb", .id = -1, - .num_resources = ARRAY_SIZE(fb_resources), - .resource = fb_resources, + .num_resources = ARRAY_SIZE(jz4740_framebuffer_resources), + .resource = jz4740_framebuffer_resources, .dev = { - .dma_mask = &jz_fb_dmamask, + .dma_mask = &jz4740_fb_dmamask, .coherent_dma_mask = 0xffffffff, - .platform_data = &qi_lb60_fb_data, }, }; -struct spi_gpio_platform_data spigpio_platform_data = { - .sck = JZ_GPIO_PORTC(23), - .mosi = JZ_GPIO_PORTC(22), - .miso = JZ_GPIO_PORTC(22), - .num_chipselect = 1, -}; - -static struct platform_device spigpio_device = { - .name = "spi_gpio", - .id = 1, - .dev = { - .platform_data = &spigpio_platform_data, - }, -}; - -static struct spi_board_info qi_lb60_spi_board_info[] = { - { - .modalias = "gpm940b0", - .controller_data = (void*)JZ_GPIO_PORTC(21), - .chip_select = 0, - .bus_num = 1, - .max_speed_hz = 30 * 1000, - }, -}; - -static struct resource i2s_resources[] = { +static struct resource jz4740_i2s_resources[] = { [0] = { .start = CPHYSADDR(AIC_BASE), .end = CPHYSADDR(AIC_BASE) + 0x38 - 1, @@ -454,14 +189,14 @@ static struct resource i2s_resources[] = { }, }; -static struct platform_device jz_i2s_device = { +struct platform_device jz4740_i2s_device = { .name = "jz4740-i2s", .id = -1, - .num_resources = ARRAY_SIZE(i2s_resources), - .resource = i2s_resources, + .num_resources = ARRAY_SIZE(jz4740_i2s_resources), + .resource = jz4740_i2s_resources, }; -static struct resource codec_resources[] = { +static struct resource jz4740_codec_resources[] = { [0] = { .start = CPHYSADDR(AIC_BASE) + 0x80, .end = CPHYSADDR(AIC_BASE) + 0x88 - 1, @@ -469,14 +204,14 @@ static struct resource codec_resources[] = { }, }; -static struct platform_device jz_codec_device = { +struct platform_device jz4740_codec_device = { .name = "jz4740-codec", .id = -1, - .num_resources = ARRAY_SIZE(codec_resources), - .resource = codec_resources, + .num_resources = ARRAY_SIZE(jz4740_codec_resources), + .resource = jz4740_codec_resources, }; -static struct resource adc_resources[] = { +static struct resource jz4740_adc_resources[] = { [0] = { .start = CPHYSADDR(SADC_BASE), .end = CPHYSADDR(SADC_BASE) + 0x30, @@ -489,78 +224,17 @@ static struct resource adc_resources[] = { }, }; -static struct platform_device jz_adc_device = { +struct platform_device jz4740_adc_device = { .name = "jz4740-adc", .id = -1, - .num_resources = ARRAY_SIZE(adc_resources), - .resource = adc_resources, + .num_resources = ARRAY_SIZE(jz4740_adc_resources), + .resource = jz4740_adc_resources, }; -static struct jz_batt_info jz_battery_platform_data = { - .dc_dect_gpio = GPIO_DC_DETE_N, - .usb_dect_gpio = GPIO_USB_DETE, - .charg_stat_gpio = GPIO_CHARG_STAT_N, - - .min_voltag = 3600000, - .max_voltag = 4200000, - .batt_tech = POWER_SUPPLY_TECHNOLOGY_LIPO, -}; - -static struct platform_device jz_battery_device = { +struct platform_device jz4740_battery_device = { .name = "jz4740-battery", .id = -1, .dev = { - .platform_data = &jz_battery_platform_data, - .parent = &jz_adc_device.dev + .parent = &jz4740_adc_device.dev }, }; - -/* GPIO Key: power */ -static const struct gpio_keys_button qi_lb60_gpio_keys_buttons[] = { - [0] = { - .code = KEY_POWER, - .gpio = GPIO_WAKEUP_N, - .active_low = 1, - .desc = "Power", - }, -}; - -static const struct gpio_keys_platform_data qi_lb60_gpio_keys_data = { - .nbuttons = ARRAY_SIZE(qi_lb60_gpio_keys_buttons), - .buttons = qi_lb60_gpio_keys_buttons, -}; - -static struct platform_device qi_lb60_gpio_keys = { - .name = "gpio-keys", - .id = -1, - .dev = { - .platform_data = &qi_lb60_gpio_keys_data, - } -}; - -/* All */ -static struct platform_device *jz_platform_devices[] __initdata = { - &jz_usb_ohci_device, - &jz_usb_gdt_device, - &jz_mmc_device, - &jz_nand_device, - &jz_i2c_device, - &qi_lb60_keypad, - &spigpio_device, - &qi_lb60_fb, - &jz_i2s_device, - &jz_codec_device, - &jz_rtc_device, - &jz_adc_device, - &jz_battery_device, - &qi_lb60_gpio_keys, -}; - -static int __init jz_platform_init(void) -{ - spi_register_board_info(qi_lb60_spi_board_info, - ARRAY_SIZE(qi_lb60_spi_board_info)); - return platform_add_devices(jz_platform_devices, ARRAY_SIZE(jz_platform_devices)); -} - -arch_initcall(jz_platform_init); diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/setup.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/setup.c index af7d34eb3..76b83b5eb 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/setup.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/setup.c @@ -183,6 +183,5 @@ void __init plat_mem_setup(void) #endif jz_soc_setup(); jz_serial_setup(); - jz_board_setup(); }