From c085f927de0a1557bab05899f9e270db7ffea1be Mon Sep 17 00:00:00 2001 From: Wolfgang Ocker Date: Wed, 15 Oct 2008 15:00:47 +0200 Subject: [PATCH] --- yaml --- r: 116952 b: refs/heads/master c: f618ebfcbf9616a0fa9a78f5ecb69762f0fa3c59 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/powerpc/booting-without-of.txt | 2 ++ trunk/drivers/of/of_spi.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ad62f244f992..77d044d2291b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd657efc67dbd70f422285101a50c2e84d03463d +refs/heads/master: f618ebfcbf9616a0fa9a78f5ecb69762f0fa3c59 diff --git a/trunk/Documentation/powerpc/booting-without-of.txt b/trunk/Documentation/powerpc/booting-without-of.txt index de4063cb4fdc..02ea9a971b8e 100644 --- a/trunk/Documentation/powerpc/booting-without-of.txt +++ b/trunk/Documentation/powerpc/booting-without-of.txt @@ -1917,6 +1917,8 @@ platforms are moved over to use the flattened-device-tree model. inverse clock polarity (CPOL) mode - spi-cpha - (optional) Empty property indicating device requires shifted clock phase (CPHA) mode + - spi-cs-high - (optional) Empty property indicating device requires + chip select active high SPI example for an MPC5200 SPI bus: spi@f00 { diff --git a/trunk/drivers/of/of_spi.c b/trunk/drivers/of/of_spi.c index b01eec026f68..bed0ed6dcdc1 100644 --- a/trunk/drivers/of/of_spi.c +++ b/trunk/drivers/of/of_spi.c @@ -61,6 +61,8 @@ void of_register_spi_devices(struct spi_master *master, struct device_node *np) spi->mode |= SPI_CPHA; if (of_find_property(nc, "spi-cpol", NULL)) spi->mode |= SPI_CPOL; + if (of_find_property(nc, "spi-cs-high", NULL)) + spi->mode |= SPI_CS_HIGH; /* Device speed */ prop = of_get_property(nc, "spi-max-frequency", &len);