summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c744
-rw-r--r--recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/defconfig8
3 files changed, 6 insertions, 748 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index e87b56c282..2c5c4f2387 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r48"
+MACHINE_KERNEL_PR = "r49"
KERNEL_IMAGETYPE = "uImage"
diff --git a/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c b/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c
deleted file mode 100644
index c7867bef2f..0000000000
--- a/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c
+++ /dev/null
@@ -1,744 +0,0 @@
-/*
- * linux/arch/arm/mach-omap2/board-omap3beagle.c
- *
- * Copyright (C) 2008 Texas Instruments
- *
- * Modified from mach-omap2/board-3430sdp.c
- *
- * Initial code: Syed Mohammed Khasim
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/leds.h>
-#include <linux/gpio.h>
-#include <linux/input.h>
-#include <linux/gpio_keys.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
-
-#include <mach/mcspi.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
-#include <linux/mma7455l.h>
-
-#include <mach/dmtimer.h>
-#include <linux/backlight.h>
-
-#include <linux/regulator/machine.h>
-#include <linux/i2c/twl4030.h>
-#include <linux/omapfb.h>
-
-#include <mach/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/flash.h>
-
-#include <mach/board.h>
-#include <mach/usb.h>
-#include <mach/common.h>
-#include <mach/gpmc.h>
-#include <mach/nand.h>
-#include <mach/mux.h>
-#include <mach/omap-pm.h>
-#include <mach/clock.h>
-#include <mach/display.h>
-
-#include "twl4030-generic-scripts.h"
-#include "mmc-twl4030.h"
-#include "pm.h"
-#include "omap3-opp.h"
-
-
-#define GPMC_CS0_BASE 0x60
-#define GPMC_CS_SIZE 0x30
-
-#define NAND_BLOCK_SIZE SZ_128K
-
-#define OMAP3_AC_GPIO 136 //Int1 DRDY
-#define OMAP3_TS_GPIO 162
-#define TB_BL_PWM_TIMER 9
-#define TB_KILL_POWER_GPIO 168
-
-static struct mtd_partition omap3beagle_nand_partitions[] = {
- /* All the partition sizes are listed in terms of NAND block size */
- {
- .name = "X-Loader",
- .offset = 0,
- .size = 4 * NAND_BLOCK_SIZE,
- .mask_flags = MTD_WRITEABLE, /* force read-only */
- },
- {
- .name = "U-Boot",
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */
- .size = 15 * NAND_BLOCK_SIZE,
- .mask_flags = MTD_WRITEABLE, /* force read-only */
- },
- {
- .name = "U-Boot Env",
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x260000 */
- .size = 1 * NAND_BLOCK_SIZE,
- },
- {
- .name = "Kernel",
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x280000 */
- .size = 32 * NAND_BLOCK_SIZE,
- },
- {
- .name = "File System",
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x680000 */
- .size = MTDPART_SIZ_FULL,
- },
-};
-
-static struct omap_nand_platform_data omap3beagle_nand_data = {
- .options = NAND_BUSWIDTH_16,
- .parts = omap3beagle_nand_partitions,
- .nr_parts = ARRAY_SIZE(omap3beagle_nand_partitions),
- .dma_channel = -1, /* disable DMA in OMAP NAND driver */
- .nand_setup = NULL,
- .dev_ready = NULL,
-};
-
-static struct resource omap3beagle_nand_resource = {
- .flags = IORESOURCE_MEM,
-};
-
-static struct platform_device omap3beagle_nand_device = {
- .name = "omap2-nand",
- .id = -1,
- .dev = {
- .platform_data = &omap3beagle_nand_data,
- },
- .num_resources = 1,
- .resource = &omap3beagle_nand_resource,
-};
-
-#include "sdram-micron-mt46h32m32lf-6.h"
-
-static struct omap_uart_config omap3_beagle_uart_config __initdata = {
- .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
-};
-
-static struct twl4030_usb_data beagle_usb_data = {
- .usb_mode = T2_USB_MODE_ULPI,
-};
-
-static struct twl4030_hsmmc_info mmc[] = {
- {
- .mmc = 1,
- .wires = 8,
- .gpio_wp = 29,
- },
- {} /* Terminator */
-};
-
-static struct regulator_consumer_supply beagle_vmmc1_supply = {
- .supply = "vmmc",
-};
-
-static struct regulator_consumer_supply beagle_vsim_supply = {
- .supply = "vmmc_aux",
-};
-
-static struct gpio_led gpio_leds[];
-
-static int beagle_twl_gpio_setup(struct device *dev,
- unsigned gpio, unsigned ngpio)
-{
- /* gpio + 0 is "mmc0_cd" (input/IRQ) */
- omap_cfg_reg(AH8_34XX_GPIO29);
- mmc[0].gpio_cd = gpio + 0;
- twl4030_mmc_init(mmc);
-
- /* link regulators to MMC adapters */
- beagle_vmmc1_supply.dev = mmc[0].dev;
- beagle_vsim_supply.dev = mmc[0].dev;
-
- /* REVISIT: need ehci-omap hooks for external VBUS
- * power switch and overcurrent detect
- */
-
-#if 0 /* TODO: This needs to be modified to not rely on u-boot */
- gpio_request(gpio + 1, "EHCI_nOC");
- gpio_direction_input(gpio + 1);
-
- /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
- gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
- gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
-
- /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
- gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
-#endif
- return 0;
-}
-
-static struct twl4030_gpio_platform_data beagle_gpio_data = {
- .gpio_base = OMAP_MAX_GPIO_LINES,
- .irq_base = TWL4030_GPIO_IRQ_BASE,
- .irq_end = TWL4030_GPIO_IRQ_END,
- .use_leds = true,
- .pullups = BIT(1),
- .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13)
- | BIT(15) | BIT(16) | BIT(17),
- .setup = beagle_twl_gpio_setup,
-};
-
-static struct platform_device omap3_beagle_lcd_device = {
- .name = "omap3beagle_lcd",
- .id = -1,
-};
-
-static struct regulator_consumer_supply beagle_vdac_supply = {
- .supply = "vdac",
- .dev = &omap3_beagle_lcd_device.dev,
-};
-
-static struct regulator_consumer_supply beagle_vdvi_supply = {
- .supply = "vdvi",
- .dev = &omap3_beagle_lcd_device.dev,
-};
-
-/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
-static struct regulator_init_data beagle_vmmc1 = {
- .constraints = {
- .min_uV = 1850000,
- .max_uV = 3150000,
- .valid_modes_mask = REGULATOR_MODE_NORMAL
- | REGULATOR_MODE_STANDBY,
- .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
- | REGULATOR_CHANGE_MODE
- | REGULATOR_CHANGE_STATUS,
- },
- .num_consumer_supplies = 1,
- .consumer_supplies = &beagle_vmmc1_supply,
-};
-
-/* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */
-static struct regulator_init_data beagle_vsim = {
- .constraints = {
- .min_uV = 1800000,
- .max_uV = 3000000,
- .valid_modes_mask = REGULATOR_MODE_NORMAL
- | REGULATOR_MODE_STANDBY,
- .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
- | REGULATOR_CHANGE_MODE
- | REGULATOR_CHANGE_STATUS,
- },
- .num_consumer_supplies = 1,
- .consumer_supplies = &beagle_vsim_supply,
-};
-
-/* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */
-static struct regulator_init_data beagle_vdac = {
- .constraints = {
- .min_uV = 1800000,
- .max_uV = 1800000,
- .valid_modes_mask = REGULATOR_MODE_NORMAL
- | REGULATOR_MODE_STANDBY,
- .valid_ops_mask = REGULATOR_CHANGE_MODE
- | REGULATOR_CHANGE_STATUS,
- },
- .num_consumer_supplies = 1,
- .consumer_supplies = &beagle_vdac_supply,
-};
-
-/* VPLL2 for digital video outputs */
-static struct regulator_init_data beagle_vpll2 = {
- .constraints = {
- .name = "VDVI",
- .min_uV = 1800000,
- .max_uV = 1800000,
- .valid_modes_mask = REGULATOR_MODE_NORMAL
- | REGULATOR_MODE_STANDBY,
- .valid_ops_mask = REGULATOR_CHANGE_MODE
- | REGULATOR_CHANGE_STATUS,
- },
- .num_consumer_supplies = 1,
- .consumer_supplies = &beagle_vdvi_supply,
-};
-
-static const struct twl4030_resconfig beagle_resconfig[] = {
- /* disable regulators that u-boot left enabled; the
- * devices' drivers should be managing these.
- */
- { .resource = RES_VAUX3, }, /* not even connected! */
- { .resource = RES_VMMC1, },
- { .resource = RES_VSIM, },
- { .resource = RES_VPLL2, },
- { .resource = RES_VDAC, },
- { .resource = RES_VUSB_1V5, },
- { .resource = RES_VUSB_1V8, },
- { .resource = RES_VUSB_3V1, },
- { 0, },
-};
-
-static struct twl4030_power_data beagle_power_data = {
- .resource_config = beagle_resconfig,
- /* REVISIT can't use GENERIC3430_T2SCRIPTS_DATA;
- * among other things, it makes reboot fail.
- */
-};
-
-static struct twl4030_bci_platform_data touchbook_bci_data = {
- .tblsize = 0,
- .no_backup_battery = 1,
-};
-
-static struct twl4030_platform_data beagle_twldata = {
- .irq_base = TWL4030_IRQ_BASE,
- .irq_end = TWL4030_IRQ_END,
-
- /* platform_data for children goes here */
- .usb = &beagle_usb_data,
- .gpio = &beagle_gpio_data,
- .power = &beagle_power_data,
- .vmmc1 = &beagle_vmmc1,
- .vsim = &beagle_vsim,
- .vdac = &beagle_vdac,
- .vpll2 = &beagle_vpll2,
-
- /* TouchBook BCI */
- .bci = &touchbook_bci_data,
-};
-
-static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = {
- {
- I2C_BOARD_INFO("twl4030", 0x48),
- .flags = I2C_CLIENT_WAKE,
- .irq = INT_34XX_SYS_NIRQ,
- .platform_data = &beagle_twldata,
- },
-};
-
-static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = {
- {
- I2C_BOARD_INFO("bq27200", 0x55),
- },
-};
-
-static int __init omap3_beagle_i2c_init(void)
-{
- /* Standard BeagleBoard bus */
- omap_register_i2c_bus(1, 2600, beagle_i2c_boardinfo,
- ARRAY_SIZE(beagle_i2c_boardinfo));
-
- /* TouchBook keyboard bus */
- omap_register_i2c_bus(3, 100, touchBook_i2c_boardinfo,
- ARRAY_SIZE(touchBook_i2c_boardinfo));
-
- return 0;
-}
-
-static void __init omap3_ads7846_init(void)
-{
- if (gpio_request(OMAP3_TS_GPIO, "ads7846_pen_down")) {
- printk(KERN_ERR "Failed to request GPIO %d for "
- "ads7846 pen down IRQ\n", OMAP3_TS_GPIO);
- return;
- }
-
- gpio_direction_input(OMAP3_TS_GPIO);
- omap_set_gpio_debounce(OMAP3_TS_GPIO, 1);
- omap_set_gpio_debounce_time(OMAP3_TS_GPIO, 0xa);
-}
-
-static struct ads7846_platform_data ads7846_config = {
- .x_min = 100,
- .y_min = 265,
- .x_max = 3950,
- .y_max = 3750,
- .x_plate_ohms = 40,
- .pressure_max = 255,
- .debounce_max = 10,
- .debounce_tol = 5,
- .debounce_rep = 1,
- .gpio_pendown = OMAP3_TS_GPIO,
- .keep_vref_on = 1,
-};
-
-static struct omap2_mcspi_device_config ads7846_mcspi_config = {
- .turbo_mode = 0,
- .single_channel = 1, /* 0: slave, 1: master */
-};
-
-static struct spi_board_info omap3_ads7846_spi_board_info[] __initdata = {
- {
- .modalias = "ads7846",
- .bus_num = 4,
- .chip_select = 0,
- .max_speed_hz = 1500000,
- .controller_data = &ads7846_mcspi_config, //(void *) 161,
- .irq = OMAP_GPIO_IRQ(OMAP3_TS_GPIO),
- .platform_data = &ads7846_config,
- }
-};
-
-static void __init omap3_beagle_init_irq(void)
-{
- omap2_init_common_hw(mt46h32m32lf6_sdrc_params, omap3_mpu_rate_table,
- omap3_dsp_rate_table, omap3_l3_rate_table);
- omap_init_irq();
- omap_gpio_init();
-}
-
-static struct gpio_led gpio_leds[] = {
- {
- .name = "beagleboard::usr0",
- .default_trigger = "heartbeat",
- .gpio = 150,
- },
- {
- .name = "beagleboard::usr1",
- .default_trigger = "mmc0",
- .gpio = 149,
- },
- {
- .name = "beagleboard::pmu_stat",
- .gpio = -EINVAL, /* gets replaced */
- .active_low = true,
- },
-};
-
-static struct gpio_led_platform_data gpio_led_info = {
- .leds = gpio_leds,
- .num_leds = ARRAY_SIZE(gpio_leds),
-};
-
-static struct platform_device leds_gpio = {
- .name = "leds-gpio",
- .id = -1,
- .dev = {
- .platform_data = &gpio_led_info,
- },
-};
-
-static struct gpio_keys_button gpio_buttons[] = {
- {
- .code = BTN_EXTRA,
- .gpio = 7,
- .desc = "user",
- .wakeup = 1,
- },
- {
- .code = KEY_POWER,
- .gpio = 183,
- .desc = "power",
- .wakeup = 1,
- },
-};
-
-static struct gpio_keys_platform_data gpio_key_info = {
- .buttons = gpio_buttons,
- .nbuttons = ARRAY_SIZE(gpio_buttons),
-};
-
-static struct platform_device keys_gpio = {
- .name = "gpio-keys",
- .id = -1,
- .dev = {
- .platform_data = &gpio_key_info,
- },
-};
-
-/* DSS */
-
-static int beagle_enable_dvi(struct omap_display *display)
-{
- if (display->hw_config.panel_reset_gpio != -1)
- gpio_set_value(display->hw_config.panel_reset_gpio, 1);
-
- return 0;
-}
-
-static void beagle_disable_dvi(struct omap_display *display)
-{
- if (display->hw_config.panel_reset_gpio != -1)
- gpio_set_value(display->hw_config.panel_reset_gpio, 0);
-}
-
-static struct omap_dss_display_config beagle_display_data_dvi = {
- .type = OMAP_DISPLAY_TYPE_DPI,
- .name = "dvi",
- .panel_name = "panel-generic",
- .u.dpi.data_lines = 24,
- .panel_reset_gpio = 176,
- .panel_enable = beagle_enable_dvi,
- .panel_disable = beagle_disable_dvi,
-};
-
-
-static int beagle_panel_enable_tv(struct omap_display *display)
-{
-#define ENABLE_VDAC_DEDICATED 0x03
-#define ENABLE_VDAC_DEV_GRP 0x20
-
- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
- ENABLE_VDAC_DEDICATED,
- TWL4030_VDAC_DEDICATED);
- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
- ENABLE_VDAC_DEV_GRP, TWL4030_VDAC_DEV_GRP);
-
- return 0;
-}
-
-static void beagle_panel_disable_tv(struct omap_display *display)
-{
- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00,
- TWL4030_VDAC_DEDICATED);
- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00,
- TWL4030_VDAC_DEV_GRP);
-}
-
-static struct omap_dss_display_config beagle_display_data_tv = {
- .type = OMAP_DISPLAY_TYPE_VENC,
- .name = "tv",
- .u.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
- .panel_enable = beagle_panel_enable_tv,
- .panel_disable = beagle_panel_disable_tv,
-};
-
-static struct omap_dss_board_info beagle_dss_data = {
- .num_displays = 2,
- .displays = {
- &beagle_display_data_dvi,
- &beagle_display_data_tv,
- }
-};
-
-static struct platform_device beagle_dss_device = {
- .name = "omapdss",
- .id = -1,
- .dev = {
- .platform_data = &beagle_dss_data,
- },
-};
-
-static void __init beagle_display_init(void)
-{
- int r;
-
- r = gpio_request(beagle_display_data_dvi.panel_reset_gpio, "DVI reset");
- if (r < 0) {
- printk(KERN_ERR "Unable to get DVI reset GPIO\n");
- return;
- }
-
- gpio_direction_output(beagle_display_data_dvi.panel_reset_gpio, 0);
-}
-
-static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
- { OMAP_TAG_UART, &omap3_beagle_uart_config },
-};
-
-static struct platform_device *omap3_beagle_devices[] __initdata = {
- &beagle_dss_device,
- &leds_gpio,
- &keys_gpio,
-};
-
-static void __init omap3beagle_flash_init(void)
-{
- u8 cs = 0;
- u8 nandcs = GPMC_CS_NUM + 1;
-
- u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;
-
- /* find out the chip-select on which NAND exists */
- while (cs < GPMC_CS_NUM) {
- u32 ret = 0;
- ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
-
- if ((ret & 0xC00) == 0x800) {
- printk(KERN_INFO "Found NAND on CS%d\n", cs);
- if (nandcs > GPMC_CS_NUM)
- nandcs = cs;
- }
- cs++;
- }
-
- if (nandcs > GPMC_CS_NUM) {
- printk(KERN_INFO "NAND: Unable to find configuration "
- "in GPMC\n ");
- return;
- }
-
- if (nandcs < GPMC_CS_NUM) {
- omap3beagle_nand_data.cs = nandcs;
- omap3beagle_nand_data.gpmc_cs_baseaddr = (void *)
- (gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);
- omap3beagle_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add);
-
- printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
- if (platform_device_register(&omap3beagle_nand_device) < 0)
- printk(KERN_ERR "Unable to register NAND device\n");
- }
-}
-
-static void __init omap3_mma7455l_init(void)
-{
- int ret;
-
- ret = gpio_request(OMAP3_AC_GPIO, "mma7455l");
- if (ret < 0) {
- printk(KERN_ERR "Failed to request GPIO %d for mma7455l IRQ\n", OMAP3_AC_GPIO);
- return;
- }
-
- gpio_direction_input(OMAP3_AC_GPIO);
-}
-
-static struct mma7455l_platform_data mma7455l_config = {
- .calibration_x = -4, //26 for Beagleboard
- .calibration_y = 28, //44 for Beagleboard
- .calibration_z = -28, //26 for Beagleboard
-};
-
-static struct omap2_mcspi_device_config mma7455l_mcspi_config = {
- .turbo_mode = 0,
- .single_channel = 1, /* 0: slave, 1: master */
-};
-
-static struct spi_board_info omap3_mma7455l_spi_board_info[] __initdata = {
- {
- .modalias = "mma7455l",
- .bus_num = 3,
- .chip_select = 0,
- .max_speed_hz = 200000,
- .irq = OMAP_GPIO_IRQ(OMAP3_AC_GPIO),
- .controller_data = &mma7455l_mcspi_config, //(void *) 135,
- .platform_data = &mma7455l_config,
- }
-};
-
-static int touchbook_backlight_brightness = 50;
-static struct omap_dm_timer *touchbook_backlight_pwm;
-
-static int touchbook_backlight_read(struct backlight_device *bd)
-{
- return touchbook_backlight_brightness;
-}
-
-static int touchbook_backlight_update(struct backlight_device *bd)
-{
- int value = bd->props.brightness;
- touchbook_backlight_brightness = value;
-
- /* Frequency calculation:
- - For 200Hz PWM, you want to load -164 (=> -32768Hz / 200Hz).
- - Minimum duty cycle for the backlight is 15%.
- - You have (164*0.85) => ~140 levels of brightness.
- */
-
- /* Convert from 0-100 range to 0-140 range */
- value = (value * 14) / 10 / 2;
-
- /* For maximum brightness, just stop the timer... */
- if(value != bd->props.max_brightness)
- {
- omap_dm_timer_set_load(touchbook_backlight_pwm, 1, -164);
- omap_dm_timer_set_match(touchbook_backlight_pwm, 1, -24 - value);
- omap_dm_timer_write_counter(touchbook_backlight_pwm, -1);
- //omap_dm_timer_stop(touchbook_backlight_pwm);
- omap_dm_timer_start(touchbook_backlight_pwm);
- }
- else
- omap_dm_timer_stop(touchbook_backlight_pwm);
-
-
- return 0;
-}
-
-static struct backlight_ops touchbook_backlight_properties = {
- .get_brightness = touchbook_backlight_read,
- .update_status = touchbook_backlight_update,
-};
-
-static void __init omap3_touchbook_backlight_init(void)
-{
- static struct backlight_device *bd;
- bd = backlight_device_register("touchbook", NULL, NULL, &touchbook_backlight_properties);
-
- if(bd)
- {
- touchbook_backlight_pwm = omap_dm_timer_request_specific(TB_BL_PWM_TIMER);
- omap_dm_timer_enable(touchbook_backlight_pwm);
- omap_dm_timer_set_source(touchbook_backlight_pwm, OMAP_TIMER_SRC_32_KHZ);
- omap_dm_timer_set_pwm(touchbook_backlight_pwm, 1, 1, OMAP_TIMER_TRIGGER_OVERFLOW_AND_COMPARE);
-
- bd->props.max_brightness = 100;
- bd->props.brightness = touchbook_backlight_brightness;
- }
-
- touchbook_backlight_update(bd);
-}
-
-static void omap3_touchbook_poweroff(void)
-{
- int r;
-
- r = gpio_request(TB_KILL_POWER_GPIO, "DVI reset");
- if (r < 0) {
- printk(KERN_ERR "Unable to get kill power GPIO\n");
- return;
- }
-
- gpio_direction_output(TB_KILL_POWER_GPIO, 0);
-}
-
-static void __init omap3_beagle_init(void)
-{
- pm_power_off = omap3_touchbook_poweroff;
-
- omap3_beagle_i2c_init();
- platform_add_devices(omap3_beagle_devices,
- ARRAY_SIZE(omap3_beagle_devices));
- omap_board_config = omap3_beagle_config;
- omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
- omap_serial_init();
-
- omap_cfg_reg(J25_34XX_GPIO170);
-
- omap3beagle_flash_init();
- beagle_display_init();
- omap3_touchbook_backlight_init();
-
- /* Touch Book */
- spi_register_board_info(omap3_ads7846_spi_board_info, ARRAY_SIZE(omap3_ads7846_spi_board_info));
- spi_register_board_info(omap3_mma7455l_spi_board_info, ARRAY_SIZE(omap3_mma7455l_spi_board_info));
-
- omap3_ads7846_init();
- omap3_mma7455l_init();
-
- usb_musb_init();
- usb_ehci_init();
-}
-
-static void __init omap3_beagle_map_io(void)
-{
- omap2_set_globals_343x();
- omap2_map_common_io();
-}
-
-MACHINE_START(OMAP3_BEAGLE, "OMAP3 Touch Book")
- /* Maintainer: Gregoire Gentil - http://www.alwaysinnovating.com */
- .phys_io = 0x48000000,
- .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
- .boot_params = 0x80000100,
- .map_io = omap3_beagle_map_io,
- .init_irq = omap3_beagle_init_irq,
- .init_machine = omap3_beagle_init,
- .timer = &omap_timer,
-MACHINE_END
diff --git a/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/defconfig b/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/defconfig
index e628b28d28..e59c557613 100644
--- a/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/defconfig
+++ b/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29-omap1
-# Fri Sep 25 11:38:50 2009
+# Thu Nov 5 13:07:24 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -222,9 +222,10 @@ CONFIG_ARCH_OMAP3430=y
# CONFIG_MACH_OMAP_LDP is not set
# CONFIG_MACH_OMAP_3430SDP is not set
# CONFIG_MACH_OMAP3EVM is not set
-CONFIG_MACH_OMAP3_BEAGLE=y
+# CONFIG_MACH_OMAP3_BEAGLE is not set
# CONFIG_MACH_OVERO is not set
# CONFIG_MACH_OMAP3_PANDORA is not set
+CONFIG_MACH_OMAP3_TOUCHBOOK=y
#
# Processor Type
@@ -1849,7 +1850,7 @@ CONFIG_SND_USB_CAIAQ_INPUT=y
CONFIG_SND_SOC=y
CONFIG_SND_OMAP_SOC=y
CONFIG_SND_OMAP_SOC_MCBSP=y
-CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
+CONFIG_SND_OMAP_SOC_OMAP3_TOUCHBOOK=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_TWL4030=y
@@ -1871,6 +1872,7 @@ CONFIG_USB_HID=y
#
CONFIG_HID_COMPAT=y
CONFIG_HID_A4TECH=y
+CONFIG_HID_AI=y
CONFIG_HID_APPLE=y
CONFIG_HID_BELKIN=y
CONFIG_HID_CHERRY=y
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 09:36:37 +0000