Skip to content

Commit 7fe0b14

Browse files
torvaldstorvalds
committed
Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc
Pull spi updates from Mark Brown: "No framework work here, only a bunch of driver updates of varying sizes: - Factoring out of the core hardware support from the MXS MMC driver by Marek Vasut to allow the hardware to also be used for SPI. - Lots of error handling cleanups from Guenter Roeck - Removal of the existing Tegra driver which is quite comprehensively broken as detailed in the changelog for the removal. - DT suppport for the PL022 and GPIO drivers. - pinctrl support for OMAP and PL022." Pulling from Mark Brown as Grant Likely is still busy moving. * tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc: (53 commits) spi: remove completely broken Tegra driver spi/imx: set the inactive state of the clock according to the clock polarity spi/pl022: get/put resources on suspend/resume spi/pl022: use more managed resources spi/pl022: Devicetree support w/o platform data spi/s3c64xx: Don't free controller_data on non-dt platforms spi: omap2-mcspi: add pinctrl support spi/pl022: adopt pinctrl support spi: omap2-mcspi: Cleanup the omap2_mcspi_txrx_dma function spi/gpio: Fix stub for spi_gpio_probe_dt() spi/mxs: Make the SPI block clock speed configurable via DT spi: spi-sh-hspi: drop frees of devm_ alloc'd data spi/pl022: Fix chipselects pointer computation spi: spi-tle62x0: Use module_spi_driver macro mxs/spi: Rework the mxs_ssp_timeout to be more readable mxs/spi: Decrement the DMA/PIO border mxs/spi: Increment the transfer length only if transfer succeeded mxs/spi: Fix issues when doing long continuous transfer spi: spi-gpio: Add DT bindings spi: spi-gpio: store chipselect information in private structure ...
2 parents 7a9a297 + 536a53a commit 7fe0b14

33 files changed

+2114
-1260
lines changed

‎Documentation/devicetree/bindings/spi/mxs-spi.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
* Freescale MX233/MX28 SSP/SPI
2+
3+
Required properties:
4+
- compatible: Should be "fsl,<soc>-spi", where soc is "imx23" or "imx28"
5+
- reg: Offset and length of the register set for the device
6+
- interrupts: Should contain SSP interrupts (error irq first, dma irq second)
7+
- fsl,ssp-dma-channel: APBX DMA channel for the SSP
8+
9+
Optional properties:
10+
- clock-frequency : Input clock frequency to the SPI block in Hz.
11+
Default is 160000000 Hz.
12+
13+
Example:
14+
15+
ssp0: ssp@80010000 {
16+
#address-cells = <1>;
17+
#size-cells = <0>;
18+
compatible = "fsl,imx28-spi";
19+
reg = <0x80010000 0x2000>;
20+
interrupts = <96 82>;
21+
fsl,ssp-dma-channel = <0>;
22+
};

‎Documentation/devicetree/bindings/spi/spi-bus.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ assumption that board specific platform code will be used to manage
2121
chip selects. Individual drivers can define additional properties to
2222
support describing the chip select layout.
2323

24+
Optional property:
25+
- num-cs : total number of chipselects
26+
2427
SPI slave nodes must be children of the SPI master node and can
2528
contain the following properties.
2629
- reg - (required) chip select address of device.

‎Documentation/devicetree/bindings/spi/spi-gpio.txt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
SPI-GPIO devicetree bindings
2+
3+
Required properties:
4+
5+
- compatible: should be set to "spi-gpio"
6+
- #address-cells: should be set to <0x1>
7+
- ranges
8+
- gpio-sck: GPIO spec for the SCK line to use
9+
- gpio-miso: GPIO spec for the MISO line to use
10+
- gpio-mosi: GPIO spec for the MOSI line to use
11+
- cs-gpios: GPIOs to use for chipselect lines
12+
- num-chipselects: number of chipselect lines
13+
14+
Example:
15+
16+
spi {
17+
compatible = "spi-gpio";
18+
#address-cells = <0x1>;
19+
ranges;
20+
21+
gpio-sck = <&gpio 95 0>;
22+
gpio-miso = <&gpio 98 0>;
23+
gpio-mosi = <&gpio 97 0>;
24+
cs-gpios = <&gpio 125 0>;
25+
num-chipselects = <1>;
26+
27+
/* clients */
28+
};
29+

