Revert "update source to M7630AABBQMLZA404028"

This reverts commit a62ce64. Conflicts: kernel/arch/arm/configs/acer_a4_defconfig kernel/arch/arm/configs/acer_a5_defconfig kernel/drivers/misc/Kconfig kernel/drivers/video/msm/mddihosti.c kernel/include/linux/msm_mdp.h
marcOcram · Jun 23, 2012 · e3858b1 · e3858b1
1 parent 0dc3b01
commit e3858b1
Show file tree

Hide file tree

Showing 139 changed files with 4,080 additions and 6,311 deletions.
diff --git a/kernel/arch/arm/configs/acer_a4_defconfig b/kernel/arch/arm/configs/acer_a4_defconfig
@@ -1039,8 +1039,7 @@ CONFIG_PMIC8058_UPL=y
 # CONFIG_PMIC8058_MISC is not set
 # CONFIG_MCU_MSP430 is not set
 CONFIG_SENSORS_ISL29018=y
-CONFIG_SENSORS_AK8975_ACER=y
-# CONFIG_SENSORS_AK8975 is not set
+CONFIG_SENSORS_AK8975B=y
 # CONFIG_SENSORS_ADI_ADXL346 is not set
 CONFIG_BOSCH_SMB380=y
 # CONFIG_C2PORT is not set

diff --git a/kernel/arch/arm/configs/acer_a5_defconfig b/kernel/arch/arm/configs/acer_a5_defconfig
@@ -1025,8 +1025,7 @@ CONFIG_ANDROID_PMEM=y
 # CONFIG_VP_A1026 is not set
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
-# CONFIG_SENSORS_AK8975_ACER is not set
-# CONFIG_SENSORS_AK8975 is not set
+# CONFIG_SENSORS_AK8975B is not set
 # CONFIG_SENSORS_ADI_ADXL346 is not set
 CONFIG_UID_STAT=y
 # CONFIG_WL127X_RFKILL is not set

diff --git a/kernel/arch/arm/configs/msm8660-perf_defconfig b/kernel/arch/arm/configs/msm8660-perf_defconfig
@@ -341,7 +341,7 @@ CONFIG_MSM_SMD_TTY=y
 # CONFIG_MSM_SMD_QMI is not set
 CONFIG_MSM_SMD_PKT=y
 CONFIG_MSM_SDIO_CMUX=y
-# CONFIG_MSM_DSPS is not set
+CONFIG_MSM_DSPS=y
 CONFIG_MSM_SDIO_CTL=y
 CONFIG_MSM_ONCRPCROUTER=y
 CONFIG_MSM_ONCRPCROUTER_DEBUG=y
@@ -372,7 +372,7 @@ CONFIG_MSM_PM_TIMEOUT_HALT=y
 # CONFIG_MSM_PM_TIMEOUT_RESET_CHIP is not set
 CONFIG_MSM_IDLE_WAIT_ON_MODEM=0
 CONFIG_MSM_PIL=y
-CONFIG_MSM_SECURE_PIL=y
+# CONFIG_MSM_SECURE_PIL is not set
 CONFIG_MSM_SCM=y
 CONFIG_MSM_RPM_LOG=y
 # CONFIG_SMMU is not set

diff --git a/kernel/arch/arm/configs/msm8660_defconfig b/kernel/arch/arm/configs/msm8660_defconfig
@@ -341,7 +341,7 @@ CONFIG_MSM_SMD_TTY=y
 # CONFIG_MSM_SMD_QMI is not set
 CONFIG_MSM_SMD_PKT=y
 CONFIG_MSM_SDIO_CMUX=y
-# CONFIG_MSM_DSPS is not set
+CONFIG_MSM_DSPS=y
 CONFIG_MSM_SDIO_CTL=y
 CONFIG_MSM_ONCRPCROUTER=y
 CONFIG_MSM_ONCRPCROUTER_DEBUG=y

