Merge of the acer A501 Code Drop

(Mostly a clean merge from the a500 to a501 diff, however sim_detect remains a module for this codebase as in v1.0.0) Note the a101 may also now work with sim-detect.. needs testing
ezterry · Aug 10, 2012 · f635dcc · f635dcc
1 parent 926893f
commit f635dcc
Show file tree

Hide file tree

Showing 24 changed files with 1,310 additions and 302 deletions.
diff --git a/arch/arm/configs/picasso_defconfig b/arch/arm/configs/picasso_defconfig
@@ -2338,7 +2338,7 @@ CONFIG_ROTATELOCK=y
 CONFIG_DOCK_V1=y
 # CONFIG_DOCK_V2 is not set
 # CONFIG_PSENSOR3G is not set
-# CONFIG_SIMDETECT is not set
+CONFIG_SIMDETECT=m
 CONFIG_PSENSOR=y
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
@@ -2746,7 +2746,7 @@ CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
-CONFIG_DEBUG_SLAB=y
+# CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SLAB_LEAK is not set
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_PREEMPT is not set

diff --git a/arch/arm/configs/picasso_e_defconfig b/arch/arm/configs/picasso_e_defconfig
@@ -976,7 +976,7 @@ CONFIG_MISC_DEVICES=y
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_HMC6352 is not set
 # CONFIG_SENSORS_AK8975 is not set
-# CONFIG_SENSORS_NCT1008 is not set
+CONFIG_SENSORS_NCT1008=y
 # CONFIG_DS1682 is not set
 CONFIG_UID_STAT=y
 # CONFIG_BMP085 is not set
@@ -2737,7 +2737,7 @@ CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
-CONFIG_DEBUG_SLAB=y
+# CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SLAB_LEAK is not set
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_PREEMPT is not set

diff --git a/arch/arm/configs/vangogh_defconfig b/arch/arm/configs/vangogh_defconfig
@@ -2337,7 +2337,7 @@ CONFIG_ROTATELOCK=y
 CONFIG_DOCK_V1=y
 # CONFIG_DOCK_V2 is not set
 # CONFIG_PSENSOR3G is not set
-# CONFIG_SIMDETECT is not set
+CONFIG_SIMDETECT=m
 # CONFIG_PSENSOR is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set

diff --git a/arch/arm/mach-tegra/board-acer-t20.c b/arch/arm/mach-tegra/board-acer-t20.c
@@ -200,7 +200,7 @@ static struct tegra_ulpi_config ventana_ehci2_ulpi_phy_config = {
 
 static struct tegra_ehci_platform_data ventana_ehci2_ulpi_platform_data = {
 	.operating_mode = TEGRA_USB_HOST,
-	.power_down_on_bus_suspend = 1,
+	.power_down_on_bus_suspend = 0,
 	.phy_config = &ventana_ehci2_ulpi_phy_config,
 	.phy_type = TEGRA_USB_PHY_TYPE_LINK_ULPI,
 };
@@ -562,6 +562,26 @@ static void p_sensor_init(void)
 }
 #endif
 
+#ifdef CONFIG_SIMDETECT
+static struct gpio_switch_platform_data simdetect_switch_platform_data = {
+	.gpio = TEGRA_GPIO_PI7,
+};
+static struct platform_device picasso_simdetect_switch = {
+	.name = "simdetect",
+	.id   = -1,
+	.dev  = {
+		.platform_data = &simdetect_switch_platform_data,
+	},
+};
+
+static void simdet_init(void)
+{
+	if(get_sku_id() == BOARD_PICASSO_3G || get_sku_id() == BOARD_VANGOGH_3G) {
+		platform_device_register(&picasso_simdetect_switch);
+	}
+}
+#endif
+
 static struct platform_device *ventana_devices[] __initdata = {
 	&tegra_pmu_device,
 	&tegra_gart_device,
@@ -970,6 +990,9 @@ static void __init acer_t20_init(void)
 	ventana_setup_bluesleep();
 #if defined(CONFIG_ACER_VIBRATOR)
 	vib_init();
+#endif
+#ifdef CONFIG_SIMDETECT
+	simdet_init();
 #endif
 	tegra_release_bootloader_fb();
 }

diff --git a/arch/arm/mach-tegra/dvfs.c b/arch/arm/mach-tegra/dvfs.c
@@ -634,11 +634,6 @@ struct dvfs_rail *tegra_dvfs_get_rail_by_name(const char *reg_id)
 	mutex_unlock(&dvfs_lock);
 	return NULL;
 }
-#if defined(CONFIG_ARCH_ACER_T20) || defined(CONFIG_ARCH_ACER_T30)
-EXPORT_SYMBOL_GPL(tegra_dvfs_rail_enable);
-EXPORT_SYMBOL_GPL(tegra_dvfs_rail_disable_by_name);
-EXPORT_SYMBOL_GPL(tegra_dvfs_get_rail_by_name);
-#endif
 
 bool tegra_dvfs_rail_updating(struct clk *clk)
 {

diff --git a/arch/arm/mach-tegra/include/mach/usb_phy.h b/arch/arm/mach-tegra/include/mach/usb_phy.h
@@ -113,6 +113,7 @@ struct tegra_usb_phy {
 	bool remote_wakeup;
 	int hotplug;
 	unsigned int xcvr_setup_value;
+	unsigned int controller_reset;
 };
 
 typedef int (*tegra_phy_fp)(struct tegra_usb_phy *phy, bool is_dpd);

diff --git a/arch/arm/mach-tegra/tegra2_dvfs.c b/arch/arm/mach-tegra/tegra2_dvfs.c
@@ -191,9 +191,9 @@ static struct dvfs dvfs_init[] = {
 	CORE_DVFS("nor",     -1, 1, KHZ, 0,      92000,  92000,  92000,  92000,  92000,  92000),
 	CORE_DVFS("ide",     -1, 1, KHZ, 0,      0,      100000, 100000, 100000, 100000, 100000),
 	CORE_DVFS("mipi",    -1, 1, KHZ, 0,      40000,  40000,  40000,  40000,  60000,  60000),
-	CORE_DVFS("usbd",    -1, 1, KHZ, 400000, 400000, 400000, 480000, 480000, 480000, 480000),
+	CORE_DVFS("usbd",    -1, 1, KHZ, 400000,      400000,      400000,      480000, 480000, 480000, 480000),
 	CORE_DVFS("usb2",    -1, 1, KHZ, 0,      0,      480000, 480000, 480000, 480000, 480000),
-	CORE_DVFS("usb3",    -1, 1, KHZ, 400000, 400000, 400000, 480000, 480000, 480000, 480000),
+	CORE_DVFS("usb3",    -1, 1, KHZ, 400000,      400000,      400000,  480000, 480000, 480000, 480000),
 	CORE_DVFS("pcie",    -1, 1, KHZ, 0,      0,      0,      250000, 250000, 250000, 250000),
 	CORE_DVFS("dsi",     -1, 1, KHZ, 100000, 100000, 100000, 500000, 500000, 500000, 500000),
 	CORE_DVFS("tvo",     -1, 1, KHZ, 0,      0,      0,      250000, 250000, 250000, 250000),