‎Documentation/devicetree/bindings/spi/spi-sc18is602.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
NXP SC18IS602/SCIS603
2+
3+
Required properties:
4+
- compatible : Should be one of
5+
"nxp,sc18is602"
6+
"nxp,sc18is602b"
7+
"nxp,sc18is603"
8+
- reg: I2C bus address
9+
10+
Optional properties:
11+
- clock-frequency : external oscillator clock frequency. If not
12+
specified, the SC18IS602 default frequency (7372000) will be used.
13+
14+
The clock-frequency property is relevant and needed only if the chip has an
15+
external oscillator (SC18IS603).
16+
17+
Example:
18+
19+
sc18is603@28 {
20+
compatible = "nxp,sc18is603";
21+
reg = <0x28>;
22+
clock-frequency = <14744000>;
23+
}

‎Documentation/devicetree/bindings/spi/spi_pl022.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,29 @@ Required properties:
66
- interrupts : Should contain SPI controller interrupt
77

88
Optional properties:
9+
- num-cs : total number of chipselects
910
- cs-gpios : should specify GPIOs used for chipselects.
1011
The gpios will be referred to as reg = <index> in the SPI child nodes.
1112
If unspecified, a single SPI device without a chip select can be used.
13+
- pl022,autosuspend-delay : delay in ms following transfer completion before
14+
the runtime power management system suspends the
15+
device. A setting of 0 indicates no delay and the
16+
device will be suspended immediately
17+
- pl022,rt : indicates the controller should run the message pump with realtime
18+
priority to minimise the transfer latency on the bus (boolean)
19+
20+
21+
SPI slave nodes must be children of the SPI master node and can
22+
contain the following properties.
23+
24+
- pl022,interface : interface type:
25+
0: SPI
26+
1: Texas Instruments Synchronous Serial Frame Format
27+
2: Microwire (Half Duplex)
28+
- pl022,com-mode : polling, interrupt or dma
29+
- pl022,rx-level-trig : Rx FIFO watermark level
30+
- pl022,tx-level-trig : Tx FIFO watermark level
31+
- pl022,ctrl-len : Microwire interface: Control length
32+
- pl022,wait-state : Microwire interface: Wait state
33+
- pl022,duplex : Microwire interface: Full/Half duplex
1234

‎Documentation/spi/spi-sc18is602

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Kernel driver spi-sc18is602
2+
===========================
3+
4+
Supported chips:
5+
* NXP SI18IS602/602B/603
6+
Datasheet: http://www.nxp.com/documents/data_sheet/SC18IS602_602B_603.pdf
7+
8+
Author:
9+
Guenter Roeck <linux@roeck-us.net>
10+
11+
12+
Description
13+
-----------
14+
15+
This driver provides connects a NXP SC18IS602/603 I2C-bus to SPI bridge to the
16+
kernel's SPI core subsystem.
17+
18+
The driver does not probe for supported chips, since the SI18IS602/603 does not
19+
support Chip ID registers. You will have to instantiate the devices explicitly.
20+
Please see Documentation/i2c/instantiating-devices for details.
21+
22+
23+
Usage Notes
24+
-----------
25+
26+
This driver requires the I2C adapter driver to support raw I2C messages. I2C
27+
adapter drivers which can only handle the SMBus protocol are not supported.
28+
29+
The maximum SPI message size supported by SC18IS602/603 is 200 bytes. Attempts
30+
to initiate longer transfers will fail with -EINVAL. EEPROM read operations and
31+
similar large accesses have to be split into multiple chunks of no more than
32+
200 bytes per SPI message (128 bytes of data per message is recommended). This
33+
means that programs such as "cp" or "od", which automatically use large block
34+
sizes to access a device, can not be used directly to read data from EEPROM.
35+
Programs such as dd, where the block size can be specified, should be used
36+
instead.

