Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/devicetrees: Change 'gpios' to 'cs-gpios' on fsl, spi nodes

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>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/7556683b57d8ce100855857f03d1cd3d2903d045.1574943062.git.christophe.leroy@c-s.fr

authored by

Christophe Leroy and committed by
Michael Ellerman
8c452a88 a426ea9b

+7 -7
+4 -4
Documentation/devicetree/bindings/spi/fsl-spi.txt
··· 15 15 - clock-frequency : input clock frequency to non FSL_SOC cores 16 16 17 17 Optional properties: 18 - - gpios : specifies the gpio pins to be used for chipselects. 18 + - cs-gpios : specifies the gpio pins to be used for chipselects. 19 19 The gpios will be referred to as reg = <index> in the SPI child nodes. 20 20 If unspecified, a single SPI device without a chip select can be used. 21 21 - fsl,spisel_boot : for the MPC8306 and MPC8309, specifies that the 22 22 SPISEL_BOOT signal is used as chip select for a slave device. Use 23 23 reg = <number of gpios> in the corresponding child node, i.e. 0 if 24 - the gpios property is not present. 24 + the cs-gpios property is not present. 25 25 26 26 Example: 27 27 spi@4c0 { ··· 31 31 interrupts = <82 0>; 32 32 interrupt-parent = <700>; 33 33 mode = "cpu"; 34 - gpios = <&gpio 18 1 // device reg=<0> 35 - &gpio 19 1>; // device reg=<1> 34 + cs-gpios = <&gpio 18 1 // device reg=<0> 35 + &gpio 19 1>; // device reg=<1> 36 36 }; 37 37 38 38
+1 -1
arch/powerpc/boot/dts/mgcoge.dts
··· 224 224 reg = <0x11a80 0x40 0x89fc 0x2>; 225 225 interrupts = <2 8>; 226 226 interrupt-parent = <&PIC>; 227 - gpios = < &cpm2_pio_d 19 0>; 227 + cs-gpios = < &cpm2_pio_d 19 0>; 228 228 #address-cells = <1>; 229 229 #size-cells = <0>; 230 230 ds3106@1 {
+1 -1
arch/powerpc/boot/dts/mpc832x_rdb.dts
··· 249 249 reg = <0x4c0 0x40>; 250 250 interrupts = <2>; 251 251 interrupt-parent = <&qeic>; 252 - gpios = <&qe_pio_d 13 0>; 252 + cs-gpios = <&qe_pio_d 13 0>; 253 253 mode = "cpu-qe"; 254 254 255 255 mmc-slot@0 {
+1 -1
arch/powerpc/boot/dts/mpc8610_hpcd.dts
··· 200 200 interrupts = <59 2>; 201 201 interrupt-parent = <&mpic>; 202 202 mode = "cpu"; 203 - gpios = <&sdcsr_pio 7 0>; 203 + cs-gpios = <&sdcsr_pio 7 0>; 204 204 sleep = <&pmc 0x00000800 0>; 205 205 206 206 mmc-slot@0 {