diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
| commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
| tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /drivers/mmc/mtk-sd.c | |
| parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/mmc/mtk-sd.c')
| -rw-r--r-- | drivers/mmc/mtk-sd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c index 296aaee7331..3a9258255a7 100644 --- a/drivers/mmc/mtk-sd.c +++ b/drivers/mmc/mtk-sd.c @@ -7,7 +7,6 @@ */ #include <clk.h> -#include <common.h> #include <dm.h> #include <mmc.h> #include <errno.h> @@ -1011,7 +1010,7 @@ static int msdc_ops_get_wp(struct udevice *dev) #endif } -#ifdef MMC_SUPPORTS_TUNING +#if CONFIG_IS_ENABLED(MMC_SUPPORTS_TUNING) static u32 test_delay_bit(u32 delay, u32 bit) { bit %= PAD_DELAY_MAX; @@ -1760,7 +1759,7 @@ static const struct dm_mmc_ops msdc_ops = { .set_ios = msdc_ops_set_ios, .get_cd = msdc_ops_get_cd, .get_wp = msdc_ops_get_wp, -#ifdef MMC_SUPPORTS_TUNING +#if CONFIG_IS_ENABLED(MMC_SUPPORTS_TUNING) .execute_tuning = msdc_execute_tuning, #endif .wait_dat0 = msdc_ops_wait_dat0, |