| Message ID | 20220407143405.295907-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 673283a3be1718a58ab9ff7762ef4ec6bcf505c4 |
| Headers | show |
| Series | dt-bindings: align SPI NOR node name with dtschema | expand |
Hi Krzysztof, krzysztof.kozlowski@linaro.org wrote on Thu, 7 Apr 2022 16:34:05 +0200: > The node names should be generic and SPI NOR dtschema expects "flash". > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Thanks, Miquèl
On Thu, Apr 07, 2022 at 05:23:40PM +0200, Krzysztof Kozlowski wrote: > On 07/04/2022 17:15, Mark Brown wrote: > > On Thu, Apr 07, 2022 at 04:34:05PM +0200, Krzysztof Kozlowski wrote: > >> The node names should be generic and SPI NOR dtschema expects "flash". > >> > >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >> --- > >> Documentation/devicetree/bindings/mtd/hisilicon,fmc-spi-nor.txt | 2 +- > >> Documentation/devicetree/bindings/spi/spi-davinci.txt | 2 +- > >> Documentation/devicetree/bindings/spi/spi-pl022.yaml | 2 +- > > > > Acked-by: Mark Brown <broonie@kernel.org> > > > > but it would be easier to split this into per subsystem stuff. > > With DTS changes I had 22 patches, so splitting is a trade-off. If > that's preferred (actually can reduce conflicts), I'll split it and send > a v2. I've applied it. Really, I would have just fixed spi-pl022.yaml. In general, I'm not that interested in taking fixes on the .txt bindings. Rob
diff --git a/Documentation/devicetree/bindings/mtd/hisilicon,fmc-spi-nor.txt b/Documentation/devicetree/bindings/mtd/hisilicon,fmc-spi-nor.txt index 74981520d6dd..a99de13c7ccd 100644 --- a/Documentation/devicetree/bindings/mtd/hisilicon,fmc-spi-nor.txt +++ b/Documentation/devicetree/bindings/mtd/hisilicon,fmc-spi-nor.txt @@ -17,7 +17,7 @@ spi-nor-controller@10000000 { reg = <0x10000000 0x1000>, <0x14000000 0x1000000>; reg-names = "control", "memory"; clocks = <&clock HI3519_FMC_CLK>; - spi-nor@0 { + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; }; diff --git a/Documentation/devicetree/bindings/spi/spi-davinci.txt b/Documentation/devicetree/bindings/spi/spi-davinci.txt index 200c7fc7b089..f012888656ec 100644 --- a/Documentation/devicetree/bindings/spi/spi-davinci.txt +++ b/Documentation/devicetree/bindings/spi/spi-davinci.txt @@ -78,7 +78,7 @@ spi0:spi@20bf0000 { interrupts = <338>; clocks = <&clkspi>; - flash: n25q032@0 { + flash: flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "st,m25p32"; diff --git a/Documentation/devicetree/bindings/spi/spi-pl022.yaml b/Documentation/devicetree/bindings/spi/spi-pl022.yaml index bda45ff3d294..0e382119c64f 100644 --- a/Documentation/devicetree/bindings/spi/spi-pl022.yaml +++ b/Documentation/devicetree/bindings/spi/spi-pl022.yaml @@ -143,7 +143,7 @@ examples: <&dma_controller 24 0>; dma-names = "rx", "tx"; - m25p80@1 { + flash@1 { compatible = "st,m25p80"; reg = <1>; spi-max-frequency = <12000000>;
The node names should be generic and SPI NOR dtschema expects "flash". Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- Documentation/devicetree/bindings/mtd/hisilicon,fmc-spi-nor.txt | 2 +- Documentation/devicetree/bindings/spi/spi-davinci.txt | 2 +- Documentation/devicetree/bindings/spi/spi-pl022.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)