From: Wolfgang Ocker <weo@reccoware.de>
To: linuxppc-dev@ozlabs.org
Cc: Stefan Roese <sr@denx.de>
Subject: [PATCH] Added gpios property for SPI slaves
Date: Fri, 24 Oct 2008 22:08:59 +0200 [thread overview]
Message-ID: <1224878939.4039.22.camel@galileo.recco.de> (raw)
SPI slave devices require the specification of a chip select address.
This patch allows that specification using the gpios property. The reg
property remains supported.
Signed-off-by: Wolfgang Ocker <weo@reccoware.de>
---
--- linux-2.6.27.3/drivers/of/of_spi.c.of_spi_gpio 2008-10-22 23:38:01.000000000 +0200
+++ linux-2.6.27.3/drivers/of/of_spi.c.of_spi_cshigh 2008-10-24 21:36:39.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/device.h>
#include <linux/spi/spi.h>
#include <linux/of_spi.h>
+#include <linux/of_gpio.h>
/**
* of_register_spi_devices - Register child devices onto the SPI bus
@@ -24,6 +25,7 @@ void of_register_spi_devices(struct spi_
struct spi_device *spi;
struct device_node *nc;
const u32 *prop;
+ int cs_addr;
int rc;
int len;
@@ -48,13 +50,20 @@ void of_register_spi_devices(struct spi_
/* Device address */
prop = of_get_property(nc, "reg", &len);
- if (!prop || len < sizeof(*prop)) {
- dev_err(&master->dev, "%s has no 'reg' property\n",
- nc->full_name);
- spi_dev_put(spi);
- continue;
+ if (prop && len >= sizeof(*prop)) {
+ cs_addr = *prop;
+ }
+ else {
+ cs_addr = of_get_gpio(nc, 0);
+ if (cs_addr < 0) {
+ dev_err(&master->dev,
+ "%s has no 'reg' nor gpios property\n",
+ nc->full_name);
+ spi_dev_put(spi);
+ continue;
+ }
}
- spi->chip_select = *prop;
+ spi->chip_select = cs_addr;
/* Mode (clock phase/polarity/etc.) */
if (of_find_property(nc, "spi-cpha", NULL))
--- linux-2.6.27.3/Documentation/powerpc/booting-without-of.txt.of_spi_gpio 2008-10-22 23:38:01.000000000 +0200
+++ linux-2.6.27.3/Documentation/powerpc/booting-without-of.txt.of_spi_cshigh 2008-10-24 21:57:16.000000000 +0200
@@ -1909,7 +1909,9 @@ platforms are moved over to use the flat
SPI slave nodes must be children of the SPI master node and can
contain the following properties.
- - reg - (required) chip select address of device.
+ - reg - chip select address of device.
+ - gpios - chip select address of device (alternatively).
+ one of reg and gpios is required.
- compatible - (required) name of SPI device following generic names
recommended practice
- spi-max-frequency - (required) Maximum SPI clocking speed of device in Hz
@@ -1936,7 +1938,7 @@ platforms are moved over to use the flat
codec@1 {
compatible = "ti,tlv320aic26";
spi-max-frequency = <100000>;
- reg = <1>;
+ gpios = <&GPIO1 3>;
};
};
next reply other threads:[~2008-10-24 20:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-24 20:08 Wolfgang Ocker [this message]
2008-10-24 21:10 ` [PATCH] Added gpios property for SPI slaves Anton Vorontsov
2008-10-24 21:29 ` Grant Likely
2008-10-24 21:41 ` Wolfgang Ocker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1224878939.4039.22.camel@galileo.recco.de \
--to=weo@reccoware.de \
--cc=linuxppc-dev@ozlabs.org \
--cc=sr@denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).