arm: tegra: Remove reduntant headers for platform data
Rahul Mittal [Tue, 6 Nov 2012 13:25:07 +0000 (18:25 +0530)]
Remove reduntant header files
Correct platform data

Change-Id: I9a70b79031b5ba47ab87e50d94934e936749c4d7
Signed-off-by: Rahul Mittal <rmittal@nvidia.com>
Reviewed-on: http://git-master/r/161639
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijay Mali <vmali@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

arch/arm/mach-tegra/board-enterprise.c
arch/arm/mach-tegra/include/mach/tegra_aic326x_pdata.h [deleted file]
arch/arm/mach-tegra/include/mach/tegra_asoc_pdata.h
sound/soc/tegra/tegra_aic326x.c

index 06ae1a2..fe2a6c8 100644 (file)
@@ -59,7 +59,6 @@
 #include <mach/io_dpd.h>
 #include <mach/usb_phy.h>
 #include <mach/i2s.h>
-#include <mach/tegra_aic326x_pdata.h>
 #include <mach/tegra_asoc_pdata.h>
 #include <mach/tegra-bb-power.h>
 #include <mach/gpio-tegra.h>
diff --git a/arch/arm/mach-tegra/include/mach/tegra_aic326x_pdata.h b/arch/arm/mach-tegra/include/mach/tegra_aic326x_pdata.h
deleted file mode 100644 (file)
index b8d5915..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * arch/arm/mach-tegra/include/mach/tegra_aic326x_pdata.h
- *
- * Copyright 2011-2012 NVIDIA, 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,
- * 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.
- *
- */
-#ifndef __MACH_TEGRA_TLVAIC326X_H
-#define __MACH_TEGRA_TLVAIC326X_H
-
-#define        HIFI_CODEC              0
-#define        BASEBAND                1
-#define        BT_SCO                  2
-#define        VOICE_CODEC             3
-#define        NUM_I2S_DEVICES         4
-
-struct baseband_config {
-       int rate;
-       int channels;
-};
-
-struct tegra_aic326x_platform_data {
-       int gpio_spkr_en;
-       int gpio_hp_det;
-       int gpio_hp_mute;
-       int gpio_int_mic_en;
-       int gpio_ext_mic_en;
-       int audio_port_id[NUM_I2S_DEVICES];
-       struct baseband_config baseband_param;
-};
-#endif
-
index f1fea5d..3de36db 100644 (file)
@@ -17,9 +17,8 @@
 #define        HIFI_CODEC              0
 #define        BASEBAND                1
 #define        BT_SCO                  2
-#ifndef        NUM_I2S_DEVICES
-#define        NUM_I2S_DEVICES         3
-#endif
+#define        VOICE_CODEC             3
+#define        NUM_I2S_DEVICES         4
 
 #define        TEGRA_DAIFMT_DSP_A              0
 #define        TEGRA_DAIFMT_DSP_B              1
index b84ea31..4120664 100644 (file)
@@ -31,7 +31,6 @@
 #ifdef CONFIG_SWITCH
 #include <linux/switch.h>
 #endif
-#include <mach/tegra_aic326x_pdata.h>
 #include <mach/tegra_asoc_pdata.h>
 
 #include <sound/core.h>