diff --git a/kernel/arch/arm/include/asm/mach/mmc.h b/kernel/arch/arm/include/asm/mach/mmc.h
@@ -23,7 +23,6 @@ struct embedded_sdio_data {
 struct mmc_platform_data {
 	unsigned int ocr_mask;			/* available voltages */
 	u32 (*translate_vdd)(struct device *, unsigned int);
-	void (*sdio_lpm_gpio_setup)(struct device *, unsigned int);
 	unsigned int (*status)(struct device *);
         unsigned int status_irq;
         struct embedded_sdio_data *embedded_sdio;
@@ -39,7 +38,6 @@ struct mmc_platform_data {
 	bool nonremovable;
 	bool pclk_src_dfab;
 	int (*cfg_mpm_sdiowakeup)(struct device *, unsigned);
-	int is_sdio_al_client;
 };
 
 #endif
diff --git a/kernel/arch/arm/mach-msm/Kconfig b/kernel/arch/arm/mach-msm/Kconfig
@@ -819,7 +819,7 @@ config MSM_N_WAY_SMSM
 config MSM_RESET_MODEM
 	tristate "Reset Modem Driver"
 	depends on MSM_SMD
-	default m
+	default n
 	help
 	  Allows the user to reset the modem through a device node.
 
@@ -1328,17 +1328,6 @@ config MSM_RPM_LOG
 	  information about RPM operation. The driver outputs the messages
 	  via a debugfs node.
 
-config MSM_RPM_STATS_LOG
-	tristate "MSM Resource Power Manager Stat Driver
-	depends on DEBUG_FS
-	depends on ARCH_MSM8X60
-	default n
-	  help
-	  This option enables a driver which reads RPM messages from a shared
-	  memory location. These messages provide statistical information about
-	  the low power modes that RPM enters. The drivers outputs the message
-	  via a debugfs node.
-
 config SMMU
 	bool "System MMU support"
 	depends on MMU

diff --git a/kernel/arch/arm/mach-msm/Makefile b/kernel/arch/arm/mach-msm/Makefile
@@ -119,7 +119,7 @@ obj-$(CONFIG_MACH_QSD8X50A_SURF) += board-qsd8x50.o
 obj-$(CONFIG_MACH_QSD8X50A_FFA) += board-qsd8x50.o
 obj-$(CONFIG_MACH_QSD8X50A_ST1_5) += board-qsd8x50a-st1x.o
 obj-$(CONFIG_ARCH_MSM8X60) += devices-msm8x60.o clock-local.o clock-8x60.o acpuclock-8x60.o
-obj-$(CONFIG_ARCH_MSM8X60) += clock-rpm.o spm.o restart.o
+obj-$(CONFIG_ARCH_MSM8X60) += clock-8x60_mxo.o clock-rpm.o spm.o restart.o
 obj-$(CONFIG_ARCH_MSM8X60) += subsystem-fatal-8x60.o
 obj-$(CONFIG_ARCH_MSM8X60) += saw-regulator.o
 obj-$(CONFIG_ARCH_MSM8X60) += rpm-regulator.o
@@ -162,7 +162,6 @@ obj-$(CONFIG_MSM_SDIO_SMEM) += sdio_smem.o
 obj-$(CONFIG_PMIC8058) += pmic8058-gpio.o pmic8058-mpp.o
 obj-$(CONFIG_ARCH_MSM7X30) += spm.o
 obj-$(CONFIG_MSM_RPM) += rpm.o rpm_resources.o mpm.o
-obj-$(CONFIG_MSM_RPM_STATS_LOG) += rpm_stats.o
 obj-$(CONFIG_MSM_RPM_LOG) += rpm_log.o
 obj-$(CONFIG_MSM_XO) += msm_xo.o
 obj-$(CONFIG_MSM_BUS_SCALING)	+= msm_bus_core.o msm_bus_fabric.o msm_bus_board_8660.o

diff --git a/kernel/arch/arm/mach-msm/acpuclock-7x30.c b/kernel/arch/arm/mach-msm/acpuclock-7x30.c
@@ -548,7 +548,6 @@ void __init pll2_fixup(void)
 		}
 #endif
 	}
-
 #ifndef CONFIG_ENABLE_OVERCLOCK
 	pr_err("Unknown PLL2 lval %d\n", pll2_l);
 	BUG();

diff --git a/kernel/arch/arm/mach-msm/acpuclock-8x50a.c b/kernel/arch/arm/mach-msm/acpuclock-8x50a.c
@@ -270,6 +270,7 @@ int acpuclk_set_rate(int cpu, unsigned long rate, enum setrate_reason reason)
 {
 	struct clkctl_acpu_speed *tgt_s, *strt_s;
 	int res, rc = 0;
+	int freq_index = 0;
 
 	if (reason == SETRATE_CPUFREQ)
 		mutex_lock(&drv_state.lock);
@@ -279,9 +280,11 @@ int acpuclk_set_rate(int cpu, unsigned long rate, enum setrate_reason reason)
 	if (rate == strt_s->acpuclk_khz)
 		goto out;
 
-	for (tgt_s = acpu_freq_tbl; tgt_s->acpuclk_khz != 0; tgt_s++)
+	for (tgt_s = acpu_freq_tbl; tgt_s->acpuclk_khz != 0; tgt_s++) {
 		if (tgt_s->acpuclk_khz == rate)
 			break;
+		freq_index++;
+	}
 
 	if (tgt_s->acpuclk_khz == 0) {
 		rc = -EINVAL;