From: Matthias Brugger <matthias....@gmail.com> TI omap2 mcspi allows the slave devices to configure the behavior of the SPI master. This patch adds device tree support to the existing options.
[Illia: added changes discussed at https://patchwork.kernel.org/patch/2333911/] Signed-off-by: Matthias Brugger <matthias....@gmail.com> Signed-off-by: Illia Smyrnov <illia.smyr...@ti.com> --- Documentation/devicetree/bindings/spi/omap-spi.txt | 17 ++++++++ drivers/spi/spi-omap2-mcspi.c | 40 ++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/Documentation/devicetree/bindings/spi/omap-spi.txt b/Documentation/devicetree/bindings/spi/omap-spi.txt index 938809c..87b2841 100644 --- a/Documentation/devicetree/bindings/spi/omap-spi.txt +++ b/Documentation/devicetree/bindings/spi/omap-spi.txt @@ -10,8 +10,15 @@ Required properties: input. The default is D0 as input and D1 as output. +SPI Controller specific data in SPI slave nodes: +- The spi slave nodes can provide the following information which is used + by the spi controller: + - ti,spi-turbo-mode: Set turbo mode for this device. + Example: +- SoC Specific Portion: + mcspi1: mcspi@1 { #address-cells = <1>; #size-cells = <0>; @@ -20,3 +27,13 @@ mcspi1: mcspi@1 { ti,spi-num-cs = <4>; }; +- Board Specific Portion: + + spi-device@0 { + #address-cells = <1>; + #size-cells = <1>; + + controller-data { + ti,spi-turbo-mode; + }; + }; diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 86d2158..67d0409 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -735,6 +735,38 @@ static u32 omap2_mcspi_calc_divisor(u32 speed_hz) return 15; } +static struct omap2_mcspi_device_config *omap2_mcspi_get_slave_ctrldata( + struct spi_device *spi) +{ + struct omap2_mcspi_device_config *cd; + struct device_node *slave_np, *data_np = NULL; + + slave_np = spi->dev.of_node; + if (!slave_np) { + dev_err(&spi->dev, "device node not found\n"); + return ERR_PTR(-EINVAL); + } + + data_np = of_get_child_by_name(slave_np, "controller-data"); + if (!data_np) { + dev_err(&spi->dev, "child node 'controller-data' not found\n"); + return ERR_PTR(-EINVAL); + } + + cd = kzalloc(sizeof(*cd), GFP_KERNEL); + if (!cd) { + dev_err(&spi->dev, "could not allocate memory for controller data\n"); + of_node_put(data_np); + return ERR_PTR(-ENOMEM); + } + + if (of_find_property(data_np, "ti,spi-turbo-mode", NULL)) + cd->turbo_mode = 1; + + of_node_put(data_np); + return cd; +} + /* called only when no transfer is active to this device */ static int omap2_mcspi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) @@ -856,6 +888,11 @@ static int omap2_mcspi_setup(struct spi_device *spi) struct omap2_mcspi_regs *ctx = &mcspi->ctx; struct omap2_mcspi_dma *mcspi_dma; struct omap2_mcspi_cs *cs = spi->controller_state; + struct omap2_mcspi_device_config *cd; + + if (spi->dev.of_node) + spi->controller_data = omap2_mcspi_get_slave_ctrldata(spi); + cd = spi->controller_data; if (spi->bits_per_word < 4 || spi->bits_per_word > 32) { dev_dbg(&spi->dev, "setup: unsupported %d bit words\n", @@ -902,6 +939,9 @@ static void omap2_mcspi_cleanup(struct spi_device *spi) mcspi = spi_master_get_devdata(spi->master); + if (spi->dev.of_node && spi->controller_data) + kfree(spi->controller_data); + if (spi->controller_state) { /* Unlink controller state from context save list */ cs = spi->controller_state; -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
