Merge "platform: msm_shared: Move the regulator APIs to target specifc files."
diff --git a/platform/msm_shared/include/regulator.h b/platform/msm_shared/include/regulator.h
index 4e6c932..9a54063 100644
--- a/platform/msm_shared/include/regulator.h
+++ b/platform/msm_shared/include/regulator.h
@@ -45,6 +45,11 @@
#define KEY_BYPASS_ALLOWED_KEY 0x61707962 //bypa - bypass allowed
#define KEY_CORNER_LEVEL_KEY 0x6E726F63 // corn - coner voltage
#define KEY_ACTIVE_FLOOR 0x636676
+#define GENERIC_DISABLE 0
+#define GENERIC_ENABLE 1
+#define SW_MODE_LDO_IPEAK 1
+#define LDOA_RES_TYPE 0x616F646C //aodl
+#define SMPS_RES_TYPE 0x61706D73 //apms
void regulator_enable();
void regulator_disable();
diff --git a/platform/msm_shared/regulator.c b/platform/msm_shared/regulator.c
deleted file mode 100644
index 440049b..0000000
--- a/platform/msm_shared/regulator.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of The Linux Fundation, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <regulator.h>
-#include <rpm-smd.h>
-
-#define GENERIC_DISABLE 0
-#define GENERIC_ENABLE 1
-#define SW_MODE_LDO_IPEAK 1
-#define LDOA_RES_TYPE 0x616F646C //aodl
-#define SMPS_RES_TYPE 0x61706D73 //apms
-
-static uint32_t ldo2[][11]=
-{
- {
- LDOA_RES_TYPE, 2,
- KEY_SOFTWARE_ENABLE, 4, GENERIC_DISABLE,
- KEY_LDO_SOFTWARE_MODE, 4, SW_MODE_LDO_IPEAK,
- KEY_MICRO_VOLT, 4, 0,
- },
-
- {
- LDOA_RES_TYPE, 2,
- KEY_SOFTWARE_ENABLE, 4, GENERIC_ENABLE,
- KEY_LDO_SOFTWARE_MODE, 4, SW_MODE_LDO_IPEAK,
- KEY_MICRO_VOLT, 4, 1250000,
- },
-};
-
-static uint32_t ldo12[][11]=
-{
- {
- LDOA_RES_TYPE, 12,
- KEY_SOFTWARE_ENABLE, 4, GENERIC_DISABLE,
- KEY_LDO_SOFTWARE_MODE, 4, SW_MODE_LDO_IPEAK,
- KEY_MICRO_VOLT, 4, 0,
- },
-
- {
- LDOA_RES_TYPE, 12,
- KEY_SOFTWARE_ENABLE, 4, GENERIC_ENABLE,
- KEY_LDO_SOFTWARE_MODE, 4, SW_MODE_LDO_IPEAK,
- KEY_MICRO_VOLT, 4, 1800000,
- },
-};
-
-static uint32_t ldo14[][11]=
-{
- {
- LDOA_RES_TYPE, 14,
- KEY_SOFTWARE_ENABLE, 4, GENERIC_DISABLE,
- KEY_LDO_SOFTWARE_MODE, 4, SW_MODE_LDO_IPEAK,
- KEY_MICRO_VOLT, 4, 0,
- },
-
- {
- LDOA_RES_TYPE, 14,
- KEY_SOFTWARE_ENABLE, 4, GENERIC_ENABLE,
- KEY_LDO_SOFTWARE_MODE, 4, SW_MODE_LDO_IPEAK,
- KEY_MICRO_VOLT, 4, 1800000,
- },
-};
-
-static uint32_t ldo28[][11]=
-{
- {
- LDOA_RES_TYPE, 28,
- KEY_SOFTWARE_ENABLE, 4, GENERIC_DISABLE,
- KEY_LDO_SOFTWARE_MODE, 4, SW_MODE_LDO_IPEAK,
- KEY_MICRO_VOLT, 4, 0,
- },
-
- {
- LDOA_RES_TYPE, 28,
- KEY_SOFTWARE_ENABLE, 4, GENERIC_ENABLE,
- KEY_LDO_SOFTWARE_MODE, 4, SW_MODE_LDO_IPEAK,
- KEY_MICRO_VOLT, 4, 1000000,
- },
-
-};
-
-void regulator_enable()
-{
- rpm_send_data(&ldo2[GENERIC_ENABLE][0], 36, RPM_REQUEST_TYPE);
-
- rpm_send_data(&ldo12[GENERIC_ENABLE][0], 36, RPM_REQUEST_TYPE);
-
- rpm_send_data(&ldo14[GENERIC_ENABLE][0], 36, RPM_REQUEST_TYPE);
-
- rpm_send_data(&ldo28[GENERIC_ENABLE][0], 36, RPM_REQUEST_TYPE);
-}
-
-
-void regulator_disable()
-{
-
-}
diff --git a/platform/msm_shared/rules.mk b/platform/msm_shared/rules.mk
index 9d9196c..d6e048a 100755
--- a/platform/msm_shared/rules.mk
+++ b/platform/msm_shared/rules.mk
@@ -19,8 +19,7 @@
ifeq ($(ENABLE_SMD_SUPPORT),1)
OBJS += \
$(LOCAL_DIR)/rpm-smd.o \
- $(LOCAL_DIR)/smd.o \
- $(LOCAL_DIR)/regulator.o
+ $(LOCAL_DIR)/smd.o
endif
ifeq ($(ENABLE_SDHCI_SUPPORT),1)