Skip to content

Commit

Permalink
mmc: core: allow to match the device tree to apply quirks
Browse files Browse the repository at this point in the history
MMC subsystem provides a way to apply quirks when a device match some
properties (VID, PID, etc...) Unfortunately, some SDIO devices does not
comply with the SDIO specification and does not provide reliable VID/PID
(eg. Silabs WF200).

So, the drivers for these devices rely on device tree to identify the
device.

This patch allows the MMC to also rely on the device tree to apply a
quirk.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
  • Loading branch information
jerome-pouiller authored and intel-lab-lkp committed Nov 3, 2021
1 parent b49950c commit e34268c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/mmc/core/card.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ struct mmc_fixup {
/* for MMC cards */
unsigned int ext_csd_rev;

/* Match against functions declared in device tree */
const char *const *of_compatible;

void (*vendor_fixup)(struct mmc_card *card, int data);
int data;
};
Expand Down
18 changes: 18 additions & 0 deletions drivers/mmc/core/quirks.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*
*/

#include <linux/of.h>
#include <linux/mmc/sdio_ids.h>

#include "card.h"
Expand Down Expand Up @@ -145,6 +146,20 @@ static const struct mmc_fixup __maybe_unused sdio_fixup_methods[] = {
END_FIXUP
};

static inline bool mmc_fixup_of_compatible_match(struct mmc_card *card,
const char *const *compat_list)
{
struct device_node *of_node;
int i;

for (i = 0; i < 7; i++) {
of_node = mmc_of_find_child_device(card->host, i);
if (of_node && of_device_compatible_match(of_node, compat_list))
return true;
}
return false;
}

static inline void mmc_fixup_device(struct mmc_card *card,
const struct mmc_fixup *table)
{
Expand Down Expand Up @@ -173,6 +188,9 @@ static inline void mmc_fixup_device(struct mmc_card *card,
continue;
if (rev < f->rev_start || rev > f->rev_end)
continue;
if (f->of_compatible &&
!mmc_fixup_of_compatible_match(card, f->of_compatible))
continue;

dev_dbg(&card->dev, "calling %ps\n", f->vendor_fixup);
f->vendor_fixup(card, f->data);
Expand Down

0 comments on commit e34268c

Please sign in to comment.