From patchwork Mon Mar 25 23:00:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 2333911 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 218FDDF24C for ; Mon, 25 Mar 2013 23:01:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759014Ab3CYXAj (ORCPT ); Mon, 25 Mar 2013 19:00:39 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:46774 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754156Ab3CYXAh (ORCPT ); Mon, 25 Mar 2013 19:00:37 -0400 Received: by mail-we0-f175.google.com with SMTP id t11so3500401wey.20 for ; Mon, 25 Mar 2013 16:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=DbIKakgIHHtyZBkRuDdAk873US/QY++IRVPJzN/ScWQ=; b=m6ukmxADY5hDcfwL489kstKtLjjPlUJ5QtxfTih8J+4XGm5QLmxqK8/3DFyL/fkCHX 7DbgnStgcM26OGbevKlo+FqDMENh2qLHgIwF5Fy8ksjLC5Cv0F64/rGM1abImF92NZHM w157sj23am8M0sDDjK+0gcKO30rinNwzTjxDxQk+oX+owK9KpfX8WWMmI/Ugl5qj9yrn bAHB1rdR1v4KpXZG5sHVhjDRsyJUtOkDFxvOEyMofFo5/LV2fRhUxvfDW2ZerB+jy1Gy w1sCJcnTicTL4/f0Lfr6XudtAugWmb/0/uir5iyPyl3idsGeM/uHCKkbM979IJOUUZjo 8h7A== X-Received: by 10.194.95.198 with SMTP id dm6mr21128464wjb.6.1364252435625; Mon, 25 Mar 2013 16:00:35 -0700 (PDT) Received: from ubi.home (32.pool85-58-18.dynamic.orange.es. [85.58.18.32]) by mx.google.com with ESMTPS id g9sm16662061wix.1.2013.03.25.16.00.33 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 25 Mar 2013 16:00:35 -0700 (PDT) From: Matthias Brugger To: Grant Likely , Rob Herring , Rob Landley , Mark Brown , Daniel Mack , Matthias Brugger , "Enric Balletbo Serra" , "Javier Martinez Canillas" , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, spi-devel-general@lists.sourceforge.net, linux-omap@vger.kernel.org, ezequiel.garcia@free-electrons.com Subject: [PATCH] spi: spi-omap2-mcspi.c: Add dts for slave device configuration. Date: Tue, 26 Mar 2013 00:00:15 +0100 Message-Id: <1364252415-3613-1-git-send-email-matthias.bgg@gmail.com> X-Mailer: git-send-email 1.7.11.7 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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. Signed-off-by: Matthias Brugger --- Documentation/devicetree/bindings/spi/omap-spi.txt | 23 ++++++++++++ drivers/spi/spi-omap2-mcspi.c | 41 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/Documentation/devicetree/bindings/spi/omap-spi.txt b/Documentation/devicetree/bindings/spi/omap-spi.txt index 938809c..fef16bf 100644 --- a/Documentation/devicetree/bindings/spi/omap-spi.txt +++ b/Documentation/devicetree/bindings/spi/omap-spi.txt @@ -10,8 +10,20 @@ 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-cs-per-word: Set chipselect to be toggled on every word send. + +- 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 +32,14 @@ mcspi1: mcspi@1 { ti,spi-num-cs = <4>; }; +- Board Specific Portion: + + spi-device@0 { + #address-cells = <1>; + #size-cells = <1>; + + controller-data { + ti,spi-cs-per-word = <1>; + ti,spi-turbo-mode = <0>; + }; + }; diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 893c3d7..1ae5009 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -731,11 +731,47 @@ 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_get_property(data_np, "ti,spi-cs-per-word", NULL)) + cd->cs_per_word = 1; + + if (of_get_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) { struct omap2_mcspi_cs *cs = spi->controller_state; + struct omap2_mcspi_device_config *cd = spi->controller_data; struct omap2_mcspi *mcspi; struct spi_master *spi_cntrl; u32 l = 0, div = 0; @@ -745,6 +781,11 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi, mcspi = spi_master_get_devdata(spi->master); spi_cntrl = mcspi->master; + if (!cd && spi->dev.of_node) { + cd = omap2_mcspi_get_slave_ctrldata(spi); + spi->controller_data = cd; + } + if (t != NULL && t->bits_per_word) word_len = t->bits_per_word;