CHROMIUM: ARM: Tegra: Harmony: Support for latest ASoC driver

arch/arm/mach-tegra/board-harmony.c

 /*
  * arch/arm/mach-tegra/board-harmony.c
  *
  * Copyright (C) 2010 Google, Inc.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
  * may be copied, distributed, and modified under those terms.
  *
  * This program is distributed in the hope that it will be useful,
@@ skipping 11 matching lines @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/dma-mapping.h>
 #include <linux/pda_power.h>
 #include <linux/i2c.h>
 #include <linux/i2c-tegra.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/tegra_usb.h>
 
+#include <sound/wm8903.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/setup.h>
 
+#include <mach/harmony_audio.h>
 #include <mach/iomap.h>
 #include <mach/irqs.h>
 #include <mach/nand.h>
 #include <mach/clk.h>
+#include <mach/gpio.h>
 #include <mach/usb_phy.h>
 #include <mach/suspend.h>
 
 #include "clock.h"
 #include "board.h"
 #include "board-harmony.h"
 #include "devices.h"
+#include "gpio-names.h"
 
 /* NVidia bootloader tags */
 #define ATAG_NVIDIA             0x41000801
 
 #define ATAG_NVIDIA_RM                  0x1
 #define ATAG_NVIDIA_DISPLAY             0x2
 #define ATAG_NVIDIA_FRAMEBUFFER         0x3
 #define ATAG_NVIDIA_CHIPSHMOO           0x4
 #define ATAG_NVIDIA_CHIPSHMOOPHYS       0x5
 #define ATAG_NVIDIA_PRESERVED_MEM_0     0x10000
@@ skipping 155 matching lines @@
         .bus_clk_rate   = { 400000, 0 },
 };
 
 static struct tegra_i2c_platform_data harmony_dvc_platform_data = {
         .adapter_nr     = 4,
         .bus_count      = 1,
         .bus_clk_rate   = { 400000, 0 },
         .is_dvc         = true,
 };
 
+static struct wm8903_platform_data wm8903_pdata = {
+        .irq_active_low = 0,
+        .micdet_cfg = 0,
+        .micdet_delay = 100,
+        .gpio_base = GPIO_WM8903(0),
+        .gpio_cfg = {
+                WM8903_GPIO_NO_CONFIG,
+                WM8903_GPIO_NO_CONFIG,
+                0,
+                WM8903_GPIO_NO_CONFIG,
+                WM8903_GPIO_NO_CONFIG,
+        },
+};
+
 static struct i2c_board_info __initdata harmony_i2c_bus1_board_info[] = {
         {
                 I2C_BOARD_INFO("wm8903", 0x1a),
+                .platform_data = &wm8903_pdata,
+                .irq = TEGRA_GPIO_TO_IRQ(TEGRA_GPIO_PX3),
         },
 };
 
 static void harmony_i2c_init(void)
 {
         tegra_i2c_device1.dev.platform_data = &harmony_i2c1_platform_data;
         tegra_i2c_device2.dev.platform_data = &harmony_i2c2_platform_data;
         tegra_i2c_device3.dev.platform_data = &harmony_i2c3_platform_data;
         tegra_i2c_device4.dev.platform_data = &harmony_dvc_platform_data;
 
         platform_device_register(&tegra_i2c_device1);
         platform_device_register(&tegra_i2c_device2);
         platform_device_register(&tegra_i2c_device3);
         platform_device_register(&tegra_i2c_device4);
 
         i2c_register_board_info(0, harmony_i2c_bus1_board_info,
                                 ARRAY_SIZE(harmony_i2c_bus1_board_info));
 }
 
+static struct harmony_audio_platform_data audio_pdata = {
+        .gpio_spkr_en = GPIO_WM8903(2),
+        .gpio_hp_det = TEGRA_GPIO_PW2,
+        .gpio_int_mic_en = TEGRA_GPIO_PX0,
+        .gpio_ext_mic_en = TEGRA_GPIO_PX1,
+};
+
+static struct platform_device audio_device = {
+        .name = "tegra-snd-harmony",
+        .id   = 0,
+        .dev  = {
+                .platform_data  = &audio_pdata,
+        },
+};
+
 static struct platform_device *harmony_devices[] __initdata = {
         &debug_uart,
         &pmu_device,
         &tegra_nand_device,
         &tegra_udc_device,
         &pda_power_device,
         &tegra_ehci3_device,
         &tegra_spi_device1,
         &tegra_spi_device2,
         &tegra_spi_device3,
         &tegra_spi_device4,
         &tegra_gart_device,
         &tegra_i2s_device1,
         &tegra_das_device,
         &tegra_pcm_device,
+        &audio_device,
         &tegra_avp_device,
 };
 
 static void __init tegra_harmony_fixup(struct machine_desc *desc,
         struct tag *tags, char **cmdline, struct meminfo *mi)
 {
         mi->nr_banks = 2;
         mi->bank[0].start = PHYS_OFFSET;
         mi->bank[0].size = 448 * SZ_1M;
         mi->bank[1].start = SZ_512M;
@@ skipping 107 matching lines @@
         harmony_pinmux_init();
 
         tegra_common_init();
 
         tegra_init_suspend(&harmony_suspend);
 
         tegra_clk_init_from_table(harmony_clk_init_table);
 
         tegra_ehci3_device.dev.platform_data = &tegra_ehci_pdata;
 
+        tegra_gpio_enable(audio_pdata.gpio_hp_det);
+        tegra_gpio_enable(audio_pdata.gpio_int_mic_en);
+        tegra_gpio_enable(audio_pdata.gpio_ext_mic_en);
+        tegra_gpio_enable(TEGRA_IRQ_TO_GPIO(harmony_i2c_bus1_board_info[0].irq));
+
         platform_add_devices(harmony_devices, ARRAY_SIZE(harmony_devices));
 
         harmony_panel_init();
         harmony_sdhci_init();
         harmony_i2c_init();
 }
 
 MACHINE_START(HARMONY, "harmony")
         .boot_params  = 0x00000100,
         .fixup          = tegra_harmony_fixup,
         .init_irq       = tegra_init_irq,
         .init_machine   = tegra_harmony_init,
         .map_io         = tegra_map_common_io,
         .timer          = &tegra_timer,
 MACHINE_END