Signed-off-by: Andreas Fenkart <andreas.fenkart@xxxxxxxxxxxxxxxxxxx> --- arch/arm/boot/dts/am335x-sue-s800.dtsi | 1 + drivers/mmc/host/omap_hsmmc.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/am335x-sue-s800.dtsi b/arch/arm/boot/dts/am335x-sue-s800.dtsi index 06304cc..7a446fe 100644 --- a/arch/arm/boot/dts/am335x-sue-s800.dtsi +++ b/arch/arm/boot/dts/am335x-sue-s800.dtsi @@ -158,6 +158,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; ti,non-removable; + ti,swakeup-not-implemented; bus-width = <4>; vmmc-supply = <&ldo2_reg>; vmmc_aux-supply = <&vmmc>; diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 90f4b32..290d5da 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1783,6 +1783,9 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev) if (of_find_property(np, "ti,dual-volt", NULL)) pdata->controller_flags |= OMAP_HSMMC_SUPPORTS_DUAL_VOLT; + if (of_find_property(np, "ti,swakeup-not-implemented", NULL)) + pdata->controller_flags |= OMAP_HSMMC_SWAKEUP_NOT_IMPLEMENTED; + /* This driver only supports 1 slot */ pdata->nr_slots = 1; pdata->slots[0].switch_pin = of_get_named_gpio(np, "cd-gpios", 0); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
