random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-19 15:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

mmc: mtk-sd: fix configuration option check

Browse Source 
We either need to use IS_ENABLED(CONFIG_FOO) or CONFIG_IS_ENABLED(FOO).
IS_ENABLE(FOO) will always return false.

This commit fixes the comparison by using the CONFIG_IS_ENABLED(FOO)
syntax.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
This commit is contained in:
Fabien Parent 2019-03-24 16:46:34 +01:00 committed by Tom Rini
parent a93326681d
commit b5096f1b6d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mmc/mtk-sd.c
View File

@ -270,7 +270,7 @@ struct msdc_host {
bool builtin_cd; bool builtin_cd;
/* card detection / write protection GPIOs */ /* card detection / write protection GPIOs */
#if IS_ENABLED(DM_GPIO) #if CONFIG_IS_ENABLED(DM_GPIO)
struct gpio_desc gpio_wp; struct gpio_desc gpio_wp;
struct gpio_desc gpio_cd; struct gpio_desc gpio_cd;
#endif #endif
@ -850,7 +850,7 @@ static int msdc_ops_get_cd(struct udevice *dev)
return !(val & MSDC_PS_CDSTS); return !(val & MSDC_PS_CDSTS);
} }
#if IS_ENABLED(DM_GPIO) #if CONFIG_IS_ENABLED(DM_GPIO)
if (!host->gpio_cd.dev) if (!host->gpio_cd.dev)
return 1; return 1;
@ -862,7 +862,7 @@ static int msdc_ops_get_cd(struct udevice *dev)
static int msdc_ops_get_wp(struct udevice *dev) static int msdc_ops_get_wp(struct udevice *dev)
{ {
#if IS_ENABLED(DM_GPIO) #if CONFIG_IS_ENABLED(DM_GPIO)
struct msdc_host *host = dev_get_priv(dev); struct msdc_host *host = dev_get_priv(dev);
if (!host->gpio_wp.dev) if (!host->gpio_wp.dev)
@ -1337,7 +1337,7 @@ static int msdc_ofdata_to_platdata(struct udevice *dev)
clk_get_by_name(dev, "source_cg", &host->src_clk_cg); /* optional */ clk_get_by_name(dev, "source_cg", &host->src_clk_cg); /* optional */
#if IS_ENABLED(DM_GPIO) #if CONFIG_IS_ENABLED(DM_GPIO)
gpio_request_by_name(dev, "wp-gpios", 0, &host->gpio_wp, GPIOD_IS_IN); gpio_request_by_name(dev, "wp-gpios", 0, &host->gpio_wp, GPIOD_IS_IN);
gpio_request_by_name(dev, "cd-gpios", 0, &host->gpio_cd, GPIOD_IS_IN); gpio_request_by_name(dev, "cd-gpios", 0, &host->gpio_cd, GPIOD_IS_IN);
#endif #endif