From: 黄涛 <huangtao@rock-chips.com>
Date: Fri, 21 Jun 2013 10:00:47 +0000 (+0800)
Subject: rk3188m: add SOC_RK3188M config
X-Git-Tag: firefly_0821_release~6965^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=23a94796e9f39666d635d2e9c1a5b837e72c3b15;p=firefly-linux-kernel-4.4.55.git

rk3188m: add SOC_RK3188M config
---

diff --git a/arch/arm/mach-rk3188/Kconfig b/arch/arm/mach-rk3188/Kconfig
index e91a5adab370..c2cbe0ae805c 100755
--- a/arch/arm/mach-rk3188/Kconfig
+++ b/arch/arm/mach-rk3188/Kconfig
@@ -5,6 +5,9 @@ choice
 config SOC_RK3188
 	bool "RK3188"
 
+config SOC_RK3188M
+	bool "RK3188M"
+
 endchoice
 
 choice
@@ -36,11 +39,16 @@ config MACH_RK3188_JETTAB
 config MACH_RK3188_RK618
         bool "RK3188 RK618 sdk"
 
+config MACH_RK3188_FT
+	bool "RK3188 FT Board"
+
+endchoice
+
+choice
+	prompt "RK3188M Board Type"
+	depends on SOC_RK3188M
 
 config MACH_RK3188M_TB
 	bool "RK3188m Top Board"
 
-config MACH_RK3188_FT
-	bool "RK3188 FT Board"
-
 endchoice
diff --git a/arch/arm/plat-rk/include/plat/cpu.h b/arch/arm/plat-rk/include/plat/cpu.h
index 11cf548a0c7a..23ee47716bba 100644
--- a/arch/arm/plat-rk/include/plat/cpu.h
+++ b/arch/arm/plat-rk/include/plat/cpu.h
@@ -101,6 +101,12 @@ static inline bool cpu_is_rk3188(void)
 	return soc_is_rk3188plus() || soc_is_rk3188();
 }
 
+#ifdef CONFIG_SOC_RK3188M
+static inline bool soc_is_rk3188m(void) { return true; }
+#else
+static inline bool soc_is_rk3188m(void) { return false; }
+#endif
+
 static inline bool soc_is_rk3028(void) { return soc_is_rk3168m(); }
 static inline bool soc_is_rk3168(void) { return soc_is_rk3108(); }
 
diff --git a/drivers/usb/dwc_otg/usbdev_rk30.c b/drivers/usb/dwc_otg/usbdev_rk30.c
index a601d6e5c462..f651f658afca 100755
--- a/drivers/usb/dwc_otg/usbdev_rk30.c
+++ b/drivers/usb/dwc_otg/usbdev_rk30.c
@@ -27,7 +27,7 @@
 #if defined(CONFIG_SOC_RK3066B) || defined(CONFIG_SOC_RK3108) 
 #define RK3066B_HOST_DRV_VBUS RK30_PIN0_PD7
 #define RK3066B_OTG_DRV_VBUS  RK30_PIN0_PD6
-#elif defined(CONFIG_SOC_RK3168) || defined(CONFIG_SOC_RK3188) || defined(CONFIG_SOC_RK3168M)
+#elif defined(CONFIG_SOC_RK3168) || defined(CONFIG_SOC_RK3188) || defined(CONFIG_SOC_RK3168M) || defined(CONFIG_SOC_RK3188M)
 #define RK3066B_HOST_DRV_VBUS RK30_PIN0_PC0
 #define RK3066B_OTG_DRV_VBUS  RK30_PIN3_PD5
 #elif defined(CONFIG_SOC_RK3028)