Merge branches 'gemini' and 'misc' into devel

1 files changed, 99 insertions, 6 deletions

diff --git a/arch/arm/mach-msm/proc_comm.h b/arch/arm/mach-msm/proc_comm.h
index 834760f25692..12da4cacd4a8 100644
--- a/arch/arm/mach-msm/proc_comm.h
+++ b/arch/arm/mach-msm/proc_comm.h
@@ -16,6 +16,8 @@
 #ifndef _ARCH_ARM_MACH_MSM_PROC_COMM_H_
 #define _ARCH_ARM_MACH_MSM_PROC_COMM_H_
 
+#include <linux/init.h>
+
 enum {
         PCOM_CMD_IDLE = 0x0,
         PCOM_CMD_DONE,
@@ -62,19 +64,104 @@ enum {
         PCOM_RESET_CHIP_IMM,
         PCOM_PM_VID_EN,
         PCOM_VREG_PULLDOWN,
+        PCOM_GET_MODEM_VERSION,
+        PCOM_CLK_REGIME_SEC_RESET,
+        PCOM_CLK_REGIME_SEC_RESET_ASSERT,
+        PCOM_CLK_REGIME_SEC_RESET_DEASSERT,
+        PCOM_CLK_REGIME_SEC_PLL_REQUEST_WRP,
+        PCOM_CLK_REGIME_SEC_ENABLE,
+        PCOM_CLK_REGIME_SEC_DISABLE,
+        PCOM_CLK_REGIME_SEC_IS_ON,
+        PCOM_CLK_REGIME_SEC_SEL_CLK_INV,
+        PCOM_CLK_REGIME_SEC_SEL_CLK_SRC,
+        PCOM_CLK_REGIME_SEC_SEL_CLK_DIV,
+        PCOM_CLK_REGIME_SEC_ICODEC_CLK_ENABLE,
+        PCOM_CLK_REGIME_SEC_ICODEC_CLK_DISABLE,
+        PCOM_CLK_REGIME_SEC_SEL_SPEED,
+        PCOM_CLK_REGIME_SEC_CONFIG_GP_CLK_WRP,
+        PCOM_CLK_REGIME_SEC_CONFIG_MDH_CLK_WRP,
+        PCOM_CLK_REGIME_SEC_USB_XTAL_ON,
+        PCOM_CLK_REGIME_SEC_USB_XTAL_OFF,
+        PCOM_CLK_REGIME_SEC_SET_QDSP_DME_MODE,
+        PCOM_CLK_REGIME_SEC_SWITCH_ADSP_CLK,
+        PCOM_CLK_REGIME_SEC_GET_MAX_ADSP_CLK_KHZ,
+        PCOM_CLK_REGIME_SEC_GET_I2C_CLK_KHZ,
+        PCOM_CLK_REGIME_SEC_MSM_GET_CLK_FREQ_KHZ,
+        PCOM_CLK_REGIME_SEC_SEL_VFE_SRC,
+        PCOM_CLK_REGIME_SEC_MSM_SEL_CAMCLK,
+        PCOM_CLK_REGIME_SEC_MSM_SEL_LCDCLK,
+        PCOM_CLK_REGIME_SEC_VFE_RAIL_OFF,
+        PCOM_CLK_REGIME_SEC_VFE_RAIL_ON,
+        PCOM_CLK_REGIME_SEC_GRP_RAIL_OFF,
+        PCOM_CLK_REGIME_SEC_GRP_RAIL_ON,
+        PCOM_CLK_REGIME_SEC_VDC_RAIL_OFF,
+        PCOM_CLK_REGIME_SEC_VDC_RAIL_ON,
+        PCOM_CLK_REGIME_SEC_LCD_CTRL,
+        PCOM_CLK_REGIME_SEC_REGISTER_FOR_CPU_RESOURCE,
+        PCOM_CLK_REGIME_SEC_DEREGISTER_FOR_CPU_RESOURCE,
+        PCOM_CLK_REGIME_SEC_RESOURCE_REQUEST_WRP,
+        PCOM_CLK_REGIME_MSM_SEC_SEL_CLK_OWNER,
+        PCOM_CLK_REGIME_SEC_DEVMAN_REQUEST_WRP,
+        PCOM_GPIO_CONFIG,
+        PCOM_GPIO_CONFIGURE_GROUP,
+        PCOM_GPIO_TLMM_SET_PORT,
+        PCOM_GPIO_TLMM_CONFIG_EX,
+        PCOM_SET_FTM_BOOT_COUNT,
+        PCOM_RESERVED0,
+        PCOM_RESERVED1,
+        PCOM_CUSTOMER_CMD1,
+        PCOM_CUSTOMER_CMD2,
+        PCOM_CUSTOMER_CMD3,
+        PCOM_CLK_REGIME_ENTER_APPSBL_CHG_MODE,
+        PCOM_CLK_REGIME_EXIT_APPSBL_CHG_MODE,
+        PCOM_CLK_REGIME_SEC_RAIL_DISABLE,
+        PCOM_CLK_REGIME_SEC_RAIL_ENABLE,
+        PCOM_CLK_REGIME_SEC_RAIL_CONTROL,
+        PCOM_SET_SW_WATCHDOG_STATE,
+        PCOM_PM_MPP_CONFIG_DIGITAL_INPUT,
+        PCOM_PM_MPP_CONFIG_I_SINK,
+        PCOM_RESERVED_101,
+        PCOM_MSM_HSUSB_PHY_RESET,
+        PCOM_GET_BATT_MV_LEVEL,
+        PCOM_CHG_USB_IS_PC_CONNECTED,
+        PCOM_CHG_USB_IS_CHARGER_CONNECTED,
+        PCOM_CHG_USB_IS_DISCONNECTED,
+        PCOM_CHG_USB_IS_AVAILABLE,
+        PCOM_CLK_REGIME_SEC_MSM_SEL_FREQ,
+        PCOM_CLK_REGIME_SEC_SET_PCLK_AXI_POLICY,
+        PCOM_CLKCTL_RPC_RESET_ASSERT,
+        PCOM_CLKCTL_RPC_RESET_DEASSERT,
+        PCOM_CLKCTL_RPC_RAIL_ON,
+        PCOM_CLKCTL_RPC_RAIL_OFF,
+        PCOM_CLKCTL_RPC_RAIL_ENABLE,
+        PCOM_CLKCTL_RPC_RAIL_DISABLE,
+        PCOM_CLKCTL_RPC_RAIL_CONTROL,
+        PCOM_CLKCTL_RPC_MIN_MSMC1,
         PCOM_NUM_CMDS,
 };
 
 enum {
-         PCOM_INVALID_STATUS = 0x0,
-         PCOM_READY,
-         PCOM_CMD_RUNNING,
-         PCOM_CMD_SUCCESS,
-         PCOM_CMD_FAIL,
+        PCOM_INVALID_STATUS = 0x0,
+        PCOM_READY,
+        PCOM_CMD_RUNNING,
+        PCOM_CMD_SUCCESS,
+        PCOM_CMD_FAIL,
+        PCOM_CMD_FAIL_FALSE_RETURNED,
+        PCOM_CMD_FAIL_CMD_OUT_OF_BOUNDS_SERVER,
+        PCOM_CMD_FAIL_CMD_OUT_OF_BOUNDS_CLIENT,
+        PCOM_CMD_FAIL_CMD_UNREGISTERED,
+        PCOM_CMD_FAIL_CMD_LOCKED,
+        PCOM_CMD_FAIL_SERVER_NOT_YET_READY,
+        PCOM_CMD_FAIL_BAD_DESTINATION,
+        PCOM_CMD_FAIL_SERVER_RESET,
+        PCOM_CMD_FAIL_SMSM_NOT_INIT,
+        PCOM_CMD_FAIL_PROC_COMM_BUSY,
+        PCOM_CMD_FAIL_PROC_COMM_NOT_INIT,
+
 };
 
 /* List of VREGs that support the Pull Down Resistor setting. */
-enum {
+enum vreg_pdown_id {
         PM_VREG_PDOWN_MSMA_ID,
         PM_VREG_PDOWN_MSMP_ID,
         PM_VREG_PDOWN_MSME1_ID, /* Not supported in Panoramix */
@@ -131,6 +218,11 @@ enum {
         PM_VREG_PDOWN_XO_ID = PM_VREG_PDOWN_TCXO_ID
 };
 
+enum {
+        PCOM_CLKRGM_APPS_RESET_USB_PHY  = 34,
+        PCOM_CLKRGM_APPS_RESET_USBH     = 37,
+};
+
 /* gpio info for PCOM_RPC_GPIO_TLMM_CONFIG_EX */
 
 #define GPIO_ENABLE     0
@@ -161,5 +253,6 @@ enum {
                 (((drvstr) & 0xF) << 17))
 
 int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2);
+void __init proc_comm_boot_wait(void);
 
 #endif