‎arch/arm/mach-u300/core.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,9 +1556,6 @@ static struct u300_mux_hog u300_mux_hogs[] = {
15561556
{
15571557
.dev = &uart0_device.dev,
15581558
},
1559-
{
1560-
.dev = &pl022_device.dev,
1561-
},
15621559
{
15631560
.dev = &mmcsd_device.dev,
15641561
},

‎drivers/clk/mxs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Makefile for mxs specific clk
33
#
44

5-
obj-y += clk.o clk-pll.o clk-ref.o clk-div.o clk-frac.o
5+
obj-y += clk.o clk-pll.o clk-ref.o clk-div.o clk-frac.o clk-ssp.o
66

77
obj-$(CONFIG_SOC_IMX23) += clk-imx23.o
88
obj-$(CONFIG_SOC_IMX28) += clk-imx28.o

‎drivers/clk/mxs/clk-ssp.c

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/*
2+
* Copyright 2012 DENX Software Engineering, GmbH
3+
*
4+
* Pulled from code:
5+
* Portions copyright (C) 2003 Russell King, PXA MMCI Driver
6+
* Portions copyright (C) 2004-2005 Pierre Ossman, W83L51xD SD/MMC driver
7+
*
8+
* Copyright 2008 Embedded Alley Solutions, Inc.
9+
* Copyright 2009-2011 Freescale Semiconductor, Inc.
10+
*
11+
* The code contained herein is licensed under the GNU General Public
12+
* License. You may obtain a copy of the GNU General Public License
13+
* Version 2 or later at the following locations:
14+
*
15+
* http://www.opensource.org/licenses/gpl-license.html
16+
* http://www.gnu.org/copyleft/gpl.html
17+
*/
18+
19+
#include <linux/kernel.h>
20+
#include <linux/init.h>
21+
#include <linux/clk.h>
22+
#include <linux/module.h>
23+
#include <linux/device.h>
24+
#include <linux/io.h>
25+
#include <linux/spi/mxs-spi.h>
26+
27+
void mxs_ssp_set_clk_rate(struct mxs_ssp *ssp, unsigned int rate)
28+
{
29+
unsigned int ssp_clk, ssp_sck;
30+
u32 clock_divide, clock_rate;
31+
u32 val;
32+
33+
ssp_clk = clk_get_rate(ssp->clk);
34+
35+
for (clock_divide = 2; clock_divide <= 254; clock_divide += 2) {
36+
clock_rate = DIV_ROUND_UP(ssp_clk, rate * clock_divide);
37+
clock_rate = (clock_rate > 0) ? clock_rate - 1 : 0;
38+
if (clock_rate <= 255)
39+
break;
40+
}
41+
42+
if (clock_divide > 254) {
43+
dev_err(ssp->dev,
44+
"%s: cannot set clock to %d\n", __func__, rate);
45+
return;
46+
}
47+
48+
ssp_sck = ssp_clk / clock_divide / (1 + clock_rate);
49+
50+
val = readl(ssp->base + HW_SSP_TIMING(ssp));
51+
val &= ~(BM_SSP_TIMING_CLOCK_DIVIDE | BM_SSP_TIMING_CLOCK_RATE);
52+
val |= BF_SSP(clock_divide, TIMING_CLOCK_DIVIDE);
53+
val |= BF_SSP(clock_rate, TIMING_CLOCK_RATE);
54+
writel(val, ssp->base + HW_SSP_TIMING(ssp));
55+
56+
ssp->clk_rate = ssp_sck;
57+
58+
dev_dbg(ssp->dev,
59+
"%s: clock_divide %d, clock_rate %d, ssp_clk %d, rate_actual %d, rate_requested %d\n",
60+
__func__, clock_divide, clock_rate, ssp_clk, ssp_sck, rate);
61+
}
62+
EXPORT_SYMBOL_GPL(mxs_ssp_set_clk_rate);

0 commit comments

Comments
 (0)