* [PATCH 0/4] ARM: OMAP2: Add support for Gumstix Overo @ 2008-09-01 21:57 sakoman 2008-09-01 21:57 ` [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board sakoman 0 siblings, 1 reply; 22+ messages in thread From: sakoman @ 2008-09-01 21:57 UTC (permalink / raw) To: linux-omap, alsa-devel This patch series adds support for the Gumstix Overo board. Since it includes an ASoC driver I am copying both linux-omap and alsa-devel The first patch adds the basic board files, the second adds an ASoC driver for the TWL4030 codec, the third an ASoC machine driver for the Overo, and the final patch is the Overo defconfig ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board 2008-09-01 21:57 [PATCH 0/4] ARM: OMAP2: Add support for Gumstix Overo sakoman @ 2008-09-01 21:57 ` sakoman 2008-09-01 21:57 ` [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec sakoman ` (3 more replies) 0 siblings, 4 replies; 22+ messages in thread From: sakoman @ 2008-09-01 21:57 UTC (permalink / raw) To: linux-omap, alsa-devel; +Cc: Steve Sakoman From: Steve Sakoman <steve@sakoman.com> This patch adds support for basic features: onenand, uarts, i2c, mmc, rtc, lcd and usb Signed-off-by: Steve Sakoman <steve@sakoman.com> --- arch/arm/mach-omap2/Kconfig | 4 + arch/arm/mach-omap2/Makefile | 4 + arch/arm/mach-omap2/board-overo.c | 236 +++++++++++++++++++++++++ arch/arm/plat-omap/include/mach/board-overo.h | 22 +++ arch/arm/plat-omap/include/mach/hardware.h | 4 + drivers/video/omap/Kconfig | 21 +++ drivers/video/omap/Makefile | 1 + drivers/video/omap/lcd_overo.c | 189 ++++++++++++++++++++ 8 files changed, 481 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap2/board-overo.c create mode 100644 arch/arm/plat-omap/include/mach/board-overo.h create mode 100644 drivers/video/omap/lcd_overo.c diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 365b982..362edfa 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -123,6 +123,10 @@ config MACH_OMAP3_BEAGLE bool "OMAP3 BEAGLE board" depends on ARCH_OMAP3 && ARCH_OMAP34XX +config MACH_OVERO + bool "Gumstix Overo board" + depends on ARCH_OMAP3 && ARCH_OMAP34XX + config OMAP_TICK_GPTIMER int "GPTIMER used for system tick timer" depends on ARCH_OMAP2 || ARCH_OMAP3 diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index d89b7cb..1f6c704 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -75,6 +75,10 @@ obj-$(CONFIG_MACH_NOKIA_N800) += board-n800.o board-n800-flash.o \ board-n800-dsp.o \ board-n800-camera.o obj-$(CONFIG_MACH_NOKIA_N810) += board-n810.o +obj-$(CONFIG_MACH_OVERO) += board-overo.o \ + hsmmc.o \ + usb-musb.o \ + usb-ehci.o # TUSB 6010 chips obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c new file mode 100644 index 0000000..85f5db2 --- /dev/null +++ b/arch/arm/mach-omap2/board-overo.c @@ -0,0 +1,236 @@ +/* + * board-overo.c (Gumstix Overo) + * + * Initial code: Steve Sakoman <steve@sakoman.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <linux/mtd/mtd.h> +#include <linux/mtd/partitions.h> +#include <linux/mtd/nand.h> +#include <linux/mtd/onenand_regs.h> + +#include <asm/mach-types.h> +#include <asm/mach/arch.h> +#include <asm/mach/flash.h> +#include <asm/mach/map.h> + +#include <mach/board.h> +#include <mach/common.h> +#include <mach/gpio.h> +#include <mach/gpmc.h> +#include <mach/hardware.h> +#include <mach/hsmmc.h> +#include <mach/onenand.h> +#include <mach/usb-ehci.h> +#include <mach/usb-musb.h> + +#include "sdram-micron-mt46h32m32lf-6.h" + +#define NAND_BLOCK_SIZE SZ_128K + +#define W2W_NRESET 16 +#define BT_NRESET 164 +#define USBH_CPEN 168 +#define USBH_NRESET 183 + +static struct mtd_partition overo_onenand_partitions[] = { + { + .name = "xloader", + .offset = 0, + .size = 4 * NAND_BLOCK_SIZE, + .mask_flags = MTD_WRITEABLE + }, + { + .name = "uboot", + .offset = MTDPART_OFS_APPEND, + .size = 15 * NAND_BLOCK_SIZE, + }, + { + .name = "params", + .offset = MTDPART_OFS_APPEND, + .size = 1 * NAND_BLOCK_SIZE, + }, + { + .name = "linux", + .offset = MTDPART_OFS_APPEND, + .size = 40 * NAND_BLOCK_SIZE, + }, + { + .name = "jffs2", + .offset = MTDPART_OFS_APPEND, + .size = MTDPART_SIZ_FULL, + }, +}; + +static struct omap_onenand_platform_data overo_onenand_data = { + .parts = overo_onenand_partitions, + .nr_parts = ARRAY_SIZE(overo_onenand_partitions), + .dma_channel = -1, /* disable DMA in OMAP OneNAND driver */ +}; + +static struct platform_device overo_onenand_device = { + .name = "omap2-onenand", + .id = -1, + .dev = { + .platform_data = &overo_onenand_data, + }, +}; + +void __init overo_flash_init(void) +{ + u8 cs = 0; + u8 onenandcs = GPMC_CS_NUM + 1; + + while (cs < GPMC_CS_NUM) { + u32 ret = 0; + ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7); + + if ((ret & 0x3F) == (ONENAND_MAP >> 24)) + onenandcs = cs; + cs++; + } + if (onenandcs > GPMC_CS_NUM) { + printk(KERN_ERR "OneNAND: Unable to find configuration " + " in GPMC\n "); + return; + } + + if (onenandcs < GPMC_CS_NUM) { + overo_onenand_data.cs = onenandcs; + if (platform_device_register(&overo_onenand_device) < 0) + printk(KERN_ERR "Unable to register OneNAND device\n"); + } +} +static struct omap_uart_config overo_uart_config __initdata = { + .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), +}; + +static int __init overo_i2c_init(void) +{ + omap_register_i2c_bus(1, 2600, NULL, 0); + /* i2c2 pins are used for gpio */ + omap_register_i2c_bus(3, 400, NULL, 0); + return 0; +} + +static void __init overo_init_irq(void) +{ + omap2_init_common_hw(mt46h32m32lf6_sdrc_params); + omap_init_irq(); + omap_gpio_init(); +} + +static struct omap_mmc_config overo_mmc_config __initdata = { + .mmc[0] = { + .enabled = 1, + .wire4 = 1, + }, + .mmc[1] = { + .enabled = 1, + .wire4 = 1, + }, +}; + +static struct platform_device overo_twl4030rtc_device = { + .name = "twl4030_rtc", + .id = -1, +}; + +static struct platform_device overo_lcd_device = { + .name = "overo_lcd", + .id = -1, +}; + +static struct omap_lcd_config overo_lcd_config __initdata = { + .ctrl_name = "internal", +}; + +static struct omap_board_config_kernel overo_config[] __initdata = { + { OMAP_TAG_UART, &overo_uart_config }, + { OMAP_TAG_MMC, &overo_mmc_config }, + { OMAP_TAG_LCD, &overo_lcd_config }, +}; + +static struct platform_device *overo_devices[] __initdata = { + &overo_lcd_device, +#ifdef CONFIG_RTC_DRV_TWL4030 + &overo_twl4030rtc_device, +#endif +}; + +static void __init overo_init(void) +{ + + platform_add_devices(overo_devices, ARRAY_SIZE(overo_devices)); + omap_board_config = overo_config; + omap_board_config_size = ARRAY_SIZE(overo_config); + omap_serial_init(); + hsmmc_init(); + usb_musb_init(); + usb_ehci_init(); + overo_flash_init(); + + if ((gpio_request(W2W_NRESET, "W2W_NRESET") == 0) && + (gpio_direction_output(W2W_NRESET, 1) == 0)) { + gpio_export(W2W_NRESET, 0); + gpio_direction_output(W2W_NRESET, 0); + udelay(10); + gpio_direction_output(W2W_NRESET, 1); + } else + printk(KERN_ERR "could not obtain gpio for W2W_NRESET\n"); + + if ((gpio_request(BT_NRESET, "BT_NRESET") == 0) && + (gpio_direction_output(BT_NRESET, 1) == 0)) { + gpio_export(BT_NRESET, 0); + gpio_direction_output(BT_NRESET, 0); + mdelay(6); + gpio_direction_output(BT_NRESET, 1); + } else + printk(KERN_ERR "could not obtain gpio for BT_NRESET\n"); + + if ((gpio_request(USBH_CPEN, "USBH_CPEN") == 0) && + (gpio_direction_output(USBH_CPEN, 1) == 0)) + gpio_export(USBH_CPEN, 0); + else + printk(KERN_ERR "could not obtain gpio for USBH_CPEN\n"); + + if ((gpio_request(USBH_NRESET, "USBH_NRESET") == 0) && + (gpio_direction_output(USBH_NRESET, 1) == 0)) + gpio_export(USBH_NRESET, 0); + else + printk(KERN_ERR "could not obtain gpio for USBH_NRESET\n"); +} + +arch_initcall(overo_i2c_init); + +static void __init overo_map_io(void) +{ + omap2_set_globals_343x(); + omap2_map_common_io(); +} + +MACHINE_START(OVERO, "Gumstix Overo") + .phys_io = 0x48000000, + .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, + .boot_params = 0x80000100, + .map_io = overo_map_io, + .init_irq = overo_init_irq, + .init_machine = overo_init, + .timer = &omap_timer, +MACHINE_END diff --git a/arch/arm/plat-omap/include/mach/board-overo.h b/arch/arm/plat-omap/include/mach/board-overo.h new file mode 100644 index 0000000..0fc14e4 --- /dev/null +++ b/arch/arm/plat-omap/include/mach/board-overo.h @@ -0,0 +1,22 @@ +/* + * board-overo.h (Gumstix Overo) + * + * Initial code: Steve Sakoman <steve@sakoman.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __ASM_ARCH_OVERO_H +#define __ASM_ARCH_OVERO_H + +#define ONENAND_MAP 0x20000000 + +#endif /* ____ASM_ARCH_OVERO_H */ + diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h index 438de80..f859c00 100644 --- a/arch/arm/plat-omap/include/mach/hardware.h +++ b/arch/arm/plat-omap/include/mach/hardware.h @@ -374,6 +374,10 @@ #include "board-sx1.h" #endif +#ifdef CONFIG_MACH_OVERO +#include "board-overo.h" +#endif + #endif /* !__ASSEMBLER__ */ #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig index bdeb8fb..5ebd591 100644 --- a/drivers/video/omap/Kconfig +++ b/drivers/video/omap/Kconfig @@ -7,6 +7,27 @@ config FB_OMAP help Frame buffer driver for OMAP based boards. +choice + depends on FB_OMAP && MACH_OVERO + prompt "Screen resolution" + default FB_OMAP_079M3R + help + Selected desired screen resolution + +config FB_OMAP_031M3R + boolean "640 x 480 @ 60 Hz Reduced blanking" + +config FB_OMAP_048M3R + boolean "800 x 600 @ 60 Hz Reduced blanking" + +config FB_OMAP_079M3R + boolean "1024 x 768 @ 60 Hz Reduced blanking" + +config FB_OMAP_092M9R + boolean "1280 x 720 @ 60 Hz Reduced blanking" + +endchoice + config FB_OMAP_LCDC_EXTERNAL bool "External LCD controller support" depends on FB_OMAP diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile index f9b5cd4..291c46e 100644 --- a/drivers/video/omap/Makefile +++ b/drivers/video/omap/Makefile @@ -35,6 +35,7 @@ objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o +objs-y$(CONFIG_MACH_OVERO) += lcd_overo.o omapfb-objs := $(objs-yy) diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c new file mode 100644 index 0000000..831936d --- /dev/null +++ b/drivers/video/omap/lcd_overo.c @@ -0,0 +1,189 @@ +/* + * LCD panel support for the Gumstix Overo + * + * Author: Steve Sakoman <steve@sakoman.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/i2c/twl4030.h> + +#include <mach/gpio.h> +#include <mach/mux.h> +#include <mach/omapfb.h> +#include <asm/mach-types.h> + +#define LCD_ENABLE 144 + +static int overo_panel_init(struct lcd_panel *panel, + struct omapfb_device *fbdev) +{ + if ((gpio_request(LCD_ENABLE, "LCD_ENABLE") == 0) && + (gpio_direction_output(LCD_ENABLE, 1) == 0)) + gpio_export(LCD_ENABLE, 0); + else + printk(KERN_ERR "could not obtain gpio for LCD_ENABLE\n"); + + return 0; +} + +static void overo_panel_cleanup(struct lcd_panel *panel) +{ +} + +static int overo_panel_enable(struct lcd_panel *panel) +{ + gpio_direction_output(LCD_ENABLE, 1); + return 0; +} + +static void overo_panel_disable(struct lcd_panel *panel) +{ + gpio_direction_output(LCD_ENABLE, 0); +} + +static unsigned long overo_panel_get_caps(struct lcd_panel *panel) +{ + return 0; +} + +struct lcd_panel overo_panel = { + .name = "overo", + .config = OMAP_LCDC_PANEL_TFT, + .bpp = 16, + .data_lines = 24, + +#if defined CONFIG_FB_OMAP_031M3R + + /* 640 x 480 @ 60 Hz Reduced blanking VESA CVT 0.31M3-R */ + .x_res = 640, + .y_res = 480, + .hfp = 48, + .hsw = 32, + .hbp = 80, + .vfp = 3, + .vsw = 4, + .vbp = 7, + .pixel_clock = 23500, + +#elif defined CONFIG_FB_OMAP_048M3R + + /* 800 x 600 @ 60 Hz Reduced blanking VESA CVT 0.48M3-R */ + .x_res = 800, + .y_res = 600, + .hfp = 48, + .hsw = 32, + .hbp = 80, + .vfp = 3, + .vsw = 4, + .vbp = 11, + .pixel_clock = 35500, + +#elif defined CONFIG_FB_OMAP_079M3R + + /* 1024 x 768 @ 60 Hz Reduced blanking VESA CVT 0.79M3-R */ + .x_res = 1024, + .y_res = 768, + .hfp = 48, + .hsw = 32, + .hbp = 80, + .vfp = 3, + .vsw = 4, + .vbp = 15, + .pixel_clock = 56000, + +#elif defined CONFIG_FB_OMAP_092M9R + + /* 1280 x 720 @ 60 Hz Reduced blanking VESA CVT 0.92M9-R */ + .x_res = 1280, + .y_res = 720, + .hfp = 48, + .hsw = 32, + .hbp = 80, + .vfp = 3, + .vsw = 5, + .vbp = 13, + .pixel_clock = 64000, + +#else + + /* use 640 x 480 if no config option */ + /* 640 x 480 @ 60 Hz Reduced blanking VESA CVT 0.31M3-R */ + .x_res = 640, + .y_res = 480, + .hfp = 48, + .hsw = 32, + .hbp = 80, + .vfp = 3, + .vsw = 4, + .vbp = 7, + .pixel_clock = 23500, + +#endif + + .init = overo_panel_init, + .cleanup = overo_panel_cleanup, + .enable = overo_panel_enable, + .disable = overo_panel_disable, + .get_caps = overo_panel_get_caps, +}; + +static int overo_panel_probe(struct platform_device *pdev) +{ + omapfb_register_panel(&overo_panel); + return 0; +} + +static int overo_panel_remove(struct platform_device *pdev) +{ + return 0; +} + +static int overo_panel_suspend(struct platform_device *pdev, + pm_message_t mesg) +{ + return 0; +} + +static int overo_panel_resume(struct platform_device *pdev) +{ + return 0; +} + +struct platform_driver overo_panel_driver = { + .probe = overo_panel_probe, + .remove = overo_panel_remove, + .suspend = overo_panel_suspend, + .resume = overo_panel_resume, + .driver = { + .name = "overo_lcd", + .owner = THIS_MODULE, + }, +}; + +static int __init overo_panel_drv_init(void) +{ + return platform_driver_register(&overo_panel_driver); +} + +static void __exit overo_panel_drv_exit(void) +{ + platform_driver_unregister(&overo_panel_driver); +} + +module_init(overo_panel_drv_init); +module_exit(overo_panel_drv_exit); -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-01 21:57 ` [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board sakoman @ 2008-09-01 21:57 ` sakoman 2008-09-01 21:57 ` [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo sakoman 2008-09-02 11:26 ` [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec Mark Brown 2008-09-02 0:46 ` [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board Felipe Balbi ` (2 subsequent siblings) 3 siblings, 2 replies; 22+ messages in thread From: sakoman @ 2008-09-01 21:57 UTC (permalink / raw) To: linux-omap, alsa-devel; +Cc: Steve Sakoman From: Steve Sakoman <steve@sakoman.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> --- sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/twl4030.c | 618 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/twl4030.h | 152 +++++++++++ 4 files changed, 777 insertions(+), 0 deletions(-) create mode 100644 sound/soc/codecs/twl4030.c create mode 100644 sound/soc/codecs/twl4030.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 1db04a2..2f00e1e 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -50,3 +50,8 @@ config SND_SOC_CS4270_VD33_ERRATA config SND_SOC_TLV320AIC3X tristate depends on I2C + +config SND_SOC_TWL4030 + tristate + depends on SND_SOC && I2C + diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index d7b97ab..a519ced 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -10,6 +10,7 @@ snd-soc-wm9712-objs := wm9712.o snd-soc-wm9713-objs := wm9713.o snd-soc-cs4270-objs := cs4270.o snd-soc-tlv320aic3x-objs := tlv320aic3x.o +snd-soc-twl4030-objs := twl4030.o obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o @@ -23,3 +24,4 @@ obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o obj-$(CONFIG_SND_SOC_TLV320AIC3X) += snd-soc-tlv320aic3x.o +obj-$(CONFIG_SND_SOC_TWL4030) += snd-soc-twl4030.o diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c new file mode 100644 index 0000000..e2917e3 --- /dev/null +++ b/sound/soc/codecs/twl4030.c @@ -0,0 +1,618 @@ +/* + * ALSA SoC TWL4030 codec driver + * + * Author: Steve Sakoman, <steve@sakoman.com> + * + * 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/module.h> +#include <linux/moduleparam.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/pm.h> +#include <linux/i2c.h> +#include <linux/platform_device.h> +#include <linux/i2c/twl4030.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/initval.h> + +#include "twl4030.h" + +/* + * twl4030 register cache & default register settings + */ +static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = { + 0x00, /* this register not used */ + 0x93, /* REG_CODEC_MODE (0x1) */ + 0xc3, /* REG_OPTION (0x2) */ + 0x00, /* REG_UNKNOWN (0x3) */ + 0x00, /* REG_MICBIAS_CTL (0x4) */ + 0x34, /* REG_ANAMICL (0x5) */ + 0x14, /* REG_ANAMICR (0x6) */ + 0x0a, /* REG_AVADC_CTL (0x7) */ + 0x00, /* REG_ADCMICSEL (0x8) */ + 0x00, /* REG_DIGMIXING (0x9) */ + 0x0c, /* REG_ATXL1PGA (0xA) */ + 0x0c, /* REG_ATXR1PGA (0xB) */ + 0x00, /* REG_AVTXL2PGA (0xC) */ + 0x00, /* REG_AVTXR2PGA (0xD) */ + 0x01, /* REG_AUDIO_IF (0xE) */ + 0x00, /* REG_VOICE_IF (0xF) */ + 0x00, /* REG_ARXR1PGA (0x10) */ + 0x00, /* REG_ARXL1PGA (0x11) */ + 0x6c, /* REG_ARXR2PGA (0x12) */ + 0x6c, /* REG_ARXL2PGA (0x13) */ + 0x00, /* REG_VRXPGA (0x14) */ + 0x00, /* REG_VSTPGA (0x15) */ + 0x00, /* REG_VRX2ARXPGA (0x16) */ + 0x0c, /* REG_AVDAC_CTL (0x17) */ + 0x00, /* REG_ARX2VTXPGA (0x18) */ + 0x00, /* REG_ARXL1_APGA_CTL (0x19) */ + 0x00, /* REG_ARXR1_APGA_CTL (0x1A) */ + 0x4b, /* REG_ARXL2_APGA_CTL (0x1B) */ + 0x4b, /* REG_ARXR2_APGA_CTL (0x1C) */ + 0x00, /* REG_ATX2ARXPGA (0x1D) */ + 0x00, /* REG_BT_IF (0x1E) */ + 0x00, /* REG_BTPGA (0x1F) */ + 0x00, /* REG_BTSTPGA (0x20) */ + 0x00, /* REG_EAR_CTL (0x21) */ + 0x24, /* REG_HS_SEL (0x22) */ + 0x0a, /* REG_HS_GAIN_SET (0x23) */ + 0x00, /* REG_HS_POPN_SET (0x24) */ + 0x00, /* REG_PREDL_CTL (0x25) */ + 0x00, /* REG_PREDR_CTL (0x26) */ + 0x00, /* REG_PRECKL_CTL (0x27) */ + 0x00, /* REG_PRECKR_CTL (0x28) */ + 0x00, /* REG_HFL_CTL (0x29) */ + 0x00, /* REG_HFR_CTL (0x2A) */ + 0x00, /* REG_ALC_CTL (0x2B) */ + 0x00, /* REG_ALC_SET1 (0x2C) */ + 0x00, /* REG_ALC_SET2 (0x2D) */ + 0x00, /* REG_BOOST_CTL (0x2E) */ + 0x01, /* REG_SOFTVOL_CTL (0x2F) */ + 0x00, /* REG_DTMF_FREQSEL (0x30) */ + 0x00, /* REG_DTMF_TONEXT1H (0x31) */ + 0x00, /* REG_DTMF_TONEXT1L (0x32) */ + 0x00, /* REG_DTMF_TONEXT2H (0x33) */ + 0x00, /* REG_DTMF_TONEXT2L (0x34) */ + 0x00, /* REG_DTMF_TONOFF (0x35) */ + 0x00, /* REG_DTMF_WANONOFF (0x36) */ + 0x00, /* REG_I2S_RX_SCRAMBLE_H (0x37) */ + 0x00, /* REG_I2S_RX_SCRAMBLE_M (0x38) */ + 0x00, /* REG_I2S_RX_SCRAMBLE_L (0x39) */ + 0x16, /* REG_APLL_CTL (0x3A) */ + 0x00, /* REG_DTMF_CTL (0x3B) */ + 0x00, /* REG_DTMF_PGA_CTL2 (0x3C) */ + 0x00, /* REG_DTMF_PGA_CTL1 (0x3D) */ + 0x00, /* REG_MISC_SET_1 (0x3E) */ + 0x00, /* REG_PCMBTMUX (0x3F) */ + 0x00, /* not used (0x40) */ + 0x00, /* not used (0x41) */ + 0x00, /* not used (0x42) */ + 0x00, /* REG_RX_PATH_SEL (0x43) */ + 0x00, /* REG_VDL_APGA_CTL (0x44) */ + 0x00, /* REG_VIBRA_CTL (0x45) */ + 0x00, /* REG_VIBRA_SET (0x46) */ + 0x00, /* REG_VIBRA_PWM_SET (0x47) */ + 0x00, /* REG_ANAMIC_GAIN (0x48) */ + 0x00, /* REG_MISC_SET_2 (0x49) */ +}; + +static void twl4030_dump_registers(void) +{ + int i = 0; + u8 data; + + printk(KERN_INFO "TWL 4030 Register dump for Audio Module\n"); + + for (i = REG_CODEC_MODE; i <= REG_MISC_SET_2; i++) { + twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &data, i); + printk(KERN_INFO "Register[0x%02x]=0x%02x\n", i, data); + } +} + +struct twl4030_priv { + unsigned int dummy; +}; + +/* + * read twl4030 register cache + */ +static inline unsigned int twl4030_read_reg_cache(struct snd_soc_codec *codec, + unsigned int reg) +{ + u8 *cache = codec->reg_cache; + + return cache[reg]; +} + +/* + * write twl4030 register cache + */ +static inline void twl4030_write_reg_cache(struct snd_soc_codec *codec, + u8 reg, u8 value) +{ + u8 *cache = codec->reg_cache; + + if (reg >= TWL4030_CACHEREGNUM) + return; + cache[reg] = value; +} + +/* + * write to the twl4030 register space + */ +static int twl4030_write(struct snd_soc_codec *codec, + unsigned int reg, unsigned int value) +{ + twl4030_write_reg_cache(codec, reg, value); + return twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, value, reg); +} + +static void twl4030_init_chip(void) +{ + unsigned char byte; + int i; + + twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, + twl4030_reg[REG_CODEC_MODE] & 0xfd, REG_CODEC_MODE); + + udelay(10); /* delay for power settling */ + + for (i = REG_OPTION; i <= REG_MISC_SET_2; i++) + twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, + twl4030_reg[i], i); + + twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, + twl4030_reg[REG_CODEC_MODE], REG_CODEC_MODE); + + udelay(10); /* delay for power settling */ + + /* initiate offset cancellation */ + twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, + twl4030_reg[REG_ANAMICL] | 0x80, REG_ANAMICL); + + /* wait for offset cancellation to complete */ + twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &byte, REG_ANAMICL); + while ((byte & 0x80) == 0x80) + twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, + &byte, REG_ANAMICL); + + twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, + twl4030_reg[REG_MISC_SET_1] | 0x02, REG_MISC_SET_1); + +} + +static const struct snd_kcontrol_new twl4030_snd_controls[] = { + SOC_DOUBLE_R("Master Playback Volume", + REG_ARXL2PGA, REG_ARXR2PGA, + 0, 127, 0), + SOC_DOUBLE_R("Capture Volume", + REG_ATXL1PGA, REG_ATXR1PGA, + 0, 127, 0), +}; + +/* add non dapm controls */ +static int twl4030_add_controls(struct snd_soc_codec *codec) +{ + int err, i; + + for (i = 0; i < ARRAY_SIZE(twl4030_snd_controls); i++) { + err = snd_ctl_add(codec->card, + snd_soc_cnew(&twl4030_snd_controls[i], + codec, NULL)); + if (err < 0) + return err; + } + + return 0; +} + +static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { + SND_SOC_DAPM_INPUT("INL"), + SND_SOC_DAPM_INPUT("INR"), + + SND_SOC_DAPM_OUTPUT("OUTL"), + SND_SOC_DAPM_OUTPUT("OUTR"), + + SND_SOC_DAPM_DAC("DACL", "Left Playback", SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_DAC("DACR", "Right Playback", SND_SOC_NOPM, 0, 0), + + SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0), +}; + +static const struct snd_soc_dapm_route intercon[] = { + /* outputs */ + {"OUTL", NULL, "DACL"}, + {"OUTR", NULL, "DACR"}, + + /* inputs */ + {"ADCL", NULL, "INL"}, + {"ADCR", NULL, "INR"}, +}; + +static int twl4030_add_widgets(struct snd_soc_codec *codec) +{ + snd_soc_dapm_new_controls(codec, twl4030_dapm_widgets, + ARRAY_SIZE(twl4030_dapm_widgets)); + + snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); + + snd_soc_dapm_new_widgets(codec); + return 0; +} + +static int twl4030_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + + printk(KERN_INFO "TWL4030 Audio Codec set bias level\n"); + switch (level) { + case SND_SOC_BIAS_ON: + break; + case SND_SOC_BIAS_PREPARE: + break; + case SND_SOC_BIAS_STANDBY: + break; + case SND_SOC_BIAS_OFF: + break; + } + codec->bias_level = level; + + return 0; +} + +static void twl4030_power_up(struct snd_soc_codec *codec, u8 mode) +{ + u8 popn, hsgain; + + twl4030_write(codec, REG_CODEC_MODE, mode & ~CODECPDZ); + twl4030_write(codec, REG_CODEC_MODE, mode | CODECPDZ); + udelay(10); + + popn = twl4030_read_reg_cache(codec, REG_HS_POPN_SET); + popn &= RAMP_DELAY; + popn |= VMID_EN | RAMP_DELAY_161MS; + twl4030_write(codec, REG_HS_POPN_SET, popn); + + hsgain = HSR_GAIN_0DB | HSL_GAIN_0DB; + twl4030_write(codec, REG_HS_GAIN_SET, hsgain); + + popn |= RAMP_EN; + twl4030_write(codec, REG_HS_POPN_SET, popn); +} + +static void twl4030_power_down(struct snd_soc_codec *codec) +{ + u8 popn, hsgain, mode; + + popn = twl4030_read_reg_cache(codec, REG_HS_POPN_SET); + popn &= ~RAMP_EN; + twl4030_write(codec, REG_HS_POPN_SET, popn); + + hsgain = HSR_GAIN_PWR_DOWN | HSL_GAIN_PWR_DOWN; + twl4030_write(codec, REG_HS_GAIN_SET, hsgain); + + popn &= ~VMID_EN; + twl4030_write(codec, REG_HS_POPN_SET, popn); + + mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); + mode &= ~CODECPDZ; + twl4030_write(codec, REG_CODEC_MODE, mode); + udelay(10); +} + + +static int twl4030_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_device *socdev = rtd->socdev; + struct snd_soc_codec *codec = socdev->codec; + struct twl4030_priv *twl4030 = codec->private_data; + u8 mode, old_mode, format, old_format; + + + /* bit rate */ + old_mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE) & ~CODECPDZ; + mode = old_mode; + mode &= ~APLL_RATE; + switch (params_rate(params)) { + case 44100: + mode |= APLL_RATE_44100; + break; + case 48000: + mode |= APLL_RATE_48000; + break; + default: + printk(KERN_INFO "TWL4030 hw params: unknown rate %d\n", + params_rate(params)); + return -EINVAL; + } + + if (mode != old_mode) { + /* change rate and turn codec back on */ + twl4030_write(codec, REG_CODEC_MODE, mode); + mode |= CODECPDZ; + twl4030_write(codec, REG_CODEC_MODE, mode); + } + + /* sample size */ + old_format = twl4030_read_reg_cache(codec, REG_AUDIO_IF); + format = old_format; + format &= ~DATA_WIDTH; + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + format |= DATA_WIDTH_16S_16W; + break; + case SNDRV_PCM_FORMAT_S24_LE: + format |= DATA_WIDTH_32S_24W; + break; + default: + printk(KERN_INFO "TWL4030 hw params: unknown format %d\n", + params_format(params)); + return -EINVAL; + } + + if (format != old_format) { + + /* turn off codec before changing format */ + mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); + mode &= ~CODECPDZ; + twl4030_write(codec, REG_CODEC_MODE, mode); + + /* change format */ + twl4030_write(codec, REG_AUDIO_IF, format); + + /* turn on codec */ + mode |= CODECPDZ; + twl4030_write(codec, REG_CODEC_MODE, mode); + } + return 0; +} + +static int twl4030_mute(struct snd_soc_dai *dai, int mute) +{ + struct snd_soc_codec *codec = dai->codec; + + u8 ldac_reg = twl4030_read_reg_cache(codec, REG_ARXL2PGA); + u8 rdac_reg = twl4030_read_reg_cache(codec, REG_ARXR2PGA); + + if (mute) { + twl4030_write(codec, REG_ARXL2PGA, 0x00); + twl4030_write(codec, REG_ARXR2PGA, 0x00); + twl4030_write_reg_cache(codec, REG_ARXL2PGA, ldac_reg); + twl4030_write_reg_cache(codec, REG_ARXR2PGA, rdac_reg); + } else { + twl4030_write(codec, REG_ARXL2PGA, ldac_reg); + twl4030_write(codec, REG_ARXR2PGA, rdac_reg); + } + + return 0; +} + +static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct twl4030_priv *twl4030 = codec->private_data; + u8 mode, old_format, format; + + /* get format */ + old_format = twl4030_read_reg_cache(codec, REG_AUDIO_IF); + format = old_format; + + /* set master/slave audio interface */ + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBM_CFM: + format &= ~(AIF_SLAVE_EN); + format |= CLK256FS_EN; + break; + case SND_SOC_DAIFMT_CBS_CFS: + format &= ~(CLK256FS_EN); + format |= AIF_SLAVE_EN; + break; + default: + return -EINVAL; + } + + /* interface format */ + format &= ~AIF_FORMAT; + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + /* printk(KERN_INFO "TWL4030 set dai fmt: i2s\n"); */ + format |= AIF_FORMAT_CODEC; + break; + default: + return -EINVAL; + } + + if (format != old_format) { + + /* turn off codec before changing format */ + mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); + mode &= ~CODECPDZ; + twl4030_write(codec, REG_CODEC_MODE, mode); + + /* change format */ + twl4030_write(codec, REG_AUDIO_IF, format); + + mode |= CODECPDZ; + twl4030_write(codec, REG_CODEC_MODE, mode); + } + + return 0; +} + +#define TWL4030_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) +#define TWL4030_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE) + +struct snd_soc_dai twl4030_dai = { + .name = "twl4030", + .playback = { + .stream_name = "Playback", + .channels_min = 2, + .channels_max = 2, + .rates = TWL4030_RATES, + .formats = TWL4030_FORMATS,}, + .capture = { + .stream_name = "Capture", + .channels_min = 2, + .channels_max = 2, + .rates = TWL4030_RATES, + .formats = TWL4030_FORMATS,}, + .ops = { + .hw_params = twl4030_hw_params, + }, + .dai_ops = { + .digital_mute = twl4030_mute, + .set_fmt = twl4030_set_dai_fmt, + } +}; +EXPORT_SYMBOL_GPL(twl4030_dai); + +static int twl4030_suspend(struct platform_device *pdev, pm_message_t state) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->codec; + + printk(KERN_INFO "TWL4030 Audio Codec suspend\n"); + twl4030_set_bias_level(codec, SND_SOC_BIAS_OFF); + + return 0; +} + +static int twl4030_resume(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->codec; + int i; + u16 *cache = codec->reg_cache; + + printk(KERN_INFO "TWL4030 Audio Codec resume\n"); + /* Sync reg_cache with the hardware */ + for (i = REG_CODEC_MODE; i <= REG_MISC_SET_2; i++) + twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, cache[i], i); + + twl4030_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + twl4030_set_bias_level(codec, codec->suspend_bias_level); + return 0; +} + +/* + * initialize the driver + * register the mixer and dsp interfaces with the kernel + */ + +static int twl4030_init(struct snd_soc_device *socdev) +{ + struct snd_soc_codec *codec = socdev->codec; + int ret = 0; + + printk(KERN_INFO "TWL4030 Audio Codec init \n"); + + codec->name = "twl4030"; + codec->owner = THIS_MODULE; + codec->read = twl4030_read_reg_cache; + codec->write = twl4030_write; + codec->set_bias_level = twl4030_set_bias_level; + codec->dai = &twl4030_dai; + codec->num_dai = 1; + codec->reg_cache_size = sizeof(twl4030_reg); + codec->reg_cache = kmemdup(twl4030_reg, sizeof(twl4030_reg), + GFP_KERNEL); + if (codec->reg_cache == NULL) + return -ENOMEM; + + /* register pcms */ + ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); + if (ret < 0) { + printk(KERN_ERR "twl4030: failed to create pcms\n"); + goto pcm_err; + } + + twl4030_add_controls(codec); + twl4030_add_widgets(codec); + + ret = snd_soc_register_card(socdev); + if (ret < 0) { + printk(KERN_ERR "twl4030: failed to register card\n"); + goto card_err; + } + + twl4030_init_chip(); + twl4030_power_up(codec, APLL_RATE_44100 | OPT_MODE); + + return ret; + +card_err: + printk(KERN_INFO "TWL4030 Audio Codec init card error\n"); + snd_soc_free_pcms(socdev); + snd_soc_dapm_free(socdev); +pcm_err: + printk(KERN_INFO "TWL4030 Audio Codec init pcm error\n"); + kfree(codec->reg_cache); + return ret; +} + +static struct snd_soc_device *twl4030_socdev; + +static int twl4030_probe(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec; + struct twl4030_priv *twl4030; + + codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); + if (codec == NULL) + return -ENOMEM; + + twl4030 = kzalloc(sizeof(struct twl4030_priv), GFP_KERNEL); + if (twl4030 == NULL) { + kfree(codec); + return -ENOMEM; + } + + codec->private_data = twl4030; + socdev->codec = codec; + mutex_init(&codec->mutex); + INIT_LIST_HEAD(&codec->dapm_widgets); + INIT_LIST_HEAD(&codec->dapm_paths); + + twl4030_socdev = socdev; + twl4030_init(socdev); + + return 0; +} + +static int twl4030_remove(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->codec; + + printk(KERN_INFO "TWL4030 Audio Codec remove\n"); + kfree(codec->private_data); + kfree(codec); + + return 0; +} + +struct snd_soc_codec_device soc_codec_dev_twl4030 = { + .probe = twl4030_probe, + .remove = twl4030_remove, + .suspend = twl4030_suspend, + .resume = twl4030_resume, +}; +EXPORT_SYMBOL_GPL(soc_codec_dev_twl4030); + +MODULE_DESCRIPTION("ASoC TWL4030 codec driver"); +MODULE_AUTHOR("Steve Sakoman"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/twl4030.h b/sound/soc/codecs/twl4030.h new file mode 100644 index 0000000..73afbd8 --- /dev/null +++ b/sound/soc/codecs/twl4030.h @@ -0,0 +1,152 @@ +/* + * ALSA SoC TWL4030 codec driver + * + * Author: Steve Sakoman, <steve@sakoman.com> + * + * 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 __TWL4030_AUDIO_H__ +#define __TWL4030_AUDIO_H__ + +#define REG_CODEC_MODE 0x1 +#define REG_OPTION 0x2 +#define REG_UNKNOWN 0x3 +#define REG_MICBIAS_CTL 0x4 +#define REG_ANAMICL 0x5 +#define REG_ANAMICR 0x6 +#define REG_AVADC_CTL 0x7 +#define REG_ADCMICSEL 0x8 +#define REG_DIGMIXING 0x9 +#define REG_ATXL1PGA 0xA +#define REG_ATXR1PGA 0xB +#define REG_AVTXL2PGA 0xC +#define REG_AVTXR2PGA 0xD +#define REG_AUDIO_IF 0xE +#define REG_VOICE_IF 0xF +#define REG_ARXR1PGA 0x10 +#define REG_ARXL1PGA 0x11 +#define REG_ARXR2PGA 0x12 +#define REG_ARXL2PGA 0x13 +#define REG_VRXPGA 0x14 +#define REG_VSTPGA 0x15 +#define REG_VRX2ARXPGA 0x16 +#define REG_AVDAC_CTL 0x17 +#define REG_ARX2VTXPGA 0x18 +#define REG_ARXL1_APGA_CTL 0x19 +#define REG_ARXR1_APGA_CTL 0x1A +#define REG_ARXL2_APGA_CTL 0x1B +#define REG_ARXR2_APGA_CTL 0x1C +#define REG_ATX2ARXPGA 0x1D +#define REG_BT_IF 0x1E +#define REG_BTPGA 0x1F +#define REG_BTSTPGA 0x20 +#define REG_EAR_CTL 0x21 +#define REG_HS_SEL 0x22 +#define REG_HS_GAIN_SET 0x23 +#define REG_HS_POPN_SET 0x24 +#define REG_PREDL_CTL 0x25 +#define REG_PREDR_CTL 0x26 +#define REG_PRECKL_CTL 0x27 +#define REG_PRECKR_CTL 0x28 +#define REG_HFL_CTL 0x29 +#define REG_HFR_CTL 0x2A +#define REG_ALC_CTL 0x2B +#define REG_ALC_SET1 0x2C +#define REG_ALC_SET2 0x2D +#define REG_BOOST_CTL 0x2E +#define REG_SOFTVOL_CTL 0x2F +#define REG_DTMF_FREQSEL 0x30 +#define REG_DTMF_TONEXT1H 0x31 +#define REG_DTMF_TONEXT1L 0x32 +#define REG_DTMF_TONEXT2H 0x33 +#define REG_DTMF_TONEXT2L 0x34 +#define REG_DTMF_TONOFF 0x35 +#define REG_DTMF_WANONOFF 0x36 +#define REG_I2S_RX_SCRAMBLE_H 0x37 +#define REG_I2S_RX_SCRAMBLE_M 0x38 +#define REG_I2S_RX_SCRAMBLE_L 0x39 +#define REG_APLL_CTL 0x3A +#define REG_DTMF_CTL 0x3B +#define REG_DTMF_PGA_CTL2 0x3C +#define REG_DTMF_PGA_CTL1 0x3D +#define REG_MISC_SET_1 0x3E +#define REG_PCMBTMUX 0x3F +#define REG_RX_PATH_SEL 0x43 +#define REG_VDL_APGA_CTL 0x44 +#define REG_VIBRA_CTL 0x45 +#define REG_VIBRA_SET 0x46 +#define REG_VIBRA_PWM_SET 0x47 +#define REG_ANAMIC_GAIN 0x48 +#define REG_MISC_SET_2 0x49 + +#define TWL4030_CACHEREGNUM (REG_MISC_SET_2 + 1) + +/* Bitfield Definitions */ + +/* CODEC_MODE (0x01) Fields */ + +#define APLL_RATE 0xF0 +#define APLL_RATE_8000 0x00 +#define APLL_RATE_11025 0x10 +#define APLL_RATE_12000 0x20 +#define APLL_RATE_16000 0x40 +#define APLL_RATE_22050 0x50 +#define APLL_RATE_24000 0x60 +#define APLL_RATE_32000 0x80 +#define APLL_RATE_44100 0x90 +#define APLL_RATE_48000 0xa0 +#define SEL_16K 0x04 +#define CODECPDZ 0x02 +#define OPT_MODE 0x01 + +/* AUDIO_IF (0x0E) Fields */ + +#define AIF_SLAVE_EN 0x80 +#define DATA_WIDTH 0x60 +#define DATA_WIDTH_16S_16W 0x00 +#define DATA_WIDTH_32S_16W 0x40 +#define DATA_WIDTH_32S_24W 0x60 +#define AIF_FORMAT 0x18 +#define AIF_FORMAT_CODEC 0x00 +#define AIF_FORMAT_LEFT 0x08 +#define AIF_FORMAT_RIGHT 0x10 +#define AIF_FORMAT_TDM 0x18 +#define AIF_TRI_EN 0x04 +#define CLK256FS_EN 0x02 +#define AIF_EN 0x01 + +/* HS_GAIN_SET (0x23) Fields */ + +#define HSR_GAIN 0x0c +#define HSR_GAIN_PWR_DOWN 0x00 +#define HSR_GAIN_PLUS_6DB 0x04 +#define HSR_GAIN_0DB 0x08 +#define HSR_GAIN_MINUS_6DB 0x0c +#define HSL_GAIN 0x0c +#define HSL_GAIN_PWR_DOWN 0x00 +#define HSL_GAIN_PLUS_6DB 0x01 +#define HSL_GAIN_0DB 0x02 +#define HSL_GAIN_MINUS_6DB 0x03 + +/* HS_POPN_SET (0x24) Fields */ + +#define VMID_EN 0x40 +#define EXTMUTE 0x20 +#define RAMP_DELAY 0x1C +#define RAMP_DELAY_20MS 0x00 +#define RAMP_DELAY_40MS 0x04 +#define RAMP_DELAY_81MS 0x08 +#define RAMP_DELAY_161MS 0x0c +#define RAMP_DELAY_323MS 0x10 +#define RAMP_DELAY_645MS 0x14 +#define RAMP_DELAY_1291MS 0x18 +#define RAMP_DELAY_2581MS 0x1c +#define RAMP_EN 0x02 + +extern struct snd_soc_dai twl4030_dai; +extern struct snd_soc_codec_device soc_codec_dev_twl4030; + +#endif /* End of __TWL4030_AUDIO_H__ */ -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo 2008-09-01 21:57 ` [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec sakoman @ 2008-09-01 21:57 ` sakoman 2008-09-01 21:57 ` [PATCH 4/4] ARM: OMAP2: deconfig for the Gumstix Overo board sakoman 2008-09-02 11:29 ` [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo Mark Brown 2008-09-02 11:26 ` [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec Mark Brown 1 sibling, 2 replies; 22+ messages in thread From: sakoman @ 2008-09-01 21:57 UTC (permalink / raw) To: linux-omap, alsa-devel; +Cc: Steve Sakoman From: Steve Sakoman <steve@sakoman.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> --- sound/soc/omap/Kconfig | 9 +++ sound/soc/omap/Makefile | 5 ++ sound/soc/omap/overo.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+), 0 deletions(-) create mode 100644 sound/soc/omap/overo.c diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index aea27e7..d7b8939 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -13,3 +13,12 @@ config SND_OMAP_SOC_N810 select SND_SOC_TLV320AIC3X help Say Y if you want to add support for SoC audio on Nokia N810. + +config SND_OMAP_SOC_OVERO + tristate "SoC Audio support for Gumstix Overo" + depends on SND_OMAP_SOC && MACH_OVERO + select SND_OMAP_SOC_MCBSP + select SND_SOC_TWL4030 + help + Say Y if you want to add support for SoC audio on the Gumstix Overo. + diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index d8d8d58..159f7a0 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -7,5 +7,10 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o # OMAP Machine Support snd-soc-n810-objs := n810.o +snd-soc-omap3evm-objs := omap3evm.o +snd-soc-omap3beagle-objs := omap3beagle.o +snd-soc-overo-objs := overo.o obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o +obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o + diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c new file mode 100644 index 0000000..d660dc8 --- /dev/null +++ b/sound/soc/omap/overo.c @@ -0,0 +1,141 @@ +/* + * overo.c -- SoC audio for Gumstix Overo + * + * Author: Steve Sakoman <steve@sakoman.com> + * + * 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. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#include <linux/clk.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> + +#include <asm/mach-types.h> +#include <mach/hardware.h> +#include <mach/gpio.h> +#include <mach/mcbsp.h> + +#include "omap-mcbsp.h" +#include "omap-pcm.h" +#include "../codecs/twl4030.h" + +static int overo_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; + struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; + int ret; + + /* Set codec DAI configuration */ + ret = snd_soc_dai_set_fmt(codec_dai, + SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (ret < 0) { + printk(KERN_ERR "can't set codec DAI configuration\n"); + return ret; + } + + /* Set cpu DAI configuration */ + ret = snd_soc_dai_set_fmt(cpu_dai, + SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (ret < 0) { + printk(KERN_ERR "can't set cpu DAI configuration\n"); + return ret; + } + + return 0; +} + +static struct snd_soc_ops overo_ops = { + .hw_params = overo_hw_params, +}; + +/* Digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link overo_dai = { + .name = "TWL4030", + .stream_name = "TWL4030", + .cpu_dai = &omap_mcbsp_dai[0], + .codec_dai = &twl4030_dai, + .ops = &overo_ops, +}; + +/* Audio machine driver */ +static struct snd_soc_machine snd_soc_machine_overo = { + .name = "overo", + .dai_link = &overo_dai, + .num_links = 1, +}; + +/* Audio subsystem */ +static struct snd_soc_device overo_snd_devdata = { + .machine = &snd_soc_machine_overo, + .platform = &omap_soc_platform, + .codec_dev = &soc_codec_dev_twl4030, +}; + +static struct platform_device *overo_snd_device; + +static int __init overo_soc_init(void) +{ + int ret; + + printk(KERN_INFO "overo SoC init\n"); + if (!machine_is_overo()) { + printk(KERN_ERR "Not Overo!\n"); + return -ENODEV; + } + + overo_snd_device = platform_device_alloc("soc-audio", -1); + if (!overo_snd_device) { + printk(KERN_ERR "Platform device allocation failed\n"); + return -ENOMEM; + } + + platform_set_drvdata(overo_snd_device, &overo_snd_devdata); + overo_snd_devdata.dev = &overo_snd_device->dev; + *(unsigned int *)overo_dai.cpu_dai->private_data = 1; /* McBSP2 */ + + ret = platform_device_add(overo_snd_device); + if (ret) + goto err1; + + return 0; + +err1: + printk(KERN_ERR "Unable to add platform device\n"); + platform_device_put(overo_snd_device); + + return ret; +} + +static void __exit overo_soc_exit(void) +{ + platform_device_unregister(overo_snd_device); +} + +module_init(overo_soc_init); +module_exit(overo_soc_exit); + +MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>"); +MODULE_DESCRIPTION("ALSA SoC overo"); +MODULE_LICENSE("GPL"); -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 4/4] ARM: OMAP2: deconfig for the Gumstix Overo board 2008-09-01 21:57 ` [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo sakoman @ 2008-09-01 21:57 ` sakoman 2008-09-02 11:29 ` [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo Mark Brown 1 sibling, 0 replies; 22+ messages in thread From: sakoman @ 2008-09-01 21:57 UTC (permalink / raw) To: linux-omap, alsa-devel; +Cc: Steve Sakoman From: Steve Sakoman <steve@sakoman.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> --- arch/arm/configs/overo_defconfig | 1973 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 1973 insertions(+), 0 deletions(-) create mode 100644 arch/arm/configs/overo_defconfig diff --git a/arch/arm/configs/overo_defconfig b/arch/arm/configs/overo_defconfig new file mode 100644 index 0000000..b21f7ec --- /dev/null +++ b/arch/arm/configs/overo_defconfig @@ -0,0 +1,1973 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.27-rc3-omap1 +# Sun Aug 31 21:51:11 2008 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_SUPPORTS_AOUT=y +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +# CONFIG_ELF_CORE is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +# CONFIG_MARKERS is not set +CONFIG_OPROFILE=y +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set +# CONFIG_HAVE_IOREMAP_PROT is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +# CONFIG_HAVE_ARCH_TRACEHOOK is not set +# CONFIG_HAVE_DMA_ATTRS is not set +# CONFIG_USE_GENERIC_SMP_HELPERS is not set +CONFIG_HAVE_CLK=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_KMOD=y +CONFIG_BLOCK=y +CONFIG_LBD=y +# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_LSF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY 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" +CONFIG_CLASSIC_RCU=y + +# +# 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_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_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION5X 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_DAVINCI is not set +CONFIG_ARCH_OMAP=y +# CONFIG_ARCH_MSM7X00A is not set + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP_OTG=y +# CONFIG_ARCH_OMAP1 is not set +# CONFIG_ARCH_OMAP2 is not set +CONFIG_ARCH_OMAP3=y + +# +# OMAP Feature Selections +# +# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set +# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set +CONFIG_OMAP_SMARTREFLEX=y +# CONFIG_OMAP_SMARTREFLEX_TESTING is not set +# CONFIG_OMAP_RESET_CLOCKS is not set +CONFIG_OMAP_BOOT_TAG=y +CONFIG_OMAP_BOOT_REASON=y +# CONFIG_OMAP_COMPONENT_VERSION is not set +# CONFIG_OMAP_GPIO_SWITCH is not set +# CONFIG_OMAP_MUX is not set +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MMU_FWK is not set +# CONFIG_OMAP_MBOX_FWK is not set +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_DM_TIMER=y +# CONFIG_OMAP_LL_DEBUG_UART1 is not set +# CONFIG_OMAP_LL_DEBUG_UART2 is not set +CONFIG_OMAP_LL_DEBUG_UART3=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_OMAP_PM_NOOP=y +CONFIG_ARCH_OMAP34XX=y +CONFIG_ARCH_OMAP3430=y + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_LDP is not set +# CONFIG_MACH_OMAP_3430SDP is not set +# CONFIG_MACH_OMAP3EVM is not set +# CONFIG_MACH_OMAP3_BEAGLE is not set +CONFIG_MACH_OVERO=y +CONFIG_OMAP_TICK_GPTIMER=1 + +# +# Boot options +# + +# +# Power management +# + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_V7=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_IFAR=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_ARM_THUMBEE=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_HAS_TLS_REG=y +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_PREEMPT is not set +CONFIG_HZ=128 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT 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_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_LEDS=y +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE=" debug " +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y +# CONFIG_NEON_CACHE_BUG is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_APM_EMULATION is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# 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=y +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE 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=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set +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=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# 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 +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +CONFIG_BT=y +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=y + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIUART_LL is not set +CONFIG_BT_HCIBCM203X=y +CONFIG_BT_HCIBPA10X=y +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIBRF6150 is not set +# CONFIG_BT_HCIH4P is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +CONFIG_CFG80211=y +CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_MAC80211=y + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_DEFAULT_PID=y +CONFIG_MAC80211_RC_DEFAULT="pid" +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_IEEE80211=y +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=y +CONFIG_IEEE80211_CRYPT_CCMP=y +CONFIG_IEEE80211_CRYPT_TKIP=y +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=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 +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE 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_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# 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 +# CONFIG_MTD_NAND is not set +CONFIG_MTD_ONENAND=y +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +# CONFIG_MTD_ONENAND_GENERIC is not set +CONFIG_MTD_ONENAND_OMAP2=y +# CONFIG_MTD_ONENAND_OTP is not set +# CONFIG_MTD_ONENAND_2X_PROGRAM is not set +# CONFIG_MTD_ONENAND_SIM is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=m +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +CONFIG_EEPROM_93CX6=m +# CONFIG_OMAP_STI is not set +# CONFIG_ENCLOSURE_SERVICES is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# 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_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_ATA is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_DELAY=m +# CONFIG_DM_UEVENT is not set +CONFIG_NETDEVICES=y +CONFIG_DUMMY=m +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_VETH is not set +# CONFIG_NET_ETHERNET is not set +CONFIG_MII=y +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_80211=y +CONFIG_LIBERTAS=y +CONFIG_LIBERTAS_USB=y +CONFIG_LIBERTAS_SDIO=y +CONFIG_LIBERTAS_DEBUG=y +CONFIG_USB_ZD1201=m +# CONFIG_USB_NET_RNDIS_WLAN is not set +CONFIG_RTL8187=m +# CONFIG_MAC80211_HWSIM is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +# CONFIG_IWLWIFI_LEDS is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_ZD1211RW is not set +# CONFIG_RT2X00 is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=y +CONFIG_USB_NET_AX8817X=y +CONFIG_USB_NET_CDCETHER=y +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +# CONFIG_PPPOL2TP is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV 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_LM8323 is not set +# CONFIG_KEYBOARD_GPIO is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_AT24 is not set +CONFIG_SENSORS_EEPROM=y +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_ISP1301_OMAP is not set +# CONFIG_TPS65010 is not set +# CONFIG_SENSORS_TLV320AIC23 is not set +CONFIG_TWL4030_CORE=y +CONFIG_TWL4030_GPIO=y +CONFIG_TWL4030_MADC=m +CONFIG_TWL4030_USB=y +CONFIG_TWL4030_USB_HS_ULPI=y +CONFIG_TWL4030_PWRBUTTON=y +CONFIG_TWL4030_POWEROFF=y +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_LP5521 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 +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +CONFIG_SPI_OMAP24XX=y + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set +# CONFIG_SPI_TSC2101 is not set +# CONFIG_SPI_TSC2102 is not set +# CONFIG_SPI_TSC210X is not set +# CONFIG_SPI_TSC2301 is not set +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +CONFIG_DEBUG_GPIO=y +CONFIG_GPIO_SYSFS=y + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=m +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_BQ27x00 is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7473 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S 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_LM70 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_LM93 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_THMC50 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_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_TSC210X is not set +CONFIG_SENSORS_OMAP34XX=y +# CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_OMAP_WATCHDOG=y + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set + +# +# Multimedia devices +# + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L1=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_CX2341X=m +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_AU0828 is not set +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +# CONFIG_USB_GSPCA is not set +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +# CONFIG_VIDEO_EM28XX is not set +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +# CONFIG_USB_ET61X251 is not set +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +# CONFIG_USB_ZC0301 is not set +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_ZR364XX=m +# CONFIG_USB_STKWEBCAM is not set +# CONFIG_USB_S2255 is not set +# CONFIG_SOC_CAMERA is not set +# CONFIG_VIDEO_SH_MOBILE_CEU is not set +CONFIG_RADIO_ADAPTERS=y +# CONFIG_RADIO_TEA5761 is not set +# CONFIG_USB_DSBR is not set +# CONFIG_USB_SI470X is not set +CONFIG_DVB_CAPTURE_DRIVERS=y +# CONFIG_TTPCI_EEPROM is not set + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +# CONFIG_DVB_USB_DW2102 is not set +# CONFIG_DVB_USB_ANYSEE is not set +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +# CONFIG_DVB_CINERGYT2_TUNING is not set +# CONFIG_DVB_SIANO_SMS1XXX is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +# CONFIG_DVB_B2C2_FLEXCOP is not set + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +# CONFIG_DVB_DRX397XD is not set +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +# CONFIG_DVB_OR51211 is not set +# CONFIG_DVB_OR51132 is not set +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +# CONFIG_DVB_ISL6405 is not set +CONFIG_DVB_ISL6421=m +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_031M3R is not set +# CONFIG_FB_OMAP_048M3R is not set +CONFIG_FB_OMAP_079M3R=y +# CONFIG_FB_OMAP_092M9R is not set +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=8 +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=y + +# +# Display hardware drivers +# + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_RAWMIDI=y +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +# CONFIG_SND_DEBUG_VERBOSE is not set +# CONFIG_SND_PCM_XRUN_DEBUG is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_ARM=y +# CONFIG_SND_OMAP_AIC23 is not set +# CONFIG_SND_OMAP_TSC2101 is not set +# CONFIG_SND_SX1 is not set +# CONFIG_SND_OMAP_TSC2102 is not set +# CONFIG_SND_OMAP24XX_EAC is not set +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=y +CONFIG_SND_USB_CAIAQ=m +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_OVERO=y +CONFIG_SND_SOC_TWL4030=y +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +CONFIG_HID_DEBUG=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +CONFIG_USB_DEBUG=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_EHCI_HCD=y +CONFIG_OMAP_EHCI_PHY_MODE=y +# CONFIG_OMAP_EHCI_TLL_MODE is not set +CONFIG_USB_EHCI_ROOT_HUB_TT=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_SOC=y + +# +# OMAP 343x high speed USB support +# +CONFIG_USB_MUSB_HOST=y +# CONFIG_USB_MUSB_PERIPHERAL is not set +# CONFIG_USB_MUSB_OTG is not set +CONFIG_USB_MUSB_HDRC_HCD=y +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_MUSB_LOGLEVEL=0 + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=y + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# +CONFIG_USB_SERIAL=m +# CONFIG_USB_EZUSB is not set +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_AIRCABLE is not set +# CONFIG_USB_SERIAL_ARK3116 is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_CH341 is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_CP2101 is not set +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_FUNSOFT is not set +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +# CONFIG_USB_SERIAL_IUU is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_MOS7720 is not set +# CONFIG_USB_SERIAL_MOS7840 is not set +# CONFIG_USB_SERIAL_MOTOROLA is not set +# CONFIG_USB_SERIAL_NAVMAN is not set +# CONFIG_USB_SERIAL_PL2303 is not set +# CONFIG_USB_SERIAL_OTI6858 is not set +# CONFIG_USB_SERIAL_SPCP8X5 is not set +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set +# CONFIG_USB_SERIAL_TI is not set +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OPTION is not set +# CONFIG_USB_SERIAL_OMNINET is not set +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +# CONFIG_USB_BERRY_CHARGE is not set +CONFIG_USB_LED=m +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_GADGET is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_UNSAFE_RESUME=y + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=y +# CONFIG_MMC_TEST is not set + +# +# MMC/SD Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_OMAP_HS=y +# CONFIG_MMC_SPI is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_OMAP_DEBUG is not set +# CONFIG_LEDS_OMAP is not set +# CONFIG_LEDS_OMAP_PWM is not set +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=y +# CONFIG_LEDS_PCA955X is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +CONFIG_RTC_DRV_TWL4030=y +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_DMADEVICES is not set + +# +# Voltage and Current regulators +# +# CONFIG_REGULATOR is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_UIO is not set + +# +# CBUS support +# +# CONFIG_CBUS 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=y +# CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_PRINT_QUOTA_WARNING=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +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=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# 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_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# 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 + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# 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=y +# 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 +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_HAVE_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +# CONFIG_FTRACE is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_CRYPTD=m +# CONFIG_CRYPTO_AUTHENC is not set +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=y +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +# CONFIG_CRYPTO_LZO is not set +CONFIG_CRYPTO_HW=y + +# +# Library routines +# +CONFIG_BITREVERSE=y +# CONFIG_GENERIC_FIND_FIRST_BIT is not set +# CONFIG_GENERIC_FIND_NEXT_BIT is not set +CONFIG_CRC_CCITT=y +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=y +CONFIG_CRC32=y +CONFIG_CRC7=y +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo 2008-09-01 21:57 ` [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo sakoman 2008-09-01 21:57 ` [PATCH 4/4] ARM: OMAP2: deconfig for the Gumstix Overo board sakoman @ 2008-09-02 11:29 ` Mark Brown 2008-09-02 13:19 ` Steve Sakoman 1 sibling, 1 reply; 22+ messages in thread From: Mark Brown @ 2008-09-02 11:29 UTC (permalink / raw) To: sakoman; +Cc: alsa-devel, linux-omap, Steve Sakoman On Mon, Sep 01, 2008 at 02:57:58PM -0700, sakoman@gmail.com wrote: > Signed-off-by: Steve Sakoman <steve@sakoman.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> though obviously it depends on the codec driver going in and there's one nit that should be fixed: > # OMAP Machine Support > snd-soc-n810-objs := n810.o > +snd-soc-omap3evm-objs := omap3evm.o > +snd-soc-omap3beagle-objs := omap3beagle.o > +snd-soc-overo-objs := overo.o Looks like some extra stuff crept in here... ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo 2008-09-02 11:29 ` [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo Mark Brown @ 2008-09-02 13:19 ` Steve Sakoman 0 siblings, 0 replies; 22+ messages in thread From: Steve Sakoman @ 2008-09-02 13:19 UTC (permalink / raw) To: sakoman, linux-omap, alsa-devel, Steve Sakoman On Tue, Sep 2, 2008 at 4:29 AM, Mark Brown <broonie@sirena.org.uk> wrote: >> # OMAP Machine Support >> snd-soc-n810-objs := n810.o >> +snd-soc-omap3evm-objs := omap3evm.o >> +snd-soc-omap3beagle-objs := omap3beagle.o >> +snd-soc-overo-objs := overo.o > > Looks like some extra stuff crept in here... > Heh :-) Right you are! I've been testing the driver on Beagle and OMAP3EVM too. I'll fix and resubmit. Steve ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-01 21:57 ` [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec sakoman 2008-09-01 21:57 ` [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo sakoman @ 2008-09-02 11:26 ` Mark Brown 2008-09-02 12:27 ` [alsa-devel] " Felipe Balbi 2008-09-02 14:25 ` Steve Sakoman 1 sibling, 2 replies; 22+ messages in thread From: Mark Brown @ 2008-09-02 11:26 UTC (permalink / raw) To: sakoman; +Cc: alsa-devel, linux-omap, Steve Sakoman On Mon, Sep 01, 2008 at 02:57:57PM -0700, sakoman@gmail.com wrote: > Signed-off-by: Steve Sakoman <steve@sakoman.com> Looks mostly good. A few comments, though: > --- a/sound/soc/codecs/Kconfig > +++ b/sound/soc/codecs/Kconfig > @@ -50,3 +50,8 @@ config SND_SOC_CS4270_VD33_ERRATA > config SND_SOC_TLV320AIC3X > tristate > depends on I2C > + > +config SND_SOC_TWL4030 > + tristate > + depends on SND_SOC && I2C > + This should also be added to SND_SOC_ALL_CODECS to ensure testing coverage. > +static void twl4030_dump_registers(void) > +{ > + int i = 0; > + u8 data; > + > + printk(KERN_INFO "TWL 4030 Register dump for Audio Module\n"); > + > + for (i = REG_CODEC_MODE; i <= REG_MISC_SET_2; i++) { > + twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &data, i); > + printk(KERN_INFO "Register[0x%02x]=0x%02x\n", i, data); > + } > +} Perhaps I'm missing something but I can't seem to see where twl4030_i2c_read_u8() is defined or any of the I2C device hookup for the codec is done? > +struct twl4030_priv { > + unsigned int dummy; > +}; If this is empty it should be removable? > +static int twl4030_set_bias_level(struct snd_soc_codec *codec, > + enum snd_soc_bias_level level) > +{ > + > + printk(KERN_INFO "TWL4030 Audio Codec set bias level\n"); This printk() should be removed - it's just debug output. > + switch (level) { > + case SND_SOC_BIAS_ON: > + break; > + case SND_SOC_BIAS_PREPARE: > + break; > + case SND_SOC_BIAS_STANDBY: > + break; > + case SND_SOC_BIAS_OFF: > + break; > + } Should you be calling power_up() and power_down() for standby and off here? > +static int twl4030_hw_params(struct snd_pcm_substream *substream, > + struct snd_pcm_hw_params *params) > +{ > + /* turn off codec before changing format */ > + mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); > + mode &= ~CODECPDZ; > + twl4030_write(codec, REG_CODEC_MODE, mode); The comments about powering up and down the codec could probably use a little clarification given the fact that there are also power_down() and power_up() functions. > +static int twl4030_mute(struct snd_soc_dai *dai, int mute) > +{ > + struct snd_soc_codec *codec = dai->codec; > + > + u8 ldac_reg = twl4030_read_reg_cache(codec, REG_ARXL2PGA); > + u8 rdac_reg = twl4030_read_reg_cache(codec, REG_ARXR2PGA); > + > + if (mute) { > + twl4030_write(codec, REG_ARXL2PGA, 0x00); > + twl4030_write(codec, REG_ARXR2PGA, 0x00); > + twl4030_write_reg_cache(codec, REG_ARXL2PGA, ldac_reg); > + twl4030_write_reg_cache(codec, REG_ARXR2PGA, rdac_reg); > + } else { > + twl4030_write(codec, REG_ARXL2PGA, ldac_reg); > + twl4030_write(codec, REG_ARXR2PGA, rdac_reg); > + } It may be better to make these user visible controls - usually the mute provided here is specifically for the DAC but these look like controls for the PGA. The intention here is to avoid artifacts from the DAC when the input clock stops and start - if there aren't any then user space may well appreciate the control. Either way is fine. > + case SND_SOC_DAIFMT_CBM_CFM: > + format &= ~(AIF_SLAVE_EN); > + format |= CLK256FS_EN; > + break; > +static int twl4030_suspend(struct platform_device *pdev, pm_message_t state) > +{ > + struct snd_soc_device *socdev = platform_get_drvdata(pdev); > + struct snd_soc_codec *codec = socdev->codec; > + > + printk(KERN_INFO "TWL4030 Audio Codec suspend\n"); > + twl4030_set_bias_level(codec, SND_SOC_BIAS_OFF); > + > + return 0; > +} Merging the power down into set_bias_level() would mean that this would do a controlled power down - at present it will be a no-op. > +static int twl4030_resume(struct platform_device *pdev) > +{ > + struct snd_soc_device *socdev = platform_get_drvdata(pdev); > + struct snd_soc_codec *codec = socdev->codec; > + int i; > + u16 *cache = codec->reg_cache; > + > + printk(KERN_INFO "TWL4030 Audio Codec resume\n"); > + /* Sync reg_cache with the hardware */ > + for (i = REG_CODEC_MODE; i <= REG_MISC_SET_2; i++) > + twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, cache[i], i); > + > + twl4030_set_bias_level(codec, SND_SOC_BIAS_STANDBY); > + twl4030_set_bias_level(codec, codec->suspend_bias_level); > + return 0; > +} Similarly, adding the power up to the standby configuration would ensure a controlled power up of the codec when resuming. Looking at the power up sequence I'm not sure that simply writing back the cache will work well? > + twl4030_init_chip(); > + twl4030_power_up(codec, APLL_RATE_44100 | OPT_MODE); It looks like the driver is assuming a particular clock rate going into the codec - does the chip require a fixed clock or is the driver only supporting one configuration? Either is fine. ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [alsa-devel] [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-02 11:26 ` [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec Mark Brown @ 2008-09-02 12:27 ` Felipe Balbi 2008-09-02 14:25 ` Steve Sakoman 1 sibling, 0 replies; 22+ messages in thread From: Felipe Balbi @ 2008-09-02 12:27 UTC (permalink / raw) To: sakoman, linux-omap, alsa-devel, Steve Sakoman On Tue, Sep 02, 2008 at 12:26:33PM +0100, ext Mark Brown wrote: > Perhaps I'm missing something but I can't seem to see where > twl4030_i2c_read_u8() is defined or any of the I2C device hookup for the > codec is done? The driver still sitting on linux-omap only, it's under drivers/i2c/chips/twl4030-core.c -- balbi ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [alsa-devel] [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-02 11:26 ` [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec Mark Brown 2008-09-02 12:27 ` [alsa-devel] " Felipe Balbi @ 2008-09-02 14:25 ` Steve Sakoman 2008-09-02 14:53 ` Mark Brown 1 sibling, 1 reply; 22+ messages in thread From: Steve Sakoman @ 2008-09-02 14:25 UTC (permalink / raw) To: sakoman, linux-omap, alsa-devel, Steve Sakoman On Tue, Sep 2, 2008 at 4:26 AM, Mark Brown <broonie@sirena.org.uk> wrote: > On Mon, Sep 01, 2008 at 02:57:57PM -0700, sakoman@gmail.com wrote: >> + >> +config SND_SOC_TWL4030 >> + tristate >> + depends on SND_SOC && I2C >> + > > This should also be added to SND_SOC_ALL_CODECS to ensure testing > coverage. Hmm . . . I get no hits grep-ing for SND_SOC_ALL_CODECS. Could this be something we are missing in the linux-omap git? >> +struct twl4030_priv { >> + unsigned int dummy; >> +}; > > If this is empty it should be removable? I plan to support further codec features in future patches and have a strong suspicion that private data may be required. Is it preferred to add the infrastructure now, or wait till it is required in the future? I opted for the former, but don't really care either way. >> +static int twl4030_set_bias_level(struct snd_soc_codec *codec, >> + enum snd_soc_bias_level level) >> +{ >> + >> + printk(KERN_INFO "TWL4030 Audio Codec set bias level\n"); > > This printk() should be removed - it's just debug output. You are correct. I will remove this. >> + switch (level) { >> + case SND_SOC_BIAS_ON: >> + break; >> + case SND_SOC_BIAS_PREPARE: >> + break; >> + case SND_SOC_BIAS_STANDBY: >> + break; >> + case SND_SOC_BIAS_OFF: >> + break; >> + } > > Should you be calling power_up() and power_down() for standby and off > here? I was saving power management for another patch after I have time to actually measure the effects. That said, I see no reason to not add the power up/down calls to the places you indicate. I will do a quick test and add to my resubmission. >> +static int twl4030_hw_params(struct snd_pcm_substream *substream, >> + struct snd_pcm_hw_params *params) >> +{ > >> + /* turn off codec before changing format */ >> + mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); >> + mode &= ~CODECPDZ; >> + twl4030_write(codec, REG_CODEC_MODE, mode); > > The comments about powering up and down the codec could probably use a > little clarification given the fact that there are also power_down() and > power_up() functions. Good point. This is just one of those chip quirks that require the CODECPDZ bit to be 0 when modes are changed rather than any requirement for a full power up/power down sequence. >> +static int twl4030_mute(struct snd_soc_dai *dai, int mute) >> +{ >> + struct snd_soc_codec *codec = dai->codec; >> + >> + u8 ldac_reg = twl4030_read_reg_cache(codec, REG_ARXL2PGA); >> + u8 rdac_reg = twl4030_read_reg_cache(codec, REG_ARXR2PGA); >> + >> + if (mute) { >> + twl4030_write(codec, REG_ARXL2PGA, 0x00); >> + twl4030_write(codec, REG_ARXR2PGA, 0x00); >> + twl4030_write_reg_cache(codec, REG_ARXL2PGA, ldac_reg); >> + twl4030_write_reg_cache(codec, REG_ARXR2PGA, rdac_reg); >> + } else { >> + twl4030_write(codec, REG_ARXL2PGA, ldac_reg); >> + twl4030_write(codec, REG_ARXR2PGA, rdac_reg); >> + } > > It may be better to make these user visible controls - usually the mute > provided here is specifically for the DAC but these look like controls > for the PGA. The intention here is to avoid artifacts from the DAC when > the input clock stops and start - if there aren't any then user space > may well appreciate the control. Either way is fine. I'm not hearing any clicks & pops, so I will leave this in. >> +static int twl4030_suspend(struct platform_device *pdev, pm_message_t state) >> +{ >> + struct snd_soc_device *socdev = platform_get_drvdata(pdev); >> + struct snd_soc_codec *codec = socdev->codec; >> + >> + printk(KERN_INFO "TWL4030 Audio Codec suspend\n"); >> + twl4030_set_bias_level(codec, SND_SOC_BIAS_OFF); >> + >> + return 0; >> +} > > Merging the power down into set_bias_level() would mean that this would > do a controlled power down - at present it will be a no-op. > > Similarly, adding the power up to the standby configuration would ensure > a controlled power up of the codec when resuming. Looking at the power > up sequence I'm not sure that simply writing back the cache will work > well? Agreed. I will make this change. > +} > >> + twl4030_init_chip(); >> + twl4030_power_up(codec, APLL_RATE_44100 | OPT_MODE); > > It looks like the driver is assuming a particular clock rate going into > the codec - does the chip require a fixed clock or is the driver only > supporting one configuration? Either is fine. There is a fixed clock. Thanks for the comments! Steve ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [alsa-devel] [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-02 14:25 ` Steve Sakoman @ 2008-09-02 14:53 ` Mark Brown 2008-09-02 16:36 ` Steve Sakoman 0 siblings, 1 reply; 22+ messages in thread From: Mark Brown @ 2008-09-02 14:53 UTC (permalink / raw) To: Steve Sakoman; +Cc: linux-omap, alsa-devel, Steve Sakoman On Tue, Sep 02, 2008 at 07:25:48AM -0700, Steve Sakoman wrote: > On Tue, Sep 2, 2008 at 4:26 AM, Mark Brown <broonie@sirena.org.uk> wrote: > > This should also be added to SND_SOC_ALL_CODECS to ensure testing > > coverage. > Hmm . . . I get no hits grep-ing for SND_SOC_ALL_CODECS. Could this > be something we are missing in the linux-omap git? Yes, it's queued in ALSA for merge in the next window: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git > >> +struct twl4030_priv { > >> + unsigned int dummy; > >> +}; > > If this is empty it should be removable? > I plan to support further codec features in future patches and have a > strong suspicion that private data may be required. Is it preferred > to add the infrastructure now, or wait till it is required in the > future? I opted for the former, but don't really care either way. It'd be a bit cleaner to remove it but it's not a big deal either way - leave it in if you find it useful. > >> + twl4030_write(codec, REG_ARXL2PGA, 0x00); > >> + twl4030_write(codec, REG_ARXR2PGA, 0x00); > >> + twl4030_write_reg_cache(codec, REG_ARXL2PGA, ldac_reg); > >> + twl4030_write_reg_cache(codec, REG_ARXR2PGA, rdac_reg); > >> + } else { > >> + twl4030_write(codec, REG_ARXL2PGA, ldac_reg); > >> + twl4030_write(codec, REG_ARXR2PGA, rdac_reg); > >> + } > > It may be better to make these user visible controls - usually the mute > > provided here is specifically for the DAC but these look like controls > > for the PGA. The intention here is to avoid artifacts from the DAC when > > the input clock stops and start - if there aren't any then user space > > may well appreciate the control. Either way is fine. > I'm not hearing any clicks & pops, so I will leave this in. The point is that adding it in suppresses problems that might otherwise occur - if it doesn't misbehave without this users may find it useful if the mute control to be visible to them. > >> + twl4030_init_chip(); > >> + twl4030_power_up(codec, APLL_RATE_44100 | OPT_MODE); > > It looks like the driver is assuming a particular clock rate going into > > the codec - does the chip require a fixed clock or is the driver only > > supporting one configuration? Either is fine. > There is a fixed clock. Fixed per board or fixed by the chip? ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-02 14:53 ` Mark Brown @ 2008-09-02 16:36 ` Steve Sakoman 2008-09-02 18:54 ` [alsa-devel] " Mark Brown 0 siblings, 1 reply; 22+ messages in thread From: Steve Sakoman @ 2008-09-02 16:36 UTC (permalink / raw) To: Steve Sakoman, linux-omap, alsa-devel On Tue, Sep 2, 2008 at 7:53 AM, Mark Brown <broonie@opensource.wolfsonmicro.com> wrote: > On Tue, Sep 02, 2008 at 07:25:48AM -0700, Steve Sakoman wrote: >> On Tue, Sep 2, 2008 at 4:26 AM, Mark Brown <broonie@sirena.org.uk> wrote: > >> > This should also be added to SND_SOC_ALL_CODECS to ensure testing >> > coverage. > >> Hmm . . . I get no hits grep-ing for SND_SOC_ALL_CODECS. Could this >> be something we are missing in the linux-omap git? > > Yes, it's queued in ALSA for merge in the next window: OK, I'll leave this out for now and maerge when it appears in linux-omap >> >> +struct twl4030_priv { >> >> + unsigned int dummy; >> >> +}; > >> > If this is empty it should be removable? > >> I plan to support further codec features in future patches and have a >> strong suspicion that private data may be required. Is it preferred >> to add the infrastructure now, or wait till it is required in the >> future? I opted for the former, but don't really care either way. > > It'd be a bit cleaner to remove it but it's not a big deal either way - > leave it in if you find it useful. I'll remove it for now and add it back when required. >> >> + twl4030_write(codec, REG_ARXL2PGA, 0x00); >> >> + twl4030_write(codec, REG_ARXR2PGA, 0x00); >> >> + twl4030_write_reg_cache(codec, REG_ARXL2PGA, ldac_reg); >> >> + twl4030_write_reg_cache(codec, REG_ARXR2PGA, rdac_reg); >> >> + } else { >> >> + twl4030_write(codec, REG_ARXL2PGA, ldac_reg); >> >> + twl4030_write(codec, REG_ARXR2PGA, rdac_reg); >> >> + } > >> > It may be better to make these user visible controls - usually the mute >> > provided here is specifically for the DAC but these look like controls >> > for the PGA. The intention here is to avoid artifacts from the DAC when >> > the input clock stops and start - if there aren't any then user space >> > may well appreciate the control. Either way is fine. > >> I'm not hearing any clicks & pops, so I will leave this in. > > The point is that adding it in suppresses problems that might otherwise > occur - if it doesn't misbehave without this users may find it useful if > the mute control to be visible to them. I'll investigate to see if removing this results in clicks & pops. Will then do "the right thing" >> >> + twl4030_init_chip(); >> >> + twl4030_power_up(codec, APLL_RATE_44100 | OPT_MODE); > >> > It looks like the driver is assuming a particular clock rate going into >> > the codec - does the chip require a fixed clock or is the driver only >> > supporting one configuration? Either is fine. > >> There is a fixed clock. > > Fixed per board or fixed by the chip? The chip allows 19.2 Mhz, 26 Mhz, or 38.4 Mhz input clocks to the codec. All existing boards (Overo, Beagle, and OMAP3 EVM) use 26 Mhz (generated by a fixed external oscillator chip). I'll check with the Pandora folks, but I believe that they are also 26 Mhz. Steve ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [alsa-devel] [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-02 16:36 ` Steve Sakoman @ 2008-09-02 18:54 ` Mark Brown 2008-09-02 20:08 ` Liam Girdwood 2008-09-02 20:38 ` David Brownell 0 siblings, 2 replies; 22+ messages in thread From: Mark Brown @ 2008-09-02 18:54 UTC (permalink / raw) To: Steve Sakoman; +Cc: linux-omap, alsa-devel On Tue, Sep 02, 2008 at 09:36:29AM -0700, Steve Sakoman wrote: > The chip allows 19.2 Mhz, 26 Mhz, or 38.4 Mhz input clocks to the > codec. All existing boards (Overo, Beagle, and OMAP3 EVM) use 26 Mhz > (generated by a fixed external oscillator chip). I'll check with the > Pandora folks, but I believe that they are also 26 Mhz. OK, a comment to that effect somewhere (perhaps in set_sysclk() which only accepts 26MHz) probably wouldn't go amiss. Someone working on a board where the hardware guys went for a different crystal will probably thank you for it some day :) ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-02 18:54 ` [alsa-devel] " Mark Brown @ 2008-09-02 20:08 ` Liam Girdwood 2008-09-02 20:31 ` [alsa-devel] " Mark Brown 2008-09-02 20:48 ` [alsa-devel] " Steve Sakoman 2008-09-02 20:38 ` David Brownell 1 sibling, 2 replies; 22+ messages in thread From: Liam Girdwood @ 2008-09-02 20:08 UTC (permalink / raw) To: Mark Brown; +Cc: Steve Sakoman, alsa-devel, linux-omap On Tue, 2008-09-02 at 19:54 +0100, Mark Brown wrote: > On Tue, Sep 02, 2008 at 09:36:29AM -0700, Steve Sakoman wrote: > > > The chip allows 19.2 Mhz, 26 Mhz, or 38.4 Mhz input clocks to the > > codec. All existing boards (Overo, Beagle, and OMAP3 EVM) use 26 Mhz > > (generated by a fixed external oscillator chip). I'll check with the > > Pandora folks, but I believe that they are also 26 Mhz. > > OK, a comment to that effect somewhere (perhaps in set_sysclk() which > only accepts 26MHz) probably wouldn't go amiss. The codec set_sysclk() should also accept 19.2MHz and 38.4MHz otherwise return -EINVAL. It should also have a nice comment too :) Strange how the codec doesn't accept lower clocks when it's targeted at a portable device.... Liam ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [alsa-devel] [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-02 20:08 ` Liam Girdwood @ 2008-09-02 20:31 ` Mark Brown 2008-09-02 20:51 ` Liam Girdwood 2008-09-02 20:48 ` [alsa-devel] " Steve Sakoman 1 sibling, 1 reply; 22+ messages in thread From: Mark Brown @ 2008-09-02 20:31 UTC (permalink / raw) To: Liam Girdwood; +Cc: Steve Sakoman, alsa-devel, linux-omap On Tue, Sep 02, 2008 at 09:08:09PM +0100, Liam Girdwood wrote: > On Tue, 2008-09-02 at 19:54 +0100, Mark Brown wrote: > > OK, a comment to that effect somewhere (perhaps in set_sysclk() which > > only accepts 26MHz) probably wouldn't go amiss. > The codec set_sysclk() should also accept 19.2MHz and 38.4MHz otherwise > return -EINVAL. It should also have a nice comment too :) Ideally, yes but it looked like that'd need additional code to set the codec up to use them. Obviously the ideal thing would be if the driver supports everything the chip does. ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-02 20:31 ` [alsa-devel] " Mark Brown @ 2008-09-02 20:51 ` Liam Girdwood 0 siblings, 0 replies; 22+ messages in thread From: Liam Girdwood @ 2008-09-02 20:51 UTC (permalink / raw) To: Mark Brown; +Cc: Steve Sakoman, alsa-devel, linux-omap On Tue, 2008-09-02 at 21:31 +0100, Mark Brown wrote: > On Tue, Sep 02, 2008 at 09:08:09PM +0100, Liam Girdwood wrote: > > On Tue, 2008-09-02 at 19:54 +0100, Mark Brown wrote: > > > > OK, a comment to that effect somewhere (perhaps in set_sysclk() which > > > only accepts 26MHz) probably wouldn't go amiss. > > > The codec set_sysclk() should also accept 19.2MHz and 38.4MHz otherwise > > return -EINVAL. It should also have a nice comment too :) > > Ideally, yes but it looked like that'd need additional code to set the > codec up to use them. Obviously the ideal thing would be if the driver > supports everything the chip does. Then this should also be marked as a TODO. The likely users of the SYSCLK value are the codecs DSP core (for audio filtering) and codec DAI mastering. Liam ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [alsa-devel] [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-02 20:08 ` Liam Girdwood 2008-09-02 20:31 ` [alsa-devel] " Mark Brown @ 2008-09-02 20:48 ` Steve Sakoman 1 sibling, 0 replies; 22+ messages in thread From: Steve Sakoman @ 2008-09-02 20:48 UTC (permalink / raw) To: Liam Girdwood; +Cc: Mark Brown, alsa-devel, linux-omap On Tue, Sep 2, 2008 at 1:08 PM, Liam Girdwood <lrg@kernel.org> wrote: > On Tue, 2008-09-02 at 19:54 +0100, Mark Brown wrote: >> On Tue, Sep 02, 2008 at 09:36:29AM -0700, Steve Sakoman wrote: >> >> > The chip allows 19.2 Mhz, 26 Mhz, or 38.4 Mhz input clocks to the >> > codec. All existing boards (Overo, Beagle, and OMAP3 EVM) use 26 Mhz >> > (generated by a fixed external oscillator chip). I'll check with the >> > Pandora folks, but I believe that they are also 26 Mhz. >> >> OK, a comment to that effect somewhere (perhaps in set_sysclk() which >> only accepts 26MHz) probably wouldn't go amiss. > > The codec set_sysclk() should also accept 19.2MHz and 38.4MHz otherwise > return -EINVAL. It should also have a nice comment too :) It turns out to be fairly trivial to allow the codec to accept all three possibilities. I have added a set_sysck to the codec driver and a call to set_sysclk to 26 Mhz in the overo ASoC driver. This way we can handle future boards that may have chosen one of the other frequencies. Should have things ready for a re-submit later today after some testing. Steve ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [alsa-devel] [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec 2008-09-02 18:54 ` [alsa-devel] " Mark Brown 2008-09-02 20:08 ` Liam Girdwood @ 2008-09-02 20:38 ` David Brownell 1 sibling, 0 replies; 22+ messages in thread From: David Brownell @ 2008-09-02 20:38 UTC (permalink / raw) To: Mark Brown, Steve Sakoman; +Cc: linux-omap, alsa-devel On Tuesday 02 September 2008, Mark Brown wrote: > On Tue, Sep 02, 2008 at 09:36:29AM -0700, Steve Sakoman wrote: > > > The chip allows 19.2 Mhz, 26 Mhz, or 38.4 Mhz input clocks to the > > codec. All existing boards (Overo, Beagle, and OMAP3 EVM) use 26 Mhz > > (generated by a fixed external oscillator chip). I'll check with the > > Pandora folks, but I believe that they are also 26 Mhz. > > OK, a comment to that effect somewhere (perhaps in set_sysclk() which > only accepts 26MHz) probably wouldn't go amiss. Someone working on a > board where the hardware guys went for a different crystal will probably > thank you for it some day :) For that matter, as I've said on a separate thread, this board-specific data can and should be set up as part of the TWL4030 initialization. The paths by which boards can provide that data to the TWL4030 init and thence to subsidiary device init (CODEC in this case) need to be reworked before the TWL4030 code goes upstream. Being able to pass the relevant clock rate shouldn't be too hard. :) - Dave p.s. As has come up in the context of Beagle, which is the most available of those boards: the generally available version of TWL4030 will have a different part number. Docs will be available for the catalog parts, but they're not yet released: http://focus.ti.com/docs/prod/folders/print/tps65950.html ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board 2008-09-01 21:57 ` [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board sakoman 2008-09-01 21:57 ` [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec sakoman @ 2008-09-02 0:46 ` Felipe Balbi [not found] ` <200809020815.58792.david-b@pacbell.net> 2008-09-02 20:58 ` Russell King - ARM Linux 3 siblings, 0 replies; 22+ messages in thread From: Felipe Balbi @ 2008-09-02 0:46 UTC (permalink / raw) To: sakoman; +Cc: linux-omap, alsa-devel, Steve Sakoman On Mon, Sep 01, 2008 at 02:57:56PM -0700, sakoman@gmail.com wrote: > + if ((gpio_request(W2W_NRESET, "W2W_NRESET") == 0) && > + (gpio_direction_output(W2W_NRESET, 1) == 0)) { > + gpio_export(W2W_NRESET, 0); > + gpio_direction_output(W2W_NRESET, 0); > + udelay(10); > + gpio_direction_output(W2W_NRESET, 1); > + } else > + printk(KERN_ERR "could not obtain gpio for W2W_NRESET\n"); you should put {} on the else as well. The basic rule is that if one "arm" of the conditional needs {}, you put on both. Ditto below. > diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig > index bdeb8fb..5ebd591 100644 > --- a/drivers/video/omap/Kconfig > +++ b/drivers/video/omap/Kconfig > @@ -7,6 +7,27 @@ config FB_OMAP > help > Frame buffer driver for OMAP based boards. > > +choice > + depends on FB_OMAP && MACH_OVERO > + prompt "Screen resolution" > + default FB_OMAP_079M3R > + help > + Selected desired screen resolution > + > +config FB_OMAP_031M3R > + boolean "640 x 480 @ 60 Hz Reduced blanking" > + > +config FB_OMAP_048M3R > + boolean "800 x 600 @ 60 Hz Reduced blanking" > + > +config FB_OMAP_079M3R > + boolean "1024 x 768 @ 60 Hz Reduced blanking" > + > +config FB_OMAP_092M9R > + boolean "1280 x 720 @ 60 Hz Reduced blanking" > + > +endchoice > + This part should come in a separate patch. > diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile > index f9b5cd4..291c46e 100644 > --- a/drivers/video/omap/Makefile > +++ b/drivers/video/omap/Makefile > @@ -35,6 +35,7 @@ objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o > objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o > objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o > objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o > +objs-y$(CONFIG_MACH_OVERO) += lcd_overo.o > > omapfb-objs := $(objs-yy) Also this. > diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c > new file mode 100644 > index 0000000..831936d > --- /dev/null > +++ b/drivers/video/omap/lcd_overo.c > @@ -0,0 +1,189 @@ > +/* > + * LCD panel support for the Gumstix Overo > + * > + * Author: Steve Sakoman <steve@sakoman.com> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; either version 2 of the License, or (at your > + * option) any later version. > + * > + * This program is distributed in the hope that it will be useful, but > + * WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, write to the Free Software Foundation, Inc., > + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + */ > + > +#include <linux/module.h> > +#include <linux/platform_device.h> > +#include <linux/i2c/twl4030.h> > + > +#include <mach/gpio.h> > +#include <mach/mux.h> > +#include <mach/omapfb.h> > +#include <asm/mach-types.h> > + > +#define LCD_ENABLE 144 > + > +static int overo_panel_init(struct lcd_panel *panel, > + struct omapfb_device *fbdev) > +{ > + if ((gpio_request(LCD_ENABLE, "LCD_ENABLE") == 0) && > + (gpio_direction_output(LCD_ENABLE, 1) == 0)) > + gpio_export(LCD_ENABLE, 0); > + else > + printk(KERN_ERR "could not obtain gpio for LCD_ENABLE\n"); > + > + return 0; > +} > + > +static void overo_panel_cleanup(struct lcd_panel *panel) > +{ > +} > + > +static int overo_panel_enable(struct lcd_panel *panel) > +{ > + gpio_direction_output(LCD_ENABLE, 1); > + return 0; > +} > + > +static void overo_panel_disable(struct lcd_panel *panel) > +{ > + gpio_direction_output(LCD_ENABLE, 0); > +} > + > +static unsigned long overo_panel_get_caps(struct lcd_panel *panel) > +{ > + return 0; > +} > + > +struct lcd_panel overo_panel = { > + .name = "overo", > + .config = OMAP_LCDC_PANEL_TFT, > + .bpp = 16, > + .data_lines = 24, > + > +#if defined CONFIG_FB_OMAP_031M3R > + > + /* 640 x 480 @ 60 Hz Reduced blanking VESA CVT 0.31M3-R */ > + .x_res = 640, > + .y_res = 480, > + .hfp = 48, > + .hsw = 32, > + .hbp = 80, > + .vfp = 3, > + .vsw = 4, > + .vbp = 7, > + .pixel_clock = 23500, > + > +#elif defined CONFIG_FB_OMAP_048M3R > + > + /* 800 x 600 @ 60 Hz Reduced blanking VESA CVT 0.48M3-R */ > + .x_res = 800, > + .y_res = 600, > + .hfp = 48, > + .hsw = 32, > + .hbp = 80, > + .vfp = 3, > + .vsw = 4, > + .vbp = 11, > + .pixel_clock = 35500, > + > +#elif defined CONFIG_FB_OMAP_079M3R > + > + /* 1024 x 768 @ 60 Hz Reduced blanking VESA CVT 0.79M3-R */ > + .x_res = 1024, > + .y_res = 768, > + .hfp = 48, > + .hsw = 32, > + .hbp = 80, > + .vfp = 3, > + .vsw = 4, > + .vbp = 15, > + .pixel_clock = 56000, > + > +#elif defined CONFIG_FB_OMAP_092M9R > + > + /* 1280 x 720 @ 60 Hz Reduced blanking VESA CVT 0.92M9-R */ > + .x_res = 1280, > + .y_res = 720, > + .hfp = 48, > + .hsw = 32, > + .hbp = 80, > + .vfp = 3, > + .vsw = 5, > + .vbp = 13, > + .pixel_clock = 64000, > + > +#else > + > + /* use 640 x 480 if no config option */ > + /* 640 x 480 @ 60 Hz Reduced blanking VESA CVT 0.31M3-R */ > + .x_res = 640, > + .y_res = 480, > + .hfp = 48, > + .hsw = 32, > + .hbp = 80, > + .vfp = 3, > + .vsw = 4, > + .vbp = 7, > + .pixel_clock = 23500, > + > +#endif > + > + .init = overo_panel_init, > + .cleanup = overo_panel_cleanup, > + .enable = overo_panel_enable, > + .disable = overo_panel_disable, > + .get_caps = overo_panel_get_caps, > +}; > + > +static int overo_panel_probe(struct platform_device *pdev) > +{ > + omapfb_register_panel(&overo_panel); > + return 0; > +} > + > +static int overo_panel_remove(struct platform_device *pdev) > +{ > + return 0; > +} > + > +static int overo_panel_suspend(struct platform_device *pdev, > + pm_message_t mesg) > +{ > + return 0; > +} > + > +static int overo_panel_resume(struct platform_device *pdev) > +{ > + return 0; > +} > + > +struct platform_driver overo_panel_driver = { > + .probe = overo_panel_probe, > + .remove = overo_panel_remove, > + .suspend = overo_panel_suspend, > + .resume = overo_panel_resume, > + .driver = { > + .name = "overo_lcd", > + .owner = THIS_MODULE, > + }, > +}; > + > +static int __init overo_panel_drv_init(void) > +{ > + return platform_driver_register(&overo_panel_driver); > +} > + > +static void __exit overo_panel_drv_exit(void) > +{ > + platform_driver_unregister(&overo_panel_driver); > +} > + > +module_init(overo_panel_drv_init); > +module_exit(overo_panel_drv_exit); And this driver. You should put the lcd stuff in a separate patch, then it's easier to follow the changes in a logical way. -- balbi ^ permalink raw reply [flat|nested] 22+ messages in thread
[parent not found: <200809020815.58792.david-b@pacbell.net>]
* Re: [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board [not found] ` <200809020815.58792.david-b@pacbell.net> @ 2008-09-02 16:04 ` Steve Sakoman 0 siblings, 0 replies; 22+ messages in thread From: Steve Sakoman @ 2008-09-02 16:04 UTC (permalink / raw) To: David Brownell, linux-omap@vger.kernel.org On Tue, Sep 2, 2008 at 8:15 AM, David Brownell <david-b@pacbell.net> wrote: > On Monday 01 September 2008, sakoman@gmail.com wrote: >> + .name = "jffs2", > > Suggest "rootfs" instead ... have you looked at UBI/UBIFS instead? > I plan to use it on my Beagle... > > >> + gpio_direction_output(W2W_NRESET, 0); >> + udelay(10); >> + gpio_direction_output(W2W_NRESET, 1); > > These should be gpio_set_value(...) ... you already set the direction. > Ditto for BT_NRESET. And a suggestion: prefix those symbols with > something like OVERO_GPIO_ ... OVERO_ in case these move to public > headers (board-overo.h), GPIO_ since that's what they are. > > >> +++ b/drivers/video/omap/lcd_overo.c > > Strictly speaking this should be in a separate patch. Excellent suggestions! I will include in my resubmission. Steve ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board 2008-09-01 21:57 ` [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board sakoman ` (2 preceding siblings ...) [not found] ` <200809020815.58792.david-b@pacbell.net> @ 2008-09-02 20:58 ` Russell King - ARM Linux 2008-09-02 21:06 ` Steve Sakoman 3 siblings, 1 reply; 22+ messages in thread From: Russell King - ARM Linux @ 2008-09-02 20:58 UTC (permalink / raw) To: sakoman; +Cc: linux-omap, alsa-devel, Steve Sakoman On Mon, Sep 01, 2008 at 02:57:56PM -0700, sakoman@gmail.com wrote: > + .size = 15 * NAND_BLOCK_SIZE, Unnecessary additional spacing after '='. > +static struct omap_onenand_platform_data overo_onenand_data = { > + .parts = overo_onenand_partitions, > + .nr_parts = ARRAY_SIZE(overo_onenand_partitions), > + .dma_channel = -1, /* disable DMA in OMAP OneNAND driver */ Tabbing vs spacing indentation styles, please settle on one way to do it. > +void __init overo_flash_init(void) Should be static? > +{ > + u8 cs = 0; > + u8 onenandcs = GPMC_CS_NUM + 1; Do these two tabs after 'u8' help? Everywhere else you use a single space. > + > + while (cs < GPMC_CS_NUM) { > + u32 ret = 0; > + ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7); > + > + if ((ret & 0x3F) == (ONENAND_MAP >> 24)) > + onenandcs = cs; > + cs++; > + } > + if (onenandcs > GPMC_CS_NUM) { > + printk(KERN_ERR "OneNAND: Unable to find configuration" > + " in GPMC\n "); Unnecessary additional space after '\n' (which will result in the next line output by the kernel having its level tag ignored.) > + if ((gpio_request(W2W_NRESET, "W2W_NRESET") == 0) && > + (gpio_direction_output(W2W_NRESET, 1) == 0)) { > + gpio_export(W2W_NRESET, 0); > + gpio_direction_output(W2W_NRESET, 0); Since you've already just set W2W_NRESET as an output, shouldn't this be: gpio_set_value(W2W_NRESET, 0); instead? > + udelay(10); > + gpio_direction_output(W2W_NRESET, 1); gpio_set_value(W2W_NRESET, 1); ? Ditto for the rest like this. > + } else > + printk(KERN_ERR "could not obtain gpio for W2W_NRESET\n"); > + > + if ((gpio_request(BT_NRESET, "BT_NRESET") == 0) && > + (gpio_direction_output(BT_NRESET, 1) == 0)) { > + gpio_export(BT_NRESET, 0); > + gpio_direction_output(BT_NRESET, 0); > + mdelay(6); > + gpio_direction_output(BT_NRESET, 1); > + } else > + printk(KERN_ERR "could not obtain gpio for BT_NRESET\n"); > + > + if ((gpio_request(USBH_CPEN, "USBH_CPEN") == 0) && > + (gpio_direction_output(USBH_CPEN, 1) == 0)) > + gpio_export(USBH_CPEN, 0); > + else > + printk(KERN_ERR "could not obtain gpio for USBH_CPEN\n"); > + > + if ((gpio_request(USBH_NRESET, "USBH_NRESET") == 0) && > + (gpio_direction_output(USBH_NRESET, 1) == 0)) > + gpio_export(USBH_NRESET, 0); > + else > + printk(KERN_ERR "could not obtain gpio for USBH_NRESET\n"); > +} > + > +arch_initcall(overo_i2c_init); Is there a reason why overo_i2c_init can't be called from your .init_machine function? > diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h > index 438de80..f859c00 100644 > --- a/arch/arm/plat-omap/include/mach/hardware.h > +++ b/arch/arm/plat-omap/include/mach/hardware.h > @@ -374,6 +374,10 @@ > #include "board-sx1.h" > #endif > > +#ifdef CONFIG_MACH_OVERO > +#include "board-overo.h" > +#endif > + I do hate it when machine classes like to add all their platform specific header includes into another include, meaning that whenever you touch _any_ platform specific kernel, everything rebuilds whether it's affected or not. With the driver model, it just isn't necessary anymore; I would much rather prefer to see "board-overo.h" included by files which need it, which to me looks like being board-overo.c. > +static int overo_panel_init(struct lcd_panel *panel, > + struct omapfb_device *fbdev) > +{ > + if ((gpio_request(LCD_ENABLE, "LCD_ENABLE") == 0) && > + (gpio_direction_output(LCD_ENABLE, 1) == 0)) > + gpio_export(LCD_ENABLE, 0); > + else > + printk(KERN_ERR "could not obtain gpio for LCD_ENABLE\n"); > + > + return 0; > +} > + > +static void overo_panel_cleanup(struct lcd_panel *panel) > +{ No freeing of LCD_ENABLE? > +} > + > +static int overo_panel_enable(struct lcd_panel *panel) > +{ > + gpio_direction_output(LCD_ENABLE, 1); gpio_set_value() ? > + return 0; > +} > + > +static void overo_panel_disable(struct lcd_panel *panel) > +{ > + gpio_direction_output(LCD_ENABLE, 0); gpio_set_value() ? > +static int overo_panel_probe(struct platform_device *pdev) > +{ > + omapfb_register_panel(&overo_panel); > + return 0; > +} > + > +static int overo_panel_remove(struct platform_device *pdev) > +{ No possible unregistering of the panel? > +static int overo_panel_suspend(struct platform_device *pdev, > + pm_message_t mesg) > +{ > + return 0; > +} > + > +static int overo_panel_resume(struct platform_device *pdev) > +{ > + return 0; > +} No suspend/resume? So these empty functions aren't required. > + > +struct platform_driver overo_panel_driver = { Should be static. ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board 2008-09-02 20:58 ` Russell King - ARM Linux @ 2008-09-02 21:06 ` Steve Sakoman 0 siblings, 0 replies; 22+ messages in thread From: Steve Sakoman @ 2008-09-02 21:06 UTC (permalink / raw) To: Russell King - ARM Linux; +Cc: alsa-devel, linux-omap, Steve Sakoman On Tue, Sep 2, 2008 at 1:58 PM, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > On Mon, Sep 01, 2008 at 02:57:56PM -0700, sakoman@gmail.com wrote: >> + .size = 15 * NAND_BLOCK_SIZE, > > Unnecessary additional spacing after '='. <<SNIP>> >> +struct platform_driver overo_panel_driver = { > > Should be static. > Lots of great suggestions! I will incorporate them in my resubmission. Thanks, Steve ^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2008-09-02 21:06 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-01 21:57 [PATCH 0/4] ARM: OMAP2: Add support for Gumstix Overo sakoman
2008-09-01 21:57 ` [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board sakoman
2008-09-01 21:57 ` [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec sakoman
2008-09-01 21:57 ` [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo sakoman
2008-09-01 21:57 ` [PATCH 4/4] ARM: OMAP2: deconfig for the Gumstix Overo board sakoman
2008-09-02 11:29 ` [PATCH 3/4] SOUND: SOC: OMAP: Add support for Gumstix Overo Mark Brown
2008-09-02 13:19 ` Steve Sakoman
2008-09-02 11:26 ` [PATCH 2/4] SOUND: SOC: CODECS: Add support for the TWL4030 audio codec Mark Brown
2008-09-02 12:27 ` [alsa-devel] " Felipe Balbi
2008-09-02 14:25 ` Steve Sakoman
2008-09-02 14:53 ` Mark Brown
2008-09-02 16:36 ` Steve Sakoman
2008-09-02 18:54 ` [alsa-devel] " Mark Brown
2008-09-02 20:08 ` Liam Girdwood
2008-09-02 20:31 ` [alsa-devel] " Mark Brown
2008-09-02 20:51 ` Liam Girdwood
2008-09-02 20:48 ` [alsa-devel] " Steve Sakoman
2008-09-02 20:38 ` David Brownell
2008-09-02 0:46 ` [PATCH 1/4] ARM: OMAP2: Add support for the Gumstix Overo board Felipe Balbi
[not found] ` <200809020815.58792.david-b@pacbell.net>
2008-09-02 16:04 ` Steve Sakoman
2008-09-02 20:58 ` Russell King - ARM Linux
2008-09-02 21:06 ` Steve Sakoman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox