ARM: OMAP: Board updates and additions for OMAP1
Subsystems (3)
Tony Lindgren
reviewercover ARM: OMAP: Board updates and additions for OMAP1
Hi,
The following patch series contains updates board updates and additions for OMAP1 code.
This is take #2 of the earlier 90 patch mountain, which has been split into six smaller series.
Regards,
Tony
Tony Lindgren
reviewerPATCH 1/14 ARM: OMAP: Palm Tungsten E board update
From: Andrzej Zaborowski <[email protected]>
General update of the board file for Palm Tungsten E. Registers the platform devices contained in the PDA (ROM chip, keypad, infra-red) and updates the configuration for USB and MMC, whose config values were previously guessed in most cases due to lack of documentation (and now are confirmed by a number of users). Macros for GPIO pins are moved to a file in include/asm-arm/arch-omap.
Signed-off-by Andrzej Zaborowski <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/Kconfig | 9 +- arch/arm/mach-omap1/board-palmte.c | 377 ++++++++++++++++++++++++++++-- include/asm-arm/arch-omap/board-palmte.h | 34 +++ include/asm-arm/arch-omap/hardware.h | 4 + 4 files changed, 401 insertions(+), 23 deletions(-)
arch/arm/mach-omap1/Kconfig +4 -5
@@ -84,11 +84,10 @@ config MACH_OMAP_PALMTE bool "Palm Tungsten E" depends on ARCH_OMAP1 && ARCH_OMAP15XX help - Support for the Palm Tungsten E PDA. Currently only the LCD panel - is supported. To boot the kernel, you'll need a PalmOS compatible - bootloader; check out http://palmtelinux.sourceforge.net for more - informations. - Say Y here if you have such a PDA, say NO otherwise. + Support for the Palm Tungsten E PDA. To boot the kernel, you'll + need a PalmOS compatible bootloader; check out + http://palmtelinux.sourceforge.net/ for more information. + Say Y here if you have this PDA model, say N otherwise. config MACH_NOKIA770 bool "Nokia 770"
arch/arm/mach-omap1/board-palmte.c +359 -18
437 lines not on this page · raw message
include/asm-arm/arch-omap/board-palmte.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* linux/include/asm-arm/arch-omap/board-palmte.h +* +* Hardware definitions for the Palm Tungsten E device. +* +* Maintainters : http://palmtelinux.sf.net +* [email protected] +* +* 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. +*/ + +#ifndef __OMAP_BOARD_PALMTE_H +#define __OMAP_BOARD_PALMTE_H + +#include <asm/arch/gpio.h> + +#define PALMTE_USBDETECT_GPIO 0 +#define PALMTE_USB_OR_DC_GPIO 1 +#define PALMTE_TSC_GPIO 4 +#define PALMTE_PINTDAV_GPIO 6 +#define PALMTE_MMC_WP_GPIO 8 +#define PALMTE_MMC_POWER_GPIO 9 +#define PALMTE_HDQ_GPIO 11 +#define PALMTE_HEADPHONES_GPIO 14 +#define PALMTE_SPEAKER_GPIO 15 +#define PALMTE_DC_GPIO OMAP_MPUIO(2) +#define PALMTE_MMC_SWITCH_GPIO OMAP_MPUIO(4) +#define PALMTE_MMC1_GPIO OMAP_MPUIO(6) +#define PALMTE_MMC2_GPIO OMAP_MPUIO(7) +#define PALMTE_MMC3_GPIO OMAP_MPUIO(11) + +#endif /* __OMAP_BOARD_PALMTE_H */
include/asm-arm/arch-omap/hardware.h +4 -0
@@ -330,6 +330,10 @@#include "board-voiceblue.h" #endif +#ifdef CONFIG_MACH_OMAP_PALMTE +#include "board-palmte.h" +#endif +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_ARCH_OMAP_HARDWARE_H */
Tony Lindgren
reviewerPATCH 2/14 ARM: OMAP: Add support for Amstrad Delta keypad
From: Jonathan McDowell <[email protected]>
This adds support for the keypad on the top of the Amstrad Delta. It's just a standard omap-keypad so all we need to do is add the keypad layout and platform data to the board definition file.
Signed-off-by Jonathan McDowell <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-ams-delta.c | 108 +++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/board-ams-delta.c +109 -0
@@ -14,6 +14,7 @@#include <linux/kernel.h> #include <linux/init.h> +#include <linux/input.h> #include <linux/platform_device.h> #include <asm/hardware.h>
@@ -23,6 +24,7 @@#include <asm/arch/board-ams-delta.h> #include <asm/arch/gpio.h> +#include <asm/arch/keypad.h> #include <asm/arch/mux.h> #include <asm/arch/usb.h> #include <asm/arch/board.h>
@@ -31,6 +33,86 @@static u8 ams_delta_latch1_reg;static u16 ams_delta_latch2_reg; +static int ams_delta_keymap[] = { +KEY (0 ,0 ,KEY_F1 ),/* Advert */ + +KEY (3 ,0 ,KEY_COFFEE ),/* Games */ +KEY (2 ,0 ,KEY_QUESTION ),/* Directory */ +KEY (3 ,2 ,KEY_CONNECT ),/* Internet */ +KEY (2 ,1 ,KEY_SHOP ),/* Services */ +KEY (1 ,1 ,KEY_PHONE ),/* VoiceMail */ + +KEY (1 ,0 ,KEY_DELETE ),/* Delete */ +KEY (2 ,2 ,KEY_PLAY ),/* Play */ +KEY (0 ,1 ,KEY_PAGEUP ),/* Up */ +KEY (3 ,1 ,KEY_PAGEDOWN ),/* Down */ +KEY (0 ,2 ,KEY_EMAIL ),/* ReadEmail */ +KEY (1 ,2 ,KEY_STOP ),/* Stop */ + +/* Numeric keypad portion */ +KEY (7 ,0 ,KEY_KP1 ), +KEY (6 ,0 ,KEY_KP2 ), +KEY (5 ,0 ,KEY_KP3 ), +KEY (7 ,1 ,KEY_KP4 ), +KEY (6 ,1 ,KEY_KP5 ), +KEY (5 ,1 ,KEY_KP6 ), +KEY (7 ,2 ,KEY_KP7 ), +KEY (6 ,2 ,KEY_KP8 ), +KEY (5 ,2 ,KEY_KP9 ), +KEY (6 ,3 ,KEY_KP0 ), +KEY (7 ,3 ,KEY_KPASTERISK ), +KEY (5 ,3 ,KEY_KPDOT ),/* # key */ +KEY (2 ,7 ,KEY_NUMLOCK ),/* Mute */ +KEY (1 ,7 ,KEY_KPMINUS ),/* Recall */ +KEY (1 ,6 ,KEY_KPPLUS ),/* Redial */ +KEY (6 ,7 ,KEY_KPSLASH ),/* Handsfree */ +KEY (0 ,6 ,KEY_ENTER ),/* Video */ + +KEY (4 ,7 ,KEY_CAMERA ),/* Photo */ + +KEY (4 ,0 ,KEY_F2 ),/* Home */ +KEY (4 ,1 ,KEY_F3 ),/* Office */ +KEY (4 ,2 ,KEY_F4 ),/* Mobile */ +KEY (7 ,7 ,KEY_F5 ),/* SMS */ +KEY (5 ,7 ,KEY_F6 ),/* Email */ + +/* QWERTY portion of keypad */ +KEY (4 ,3 ,KEY_Q ), +KEY (3 ,3 ,KEY_W ), +KEY (2 ,3 ,KEY_E ), +KEY (1 ,3 ,KEY_R ), +KEY (0 ,3 ,KEY_T ), +KEY (7 ,4 ,KEY_Y ), +KEY (6 ,4 ,KEY_U ), +KEY (5 ,4 ,KEY_I ), +KEY (4 ,4 ,KEY_O ), +KEY (3 ,4 ,KEY_P ), + +KEY (2 ,4 ,KEY_A ), +KEY (1 ,4 ,KEY_S ), +KEY (0 ,4 ,KEY_D ), +KEY (7 ,5 ,KEY_F ), +KEY (6 ,5 ,KEY_G ), +KEY (5 ,5 ,KEY_H ), +KEY (4 ,5 ,KEY_J ), +KEY (3 ,5 ,KEY_K ), +KEY (2 ,5 ,KEY_L ), + +KEY (1 ,5 ,KEY_Z ), +KEY (0 ,5 ,KEY_X ), +KEY (7 ,6 ,KEY_C ), +KEY (6 ,6 ,KEY_V ), +KEY (5 ,6 ,KEY_B ), +KEY (4 ,6 ,KEY_N ), +KEY (3 ,6 ,KEY_M ), +KEY (2 ,6 ,KEY_SPACE ), + +KEY (0 ,7 ,KEY_LEFTSHIFT ),/* Vol up */ +KEY (3 ,7 ,KEY_LEFTCTRL ),/* Vol down */ + +0 +}; +void ams_delta_latch1_write (u8 mask,u8 value) { ams_delta_latch1_reg &= ~mask;
@@ -91,12 +173,39 @@ static struct omap_board_config_kernel a { OMAP_TAG_USB, &ams_delta_usb_config }, }; +static struct resource ams_delta_kp_resources[] = { + [0 ] = { + .start =INT_KEYBOARD , + .end =INT_KEYBOARD , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct omap_kp_platform_data ams_delta_kp_data = { + .rows =8 , + .cols =8 , + .keymap = ams_delta_keymap, + .keymapsize =ARRAY_SIZE (ams_delta_keymap), + .delay =9 , +}; + +static struct platform_device ams_delta_kp_device = { + .name ="omap-keypad" , + .id =-1 , + .dev = { + .platform_data = &ams_delta_kp_data, + }, + .num_resources =ARRAY_SIZE (ams_delta_kp_resources), + .resource = ams_delta_kp_resources, +}; +static struct platform_device ams_delta_led_device = { .name ="ams-delta-led" , .id =-1 };static struct platform_device *ams_delta_devices[]__initdata = { + &ams_delta_kp_device, &ams_delta_led_device, };
Tony Lindgren
reviewerPATCH 3/14 ARM: OMAP: PalmZ71 support
From: Marek Vasut <[email protected]>
Palmz71 specific things - board file.
Signed-off-by Marek Vasut <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/Kconfig | 9 + arch/arm/mach-omap1/Makefile | 1 + arch/arm/mach-omap1/board-palmz71.c | 384 +++++++++++++++++++++++++++++ include/asm-arm/arch-omap/board-palmz71.h | 26 ++ include/asm-arm/arch-omap/hardware.h | 4 + 5 files changed, 424 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/Kconfig +9 -0
@@ -89,6 +89,15 @@ config MACH_OMAP_PALMTE http://palmtelinux.sourceforge.net/ for more information. Say Y here if you have this PDA model, say N otherwise. +config MACH_OMAP_PALMZ71 + bool "Palm Zire71" + depends on ARCH_OMAP1 && ARCH_OMAP15XX + help + Support for the Palm Zire71 PDA. To boot the kernel, + you'll need a PalmOS compatible bootloader; check out + http://hackndev.com/palm/z71 for more informations. + Say Y here if you have such a PDA, say N otherwise. + config MACH_NOKIA770 bool "Nokia 770" depends on ARCH_OMAP1 && ARCH_OMAP16XX
arch/arm/mach-omap1/Makefile +1 -0
@@ -22,6 +22,7 @@ obj-$(CONFIG_MACH_OMAP_OSK) += board-os obj-$(CONFIG_MACH_OMAP_H3) += board-h3.o obj-$(CONFIG_MACH_VOICEBLUE) += board-voiceblue.o obj-$(CONFIG_MACH_OMAP_PALMTE) += board-palmte.o +obj-$(CONFIG_MACH_OMAP_PALMZ71) += board-palmz71.o obj-$(CONFIG_MACH_NOKIA770) += board-nokia770.o obj-$(CONFIG_MACH_AMS_DELTA) += board-ams-delta.o
arch/arm/mach-omap1/board-palmz71.c new file +383 -0
383 lines not on this page · raw message
include/asm-arm/arch-omap/board-palmz71.h new file +26 -0
@@ -0,0 +1,26 @@ +/* +* linux/include/asm-arm/arch-omap/board-palmz71.h +* +* Hardware definitions for the Palm Zire71 device. +* +* Maintainters : Marek Vasut <[email protected]> +* +* 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. +*/ + +#ifndef __OMAP_BOARD_PALMZ71_H +#define __OMAP_BOARD_PALMZ71_H + +#define PALMZ71_USBDETECT_GPIO 0 +#define PALMZ71_PENIRQ_GPIO 6 +#define PALMZ71_MMC_WP_GPIO 8 +#define PALMZ71_HDQ_GPIO 11 + +#define PALMZ71_HOTSYNC_GPIO OMAP_MPUIO(1) +#define PALMZ71_CABLE_GPIO OMAP_MPUIO(2) +#define PALMZ71_SLIDER_GPIO OMAP_MPUIO(3) +#define PALMZ71_MMC_IN_GPIO OMAP_MPUIO(4) + +#endif /* __OMAP_BOARD_PALMZ71_H */
include/asm-arm/arch-omap/hardware.h +4 -0
@@ -334,6 +334,10 @@#include "board-palmte.h" #endif +#ifdef CONFIG_MACH_OMAP_PALMZ71 +#include "board-palmz71.h" +#endif +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_ARCH_OMAP_HARDWARE_H */
Tony Lindgren
reviewerPATCH 4/14 ARM: OMAP: Register tsc2102 on Palm Tungsten E
From: Andrzej Zaborowski <[email protected]>
Add palmte board config bits for TSC2102 controlled devices. This will enable touchscreen, audio and APM code to report battery level.
If there are other boards at some point that use a TSC2102, similar code can be used.
Signed-off-by Andrzej Zaborowski <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-palmte.c | 123 ++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/board-palmte.c +123 -0
@@ -321,6 +321,116 @@ static struct tsc2102_config palmte_tsc2102_config = { .alsa_config = &palmte_alsa_config, }; +static struct omap_mcbsp_reg_cfg palmte_mcbsp1_regs = { + .spcr2 =FRST |GRST |XRST |XINTM (3 ), + .xcr2 =XDATDLY (1 ) |XFIG , + .xcr1 =XWDLEN1 (OMAP_MCBSP_WORD_32 ), + .pcr0 =SCLKME |FSXP |CLKXP , +}; + +static struct omap_alsa_codec_config palmte_alsa_config = { + .name ="TSC2102 audio" , + .mcbsp_regs_alsa = &palmte_mcbsp1_regs, + .codec_configure_dev =NULL ,/* tsc2102_configure, */ + .codec_set_samplerate =NULL ,/* tsc2102_set_samplerate, */ + .codec_clock_setup =NULL ,/* tsc2102_clock_setup, */ + .codec_clock_on =NULL ,/* tsc2102_clock_on, */ + .codec_clock_off =NULL ,/* tsc2102_clock_off, */ + .get_default_samplerate =NULL ,/* tsc2102_get_default_samplerate, */ +}; + +#ifdef CONFIG_APM +/* +* Values measured in 10 minute intervals averaged over 10 samples. +* May differ slightly from device to device but should be accurate +* enough to give basic idea of battery life left and trigger +* potential alerts. +*/ +static const int palmte_battery_sample[] = { +2194 ,2157 ,2138 ,2120 , +2104 ,2089 ,2075 ,2061 , +2048 ,2038 ,2026 ,2016 , +2008 ,1998 ,1989 ,1980 , +1970 ,1958 ,1945 ,1928 , +1910 ,1888 ,1860 ,1827 , +1791 ,1751 ,1709 ,1656 , +}; + +#define INTERVAL 10 +#define BATTERY_HIGH_TRESHOLD 66 +#define BATTERY_LOW_TRESHOLD 33 + +static void palmte_get_power_status (struct apm_power_info *info,int *battery) +{ +int charging, batt, hi, lo, mid; + + charging = !omap_get_gpio_datain (PALMTE_DC_GPIO ); + batt = battery[0 ]; +if (charging) + batt -=60 ; + + hi =ARRAY_SIZE (palmte_battery_sample); + lo =0 ; + + info->battery_flag =0 ; + info->units =APM_UNITS_MINS ; + +if (batt > palmte_battery_sample[lo]) { + info->battery_life =100 ; + info->time =INTERVAL *ARRAY_SIZE (palmte_battery_sample); + }else if (batt <= palmte_battery_sample[hi -1 ]) { + info->battery_life =0 ; + info->time =0 ; + }else { +while (hi > lo +1 ) { + mid = (hi + lo) >>2 ; +if (batt <= palmte_battery_sample[mid]) + lo = mid; +else + hi = mid; + } + + mid = palmte_battery_sample[lo] - palmte_battery_sample[hi]; + hi = palmte_battery_sample[lo] - batt; + info->battery_life =100 - (100 * lo +100 * hi / mid) / +ARRAY_SIZE (palmte_battery_sample); + info->time =INTERVAL * (ARRAY_SIZE (palmte_battery_sample) - + lo) -INTERVAL * hi / mid; + } + +if (charging) { + info->ac_line_status =APM_AC_ONLINE ; + info->battery_status =APM_BATTERY_STATUS_CHARGING ; + info->battery_flag |=APM_BATTERY_FLAG_CHARGING ; + }else { + info->ac_line_status =APM_AC_OFFLINE ; +if (info->battery_life >BATTERY_HIGH_TRESHOLD ) + info->battery_status =APM_BATTERY_STATUS_HIGH ; +else if (info->battery_life >BATTERY_LOW_TRESHOLD ) + info->battery_status =APM_BATTERY_STATUS_LOW ; +else + info->battery_status =APM_BATTERY_STATUS_CRITICAL ; + } + +if (info->battery_life >BATTERY_HIGH_TRESHOLD ) + info->battery_flag |=APM_BATTERY_FLAG_HIGH ; +else if (info->battery_life >BATTERY_LOW_TRESHOLD ) + info->battery_flag |=APM_BATTERY_FLAG_LOW ; +else + info->battery_flag |=APM_BATTERY_FLAG_CRITICAL ; +} +#else +#define palmte_get_power_status NULL +#endif + +static struct tsc2102_config palmte_tsc2102_config = { + .use_internal =0 , + .monitor =TSC_BAT1 |TSC_AUX |TSC_TEMP , + .temp_at25c = {2200 ,2615 }, + .apm_report = palmte_get_power_status, + .alsa_config = &palmte_alsa_config, +}; +static struct omap_board_config_kernel palmte_config[] = { {OMAP_TAG_USB , &palmte_usb_config }, {OMAP_TAG_MMC , &palmte_mmc_config },
@@ -339,6 +449,17 @@ static struct spi_board_info palmte_spi_info[] __initdata = { }, }; +static struct spi_board_info palmte_spi_info[]__initdata = { + { + .modalias ="tsc2102" , + .bus_num =2 ,/* uWire (officially) */ + .chip_select =0 ,/* As opposed to 3 */ + .irq =OMAP_GPIO_IRQ (PALMTE_PINTDAV_GPIO ), + .platform_data = &palmte_tsc2102_config, + .max_speed_hz =8000000 , + }, +}; +/* Periodically check for changes on important input pins */ struct timer_list palmte_pin_timer;int prev_power, prev_headphones;
@@ -418,6 +539,8 @@ static void __init omap_palmte_init(void)spi_register_board_info (palmte_spi_info,ARRAY_SIZE (palmte_spi_info)); +spi_register_board_info (palmte_spi_info,ARRAY_SIZE (palmte_spi_info)); +omap_serial_init ();palmte_gpio_setup (); }
Signature · 1 line
1.4.4.2
Tony Lindgren
reviewerPATCH 5/14 ARM: OMAP: Palm Tungsten|T support
From: Marek Vasut <[email protected]>
This patch adds board file and necessary includes for Palm Tungsten|T.
Signed-off-by Marek Vasut <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/Kconfig | 9 + arch/arm/mach-omap1/Makefile | 1 + arch/arm/mach-omap1/board-palmtt.c | 357 ++++++++++++++++++++++++++++++ include/asm-arm/arch-omap/board-palmtt.h | 23 ++ include/asm-arm/arch-omap/hardware.h | 4 + 5 files changed, 394 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/Kconfig +9 -0
@@ -98,6 +98,15 @@ config MACH_OMAP_PALMZ71 http://hackndev.com/palm/z71 for more informations. Say Y here if you have such a PDA, say N otherwise. +config MACH_OMAP_PALMTT + bool "Palm Tungsten|T" + depends on ARCH_OMAP1 && ARCH_OMAP15XX + help + Support for the Palm Tungsten|T PDA. To boot the kernel, you'll + need a PalmOS compatible bootloader (Garux); check out + http://www.hackndev.com/palm/tt/ for more information. + Say Y here if you have this PDA model, say N otherwise. + config MACH_NOKIA770 bool "Nokia 770" depends on ARCH_OMAP1 && ARCH_OMAP16XX
arch/arm/mach-omap1/Makefile +1 -0
@@ -23,6 +23,7 @@ obj-$(CONFIG_MACH_OMAP_H3) += board-h3. obj-$(CONFIG_MACH_VOICEBLUE) += board-voiceblue.o obj-$(CONFIG_MACH_OMAP_PALMTE) += board-palmte.o obj-$(CONFIG_MACH_OMAP_PALMZ71) += board-palmz71.o +obj-$(CONFIG_MACH_OMAP_PALMTT) += board-palmtt.o obj-$(CONFIG_MACH_NOKIA770) += board-nokia770.o obj-$(CONFIG_MACH_AMS_DELTA) += board-ams-delta.o
arch/arm/mach-omap1/board-palmtt.c new file +357 -0
357 lines not on this page · raw message
include/asm-arm/arch-omap/board-palmtt.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* linux/include/asm-arm/arch-omap/board-palmte.h +* +* Hardware definitions for the Palm Tungsten|T device. +* +* Maintainters : Marek Vasut <[email protected]> +* +* 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. +*/ + +#ifndef __OMAP_BOARD_PALMTT_H +#define __OMAP_BOARD_PALMTT_H + +#define PALMTT_USBDETECT_GPIO 0 +#define PALMTT_CABLE_GPIO 1 +#define PALMTT_LED_GPIO 3 +#define PALMTT_PENIRQ_GPIO 6 +#define PALMTT_MMC_WP_GPIO 8 +#define PALMTT_HDQ_GPIO 11 + +#endif /* __OMAP_BOARD_PALMTT_H */
include/asm-arm/arch-omap/hardware.h +4 -0
@@ -338,6 +338,10 @@#include "board-palmz71.h" #endif +#ifdef CONFIG_MACH_OMAP_PALMTT +#include "board-palmtt.h" +#endif +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_ARCH_OMAP_HARDWARE_H */
Tony Lindgren
reviewerPATCH 6/14 ARM: OMAP: Basic support for siemens sx1
From: Vladimir Ananiev <[email protected]>
This adds basic support for Siemens SX1. More patches are available, with video driver, mixer, and serial ports working. That is enough to do gsm calls with right userland.
Signed-off-by Pavel Machek <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/Kconfig | 11 + arch/arm/mach-omap1/Makefile | 1 + arch/arm/mach-omap1/board-sx1.c | 494 +++++++++++++++++++++++++++++++++ include/asm-arm/arch-omap/board-sx1.h | 46 +++ include/asm-arm/arch-omap/hardware.h | 4 + 5 files changed, 556 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/Kconfig +11 -0
@@ -107,6 +107,17 @@ config MACH_OMAP_PALMTT http://www.hackndev.com/palm/tt/ for more information. Say Y here if you have this PDA model, say N otherwise. +config MACH_SX1 + bool "Siemens SX1" + depends on ARCH_OMAP1 && ARCH_OMAP15XX + help + Support for the Siemens SX1 phone. To boot the kernel, + you'll need a SX1 compatible bootloader; check out + http://forum.oslik.ru and + http://www.handhelds.org/moin/moin.cgi/SiemensSX1 + for more information. + Say Y here if you have such a phone, say NO otherwise. + config MACH_NOKIA770 bool "Nokia 770" depends on ARCH_OMAP1 && ARCH_OMAP16XX
arch/arm/mach-omap1/Makefile +1 -0
@@ -26,6 +26,7 @@ obj-$(CONFIG_MACH_OMAP_PALMZ71) += boar obj-$(CONFIG_MACH_OMAP_PALMTT) += board-palmtt.o obj-$(CONFIG_MACH_NOKIA770) += board-nokia770.o obj-$(CONFIG_MACH_AMS_DELTA) += board-ams-delta.o +obj-$(CONFIG_MACH_SX1) += board-sx1.o ifeq ($(CONFIG_ARCH_OMAP15XX),y) # Innovator-1510 FPGA
arch/arm/mach-omap1/board-sx1.c new file +494 -0
494 lines not on this page · raw message
include/asm-arm/arch-omap/board-sx1.h new file +46 -0
46 lines not on this page · raw message
include/asm-arm/arch-omap/hardware.h +4 -0
@@ -342,6 +342,10 @@#include "board-palmtt.h" #endif +#ifdef CONFIG_MACH_SX1 +#include "board-sx1.h" +#endif +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_ARCH_OMAP_HARDWARE_H */
Tony Lindgren
reviewerPATCH 7/14 ARM: OMAP: Sync board specific files with linux-omap
This patch syncs omap board specific files with linux-omap tree.
Patch consists mostly of driver updates done in linux-omap tree for drivers not yet in mainline kernel.
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-ams-delta.c | 59 +++++++----- arch/arm/mach-omap1/board-h2.c | 79 ++++++++++++++ arch/arm/mach-omap1/board-h3.c | 41 ++++++++ arch/arm/mach-omap1/board-nokia770.c | 53 ++++++++-- arch/arm/mach-omap1/board-osk.c | 1 + arch/arm/mach-omap1/board-palmte.c | 123 ---------------------- arch/arm/mach-omap1/board-palmtt.c | 4 +- arch/arm/mach-omap1/board-voiceblue.c | 2 +- 10 files changed, 380 insertions(+), 176 deletions(-)
arch/arm/mach-omap1/board-ams-delta.c +38 -27
@@ -34,20 +34,20 @@ static u8 ams_delta_latch1_reg;static u16 ams_delta_latch2_reg;static int ams_delta_keymap[] = { -KEY (0 ,0 ,KEY_F1 ),/* Advert */ +KEY (0 ,0 ,KEY_F1 ),/* Advert */ -KEY (3 ,0 ,KEY_COFFEE ),/* Games */ +KEY (3 ,0 ,KEY_COFFEE ),/* Games */ KEY (2 ,0 ,KEY_QUESTION ),/* Directory */ -KEY (3 ,2 ,KEY_CONNECT ),/* Internet */ -KEY (2 ,1 ,KEY_SHOP ),/* Services */ -KEY (1 ,1 ,KEY_PHONE ),/* VoiceMail */ - -KEY (1 ,0 ,KEY_DELETE ),/* Delete */ -KEY (2 ,2 ,KEY_PLAY ),/* Play */ -KEY (0 ,1 ,KEY_PAGEUP ),/* Up */ -KEY (3 ,1 ,KEY_PAGEDOWN ),/* Down */ -KEY (0 ,2 ,KEY_EMAIL ),/* ReadEmail */ -KEY (1 ,2 ,KEY_STOP ),/* Stop */ +KEY (3 ,2 ,KEY_CONNECT ),/* Internet */ +KEY (2 ,1 ,KEY_SHOP ),/* Services */ +KEY (1 ,1 ,KEY_PHONE ),/* VoiceMail */ + +KEY (1 ,0 ,KEY_DELETE ),/* Delete */ +KEY (2 ,2 ,KEY_PLAY ),/* Play */ +KEY (0 ,1 ,KEY_PAGEUP ),/* Up */ +KEY (3 ,1 ,KEY_PAGEDOWN ),/* Down */ +KEY (0 ,2 ,KEY_EMAIL ),/* ReadEmail */ +KEY (1 ,2 ,KEY_STOP ),/* Stop */ /* Numeric keypad portion */ KEY (7 ,0 ,KEY_KP1 ),
@@ -61,20 +61,20 @@ static int ams_delta_keymap[] = {KEY (5 ,2 ,KEY_KP9 ),KEY (6 ,3 ,KEY_KP0 ),KEY (7 ,3 ,KEY_KPASTERISK ), -KEY (5 ,3 ,KEY_KPDOT ),/* # key */ -KEY (2 ,7 ,KEY_NUMLOCK ),/* Mute */ -KEY (1 ,7 ,KEY_KPMINUS ),/* Recall */ -KEY (1 ,6 ,KEY_KPPLUS ),/* Redial */ -KEY (6 ,7 ,KEY_KPSLASH ),/* Handsfree */ -KEY (0 ,6 ,KEY_ENTER ),/* Video */ - -KEY (4 ,7 ,KEY_CAMERA ),/* Photo */ - -KEY (4 ,0 ,KEY_F2 ),/* Home */ -KEY (4 ,1 ,KEY_F3 ),/* Office */ -KEY (4 ,2 ,KEY_F4 ),/* Mobile */ -KEY (7 ,7 ,KEY_F5 ),/* SMS */ -KEY (5 ,7 ,KEY_F6 ),/* Email */ +KEY (5 ,3 ,KEY_KPDOT ),/* # key */ +KEY (2 ,7 ,KEY_NUMLOCK ),/* Mute */ +KEY (1 ,7 ,KEY_KPMINUS ),/* Recall */ +KEY (1 ,6 ,KEY_KPPLUS ),/* Redial */ +KEY (6 ,7 ,KEY_KPSLASH ),/* Handsfree */ +KEY (0 ,6 ,KEY_ENTER ),/* Video */ + +KEY (4 ,7 ,KEY_CAMERA ),/* Photo */ + +KEY (4 ,0 ,KEY_F2 ),/* Home */ +KEY (4 ,1 ,KEY_F3 ),/* Office */ +KEY (4 ,2 ,KEY_F4 ),/* Mobile */ +KEY (7 ,7 ,KEY_F5 ),/* SMS */ +KEY (5 ,7 ,KEY_F6 ),/* Email */ /* QWERTY portion of keypad */ KEY(4, 3, KEY_Q),
@@ -107,7 +107,7 @@ static int ams_delta_keymap[] = {KEY (3 ,6 ,KEY_M ),KEY (2 ,6 ,KEY_SPACE ), -KEY (0 ,7 ,KEY_LEFTSHIFT ),/* Vol up */ +KEY (0 ,7 ,KEY_LEFTSHIFT ),/* Vol up */ KEY (3 ,7 ,KEY_LEFTCTRL ),/* Vol down */ 0
@@ -158,6 +158,10 @@ static struct map_desc ams_delta_io_desc } }; +static struct omap_lcd_config ams_delta_lcd_config__initdata = { + .ctrl_name ="internal" , +}; +static struct omap_uart_config ams_delta_uart_config__initdata = { .enabled_uarts =1 , };
@@ -169,6 +173,7 @@ static struct omap_usb_config ams_delta_ };static struct omap_board_config_kernel ams_delta_config[] = { + {OMAP_TAG_LCD , &ams_delta_lcd_config }, {OMAP_TAG_UART , &ams_delta_uart_config }, {OMAP_TAG_USB , &ams_delta_usb_config }, };
@@ -199,6 +204,11 @@ static struct platform_device ams_delta_ .resource = ams_delta_kp_resources, }; +static struct platform_device ams_delta_lcd_device = { + .name ="lcd_ams_delta" , + .id =-1 , +}; +static struct platform_device ams_delta_led_device = { .name ="ams-delta-led" , .id =-1
@@ -206,6 +216,7 @@ static struct platform_device ams_delta_static struct platform_device *ams_delta_devices[]__initdata = { &ams_delta_kp_device, + &ams_delta_lcd_device, &ams_delta_led_device, };
arch/arm/mach-omap1/board-h2.c +79 -0
114 lines not on this page · raw message
arch/arm/mach-omap1/board-h3.c +41 -0
70 lines not on this page · raw message
arch/arm/mach-omap1/board-nokia770.c +44 -9
116 lines not on this page · raw message
arch/arm/mach-omap1/board-osk.c +1 -0
@@ -29,6 +29,7 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> +#include <linux/interrupt.h> #include <linux/irq.h> #include <linux/interrupt.h>
arch/arm/mach-omap1/board-palmte.c +0 -123
141 lines not on this page · raw message
arch/arm/mach-omap1/board-palmtt.c +2 -2
@@ -314,8 +314,8 @@ static struct omap_uart_config palmtt_ua };static struct omap_board_config_kernel palmtt_config[] = { - {OMAP_TAG_USB , &palmtt_usb_config }, - {OMAP_TAG_LCD , &palmtt_lcd_config }, + {OMAP_TAG_USB , &palmtt_usb_config }, + {OMAP_TAG_LCD , &palmtt_lcd_config }, {OMAP_TAG_UART , &palmtt_uart_config }, };
arch/arm/mach-omap1/board-voiceblue.c +1 -1
@@ -235,7 +235,7 @@ static struct notifier_block panic_blockstatic int __init voiceblue_setup (void ) {/* Setup panic notifier */ -notifier_chain_register (&panic_notifier_list, &panic_block); +atomic_notifier_chain_register (&panic_notifier_list, &panic_block);return 0 ; }
Tony Lindgren
reviewerPATCH 8/14 ARM: OMAP: Update omap h2 defconfig
Update omap h2 defconfig
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/configs/omap_h2_1610_defconfig | 88 +++++++++++++++++++++++++------ 1 files changed, 71 insertions(+), 17 deletions(-)
arch/arm/configs/omap_h2_1610_defconfig +71 -17
@@ -1,10 +1,15 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17 -# Thu Jun 29 15:25:18 2006 +# Linux kernel version: 2.6.19 +# Thu Dec 7 15:16:40 2006 # CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -26,16 +31,21 @@ CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" -CONFIG_UID16=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y # CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y
@@ -47,6 +57,8 @@ CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set
@@ -64,7 +76,10 @@ CONFIG_MODULE_UNLOAD=y # # Block layer # +CONFIG_BLOCK=y +# CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers
@@ -86,7 +101,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_AT91RM9200 is not set +# CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set
@@ -96,7 +111,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set
@@ -121,9 +137,12 @@ CONFIG_ARCH_OMAP1=y # OMAP Feature Selections # # CONFIG_OMAP_RESET_CLOCKS is not set +# CONFIG_OMAP_BOOT_TAG is not set +# CONFIG_OMAP_GPIO_SWITCH is not set CONFIG_OMAP_MUX=y # CONFIG_OMAP_MUX_DEBUG is not set CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128
@@ -171,6 +190,8 @@ CONFIG_CPU_ABRT_EV5TJ=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_COPY_V4WB=y CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features
@@ -206,6 +227,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y
@@ -259,6 +281,7 @@ CONFIG_BINFMT_AOUT=y CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set # CONFIG_APM is not set #
@@ -275,6 +298,7 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set
@@ -295,10 +319,13 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_INET_TUNNEL is not set CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set
@@ -328,7 +355,6 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set
@@ -387,6 +413,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set CONFIG_ATA_OVER_ETH=m
@@ -396,6 +423,8 @@ CONFIG_ATA_OVER_ETH=m # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_PROC_FS=y #
@@ -414,23 +443,29 @@ CONFIG_SCSI_PROC_FS=y # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set # -# SCSI Transport Attributes +# SCSI Transports # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set # # SCSI low-level drivers # # CONFIG_ISCSI_TCP is not set -# CONFIG_SCSI_SATA is not set # CONFIG_SCSI_DEBUG is not set # +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# # Multi-device support (RAID and LVM) # # CONFIG_MD is not set
@@ -502,6 +537,7 @@ CONFIG_PPP=y # CONFIG_PPPOE is not set CONFIG_SLIP=y CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=y # CONFIG_SLIP_SMART is not set # CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_SHAPER is not set
@@ -518,6 +554,7 @@ CONFIG_SLIP_COMPRESSED=y # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces
@@ -590,21 +627,17 @@ CONFIG_WATCHDOG_NOWAYOUT=y # Watchdog Device Drivers # # CONFIG_SOFT_WATCHDOG is not set +# CONFIG_OMAP_WATCHDOG is not set # CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# # CONFIG_RAW_DRIVER is not set # # TPM devices # # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set # # I2C support
@@ -620,6 +653,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y # # Dallas's 1-wire bus # +# CONFIG_W1 is not set # # Hardware Monitoring support
@@ -628,11 +662,13 @@ CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_ABITUGURU is not set # CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_VT1211 is not set # CONFIG_HWMON_DEBUG_CHIP is not set # # Misc devices # +# CONFIG_TIFM_CORE is not set # # LED devices
@@ -651,7 +687,6 @@ CONFIG_HWMON=y # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices
@@ -753,10 +788,12 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=y
@@ -787,6 +824,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437 # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y # CONFIG_TMPFS is not set # CONFIG_HUGETLB_PAGE is not set
@@ -885,6 +923,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_UTF8 is not set # +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# # Profiling support # # CONFIG_PROFILING is not set
@@ -893,13 +936,15 @@ CONFIG_NLS_DEFAULT="iso8859-1" # Kernel hacking # # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_FS is not set CONFIG_FRAME_POINTER=y -# CONFIG_UNWIND_INFO is not set +# CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_USER is not set #
@@ -912,7 +957,11 @@ CONFIG_FRAME_POINTER=y # Cryptographic options # CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_MANAGER=y # CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=y
@@ -921,6 +970,10 @@ CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set
@@ -949,3 +1002,4 @@ CONFIG_CRYPTO_DES=y CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y +CONFIG_PLIST=y
Signature · 1 line
1.4.4.2
Tony Lindgren
reviewerPATCH 9/14 ARM: OMAP: Add omap osk defconfig
Add omap osk defconfig
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/configs/omap_osk_5912_defconfig | 1120 ++++++++++++++++++++++++++++++ 1 files changed, 1120 insertions(+), 0 deletions(-)
arch/arm/configs/omap_osk_5912_defconfig new file +1120 -0
@@ -0,0 +1,1120 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.19 +# Thu Dec 7 16:32:04 2006 +# +CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_OMAP=y + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP_OTG=y +CONFIG_ARCH_OMAP1=y +# CONFIG_ARCH_OMAP2 is not set + +# +# OMAP Feature Selections +# +CONFIG_OMAP_RESET_CLOCKS=y +# CONFIG_OMAP_BOOT_TAG is not set +# CONFIG_OMAP_GPIO_SWITCH is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 +# CONFIG_OMAP_DM_TIMER is not set +CONFIG_OMAP_LL_DEBUG_UART1=y +# CONFIG_OMAP_LL_DEBUG_UART2 is not set +# CONFIG_OMAP_LL_DEBUG_UART3 is not set +CONFIG_OMAP_SERIAL_WAKE=y + +# +# OMAP Core Type +# +# CONFIG_ARCH_OMAP730 is not set +# CONFIG_ARCH_OMAP15XX is not set +CONFIG_ARCH_OMAP16XX=y + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_INNOVATOR is not set +# CONFIG_MACH_OMAP_H2 is not set +# CONFIG_MACH_OMAP_H3 is not set +CONFIG_MACH_OMAP_OSK=y +# CONFIG_OMAP_OSK_MISTRAL is not set +# CONFIG_MACH_NOKIA770 is not set +# CONFIG_MACH_OMAP_GENERIC is not set + +# +# OMAP CPU Speed +# +# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set +# CONFIG_OMAP_ARM_216MHZ is not set +CONFIG_OMAP_ARM_192MHZ=y +# CONFIG_OMAP_ARM_168MHZ is not set +# CONFIG_OMAP_ARM_120MHZ is not set +# CONFIG_OMAP_ARM_60MHZ is not set +# CONFIG_OMAP_ARM_30MHZ is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_OMAP_CF=y + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=128 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +CONFIG_MTD_OMAP_NOR=y +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=m +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_IDE_GENERIC is not set +# CONFIG_IDE_ARM is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_SMC91X=y +# CONFIG_DM9000 is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=y +CONFIG_PPP_MULTILINK=y +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=y +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_OMAP=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_CS is not set +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=m +CONFIG_HW_RANDOM_OMAP=m +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_ISP1301_OMAP is not set +CONFIG_TPS65010=y +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# +# CONFIG_TIFM_CORE is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FIRMWARE_EDID=y +CONFIG_FB=y +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +# CONFIG_TMPFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=m +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=m +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_FS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y
Signature · 1 line
1.4.4.2
Tony Lindgren
reviewerPATCH 10/14 ARM: OMAP: osk+mistral backlight, power, board specific
From: David Brownell <[email protected]>
Mistral-specific:
- Add PWL-driven LCD backlight device
- Apply power to the board even when the LCD isn't configured; things like EEPROM, temperature sensor, and wakeup switch depend on it.
Signed-off-by David Brownell <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-osk.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/board-osk.c +22 -0
@@ -293,6 +293,18 @@ static struct platform_device osk5912_kp .resource = osk5912_kp_resources, }; +static struct omap_backlight_config mistral_bl_data = { + .default_intensity =0xa0 , +}; + +static struct platform_device mistral_bl_device = { + .name ="omap-bl" , + .id =-1 , + .dev = { + .platform_data = &mistral_bl_data, + }, +}; +static struct platform_device osk5912_lcd_device = { .name ="lcd_osk" , .id =-1 ,
@@ -300,6 +312,7 @@ static struct platform_device osk5912_lcstatic struct platform_device *mistral_devices[]__initdata = { &osk5912_kp_device, + &mistral_bl_device, &osk5912_lcd_device, };
@@ -405,6 +418,15 @@ static void __init osk_mistral_init(void } elseprintk (KERN_ERR "OSK+Mistral: wakeup button is awol\n" ); +/* LCD: backlight, and power; power controls other devices on the +* board, like the touchscreen, EEPROM, and wakeup (!) switch. +*/ +omap_cfg_reg (PWL ); +if (omap_request_gpio (2 ) ==0 ) { +omap_set_gpio_direction (2 ,0 /* out */ ); +omap_set_gpio_dataout (2 ,1 /* on */ ); + } +platform_add_devices (mistral_devices,ARRAY_SIZE (mistral_devices)); }#else
Tony Lindgren
reviewerPATCH 11/14 ARM: OMAP: H3 workqueue fixes
From: Dirk Behme <[email protected]>
Signed-off-by Dirk Behme <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-h3.c | 12 +++++++----- include/asm-arm/arch-omap/irda.h | 1 + 2 files changed, 8 insertions(+), 5 deletions(-)
arch/arm/mach-omap1/board-h3.c +7 -5
@@ -296,9 +296,11 @@ static int h3_select_irda(struct devicereturn err; } -static void set_trans_mode (void *data) +static void set_trans_mode (struct work_struct *work) { -int *mode = data; +struct omap_irda_config *irda_config = + container_of(work, struct omap_irda_config, gpio_expa.work); +int mode = irda_config->mode;unsigned char expa;int err =0 ;
@@ -308,7 +310,7 @@ static void set_trans_mode(void *data) expa &= ~0x03 ; -if (*mode &IR_SIRMODE ) { +if (mode &IR_SIRMODE ) { expa |=0x01 ; }else {/* MIR/FIR */ expa |=0x03 ;
@@ -323,9 +325,9 @@ static int h3_transceiver_mode(struct de {struct omap_irda_config *irda_config = dev->platform_data; + irda_config->mode = mode;cancel_delayed_work (&irda_config->gpio_expa); -PREPARE_WORK (&irda_config->gpio_expa, set_trans_mode, &mode); -#error this is not permitted - mode is an argument variable +PREPARE_DELAYED_WORK (&irda_config->gpio_expa, set_trans_mode);schedule_delayed_work (&irda_config->gpio_expa,0 );return 0 ;
include/asm-arm/arch-omap/irda.h +1 -0
@@ -31,6 +31,7 @@ struct omap_irda_config {unsigned long src_start;int tx_trigger;int rx_trigger; + int mode; };#endif
Tony Lindgren
reviewerPATCH 12/14 ARM: OMAP: N770: add missing LCD, LCD controller, touchscreen device registration
From: Imre Deak <[email protected]>
These were left out from the board file when merging these drivers, add them here.
Call GPIO init from the board file as well, since the platform device init code uses the GPIO API.
Signed-off-by Imre Deak <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-nokia770.c | 88 ++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/board-nokia770.c +88 -0
@@ -33,9 +33,14 @@#include <asm/arch/dsp_common.h> #include <asm/arch/aic23.h> #include <asm/arch/gpio.h> +#include <asm/arch/omapfb.h> +#include <asm/arch/hwa742.h> +#include <asm/arch/lcd_mipid.h> #include "../plat-omap/dsp/dsp_common.h" +#define ADS7846_PENDOWN_GPIO 15 +static void __init omap_nokia770_init_irq (void ) {/* On Nokia 770, the SleepX signal is masked with an
@@ -96,6 +101,41 @@ static struct platform_device *nokia770_devices[] __initdata = { &nokia770_kp_device, }; +static void mipid_shutdown (struct mipid_platform_data *pdata) +{ +if (pdata->nreset_gpio !=-1 ) { +printk (KERN_INFO "shutdown LCD\n" ); +omap_set_gpio_dataout (pdata->nreset_gpio,0 ); +msleep (120 ); + } +} + +static struct mipid_platform_data nokia770_mipid_platform_data = { + .shutdown = mipid_shutdown, +}; + +static void mipid_dev_init (void ) +{ +const struct omap_lcd_config *conf; + + conf = omap_get_config(OMAP_TAG_LCD, struct omap_lcd_config); +if (conf !=NULL ) { + nokia770_mipid_platform_data.nreset_gpio = conf->nreset_gpio; + nokia770_mipid_platform_data.data_lines = conf->data_lines; + } +} + +static void ads7846_dev_init (void ) +{ +if (omap_request_gpio (ADS7846_PENDOWN_GPIO ) <0 ) +printk (KERN_ERR "can't get ads7846 pen down GPIO\n" ); +} + +static int ads7846_get_pendown_state (void ) +{ +return !omap_get_gpio_datain (ADS7846_PENDOWN_GPIO ); +} +static struct ads7846_platform_data nokia770_ads7846_platform_data__initdata = { .x_max =0x0fff , .y_max =0x0fff ,
@@ -103,6 +143,8 @@ static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata = .pressure_max = 255, .debounce_max = 10, .debounce_tol = 3, + .debounce_rep = 1, + .get_pendown_state = ads7846_get_pendown_state, };static struct spi_board_info nokia770_spi_board_info[]__initdata = {
@@ -111,6 +153,7 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = { .bus_num = 2, .chip_select = 3, .max_speed_hz = 12000000, + .platform_data = &nokia770_mipid_platform_data, }, [1] = { .modalias = "ads7846",
@@ -122,6 +165,47 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = { }, }; +static struct { +struct clk *sys_ck; +} hwa742; + +static int hwa742_get_clocks (void ) +{ + hwa742.sys_ck =clk_get (NULL ,"bclk" ); +if (IS_ERR (hwa742.sys_ck)) { +printk (KERN_ERR "can't get HWA742 clock\n" ); +return PTR_ERR (hwa742.sys_ck); + } +return 0 ; +} + +static unsigned long hwa742_get_clock_rate (struct device *dev) +{ +return clk_get_rate (hwa742.sys_ck); +} + +static void hwa742_power_up (struct device *dev) +{ +clk_enable (hwa742.sys_ck); +} + +static void hwa742_power_down (struct device *dev) +{ +clk_disable (hwa742.sys_ck); +} + +static struct hwa742_platform_data nokia770_hwa742_platform_data = { + .get_clock_rate = hwa742_get_clock_rate, + .power_up = hwa742_power_up, + .power_down = hwa742_power_down, + .te_connected =1 , +}; + +static void hwa742_dev_init (void ) +{ +hwa742_get_clocks (); +omapfb_set_ctrl_platform_data (&nokia770_hwa742_platform_data); +}/* assume no Mini-AB port */
@@ -287,8 +371,12 @@ static void __init omap_nokia770_init(void) ARRAY_SIZE(nokia770_spi_board_info)); omap_board_config = nokia770_config; omap_board_config_size =ARRAY_SIZE (nokia770_config); +omap_gpio_init ();omap_serial_init ();omap_dsp_init (); +hwa742_dev_init (); +ads7846_dev_init (); +mipid_dev_init (); }static void __init omap_nokia770_map_io (void )
Signature · 1 line
1.4.4.2
Tony Lindgren
reviewerPATCH 13/14 ARM: OMAP: TSC2101: add platform init / registration to board files
From: Imre Deak <[email protected]>
H2 / H3 boards use this chip, update their board files.
Signed-off-by Imre Deak <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-h2.c | 77 +++++++++++++++++++++++++++++++++++ arch/arm/mach-omap1/board-h3.c | 88 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/board-h2.c +77 -0
@@ -28,6 +28,9 @@#include <linux/mtd/partitions.h> #include <linux/input.h> #include <linux/workqueue.h> +#include <linux/spi/spi.h> +#include <linux/spi/tsc2101.h> +#include <linux/clk.h> #include <asm/hardware.h> #include <asm/mach-types.h>
@@ -297,6 +300,78 @@ static struct platform_device h2_lcd_device = { .id = -1, }; +struct { +struct clk *mclk; +int initialized; +} h2_tsc2101; + +#define TSC2101_MUX_MCLK_ON R10_1610_MCLK_ON +#define TSC2101_MUX_MCLK_OFF R10_1610_MCLK_OFF + +static int h2_tsc2101_init (struct spi_device *spi) +{ +int r; + +if (h2_tsc2101.initialized) { +printk (KERN_ERR "tsc2101: already initialized\n" ); +return -ENODEV ; + } + +/* Get the MCLK */ + h2_tsc2101.mclk =clk_get (&spi->dev,"mclk" ); +if (IS_ERR (h2_tsc2101.mclk)) { +dev_err (&spi->dev,"unable to get the clock MCLK\n" ); +return PTR_ERR (h2_tsc2101.mclk); + } +if ((r =clk_set_rate (h2_tsc2101.mclk,12000000 )) <0 ) { +dev_err (&spi->dev,"unable to set rate to the MCLK\n" ); + goto err; + } + +omap_cfg_reg (TSC2101_MUX_MCLK_OFF ); +omap_cfg_reg (N15_1610_UWIRE_CS1 ); + +return 0 ; +err: +clk_put (h2_tsc2101.mclk); +return r; +} + +static void h2_tsc2101_cleanup (struct spi_device *spi) +{ +clk_put (h2_tsc2101.mclk); +omap_cfg_reg (TSC2101_MUX_MCLK_OFF ); +} + +static void h2_tsc2101_enable_mclk (struct spi_device *spi) +{ +omap_cfg_reg (TSC2101_MUX_MCLK_ON ); +clk_enable (h2_tsc2101.mclk); +} + +static void h2_tsc2101_disable_mclk (struct spi_device *spi) +{ +clk_disable (h2_tsc2101.mclk); +omap_cfg_reg (R10_1610_MCLK_OFF ); +} + +static struct tsc2101_platform_data h2_tsc2101_platform_data = { + .init = h2_tsc2101_init, + .cleanup = h2_tsc2101_cleanup, + .enable_mclk = h2_tsc2101_enable_mclk, + .disable_mclk = h2_tsc2101_disable_mclk, +}; + +static struct spi_board_info h2_spi_board_info[]__initdata = { + [0 ] = { + .modalias ="tsc2101" , + .bus_num =2 , + .chip_select =1 , + .max_speed_hz =16000000 , + .platform_data = &h2_tsc2101_platform_data, + }, +}; +static struct omap_mcbsp_reg_cfg mcbsp_regs = { .spcr2 =FREE |FRST |GRST |XRST |XINTM (3 ), .spcr1 =RINTM (3 ) |RRST ,
@@ -443,6 +518,8 @@ static void __init h2_init(void)#endif platform_add_devices (h2_devices,ARRAY_SIZE (h2_devices)); +spi_register_board_info (h2_spi_board_info, +ARRAY_SIZE (h2_spi_board_info)); omap_board_config = h2_config; omap_board_config_size =ARRAY_SIZE (h2_config);omap_serial_init ();
arch/arm/mach-omap1/board-h3.c +88 -0
106 lines not on this page · raw message
Signature · 1 line
1.4.4.2
Tony Lindgren
reviewerPATCH 14/14 ARM: OMAP: H2 lcd updates for SPI framework
From: Eduardo Valentin <[email protected]>
This is an updated patch to fix lcd for H2 board. It uses platform_data field to pass spi_device to lcd driver.
Signed-off-by Eduardo Valentin <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-h2.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)
arch/arm/mach-omap1/board-h2.c +13 -1
@@ -308,6 +308,17 @@ struct {#define TSC2101_MUX_MCLK_ON R10_1610_MCLK_ON#define TSC2101_MUX_MCLK_OFF R10_1610_MCLK_OFF +static void h2_lcd_dev_init (struct spi_device *tsc2101) +{ +/* The LCD is connected to the GPIO pins of the TSC2101, so +* we have to tie them here. We can also register the LCD driver +* first only here, where we know that the TSC driver is ready. +*/ + + h2_lcd_device.dev.platform_data = tsc2101; +platform_device_register (&h2_lcd_device); +} +static int h2_tsc2101_init (struct spi_device *spi) {int r;
@@ -331,6 +342,8 @@ static int h2_tsc2101_init(struct spi_device *spi)omap_cfg_reg (TSC2101_MUX_MCLK_OFF );omap_cfg_reg (N15_1610_UWIRE_CS1 ); +h2_lcd_dev_init (spi); +return 0 ; err:clk_put (h2_tsc2101.mclk);
@@ -413,7 +426,6 @@ static struct platform_device *h2_devices[] __initdata = { &h2_smc91x_device, &h2_irda_device, &h2_kp_device, - &h2_lcd_device, &h2_mcbsp1_device, };
Signature · 1 line
1.4.4.2