rk3188m: add SOC_RK3188M config

diff --git a/arch/arm/mach-rk3188/Kconfig b/arch/arm/mach-rk3188/Kconfig
index e91a5adab370c894285d6fd9e25885b77cc0b957..c2cbe0ae805c286576cfacd3ca10286d18cc1b09 100755 (executable)
--- 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 11cf548a0c7adaf8c1cd55641bc0d87cfbe1fe83..23ee47716bba6c471f1f2575137c02634e7ce12d 100644 (file)
--- 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 a601d6e5c4621c11213f0b0b076c5c28af96f9cd..f651f658afcafae045b154d9db74670c82b17d99 100755 (executable)
--- 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) \r
 #define RK3066B_HOST_DRV_VBUS RK30_PIN0_PD7\r
 #define RK3066B_OTG_DRV_VBUS  RK30_PIN0_PD6\r
-#elif defined(CONFIG_SOC_RK3168) || defined(CONFIG_SOC_RK3188) || defined(CONFIG_SOC_RK3168M)\r
+#elif defined(CONFIG_SOC_RK3168) || defined(CONFIG_SOC_RK3188) || defined(CONFIG_SOC_RK3168M) || defined(CONFIG_SOC_RK3188M)\r
 #define RK3066B_HOST_DRV_VBUS RK30_PIN0_PC0\r
 #define RK3066B_OTG_DRV_VBUS  RK30_PIN3_PD5\r
 #elif defined(CONFIG_SOC_RK3028)\r