SPI: McSPI: allow configuration of pin directions
Subsystems (2)
PATCH v3 1/1 SPI: McSPI: allow configuration of pin directions
Allow D0 to be an input and D1 to be an output, configurable via platform data and a new DT property.
Based on a patch from Matus Ujhelyi <[email protected]>
Signed-off-by Daniel Mack <[email protected]>
Cc Matus Ujhelyi <[email protected]>
Cc Mark Brown <broonie-yzvPICuk2AATkU/[email protected]>
Cc Grant Likely <grant.likely-s3s/[email protected]>
Cc Linus Walleij <[email protected]>
Cc Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/[email protected]>
Cc Juha Yrjola <[email protected]>
---
changes from v1: added a forgotten hunk
changes from v2: rebased to current spi-master.
Sorry for the noise. I shouldn't be working on sundays :)
Documentation/devicetree/bindings/spi/omap-spi.txt | 4 +++- drivers/spi/spi-omap2-mcspi.c | 25 ++++++++++++++++------ include/linux/platform_data/spi-omap2-mcspi.h | 4 ++++ 3 files changed, 25 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/spi/omap-spi.txt +3 -1
@@ -6,7 +6,9 @@ Required properties: - "ti,omap4-spi" for OMAP4+. - ti,spi-num-cs : Number of chipselect supported by the instance. - ti,hwmods: Name of the hwmod associated to the McSPI - +- ti,pindir-d0-in-d1-out: Select the D0 pin as input and D1 as + output. The default is D0 as output and + D1 as input. Example:
drivers/spi/spi-omap2-mcspi.c +18 -7
@@ -131,6 +131,7 @@ struct omap2_mcspi {struct omap2_mcspi_dma *dma_channels;struct device *dev;struct omap2_mcspi_regs ctx; + unsigned int pin_dir:1; };struct omap2_mcspi_cs {
@@ -766,8 +767,15 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,/* standard 4-wire master mode: SCK, MOSI/out, MISO/in, nCS * REVISIT: this controller could support SPI_3WIRE mode. */ - l &= ~(OMAP2_MCSPI_CHCONF_IS |OMAP2_MCSPI_CHCONF_DPE1 ); - l |=OMAP2_MCSPI_CHCONF_DPE0 ; +if (mcspi->pin_dir ==MCSPI_PINDIR_D0_OUT_D1_IN ) { + l &= ~OMAP2_MCSPI_CHCONF_IS ; + l &= ~OMAP2_MCSPI_CHCONF_DPE1 ; + l |=OMAP2_MCSPI_CHCONF_DPE0 ; + }else { + l |=OMAP2_MCSPI_CHCONF_IS ; + l |=OMAP2_MCSPI_CHCONF_DPE1 ; + l &= ~OMAP2_MCSPI_CHCONF_DPE0 ; + }/* wordlength */ l &= ~OMAP2_MCSPI_CHCONF_WL_MASK ;
@@ -1168,6 +1176,11 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev) master->cleanup = omap2_mcspi_cleanup; master->dev.of_node = node; +dev_set_drvdata (&pdev->dev, master); + + mcspi =spi_master_get_devdata (master); + mcspi->master = master; + match =of_match_device (omap_mcspi_of_match, &pdev->dev);if (match) {u32 num_cs =1 ;/* default number of chipselect */
@@ -1176,19 +1189,17 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)of_property_read_u32 (node,"ti,spi-num-cs" , &num_cs); master->num_chipselect = num_cs; master->bus_num = bus_num++; +if (of_get_property (node,"ti,pindir-d0-in-d1-out" ,NULL )) + mcspi->pin_dir =MCSPI_PINDIR_D0_IN_D1_OUT ; }else { pdata = pdev->dev.platform_data; master->num_chipselect = pdata->num_cs;if (pdev->id !=-1 ) master->bus_num = pdev->id; + mcspi->pin_dir = pdata->pin_dir; } regs_offset = pdata->regs_offset; -dev_set_drvdata (&pdev->dev, master); - - mcspi =spi_master_get_devdata (master); - mcspi->master = master; - r =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (r ==NULL ) { status = -ENODEV ;
include/linux/platform_data/spi-omap2-mcspi.h +4 -0
@@ -7,9 +7,13 @@#define OMAP4_MCSPI_REG_OFFSET 0x100 +#define MCSPI_PINDIR_D0_OUT_D1_IN 0 +#define MCSPI_PINDIR_D0_IN_D1_OUT 1 +struct omap2_mcspi_platform_config {unsigned short num_cs;unsigned int regs_offset; +unsigned int pin_dir:1 ; };struct omap2_mcspi_dev_attr {
Signature · 9 lines
1.7.11.4 ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev
A message that is not in the archive (sent off-list or not yet received): 1349626784-22035-1-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Mark Brown
AppliedQuoted 2 lines · Daniel Mack
Allow D0 to be an input and D1 to be an output, configurable via platform data and a new DT property.
Applied, thanks.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct