]> git.sur5r.net Git - u-boot/commitdiff
omap: Drop CONFIG_OMAP_VC_I2C_HS_MCODE
authorTom Rini <trini@konsulko.com>
Sat, 13 May 2017 02:33:25 +0000 (22:33 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 15 May 2017 14:40:03 +0000 (10:40 -0400)
The symbol CONFIG_OMAP_VC_I2C_HS_MCODE always uses the default value.
Restructure the comment and code such that if a need arises later to use
another value we can address this then.

Signed-off-by: Tom Rini <trini@konsulko.com>
arch/arm/mach-omap2/vc.c
scripts/config_whitelist.txt

index a68f1d145dcb480a50ed1d38dd8a2fb533a4c116..b7f79800de57673951b4e010647dc1fad329a7d4 100644 (file)
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 
-/*
- * Define Master code if there are multiple masters on the I2C_SR bus.
- * Normally not required
- */
-#ifndef CONFIG_OMAP_VC_I2C_HS_MCODE
-#define CONFIG_OMAP_VC_I2C_HS_MCODE 0x0
-#endif
-
 /* Register defines and masks for VC IP Block */
 /* PRM_VC_CFG_I2C_MODE */
 #define PRM_VC_CFG_I2C_MODE_DFILTEREN_BIT      (0x1 << 6)
@@ -84,8 +76,10 @@ static void omap_vc_init(u16 speed_khz)
               (cycles_low << PRM_VC_CFG_I2C_CLK_SCLL_SHIFT);
        writel(val, (*prcm)->prm_vc_cfg_i2c_clk);
 
-       val = CONFIG_OMAP_VC_I2C_HS_MCODE <<
-               PRM_VC_CFG_I2C_MODE_HSMCODE_SHIFT;
+       /*
+        * Master code if there are multiple masters on the I2C_SR bus.
+        */
+       val = 0x0 << PRM_VC_CFG_I2C_MODE_HSMCODE_SHIFT;
        /* No HS mode for now */
        val &= ~PRM_VC_CFG_I2C_MODE_HSMODEEN_BIT;
        writel(val, (*prcm)->prm_vc_cfg_i2c_mode);
index e86e7388dce5762c3b118f01941eec091c595a5b..bb73ba774e3d91ac44f4e5dee9d610191c13e82c 100644 (file)
@@ -1987,7 +1987,6 @@ CONFIG_OMAP_EHCI_PHY3_RESET_GPIO
 CONFIG_OMAP_USB2PHY2_HOST
 CONFIG_OMAP_USB3PHY1_HOST
 CONFIG_OMAP_USB_PHY
-CONFIG_OMAP_VC_I2C_HS_MCODE
 CONFIG_OPTREX_BW
 CONFIG_ORIGEN
 CONFIG_OS1_ENV_ADDR