| Message ID | 7556683b57d8ce100855857f03d1cd3d2903d045.1574943062.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8c452a889821ca0cd2a5f2e3e87fbc01e56408cb |
| Headers | show |
| Series | powerpc/devicetrees: Change 'gpios' to 'cs-gpios' on fsl,spi nodes | expand |
On Thu, Nov 28, 2019 at 1:16 PM Christophe Leroy <christophe.leroy@c-s.fr> wrote: > Since commit 0f0581b24bd0 ("spi: fsl: Convert to use CS GPIO > descriptors"), the prefered way to define chipselect GPIOs is using > 'cs-gpios' property instead of the legacy 'gpios' property. > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Thu, Nov 28, 2019 at 12:16:35PM +0000, Christophe Leroy wrote: > Since commit 0f0581b24bd0 ("spi: fsl: Convert to use CS GPIO > descriptors"), the prefered way to define chipselect GPIOs is using > 'cs-gpios' property instead of the legacy 'gpios' property. This will break using a new dtb on a kernel without the above commit. Or with any OS that never made the change. I'm fine with the doc change, but you should keep 'gpios' as deprecated. > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > --- > Documentation/devicetree/bindings/spi/fsl-spi.txt | 8 ++++---- > arch/powerpc/boot/dts/mgcoge.dts | 2 +- > arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 +- > arch/powerpc/boot/dts/mpc8610_hpcd.dts | 2 +- > 4 files changed, 7 insertions(+), 7 deletions(-)
Le 13/12/2019 à 22:34, Rob Herring a écrit : > On Thu, Nov 28, 2019 at 12:16:35PM +0000, Christophe Leroy wrote: >> Since commit 0f0581b24bd0 ("spi: fsl: Convert to use CS GPIO >> descriptors"), the prefered way to define chipselect GPIOs is using >> 'cs-gpios' property instead of the legacy 'gpios' property. > > This will break using a new dtb on a kernel without the above commit. Or > with any OS that never made the change. Why would anybody use a new dtb on an old kernel ? I have not tagged this change for stable, it will only apply to DTBs in new kernels, won't it ? That's not the first time DTS have to change for new kernels. For instance, some time ago I had to replace all 'gpios' property by a set of 'rdy-gpio', 'nce-gpio', 'ale-gpio' and 'cle-gpio' properties to continue using 'gpio-control-nand' driver. > > I'm fine with the doc change, but you should keep 'gpios' as deprecated. Ok Christophe
On Thu, 2019-11-28 at 12:16:35 UTC, Christophe Leroy wrote: > Since commit 0f0581b24bd0 ("spi: fsl: Convert to use CS GPIO > descriptors"), the prefered way to define chipselect GPIOs is using > 'cs-gpios' property instead of the legacy 'gpios' property. > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/8c452a889821ca0cd2a5f2e3e87fbc01e56408cb cheers
Hello:
The following patches were marked "accepted", because they were applied to
broonie/spi.git (refs/heads/for-next):
Series: add device tree for SAM9X60 SoC and SAM9X60-EK board
Submitter: Claudiu Beznea <claudiu.beznea@microchip.com>
Patchwork: https://patchwork.kernel.org/project/spi-devel-general/list/?series=229897
Patches: [v5,1/2] dt-bindings: atmel-usart: remove wildcard
[v5,2/2] dt-bindings: atmel-usart: add microchip,sam9x60-{usart, dbgu}
Patch: powerpc/devicetrees: Change 'gpios' to 'cs-gpios' on fsl,spi nodes
Submitter: Christophe Leroy <christophe.leroy@c-s.fr>
Patchwork: https://patchwork.kernel.org/project/spi-devel-general/list/?series=209489
Total patches: 3
diff --git a/Documentation/devicetree/bindings/spi/fsl-spi.txt b/Documentation/devicetree/bindings/spi/fsl-spi.txt index 411375eac54d..0654380eb751 100644 --- a/Documentation/devicetree/bindings/spi/fsl-spi.txt +++ b/Documentation/devicetree/bindings/spi/fsl-spi.txt @@ -15,13 +15,13 @@ Required properties: - clock-frequency : input clock frequency to non FSL_SOC cores Optional properties: -- gpios : specifies the gpio pins to be used for chipselects. +- cs-gpios : specifies the gpio pins to be used for chipselects. The gpios will be referred to as reg = <index> in the SPI child nodes. If unspecified, a single SPI device without a chip select can be used. - fsl,spisel_boot : for the MPC8306 and MPC8309, specifies that the SPISEL_BOOT signal is used as chip select for a slave device. Use reg = <number of gpios> in the corresponding child node, i.e. 0 if - the gpios property is not present. + the cs-gpios property is not present. Example: spi@4c0 { @@ -31,8 +31,8 @@ Example: interrupts = <82 0>; interrupt-parent = <700>; mode = "cpu"; - gpios = <&gpio 18 1 // device reg=<0> - &gpio 19 1>; // device reg=<1> + cs-gpios = <&gpio 18 1 // device reg=<0> + &gpio 19 1>; // device reg=<1> }; diff --git a/arch/powerpc/boot/dts/mgcoge.dts b/arch/powerpc/boot/dts/mgcoge.dts index a2dd5f1da621..7de068991bde 100644 --- a/arch/powerpc/boot/dts/mgcoge.dts +++ b/arch/powerpc/boot/dts/mgcoge.dts @@ -224,7 +224,7 @@ reg = <0x11a80 0x40 0x89fc 0x2>; interrupts = <2 8>; interrupt-parent = <&PIC>; - gpios = < &cpm2_pio_d 19 0>; + cs-gpios = < &cpm2_pio_d 19 0>; #address-cells = <1>; #size-cells = <0>; ds3106@1 { diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index b6257186528e..ecebc27a2898 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts @@ -249,7 +249,7 @@ reg = <0x4c0 0x40>; interrupts = <2>; interrupt-parent = <&qeic>; - gpios = <&qe_pio_d 13 0>; + cs-gpios = <&qe_pio_d 13 0>; mode = "cpu-qe"; mmc-slot@0 { diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 1a8321ac105a..33bbe58c1ad0 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts @@ -200,7 +200,7 @@ interrupts = <59 2>; interrupt-parent = <&mpic>; mode = "cpu"; - gpios = <&sdcsr_pio 7 0>; + cs-gpios = <&sdcsr_pio 7 0>; sleep = <&pmc 0x00000800 0>; mmc-slot@0 {
Since commit 0f0581b24bd0 ("spi: fsl: Convert to use CS GPIO descriptors"), the prefered way to define chipselect GPIOs is using 'cs-gpios' property instead of the legacy 'gpios' property. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- Documentation/devicetree/bindings/spi/fsl-spi.txt | 8 ++++---- arch/powerpc/boot/dts/mgcoge.dts | 2 +- arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 +- arch/powerpc/boot/dts/mpc8610_hpcd.dts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)