system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert r359965

Browse source 
This cause board without a cd-gpio to not schedule a card detection.
This commit is contained in:
Emmanuel Vadot 2020-04-16 12:31:12 +00:00
parent 0d9abbcf51
commit ac8dcddd8b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=360007
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sys/dev/mmc/mmc_fdt_helpers.c
View file

@ -217,7 +217,7 @@ cd_card_task(void *arg, int pending __unused)
/*
* Card detect setup.
*/
static bool
static void
cd_setup(struct mmc_fdt_helper *helper, phandle_t node)
{
int pincaps;
@ -233,7 +233,7 @@ cd_setup(struct mmc_fdt_helper *helper, phandle_t node)
helper->cd_disabled = true;
if (bootverbose)
device_printf(dev, "Non-removable media\n");
return (false);
return;
}
/*
@ -246,14 +246,14 @@ cd_setup(struct mmc_fdt_helper *helper, phandle_t node)
*/
if (gpio_pin_get_by_ofw_property(dev, node, "cd-gpios",
&helper->cd_pin))
return (false);
return;
if (gpio_pin_getcaps(helper->cd_pin, &pincaps) != 0 ||
!(pincaps & GPIO_PIN_INPUT)) {
device_printf(dev, "Cannot read card-detect gpio pin; "
"setting card-always-present flag.\n");
helper->cd_disabled = true;
return (false);
return;
}
/*
@ -313,8 +313,6 @@ cd_setup(struct mmc_fdt_helper *helper, phandle_t node)
device_get_nameunit(helper->cd_pin->dev), helper->cd_pin->pin,
cd_mode_str);
}
return (true);
}
/*
@ -356,16 +354,14 @@ mmc_fdt_gpio_setup(device_t dev, phandle_t node, struct mmc_fdt_helper *helper,
helper->dev = dev;
helper->cd_handler = handler;
cd_setup(helper, node);
wp_setup(helper, node);
if (cd_setup(helper, node)) {
/*
* Schedule a card detection
*/
taskqueue_enqueue_timeout_sbt(taskqueue_swi_giant,
&helper->cd_delayed_task, mstosbt(500), 0, C_PREL(2));
}
/*
* Schedule a card detection
*/
taskqueue_enqueue_timeout_sbt(taskqueue_swi_giant,
&helper->cd_delayed_task, mstosbt(500), 0, C_PREL(2));
return (0);
}