fixup! power: Remove duplicate Kconfig options

Change-Id: Ib8b041a84c5733dfbbb0b5a1933dd257b991c551

3 files changed, 57 insertions, 48 deletions

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 7e2e558ff71a..504e58a28dbc 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -15,6 +15,18 @@ config OPLUS_SM7250R_CHARGER
 	help
 	  Enables support for the oplus charging framework
 
+config OPLUS_CHARGER_OPTIGA
+        bool "OPLUS OPTIGA soc node"
+        help
+          Say Y to include support
+
+config OPLUS_SHORT_C_BATT_CHECK
+	tristate "OPLUS_SHORT_C_BATT CHECK SUPPORT"
+	default n
+	depends on MFD_SPMI_PMIC
+	help
+	  Say Y to include support
+
 config OPLUS_CALL_MODE_SUPPORT
 	bool "OPLUS call mode support"
 	help
@@ -25,6 +37,51 @@ config OPLUS_SMART_CHARGER_SUPPORT
 	help
 	  Say Y to include support
 
+config OPLUS_SHORT_HW_CHECK
+	tristate "OPLUS_SHORT_HW CHECK SUPPORT"
+	default n
+	depends on MFD_SPMI_PMIC
+	help
+	  Say Y to include support
+
+config OPLUS_CHIP_SOC_NODE
+	bool "OPLUS chip soc node"
+	help
+	  Say Y to include support
+
+
+config OPLUS_SHORT_IC_CHECK
+	tristate "OPLUS_SHORT_IC CHECK SUPPORT"
+	default n
+	depends on MFD_SPMI_PMIC
+	help
+	  Say Y to include support
+
+config OPLUS_SHORT_USERSPACE
+	bool "OPLUS batt userspace"
+	help
+	 Say Y to include support
+
+config OPLUS_RTC_DET_SUPPORT
+	tristate "OPLUS RTC DET SUPPORT"
+	default n
+	depends on MFD_SPMI_PMIC
+	help
+	  Say Y to include support
+
+config OPLUS_CHECK_CHARGERID_VOLT
+	tristate "OPLUS CHECK CHARGERID VOLT"
+	default n
+	depends on MFD_SPMI_PMIC
+	help
+	  Say Y to include support
+
+config OPLUS_SHIP_MODE_SUPPORT
+	tristate "OPLUS_SHIP_MODE_SUPPORT"
+	default n
+	depends on MFD_SPMI_PMIC
+	help
+	  Say Y to include support
 config OPLUS_CHARGER_WIRELESS_PEN
 	bool "OPLUS charger wireless pen"
 	help
diff --git a/drivers/power/oplus/Kconfig b/drivers/power/oplus/Kconfig
index ccafd8ee638a..ae7718e4c7a3 100644
--- a/drivers/power/oplus/Kconfig
+++ b/drivers/power/oplus/Kconfig
@@ -21,24 +21,6 @@ config OPLUS_SMART_CHARGER_SUPPORT
 	help
 	  Say Y to include support
 
-config OPLUS_RTC_DET_SUPPORT
-	bool "OPLUS RTC DET SUPPORT"
-	default n
-	help
-	  Say Y to include support
-
-config OPLUS_CHECK_CHARGERID_VOLT
-	bool "OPLUS CHECK CHARGERID VOLT"
-	default n
-	help
-	  Say Y to include support
-
-config OPLUS_SHIP_MODE_SUPPORT
-	bool "OPLUS_SHIP_MODE_SUPPORT"
-	default n
-	help
-	  Say Y to include support
-
 config OPLUS_CHG_DYNAMIC_CONFIG
 	bool "OPLUS_CHG_DYNAMIC_CONFIG"
 	default n
diff --git a/drivers/power/oplus/v1/Kconfig b/drivers/power/oplus/v1/Kconfig
index 86623c5d3aa1..dc0e5ecc1f5f 100644
--- a/drivers/power/oplus/v1/Kconfig
+++ b/drivers/power/oplus/v1/Kconfig
@@ -1,23 +1,8 @@
-config OPLUS_SHORT_C_BATT_CHECK
-	bool "OPLUS batt short "
-	help
-	  Say Y here to declare OPLUS batt short	  
-
 config OPLUS_STANDARD_BATTERY_CHECK_ADC
 	bool "OPLUS Official Standard Battery check by ADC"
 	help
 	  Say Y here to support Official Standard Battery check by ADC
 
-config OPLUS_SHORT_IC_CHECK
-	bool "OPLUS short ic"
-	help
-	  Say Y here to declare OPLUS batt short
-
-config OPLUS_SHORT_HW_CHECK
-	bool "OPLUS batt HW SHORT "
-	help
-	  Say Y here to declare charging system is on MTK
-
 config MTK_DISABLE_GAUGE
 	bool "OPLUS MTK disable gauge "
 	help
@@ -28,26 +13,11 @@ config OPLUS_SMOOTH_SOC
 	help
 	  Say Y here to include smooth soc
 
-config OPLUS_SHORT_USERSPACE
-	bool "OPLUS batt userspace"
-	help
-	  Say Y to include support
-
-config OPLUS_CHIP_SOC_NODE
-	bool "OPLUS chip soc node"
-	help
-	  Say Y to include support
-
 config OPLUS_CHARGER_WIRELESS_PEN
         bool "OPLUS charger wireless pen"
         help
           Say Y to include support
 
-config OPLUS_CHARGER_OPTIGA
-	bool "OPLUS OPTIGA soc node"
-	help
-	  Say Y to include support
-
 config OPLUS_MTK_DRM_GKI_NOTIFY_CHG
 	default n
 	tristate "chg mtk gki notify"