mpc83xx : allow SPI without cs.
PATCH 1/1 mpc83xx : allow SPI without cs.
This patch adds the possibility to have a spi device without a cs.
For example, the dts file should look something like this:
spi-controller {
gpios = <&pio1 1 0 /* cs0 */
0 /* cs1, no GPIO */
&pio2 2 0>; /* cs2 */--- drivers/spi/spi_mpc83xx.c | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-)
drivers/spi/spi_mpc83xx.c +23 -21
@@ -687,9 +687,10 @@ static void mpc83xx_spi_cs_control(struct spi_device *spi, bool on)struct mpc83xx_spi_probe_info *pinfo =to_of_pinfo (dev->platform_data);u16 cs = spi->chip_select;int gpio = pinfo->gpios[cs]; -bool alow = pinfo->alow_flags[cs]; - -gpio_set_value (gpio, on ^ alow); +if ( gpio != -EEXIST ) { +bool alow = pinfo->alow_flags[cs]; +gpio_set_value (gpio, on ^ alow); + } }static int of_mpc83xx_spi_get_chipselects (struct device *dev)
@@ -728,27 +729,28 @@ static int of_mpc83xx_spi_get_chipselects(struct device *dev)enum of_gpio_flags flags; gpio =of_get_gpio_flags (np, i, &flags); -if (!gpio_is_valid (gpio)) { +if (gpio_is_valid (gpio)) { + ret =gpio_request (gpio,dev_name (dev)); +if (ret) { +dev_err (dev,"can't request gpio #%d: %d\n" , i, ret); + goto err_loop; + } + pinfo->gpios[i] = gpio; + pinfo->alow_flags[i] = flags &OF_GPIO_ACTIVE_LOW ; + + ret =gpio_direction_output (pinfo->gpios[i], + pinfo->alow_flags[i]); +if (ret) { +dev_err (dev,"can't set output direction for gpio " +"#%d: %d\n" , i, ret); + goto err_loop; + } + }else if (gpio == -EEXIST ) { + pinfo->gpios[i] = -EEXIST ; + }else {dev_err (dev,"invalid gpio #%d: %d\n" , i, gpio); goto err_loop; } - - ret =gpio_request (gpio,dev_name (dev)); -if (ret) { -dev_err (dev,"can't request gpio #%d: %d\n" , i, ret); - goto err_loop; - } - - pinfo->gpios[i] = gpio; - pinfo->alow_flags[i] = flags &OF_GPIO_ACTIVE_LOW ; - - ret =gpio_direction_output (pinfo->gpios[i], - pinfo->alow_flags[i]); -if (ret) { -dev_err (dev,"can't set output direction for gpio " -"#%d: %d\n" , i, ret); - goto err_loop; - } } pdata->max_chipselect = ngpios;
Quoted 11 lines · Rini van Zetten
This patch adds the possibility to have a spi device without a cs.
For example, the dts file should look something like this:
spi-controller { gpios = <&pio1 1 0 /* cs0 */ 0 /* cs1, no GPIO */ &pio2 2 0>; /* cs2 */
Quoted 5 lines
Signed-off-by Rini van Zetten <[email protected]>---
drivers/spi/spi_mpc83xx.c| 44 ++++++++++++++++++++++
+---------------------1 files changed, 23 insertions(+), 21 deletions(-)
This patch needs to be respun against the -mm tree as a lot of other spi patches are queued up there that will cause this patch to not merge correctly.
- k
excuse me for my ignorance, but which -mm tree do you mean and where can I find it.
Regards,
Rini
Kumar Gala schreef:
Quoted 23 lines · Rini van Zetten
Quoted 12 lines
This patch adds the possibility to have a spi device without a cs.
For example, the dts file should look something like this:
spi-controller { gpios = <&pio1 1 0 /* cs0 */ 0 /* cs1, no GPIO */ &pio2 2 0>; /* cs2 */Quoted 5 lines
Signed-off-by Rini van Zetten <[email protected]>---
drivers/spi/spi_mpc83xx.c| 44
+++++++++++++++++++++++---------------------1 files changed, 23 insertions(+), 21 deletions(-)This patch needs to be respun against the -mm tree as a lot of other spi patches are queued up there that will cause this patch to not merge correctly.
- k
Signature · 12 lines
Rini van Zetten Senior Software Engineer ------------------------- ARVOO Engineering B.V. Tasveld 13 3417 XS Montfoort The Netherlands E-mail : <mailto:[email protected]> Rini van Zetten Web : www.arvoo.com
PATCH 1/1 mpc8xxx : allow SPI without cs.
In reply to Kumar GalaThis patch adds the possibility to have a spi device without a cs.
For example, the dts file should look something like this:
spi-controller {
gpios = <&pio1 1 0 /* cs0 */
0 /* cs1, no GPIO */
&pio2 2 0>; /* cs2 */---
Changes :
patch against 2.6.30-rc8-mm1
spi/spi_mpc8xxx.c renamed from spi/spi_mpc8xxx.c.org +24 -21
@@ -666,9 +666,10 @@ static void mpc8xxx_spi_cs_control(strucstruct mpc8xxx_spi_probe_info *pinfo =to_of_pinfo (dev->platform_data);u16 cs = spi->chip_select;int gpio = pinfo->gpios[cs]; -bool alow = pinfo->alow_flags[cs]; - -gpio_set_value (gpio, on ^ alow); +if (gpio != -EEXIST ) { +bool alow = pinfo->alow_flags[cs]; +gpio_set_value (gpio, on ^ alow); + } }static int of_mpc8xxx_spi_get_chipselects (struct device *dev)
@@ -707,27 +708,29 @@ static int of_mpc8xxx_spi_get_chipselectenum of_gpio_flags flags; gpio =of_get_gpio_flags (np, i, &flags); -if (!gpio_is_valid (gpio)) { +if (gpio_is_valid (gpio)) { + ret =gpio_request (gpio,dev_name (dev)); +if (ret) { +dev_err (dev,"can't request gpio #%d: %d\n" , i, ret); + goto err_loop; + } + + pinfo->gpios[i] = gpio; + pinfo->alow_flags[i] = flags &OF_GPIO_ACTIVE_LOW ; + + ret =gpio_direction_output (pinfo->gpios[i], + pinfo->alow_flags[i]); +if (ret) { +dev_err (dev,"can't set output direction for gpio " +"#%d: %d\n" , i, ret); + goto err_loop; + } + }else if (gpio == -EEXIST ) { + pinfo->gpios[i] = -EEXIST ; + }else {dev_err (dev,"invalid gpio #%d: %d\n" , i, gpio); goto err_loop; } - - ret =gpio_request (gpio,dev_name (dev)); -if (ret) { -dev_err (dev,"can't request gpio #%d: %d\n" , i, ret); - goto err_loop; - } - - pinfo->gpios[i] = gpio; - pinfo->alow_flags[i] = flags &OF_GPIO_ACTIVE_LOW ; - - ret =gpio_direction_output (pinfo->gpios[i], - pinfo->alow_flags[i]); -if (ret) { -dev_err (dev,"can't set output direction for gpio " -"#%d: %d\n" , i, ret); - goto err_loop; - } } pdata->max_chipselect = ngpios;
--