Hi Arnd, (Diff truncated to show relevant hunks.)
On Fri, Mar 30 2012, Arnd Bergmann wrote: > diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt > b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt > index dbd4368..90b86e5 100644 > --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt > +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt > @@ -15,10 +15,10 @@ Optional properties: > ti,dual-volt: boolean, supports dual voltage cards > <supply-name>-supply: phandle to the regulator device tree node > "supply-name" examples are "vmmc", "vmmc_aux" etc > -ti,bus-width: Number of data lines, default assumed is 1 if the property is > missing. > +bus-width: Number of data lines, default assumed is 1 if the property is > missing. > cd-gpios: GPIOs for card detection > wp-gpios: GPIOs for write protection > -ti,non-removable: non-removable slot (like eMMC) > +non-removable: non-removable slot (like eMMC) > ti,needs-special-reset: Requires a special softreset sequence > > Example: > @@ -27,7 +27,7 @@ Example: > reg = <0x4809c000 0x400>; > ti,hwmods = "mmc1"; > ti,dual-volt; > - ti,bus-width = <4>; > + bus-width = <4>; > vmmc-supply = <&vmmc>; /* phandle to regulator node */ > ti,non-removable; > }; > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c > index 47adb16..ae48fc7 100644 > --- a/drivers/mmc/host/omap_hsmmc.c > +++ b/drivers/mmc/host/omap_hsmmc.c > @@ -1766,7 +1766,7 @@ static struct omap_mmc_platform_data > *of_get_hsmmc_pdata(struct device *dev) > pdata->slots[0].nonremovable = true; > pdata->slots[0].no_regulator_off_init = true; > } > - of_property_read_u32(np, "ti,bus-width", &bus_width); > + of_property_read_u32(np, "bus-width", &bus_width); > if (bus_width == 4) > pdata->slots[0].caps |= MMC_CAP_4_BIT_DATA; > else if (bus_width == 8) Here you change "ti,non-removable" to "non-removable" in the properties section of ti-omap-hsmmc.txt without changing it in the example section of that document, or in the code or shipped .dts files. (Presumably you decided to preserve it for backwards compatibility, so the bindings documentation shouldn't be changed.) Thanks, - Chris. -- Chris Ball <c...@laptop.org> <http://printf.net/> One Laptop Per Child -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
