From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Rutland Subject: Re: [PATCH] Documentation: dt: mtd: replace "nor-jedec" binding with "jedec,spi-nor" Date: Fri, 15 May 2015 11:17:07 +0100 Message-ID: <20150515101707.GA19705@leverpostej> References: <1431624773-4165-1-git-send-email-computersforpeace@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1431624773-4165-1-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Brian Norris Cc: Rob Herring , Pawel Moll , Ian Campbell , Kumar Gala , "linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , "devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Stephen Warren , Geert Uytterhoeven , Marek Vasut , =?utf-8?B?UmFmYcWCIE1pxYJlY2tp?= List-Id: devicetree@vger.kernel.org On Thu, May 14, 2015 at 06:32:53PM +0100, Brian Norris wrote: > In commit 8ff16cf77ce3 ("Documentation: devicetree: m25p80: add "nor-= jedec" > binding"), we added a generic "nor-jedec" binding to catch all > mostly-compatible SPI NOR flash which can be detected via the READ ID > opcode (0x9F). This was discussed and reviewed at the time, however > objections have come up since then as part of this discussion: >=20 > http://lkml.kernel.org/g/20150511224646.GJ32500@ld-irv-0074 >=20 > It seems the parties involved agree that "jedec,spi-nor" does a bette= r > job of capturing the fact that this is SPI-specific, not just any NOR > flash. >=20 > This binding was only merged for v4.1-rc1, so it's still OK to change > the naming. >=20 > At the same time, let's move the documentation to a better name. >=20 > Next up: prune the m25p_ids[] table to the minimal necessary listing,= so > we can stop referring to code (drivers/mtd/devices/m25p80.c) from the > documentation. >=20 > Signed-off-by: Brian Norris > Cc: Stephen Warren > Cc: Geert Uytterhoeven > Cc: Marek Vasut > Cc: Rafa=C5=82 Mi=C5=82ecki > Cc: Rob Herring > Cc: Pawel Moll > Cc: Mark Rutland > Cc: Ian Campbell > Cc: Kumar Gala > Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > --- > I'd *really* like to get an 'ack' from a DT maintainer for this, thos= e those > are apparently very hard to come by. And I'd really not like to have = to revisit > this again in a few weeks. We have patches getting queued up for 4.2 = that are > using the "nor-jedec" binding, and I'd like to nip those in the bud A= SAP. This looks sane to me, and doesn't seem controversial. So long as you can get this through before v4.1, you can add my ack: Acked-by: Mark Rutland Thanks, Mark. >=20 > .../devicetree/bindings/mtd/{m25p80.txt =3D> jedec,spi-nor.txt} = | 6 +++--- > drivers/mtd/devices/m25p80.c = | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > rename Documentation/devicetree/bindings/mtd/{m25p80.txt =3D> jedec,= spi-nor.txt} (85%) >=20 > diff --git a/Documentation/devicetree/bindings/mtd/m25p80.txt b/Docum= entation/devicetree/bindings/mtd/jedec,spi-nor.txt > similarity index 85% > rename from Documentation/devicetree/bindings/mtd/m25p80.txt > rename to Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt > index f20b111b502a..2bee68103b01 100644 > --- a/Documentation/devicetree/bindings/mtd/m25p80.txt > +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt > @@ -8,8 +8,8 @@ Required properties: > is not Linux-only, but in case of Linux, see the "m25= p_ids" > table in drivers/mtd/devices/m25p80.c for the list of= supported > chips. > - Must also include "nor-jedec" for any SPI NOR flash t= hat can be > - identified by the JEDEC READ ID opcode (0x9F). > + Must also include "jedec,spi-nor" for any SPI NOR fla= sh that can > + be identified by the JEDEC READ ID opcode (0x9F). > - reg : Chip-Select number > - spi-max-frequency : Maximum frequency of the SPI bus the chip can = operate at > =20 > @@ -25,7 +25,7 @@ Example: > flash: m25p80@0 { > #address-cells =3D <1>; > #size-cells =3D <1>; > - compatible =3D "spansion,m25p80", "nor-jedec"; > + compatible =3D "spansion,m25p80", "jedec,spi-nor"; > reg =3D <0>; > spi-max-frequency =3D <40000000>; > m25p,fast-read; > diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p8= 0.c > index 7c8b1694a134..3d59ebc16b6e 100644 > --- a/drivers/mtd/devices/m25p80.c > +++ b/drivers/mtd/devices/m25p80.c > @@ -223,7 +223,7 @@ static int m25p_probe(struct spi_device *spi) > */ > if (data && data->type) > flash_name =3D data->type; > - else if (!strcmp(spi->modalias, "nor-jedec")) > + else if (!strcmp(spi->modalias, "jedec,spi-nor")) > flash_name =3D NULL; /* auto-detect */ > else > flash_name =3D spi->modalias; > @@ -255,7 +255,7 @@ static int m25p_remove(struct spi_device *spi) > * since most of these flash are compatible to some extent, and thei= r > * differences can often be differentiated by the JEDEC read-ID comm= and, we > * encourage new users to add support to the spi-nor library, and si= mply bind > - * against a generic string here (e.g., "nor-jedec"). > + * against a generic string here (e.g., "jedec,spi-nor"). > * > * Many flash names are kept here in this list (as well as in spi-no= r.c) to > * keep them available as module aliases for existing platforms. > @@ -305,7 +305,7 @@ static const struct spi_device_id m25p_ids[] =3D = { > * Generic support for SPI NOR that can be identified by the JEDEC = READ > * ID opcode (0x9F). Use this, if possible. > */ > - {"nor-jedec"}, > + {"jedec,spi-nor"}, > { }, > }; > MODULE_DEVICE_TABLE(spi, m25p_ids); > --=20 > 1.9.1 >=20 -- To unsubscribe from this list: send the line "unsubscribe devicetree" i= n the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html