On 28 April 2015 at 11:40, Lars-Peter Clausen <lars@xxxxxxxxxx> wrote: > Allow to specify in the device-tree that no physical write-protect signal > is connected to a particular instance of a SDHCI controller. This allows a > driver to ignore potential bogus values of the SDHCI_WRITE_PROTECT bit in > the SDHCI_PRESENT_STATE register if it is aware that no write-protect > signal is connected. > > The name for the new property is 'disable-wp' and was chosen based on the > property with the same function from the Synopsys designware mobile storage > host controller DT bindings specification. Re-using the "disable-wp" name is okay. Though, I would like this to be treated as a common MMC DT binding and not something specific for sdhci/dw_mmc. Therefore, I suggest to add a corresponding MMC_CAP* bit, which should be assigned from mmc_of_parse(). > > Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx> > Cc: Rob Herring <robh+dt@xxxxxxxxxx> > Cc: Pawel Moll <pawel.moll@xxxxxxx> > Cc: Mark Rutland <mark.rutland@xxxxxxx> > Cc: Ian Campbell <ijc+devicetree@xxxxxxxxxxxxxx> > Cc: Kumar Gala <galak@xxxxxxxxxxxxxx> > --- > Documentation/devicetree/bindings/mmc/mmc.txt | 1 + > drivers/mmc/host/sdhci-pltfm.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt > index 438899e..b068549 100644 > --- a/Documentation/devicetree/bindings/mmc/mmc.txt > +++ b/Documentation/devicetree/bindings/mmc/mmc.txt > @@ -21,6 +21,7 @@ Optional properties: > below for the case, when a GPIO is used for the CD line > - wp-inverted: when present, polarity on the WP line is inverted. See the note > below for the case, when a GPIO is used for the WP line > +- disable-wp: When set no physical WP line is present This requires some additional explanation, I believe. I assume this property is only relevant for those controllers that have internal logic to handle WP!? For those that uses GPIO, this can't ever be a correct configuration. Right? > - max-frequency: maximum operating clock frequency > - no-1-8-v: when present, denotes that 1.8v card voltage is not supported on > this system, even if the controller claims it is. > diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c > index a207f5a..aa4d343 100644 > --- a/drivers/mmc/host/sdhci-pltfm.c > +++ b/drivers/mmc/host/sdhci-pltfm.c > @@ -86,6 +86,9 @@ void sdhci_get_of_property(struct platform_device *pdev) > if (sdhci_of_wp_inverted(np)) > host->quirks |= SDHCI_QUIRK_INVERTED_WRITE_PROTECT; > > + if (of_property_read_bool(np, "disable-wp")) > + host->quirks2 |= SDHCI_QUIRK2_DISABLE_WRITE_PROTECT; > + > if (of_get_property(np, "broken-cd", NULL)) > host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; > > -- > 1.8.0 > Kind regards Uffe -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
