* [PATCH v3 01/12] misc: add driver for sequencer serial port
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
@ 2010-10-21 21:01 ` Cyril Chemparathy
[not found] ` <1287694873-12904-2-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
2010-10-21 21:01 ` [PATCH v3 02/12] davinci: add tnetv107x ssp platform device Cyril Chemparathy
` (9 subsequent siblings)
10 siblings, 1 reply; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
TI's sequencer serial port (TI-SSP) is a jack-of-all-trades type of serial port
device. It has a built-in programmable execution engine that can be programmed
to operate as almost any serial bus (I2C, SPI, EasyScale, and others).
This patch adds a driver for this controller device. The driver does not
expose a user-land interface. Protocol drivers built on top of this layer are
expected to remain in-kernel.
Acked-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-davinci/include/mach/ti_ssp.h | 89 ++++++
drivers/misc/Kconfig | 11 +
drivers/misc/Makefile | 1 +
drivers/misc/ti_ssp.c | 436 +++++++++++++++++++++++++++
4 files changed, 537 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-davinci/include/mach/ti_ssp.h
create mode 100644 drivers/misc/ti_ssp.c
diff --git a/arch/arm/mach-davinci/include/mach/ti_ssp.h b/arch/arm/mach-davinci/include/mach/ti_ssp.h
new file mode 100644
index 0000000..51afc42
--- /dev/null
+++ b/arch/arm/mach-davinci/include/mach/ti_ssp.h
@@ -0,0 +1,89 @@
+/*
+ * Sequencer Serial Port (SSP) driver for Texas Instruments' SoCs
+ *
+ * Copyright (C) 2010 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __TI_SSP_H__
+#define __TI_SSP_H__
+
+struct ti_ssp_dev_data {
+ const char *dev_name;
+ unsigned long iosel; /* see note below */
+ unsigned long config;
+ const void *pdata;
+ int pdata_sz;
+};
+
+struct ti_ssp_data {
+ unsigned long out_clock;
+ struct ti_ssp_dev_data dev_data[2];
+};
+
+/*
+ * Sequencer port IO pin configuration bits. These do not correlate 1-1 with
+ * the hardware. The iosel field in the port data combines iosel1 and iosel2,
+ * and is therefore not a direct map to register space. It is best to use the
+ * macros below to construct iosel values.
+ *
+ * least significant 16 bits --> iosel1
+ * most significant 16 bits --> iosel2
+ */
+
+#define SSP_IN 0x0000
+#define SSP_DATA 0x0001
+#define SSP_CLOCK 0x0002
+#define SSP_CHIPSEL 0x0003
+#define SSP_OUT 0x0004
+#define SSP_PIN_SEL(pin, v) ((v) << ((pin) * 3))
+#define SSP_PIN_MASK(pin) SSP_PIN_SEL(pin, 0x7)
+#define SSP_INPUT_SEL(pin) ((pin) << 16)
+
+/* Sequencer port config bits */
+#define SSP_EARLY_DIN BIT(8)
+#define SSP_DELAY_DOUT BIT(9)
+
+/* Sequence map definitions */
+#define SSP_CLK_HIGH BIT(0)
+#define SSP_CLK_LOW 0
+#define SSP_DATA_HIGH BIT(1)
+#define SSP_DATA_LOW 0
+#define SSP_CS_HIGH BIT(2)
+#define SSP_CS_LOW 0
+#define SSP_OUT_MODE BIT(3)
+#define SSP_IN_MODE 0
+#define SSP_DATA_REG BIT(4)
+#define SSP_ADDR_REG 0
+
+#define SSP_OPCODE_DIRECT ((0x0) << 5)
+#define SSP_OPCODE_TOGGLE ((0x1) << 5)
+#define SSP_OPCODE_SHIFT ((0x2) << 5)
+#define SSP_OPCODE_BRANCH0 ((0x4) << 5)
+#define SSP_OPCODE_BRANCH1 ((0x5) << 5)
+#define SSP_OPCODE_BRANCH ((0x6) << 5)
+#define SSP_OPCODE_STOP ((0x7) << 5)
+#define SSP_BRANCH(addr) ((addr) << 8)
+#define SSP_COUNT(cycles) ((cycles) << 8)
+
+int ti_ssp_raw_read(struct device *dev);
+int ti_ssp_raw_write(struct device *dev, u32 val);
+int ti_ssp_load(struct device *dev, int offs, u32* prog, int len);
+int ti_ssp_run(struct device *dev, u32 pc, u32 input, u32 *output);
+int ti_ssp_set_mode(struct device *dev, int mode);
+int ti_ssp_set_iosel(struct device *dev, u32 iosel);
+
+#endif /* __TI_SSP_H__ */
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index b743312..9fb8470 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -390,6 +390,17 @@ config BMP085
To compile this driver as a module, choose M here: the
module will be called bmp085.
+config TI_SSP
+ depends on ARCH_DAVINCI_TNETV107X
+ tristate "Sequencer Serial Port support"
+ default y
+ ---help---
+ Say Y here if you want support for the Sequencer Serial Port
+ in a Texas Instruments TNETV107X SoC.
+
+ To compile this driver as a module, choose M here: the
+ module will be called ti_ssp.
+
source "drivers/misc/c2port/Kconfig"
source "drivers/misc/eeprom/Kconfig"
source "drivers/misc/cb710/Kconfig"
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 42eab95..7568100 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o
obj-$(CONFIG_EP93XX_PWM) += ep93xx_pwm.o
obj-$(CONFIG_DS1682) += ds1682.o
obj-$(CONFIG_TI_DAC7512) += ti_dac7512.o
+obj-$(CONFIG_TI_SSP) += ti_ssp.o
obj-$(CONFIG_C2PORT) += c2port/
obj-$(CONFIG_IWMC3200TOP) += iwmc3200top/
obj-$(CONFIG_HMC6352) += hmc6352.o
diff --git a/drivers/misc/ti_ssp.c b/drivers/misc/ti_ssp.c
new file mode 100644
index 0000000..8249a8b
--- /dev/null
+++ b/drivers/misc/ti_ssp.c
@@ -0,0 +1,436 @@
+/*
+ * Sequencer Serial Port (SSP) driver for Texas Instruments' SoCs
+ *
+ * Copyright (C) 2010 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <linux/clk.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/spinlock.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+
+#include <mach/ti_ssp.h>
+
+/* Register Offsets */
+#define REG_REV 0x00
+#define REG_IOSEL_1 0x04
+#define REG_IOSEL_2 0x08
+#define REG_PREDIV 0x0c
+#define REG_INTR_ST 0x10
+#define REG_INTR_EN 0x14
+#define REG_TEST_CTRL 0x18
+
+/* Per port registers */
+#define PORT_CFG_2 0x00
+#define PORT_ADDR 0x04
+#define PORT_DATA 0x08
+#define PORT_CFG_1 0x0c
+#define PORT_STATE 0x10
+
+#define SSP_PORT_CONFIG_MASK (SSP_EARLY_DIN | SSP_DELAY_DOUT)
+#define SSP_PORT_CLKRATE_MASK 0x0f
+
+#define SSP_SEQRAM_WR_EN BIT(4)
+#define SSP_SEQRAM_RD_EN BIT(5)
+#define SSP_START BIT(15)
+#define SSP_BUSY BIT(10)
+#define SSP_PORT_ASL BIT(7)
+#define SSP_PORT_CFO1 BIT(6)
+
+#define SSP_PORT_SEQRAM_SIZE 32
+
+static const int ssp_port_base[] = {0x040, 0x080};
+static const int ssp_port_seqram[] = {0x100, 0x180};
+
+struct ti_ssp {
+ struct resource *res;
+ struct device *dev;
+ void __iomem *regs;
+ spinlock_t lock;
+ struct clk *clk;
+ const struct ti_ssp_data *data;
+};
+
+#define dev2ssp(dev) dev_get_drvdata(dev->parent)
+#define dev2port(dev) (to_platform_device(dev)->id)
+
+/* Register Access Helpers */
+static inline u32 ssp_read(struct ti_ssp *ssp, int reg)
+{
+ return __raw_readl(ssp->regs + reg);
+}
+
+static inline void ssp_write(struct ti_ssp *ssp, int reg, u32 val)
+{
+ __raw_writel(val, ssp->regs + reg);
+}
+
+static inline void ssp_rmw(struct ti_ssp *ssp, int reg, u32 mask, u32 bits)
+{
+ u32 val = ssp_read(ssp, reg);
+ val &= ~mask;
+ val |= bits;
+ ssp_write(ssp, reg, val);
+}
+
+static inline u32 ssp_port_read(struct ti_ssp *ssp, int port, int reg)
+{
+ return ssp_read(ssp, ssp_port_base[port] + reg);
+}
+
+static inline void ssp_port_write(struct ti_ssp *ssp, int port, int reg,
+ u32 val)
+{
+ ssp_write(ssp, ssp_port_base[port] + reg, val);
+}
+
+static inline void ssp_port_rmw(struct ti_ssp *ssp, int port, int reg,
+ u32 mask, u32 bits)
+{
+ ssp_rmw(ssp, ssp_port_base[port] + reg, mask, bits);
+}
+
+static inline void ssp_port_clr_bits(struct ti_ssp *ssp, int port, int reg,
+ u32 bits)
+{
+ ssp_port_rmw(ssp, port, reg, bits, 0);
+}
+
+static inline void ssp_port_set_bits(struct ti_ssp *ssp, int port, int reg,
+ u32 bits)
+{
+ ssp_port_rmw(ssp, port, reg, 0, bits);
+}
+
+static int __set_mode(struct ti_ssp *ssp, int port, int mode)
+{
+ mode &= SSP_PORT_CONFIG_MASK;
+ ssp_port_rmw(ssp, port, PORT_CFG_1, SSP_PORT_CONFIG_MASK, mode);
+
+ return 0;
+}
+
+int ti_ssp_set_mode(struct device *dev, int mode)
+{
+ struct ti_ssp *ssp = dev2ssp(dev);
+ int port = dev2port(dev);
+ int ret;
+
+ spin_lock(&ssp->lock);
+ ret = __set_mode(ssp, port, mode);
+ spin_unlock(&ssp->lock);
+
+ return ret;
+}
+EXPORT_SYMBOL(ti_ssp_set_mode);
+
+static int __set_iosel(struct ti_ssp *ssp, int port, u32 iosel)
+{
+ unsigned val;
+
+ /* IOSEL1 gets the least significant 16 bits */
+ val = ssp_read(ssp, REG_IOSEL_1);
+ val &= 0xffff << (port ? 0 : 16);
+ val |= (iosel & 0xffff) << (port ? 16 : 0);
+ ssp_write(ssp, REG_IOSEL_1, val);
+
+ /* IOSEL2 gets the most significant 16 bits */
+ val = ssp_read(ssp, REG_IOSEL_2);
+ val &= 0x0007 << (port ? 0 : 16);
+ val |= (iosel & 0x00070000) >> (port ? 0 : 16);
+ ssp_write(ssp, REG_IOSEL_2, val);
+
+ return 0;
+}
+
+int ti_ssp_set_iosel(struct device *dev, u32 iosel)
+{
+ struct ti_ssp *ssp = dev2ssp(dev);
+ int port = dev2port(dev);
+ int ret;
+
+ spin_lock(&ssp->lock);
+ ret = __set_iosel(ssp, port, iosel);
+ spin_unlock(&ssp->lock);
+
+ return ret;
+}
+EXPORT_SYMBOL(ti_ssp_set_iosel);
+
+int ti_ssp_load(struct device *dev, int offs, u32* prog, int len)
+{
+ struct ti_ssp *ssp = dev2ssp(dev);
+ int port = dev2port(dev);
+ int i;
+
+ if (len > SSP_PORT_SEQRAM_SIZE)
+ return -ENOSPC;
+
+ spin_lock(&ssp->lock);
+
+ /* Enable SeqRAM access */
+ ssp_port_set_bits(ssp, port, PORT_CFG_2, SSP_SEQRAM_WR_EN);
+
+ /* Copy code */
+ for (i = 0; i < len; i++) {
+ __raw_writel(prog[i], ssp->regs + offs + 4*i +
+ ssp_port_seqram[port]);
+ }
+
+ /* Disable SeqRAM access */
+ ssp_port_clr_bits(ssp, port, PORT_CFG_2, SSP_SEQRAM_WR_EN);
+
+ spin_unlock(&ssp->lock);
+
+ return 0;
+}
+EXPORT_SYMBOL(ti_ssp_load);
+
+int ti_ssp_raw_read(struct device *dev)
+{
+ struct ti_ssp *ssp = dev2ssp(dev);
+ int port = dev2port(dev);
+ u32 val;
+
+ val = ssp_read(ssp, REG_IOSEL_2);
+ val >>= (port ? 27 : 11);
+
+ return val & 0x0f;
+}
+EXPORT_SYMBOL(ti_ssp_raw_read);
+
+int ti_ssp_raw_write(struct device *dev, u32 val)
+{
+ struct ti_ssp *ssp = dev2ssp(dev);
+ int port = dev2port(dev);
+ u32 mask;
+
+ spin_lock(&ssp->lock);
+ val &= 0x0f;
+ val <<= (port ? 22 : 6);
+ mask = 0x0f;
+ mask <<= (port ? 22 : 6);
+ ssp_rmw(ssp, REG_IOSEL_2, mask, val);
+ spin_unlock(&ssp->lock);
+
+ return 0;
+}
+EXPORT_SYMBOL(ti_ssp_raw_write);
+
+int ti_ssp_run(struct device *dev, u32 pc, u32 input, u32 *output)
+{
+ struct ti_ssp *ssp = dev2ssp(dev);
+ int port = dev2port(dev);
+ int count;
+
+ if (pc & ~(0x3f))
+ return -EINVAL;
+
+ ssp_port_write(ssp, port, PORT_ADDR, input >> 16);
+ ssp_port_write(ssp, port, PORT_DATA, input & 0xffff);
+ ssp_port_rmw(ssp, port, PORT_CFG_1, 0x3f, pc);
+
+ ssp_port_set_bits(ssp, port, PORT_CFG_1, SSP_START);
+
+ for (count = 10000; count; count--) {
+ if ((ssp_port_read(ssp, port, PORT_CFG_1) & SSP_BUSY) == 0)
+ break;
+ udelay(1);
+ }
+
+ if (output) {
+ *(output) = (ssp_port_read(ssp, port, PORT_ADDR) << 16) |
+ (ssp_port_read(ssp, port, PORT_DATA) & 0xffff);
+ }
+
+ if (!count) {
+ dev_err(ssp->dev, "timed out waiting for SSP operation\n");
+ return -EIO;
+ }
+
+ /* return stop address */
+ return ssp_port_read(ssp, port, PORT_STATE) & 0x3f;
+}
+EXPORT_SYMBOL(ti_ssp_run);
+
+static int __unregister_subdev(struct device *dev, void *unused)
+{
+ platform_device_unregister(to_platform_device(dev));
+ return 0;
+}
+
+static int unregister_subdevs(struct ti_ssp *ssp)
+{
+ return device_for_each_child(ssp->dev, NULL, __unregister_subdev);
+}
+
+static void register_subdevs(struct ti_ssp *ssp)
+{
+ int id;
+
+ for (id = 0; id < 2; id++) {
+ const struct ti_ssp_dev_data *data = &ssp->data->dev_data[id];
+
+ if (!data->dev_name)
+ continue;
+
+ spin_lock(&ssp->lock);
+ __set_iosel(ssp, id, data->iosel);
+ ssp_port_rmw(ssp, id, PORT_CFG_1, SSP_PORT_CONFIG_MASK,
+ data->config);
+ ssp_port_rmw(ssp, id, PORT_CFG_2, SSP_PORT_CLKRATE_MASK, 0);
+ spin_unlock(&ssp->lock);
+
+ platform_device_register_data(ssp->dev, data->dev_name, id,
+ data->pdata, data->pdata_sz);
+ }
+}
+
+static int __devinit ti_ssp_probe(struct platform_device *pdev)
+{
+ static struct ti_ssp *ssp;
+ const struct ti_ssp_data *pdata = pdev->dev.platform_data;
+ int ret = 0, prediv = 0xff;
+ unsigned long sysclk;
+ struct device *dev = &pdev->dev;
+
+ ssp = kzalloc(sizeof(*ssp), GFP_KERNEL);
+ if (!ssp) {
+ dev_err(dev, "cannot allocate device info\n");
+ return -ENOMEM;
+ }
+
+ ssp->data = pdata;
+ ssp->dev = dev;
+ dev_set_drvdata(dev, ssp);
+
+ ret = -ENODEV;
+ ssp->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!ssp->res) {
+ dev_err(dev, "cannot determine register area\n");
+ goto error_res;
+ }
+
+ ret = -EINVAL;
+ if (!request_mem_region(ssp->res->start, resource_size(ssp->res),
+ pdev->name)) {
+ dev_err(dev, "cannot claim register memory\n");
+ goto error_res;
+ }
+
+ ret = -ENOMEM;
+ ssp->regs = ioremap(ssp->res->start, resource_size(ssp->res));
+ if (!ssp->regs) {
+ dev_err(dev, "cannot map register memory\n");
+ goto error_map;
+ }
+
+ ret = -EINVAL;
+ ssp->clk = clk_get(dev, NULL);
+ if (IS_ERR(ssp->clk)) {
+ dev_err(dev, "cannot claim device clock\n");
+ goto error_clk;
+ }
+
+ spin_lock_init(&ssp->lock);
+
+ /* Power on and initialize SSP */
+ ret = clk_enable(ssp->clk);
+ if (ret)
+ goto error_enable;
+
+ /* Reset registers to a sensible known state */
+ ssp_write(ssp, REG_IOSEL_1, 0);
+ ssp_write(ssp, REG_IOSEL_2, 0);
+ ssp_write(ssp, REG_INTR_EN, 0);
+ ssp_write(ssp, REG_TEST_CTRL, 0);
+ ssp_port_write(ssp, 0, PORT_CFG_1, SSP_PORT_ASL);
+ ssp_port_write(ssp, 1, PORT_CFG_1, SSP_PORT_ASL);
+ ssp_port_write(ssp, 0, PORT_CFG_2, SSP_PORT_CFO1);
+ ssp_port_write(ssp, 1, PORT_CFG_2, SSP_PORT_CFO1);
+
+ sysclk = clk_get_rate(ssp->clk);
+ if (pdata && pdata->out_clock)
+ prediv = (sysclk / pdata->out_clock) - 1;
+ prediv = clamp(prediv, 0, 0xff);
+ ssp_rmw(ssp, REG_PREDIV, 0xff, prediv);
+
+ register_subdevs(ssp);
+
+ return 0;
+
+error_enable:
+ clk_put(ssp->clk);
+error_clk:
+ iounmap(ssp->regs);
+error_map:
+ release_mem_region(ssp->res->start, resource_size(ssp->res));
+error_res:
+ kfree(ssp);
+ return ret;
+}
+
+static int __devexit ti_ssp_remove(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct ti_ssp *ssp = dev_get_drvdata(dev);
+
+ unregister_subdevs(ssp);
+ clk_disable(ssp->clk);
+ clk_put(ssp->clk);
+ iounmap(ssp->regs);
+ release_mem_region(ssp->res->start, resource_size(ssp->res));
+ kfree(ssp);
+ dev_set_drvdata(dev, NULL);
+ return 0;
+}
+
+static struct platform_driver ti_ssp_driver = {
+ .probe = ti_ssp_probe,
+ .remove = __devexit_p(ti_ssp_remove),
+ .driver = {
+ .name = "ti-ssp",
+ .owner = THIS_MODULE,
+ }
+};
+
+static int __init ti_ssp_init(void)
+{
+ return platform_driver_register(&ti_ssp_driver);
+}
+arch_initcall_sync(ti_ssp_init);
+
+static void __exit ti_ssp_exit(void)
+{
+ platform_driver_unregister(&ti_ssp_driver);
+}
+module_exit(ti_ssp_exit);
+
+MODULE_DESCRIPTION("Sequencer Serial Port (SSP) Driver");
+MODULE_AUTHOR("Cyril Chemparathy");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ti_ssp");
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v3 02/12] davinci: add tnetv107x ssp platform device
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
2010-10-21 21:01 ` [PATCH v3 01/12] misc: add driver for sequencer serial port Cyril Chemparathy
@ 2010-10-21 21:01 ` Cyril Chemparathy
2010-10-21 21:01 ` [PATCH v3 03/12] davinci: add ssp config for tnetv107x evm board Cyril Chemparathy
` (8 subsequent siblings)
10 siblings, 0 replies; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
This patch adds an SSP platform device definition for the tnetv107x soc family.
The clock lookup entry has also been updated to match.
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-davinci/devices-tnetv107x.c | 25 ++++++++++++++++++++++++
arch/arm/mach-davinci/include/mach/tnetv107x.h | 2 +
arch/arm/mach-davinci/tnetv107x.c | 2 +-
3 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-davinci/devices-tnetv107x.c b/arch/arm/mach-davinci/devices-tnetv107x.c
index c9a86d8..2c7aa5f 100644
--- a/arch/arm/mach-davinci/devices-tnetv107x.c
+++ b/arch/arm/mach-davinci/devices-tnetv107x.c
@@ -35,6 +35,7 @@
#define TNETV107X_SDIO0_BASE 0x08088700
#define TNETV107X_SDIO1_BASE 0x08088800
#define TNETV107X_KEYPAD_BASE 0x08088a00
+#define TNETV107X_SSP_BASE 0x08088c00
#define TNETV107X_ASYNC_EMIF_CNTRL_BASE 0x08200000
#define TNETV107X_ASYNC_EMIF_DATA_CE0_BASE 0x30000000
#define TNETV107X_ASYNC_EMIF_DATA_CE1_BASE 0x40000000
@@ -342,6 +343,25 @@ static struct platform_device tsc_device = {
.resource = tsc_resources,
};
+static struct resource ssp_resources[] = {
+ {
+ .start = TNETV107X_SSP_BASE,
+ .end = TNETV107X_SSP_BASE + 0x1ff,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = IRQ_TNETV107X_SSP,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device ssp_device = {
+ .name = "ti-ssp",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(ssp_resources),
+ .resource = ssp_resources,
+};
+
void __init tnetv107x_devices_init(struct tnetv107x_device_info *info)
{
int i;
@@ -367,4 +387,9 @@ void __init tnetv107x_devices_init(struct tnetv107x_device_info *info)
keypad_device.dev.platform_data = info->keypad_config;
platform_device_register(&keypad_device);
}
+
+ if (info->ssp_config) {
+ ssp_device.dev.platform_data = info->ssp_config;
+ platform_device_register(&ssp_device);
+ }
}
diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h
index 5a681d8..c1df563 100644
--- a/arch/arm/mach-davinci/include/mach/tnetv107x.h
+++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
@@ -38,12 +38,14 @@
#include <mach/mmc.h>
#include <mach/nand.h>
#include <mach/serial.h>
+#include <mach/ti_ssp.h>
struct tnetv107x_device_info {
struct davinci_uart_config *serial_config;
struct davinci_mmc_config *mmc_config[2]; /* 2 controllers */
struct davinci_nand_pdata *nand_config[4]; /* 4 chipsels */
struct matrix_keypad_platform_data *keypad_config;
+ struct ti_ssp_data *ssp_config;
};
extern struct platform_device tnetv107x_wdt_device;
diff --git a/arch/arm/mach-davinci/tnetv107x.c b/arch/arm/mach-davinci/tnetv107x.c
index daeae06..fcf30e7 100644
--- a/arch/arm/mach-davinci/tnetv107x.c
+++ b/arch/arm/mach-davinci/tnetv107x.c
@@ -277,7 +277,7 @@ static struct clk_lookup clks[] = {
CLK(NULL, "timer1", &clk_timer1),
CLK("tnetv107x_wdt.0", NULL, &clk_wdt_arm),
CLK(NULL, "clk_wdt_dsp", &clk_wdt_dsp),
- CLK("ti-ssp.0", NULL, &clk_ssp),
+ CLK("ti-ssp", NULL, &clk_ssp),
CLK(NULL, "clk_tdm0", &clk_tdm0),
CLK(NULL, "clk_vlynq", &clk_vlynq),
CLK(NULL, "clk_mcdma", &clk_mcdma),
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v3 03/12] davinci: add ssp config for tnetv107x evm board
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
2010-10-21 21:01 ` [PATCH v3 01/12] misc: add driver for sequencer serial port Cyril Chemparathy
2010-10-21 21:01 ` [PATCH v3 02/12] davinci: add tnetv107x ssp platform device Cyril Chemparathy
@ 2010-10-21 21:01 ` Cyril Chemparathy
2010-10-21 21:01 ` [PATCH v3 04/12] spi: add ti-ssp spi master driver Cyril Chemparathy
` (7 subsequent siblings)
10 siblings, 0 replies; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
This patch adds SSP configuration and pin muxing info for tnetv107x
evm boards.
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-davinci/board-tnetv107x-evm.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index 5afa8fc..401ad26 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -33,6 +33,7 @@
#include <mach/edma.h>
#include <mach/mux.h>
#include <mach/cp_intc.h>
+#include <mach/ti_ssp.h>
#include <mach/tnetv107x.h>
#define EVM_MMC_WP_GPIO 21
@@ -99,6 +100,12 @@ static const short uart1_pins[] __initdata = {
-1
};
+static const short ssp_pins[] __initdata = {
+ TNETV107X_SSP0_0, TNETV107X_SSP0_1, TNETV107X_SSP0_2,
+ TNETV107X_SSP1_0, TNETV107X_SSP1_1, TNETV107X_SSP1_2,
+ TNETV107X_SSP1_3, -1
+};
+
static struct mtd_partition nand_partitions[] = {
/* bootloader (U-Boot, etc) in first 12 sectors */
{
@@ -196,17 +203,25 @@ static struct matrix_keypad_platform_data keypad_config = {
.no_autorepeat = 0,
};
+static struct ti_ssp_data ssp_config = {
+ .out_clock = 250 * 1000,
+ .dev_data = {
+ },
+};
+
static struct tnetv107x_device_info evm_device_info __initconst = {
.serial_config = &serial_config,
.mmc_config[1] = &mmc_config, /* controller 1 */
.nand_config[0] = &nand_config, /* chip select 0 */
.keypad_config = &keypad_config,
+ .ssp_config = &ssp_config,
};
static __init void tnetv107x_evm_board_init(void)
{
davinci_cfg_reg_list(sdio1_pins);
davinci_cfg_reg_list(uart1_pins);
+ davinci_cfg_reg_list(ssp_pins);
tnetv107x_devices_init(&evm_device_info);
}
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v3 04/12] spi: add ti-ssp spi master driver
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
` (2 preceding siblings ...)
2010-10-21 21:01 ` [PATCH v3 03/12] davinci: add ssp config for tnetv107x evm board Cyril Chemparathy
@ 2010-10-21 21:01 ` Cyril Chemparathy
2010-10-21 21:01 ` [PATCH v3 05/12] davinci: add spi devices on tnetv107x evm Cyril Chemparathy
` (6 subsequent siblings)
10 siblings, 0 replies; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
This patch adds an SPI master implementation that operates on top of an
underlying TI-SSP port.
Acked-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-davinci/include/mach/ti_ssp.h | 5 +
drivers/spi/Kconfig | 7 +
drivers/spi/Makefile | 1 +
drivers/spi/spi_ti_ssp.c | 397 +++++++++++++++++++++++++++
4 files changed, 410 insertions(+), 0 deletions(-)
create mode 100644 drivers/spi/spi_ti_ssp.c
diff --git a/arch/arm/mach-davinci/include/mach/ti_ssp.h b/arch/arm/mach-davinci/include/mach/ti_ssp.h
index 51afc42..63c88fe 100644
--- a/arch/arm/mach-davinci/include/mach/ti_ssp.h
+++ b/arch/arm/mach-davinci/include/mach/ti_ssp.h
@@ -34,6 +34,11 @@ struct ti_ssp_data {
struct ti_ssp_dev_data dev_data[2];
};
+struct ti_ssp_spi_data {
+ int num_cs;
+ void (*select)(int cs);
+};
+
/*
* Sequencer port IO pin configuration bits. These do not correlate 1-1 with
* the hardware. The iosel field in the port data combines iosel1 and iosel2,
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 91c2f4f..4d282a0 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -298,6 +298,13 @@ config SPI_STMP3XXX
help
SPI driver for Freescale STMP37xx/378x SoC SSP interface
+config SPI_TI_SSP
+ tristate "TI SSP Controller SPI Driver"
+ depends on TI_SSP
+ help
+ This selects an SPI master implementation using a TI sequencer
+ serial port.
+
config SPI_TXX9
tristate "Toshiba TXx9 SPI controller"
depends on GENERIC_GPIO && CPU_TX49XX
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index e9cbd18..a427f3c 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_SPI_PPC4xx) += spi_ppc4xx.o
obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o
obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx_hw.o
obj-$(CONFIG_SPI_S3C64XX) += spi_s3c64xx.o
+obj-$(CONFIG_SPI_TI_SSP) += spi_ti_ssp.o
obj-$(CONFIG_SPI_TXX9) += spi_txx9.o
obj-$(CONFIG_SPI_XILINX) += xilinx_spi.o
obj-$(CONFIG_SPI_XILINX_OF) += xilinx_spi_of.o
diff --git a/drivers/spi/spi_ti_ssp.c b/drivers/spi/spi_ti_ssp.c
new file mode 100644
index 0000000..a566158
--- /dev/null
+++ b/drivers/spi/spi_ti_ssp.c
@@ -0,0 +1,397 @@
+/*
+ * Sequencer Serial Port (SSP) based SPI master driver
+ *
+ * Copyright (C) 2010 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <linux/completion.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+
+#include <mach/ti_ssp.h>
+
+#define MODE_BITS (SPI_CPHA | SPI_CPOL | SPI_CS_HIGH)
+
+struct ti_ssp_spi {
+ const struct ti_ssp_spi_data *pdata;
+ struct spi_master *master;
+ struct device *dev;
+ spinlock_t lock;
+ struct list_head msg_queue;
+ struct completion complete;
+ int shutdown:1;
+ struct workqueue_struct *workqueue;
+ struct work_struct work;
+ u8 mode, bpw;
+ int cs_active;
+ u32 pc_en, pc_dis, pc_wr, pc_rd;
+};
+
+static u32 do_read_data(struct ti_ssp_spi *hw)
+{
+ u32 ret;
+
+ ti_ssp_run(hw->dev, hw->pc_rd, 0, &ret);
+ return ret;
+}
+
+static void do_write_data(struct ti_ssp_spi *hw, u32 data)
+{
+ ti_ssp_run(hw->dev, hw->pc_wr, data << (32 - hw->bpw), NULL);
+}
+
+static int do_transfer(struct ti_ssp_spi *hw, struct spi_message *msg,
+ struct spi_transfer *t)
+{
+ int count;
+
+ if (hw->bpw <= 8) {
+ u8 *rx = t->rx_buf;
+ const u8 *tx = t->tx_buf;
+
+ for (count = 0; count < t->len; count += 1) {
+ if (t->tx_buf)
+ do_write_data(hw, *tx++);
+ if (t->rx_buf)
+ *rx++ = do_read_data(hw);
+ }
+ } else if (hw->bpw <= 16) {
+ u16 *rx = t->rx_buf;
+ const u16 *tx = t->tx_buf;
+
+ for (count = 0; count < t->len; count += 2) {
+ if (t->tx_buf)
+ do_write_data(hw, *tx++);
+ if (t->rx_buf)
+ *rx++ = do_read_data(hw);
+ }
+ } else {
+ u32 *rx = t->rx_buf;
+ const u32 *tx = t->tx_buf;
+
+ for (count = 0; count < t->len; count += 4) {
+ if (t->tx_buf)
+ do_write_data(hw, *tx++);
+ if (t->rx_buf)
+ *rx++ = do_read_data(hw);
+ }
+ }
+
+ msg->actual_length += count; /* bytes transferred */
+
+ dev_dbg(&msg->spi->dev, "xfer %s%s, %d bytes, %d bpw, count %d%s\n",
+ t->tx_buf ? "tx" : "", t->rx_buf ? "rx" : "", t->len,
+ hw->bpw, count, (count < t->len) ? " (under)" : "");
+
+ return (count < t->len) ? -EIO : 0; /* left over data */
+}
+
+static void chip_select(struct ti_ssp_spi *hw, int cs_active)
+{
+ cs_active = !!cs_active;
+ if (cs_active == hw->cs_active)
+ return;
+ ti_ssp_run(hw->dev, cs_active ? hw->pc_en : hw->pc_dis, 0, NULL);
+ hw->cs_active = cs_active;
+}
+
+#define __SHIFT_OUT(bits) (SSP_OPCODE_SHIFT | SSP_OUT_MODE | \
+ cs_en | clk | SSP_COUNT((bits) * 2 - 1))
+#define __SHIFT_IN(bits) (SSP_OPCODE_SHIFT | SSP_IN_MODE | \
+ cs_en | clk | SSP_COUNT((bits) * 2 - 1))
+
+static int setup_xfer(struct ti_ssp_spi *hw, u8 bpw, u8 mode)
+{
+ int error, idx = 0;
+ u32 seqram[16];
+ u32 cs_en, cs_dis, clk;
+ u32 topbits, botbits;
+
+ mode &= MODE_BITS;
+ if (mode == hw->mode && bpw == hw->bpw)
+ return 0;
+
+ cs_en = (mode & SPI_CS_HIGH) ? SSP_CS_HIGH : SSP_CS_LOW;
+ cs_dis = (mode & SPI_CS_HIGH) ? SSP_CS_LOW : SSP_CS_HIGH;
+ clk = (mode & SPI_CPOL) ? SSP_CLK_HIGH : SSP_CLK_LOW;
+
+ /* Construct instructions */
+
+ /* Disable Chip Select */
+ hw->pc_dis = idx;
+ seqram[idx++] = SSP_OPCODE_DIRECT | SSP_OUT_MODE | cs_dis | clk;
+ seqram[idx++] = SSP_OPCODE_STOP | SSP_OUT_MODE | cs_dis | clk;
+
+ /* Enable Chip Select */
+ hw->pc_en = idx;
+ seqram[idx++] = SSP_OPCODE_DIRECT | SSP_OUT_MODE | cs_en | clk;
+ seqram[idx++] = SSP_OPCODE_STOP | SSP_OUT_MODE | cs_en | clk;
+
+ /* Reads and writes need to be split for bpw > 16 */
+ topbits = (bpw > 16) ? 16 : bpw;
+ botbits = bpw - topbits;
+
+ /* Write */
+ hw->pc_wr = idx;
+ seqram[idx++] = __SHIFT_OUT(topbits) | SSP_ADDR_REG;
+ if (botbits)
+ seqram[idx++] = __SHIFT_OUT(botbits) | SSP_DATA_REG;
+ seqram[idx++] = SSP_OPCODE_STOP | SSP_OUT_MODE | cs_en | clk;
+
+ /* Read */
+ hw->pc_rd = idx;
+ if (botbits)
+ seqram[idx++] = __SHIFT_IN(botbits) | SSP_ADDR_REG;
+ seqram[idx++] = __SHIFT_IN(topbits) | SSP_DATA_REG;
+ seqram[idx++] = SSP_OPCODE_STOP | SSP_OUT_MODE | cs_en | clk;
+
+ error = ti_ssp_load(hw->dev, 0, seqram, idx);
+ if (error < 0)
+ return error;
+
+ error = ti_ssp_set_mode(hw->dev, ((mode & SPI_CPHA) ?
+ 0 : SSP_EARLY_DIN));
+ if (error < 0)
+ return error;
+
+ hw->bpw = bpw;
+ hw->mode = mode;
+
+ return error;
+}
+
+static void ti_ssp_spi_work(struct work_struct *work)
+{
+ struct ti_ssp_spi *hw = container_of(work, struct ti_ssp_spi, work);
+
+ spin_lock_irq(&hw->lock);
+
+ while (!list_empty(&hw->msg_queue)) {
+ struct spi_message *m;
+ struct spi_device *spi;
+ struct spi_transfer *t = NULL;
+ int status = 0;
+
+ m = container_of(hw->msg_queue.next, struct spi_message,
+ queue);
+
+ list_del_init(&m->queue);
+
+ spi = m->spi;
+
+ if (hw->pdata->select)
+ hw->pdata->select(spi->chip_select);
+
+ list_for_each_entry(t, &m->transfers, transfer_list) {
+ int bpw = spi->bits_per_word;
+ int xfer_status;
+
+ if (t->bits_per_word)
+ bpw = t->bits_per_word;
+
+ if (setup_xfer(hw, bpw, spi->mode) < 0)
+ break;
+
+ chip_select(hw, 1);
+
+ spin_unlock_irq(&hw->lock);
+
+ xfer_status = do_transfer(hw, m, t);
+ if (xfer_status < 0)
+ status = xfer_status;
+
+ if (t->delay_usecs)
+ udelay(t->delay_usecs);
+
+ spin_lock_irq(&hw->lock);
+
+ if (t->cs_change)
+ chip_select(hw, 0);
+ }
+
+ chip_select(hw, 0);
+ m->status = status;
+ m->complete(m->context);
+ }
+
+ if (hw->shutdown)
+ complete(&hw->complete);
+
+ spin_unlock_irq(&hw->lock);
+}
+
+static int ti_ssp_spi_setup(struct spi_device *spi)
+{
+ if (spi->bits_per_word > 32)
+ return -EINVAL;
+
+ return 0;
+}
+
+static int ti_ssp_spi_transfer(struct spi_device *spi, struct spi_message *m)
+{
+ struct ti_ssp_spi *hw;
+ struct spi_transfer *t;
+ unsigned long flags;
+ int error = 0;
+
+ m->actual_length = 0;
+ m->status = -EINPROGRESS;
+
+ hw = spi_master_get_devdata(spi->master);
+
+ if (list_empty(&m->transfers) || !m->complete)
+ return -EINVAL;
+
+ list_for_each_entry(t, &m->transfers, transfer_list) {
+ if (t->len && !(t->rx_buf || t->tx_buf)) {
+ dev_err(&spi->dev, "invalid xfer, no buffer\n");
+ return -EINVAL;
+ }
+
+ if (t->len && t->rx_buf && t->tx_buf) {
+ dev_err(&spi->dev, "invalid xfer, full duplex\n");
+ return -EINVAL;
+ }
+
+ if (t->bits_per_word > 32) {
+ dev_err(&spi->dev, "invalid xfer width %d\n",
+ t->bits_per_word);
+ return -EINVAL;
+ }
+ }
+
+ spin_lock_irqsave(&hw->lock, flags);
+ if (hw->shutdown) {
+ error = -ESHUTDOWN;
+ goto error_unlock;
+ }
+ list_add_tail(&m->queue, &hw->msg_queue);
+ queue_work(hw->workqueue, &hw->work);
+error_unlock:
+ spin_unlock_irqrestore(&hw->lock, flags);
+ return error;
+}
+
+static int __devinit ti_ssp_spi_probe(struct platform_device *pdev)
+{
+ const struct ti_ssp_spi_data *pdata;
+ struct ti_ssp_spi *hw;
+ struct spi_master *master;
+ struct device *dev = &pdev->dev;
+ int error = 0;
+
+ pdata = dev->platform_data;
+ if (!pdata) {
+ dev_err(dev, "platform data not found\n");
+ return -EINVAL;
+ }
+
+ master = spi_alloc_master(dev, sizeof(struct ti_ssp_spi));
+ if (!master) {
+ dev_err(dev, "cannot allocate SPI master\n");
+ return -ENOMEM;
+ }
+
+ hw = spi_master_get_devdata(master);
+ platform_set_drvdata(pdev, hw);
+
+ hw->master = master;
+ hw->dev = dev;
+ hw->pdata = pdata;
+
+ spin_lock_init(&hw->lock);
+ init_completion(&hw->complete);
+ INIT_LIST_HEAD(&hw->msg_queue);
+ INIT_WORK(&hw->work, ti_ssp_spi_work);
+
+ hw->workqueue = create_singlethread_workqueue(dev_name(dev));
+ if (!hw->workqueue) {
+ error = -ENOMEM;
+ dev_err(dev, "work queue creation failed\n");
+ goto error_wq;
+ }
+
+ master->bus_num = pdev->id;
+ master->num_chipselect = hw->pdata->num_cs;
+ master->mode_bits = MODE_BITS;
+ master->flags = SPI_MASTER_HALF_DUPLEX;
+ master->setup = ti_ssp_spi_setup;
+ master->transfer = ti_ssp_spi_transfer;
+
+ error = spi_register_master(master);
+ if (error) {
+ dev_err(dev, "master registration failed\n");
+ goto error_reg;
+ }
+
+ return 0;
+
+error_reg:
+ destroy_workqueue(hw->workqueue);
+error_wq:
+ spi_master_put(master);
+ return error;
+}
+
+static int __devexit ti_ssp_spi_remove(struct platform_device *pdev)
+{
+ struct ti_ssp_spi *hw = platform_get_drvdata(pdev);
+ int error;
+
+ hw->shutdown = 1;
+ while (!list_empty(&hw->msg_queue)) {
+ error = wait_for_completion_interruptible(&hw->complete);
+ if (error < 0) {
+ hw->shutdown = 0;
+ return error;
+ }
+ }
+ destroy_workqueue(hw->workqueue);
+ spi_unregister_master(hw->master);
+
+ return 0;
+}
+
+static struct platform_driver ti_ssp_spi_driver = {
+ .probe = ti_ssp_spi_probe,
+ .remove = __devexit_p(ti_ssp_spi_remove),
+ .driver = {
+ .name = "ti-ssp-spi",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init ti_ssp_spi_init(void)
+{
+ return platform_driver_register(&ti_ssp_spi_driver);
+}
+subsys_initcall(ti_ssp_spi_init);
+
+static void __exit ti_ssp_spi_exit(void)
+{
+ platform_driver_unregister(&ti_ssp_spi_driver);
+}
+module_exit(ti_ssp_spi_exit);
+
+MODULE_DESCRIPTION("SSP SPI Master");
+MODULE_AUTHOR("Cyril Chemparathy");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:spi_ti_ssp");
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v3 05/12] davinci: add spi devices on tnetv107x evm
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
` (3 preceding siblings ...)
2010-10-21 21:01 ` [PATCH v3 04/12] spi: add ti-ssp spi master driver Cyril Chemparathy
@ 2010-10-21 21:01 ` Cyril Chemparathy
2010-10-21 21:01 ` [PATCH v3 07/12] davinci: add tnetv107x evm regulators Cyril Chemparathy
` (5 subsequent siblings)
10 siblings, 0 replies; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
This patch adds definitions for spi devices on the tnetv107x evm platform.
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-davinci/board-tnetv107x-evm.c | 45 +++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index 401ad26..c37c5c6 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -25,6 +25,7 @@
#include <linux/mtd/partitions.h>
#include <linux/input.h>
#include <linux/input/matrix_keypad.h>
+#include <linux/spi/spi.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
@@ -38,6 +39,7 @@
#define EVM_MMC_WP_GPIO 21
#define EVM_MMC_CD_GPIO 24
+#define EVM_SPI_CS_GPIO 54
static int initialize_gpio(int gpio, char *desc)
{
@@ -203,9 +205,47 @@ static struct matrix_keypad_platform_data keypad_config = {
.no_autorepeat = 0,
};
+static void spi_select_device(int cs)
+{
+ static int gpio;
+
+ if (!gpio) {
+ int ret;
+ ret = gpio_request(EVM_SPI_CS_GPIO, "spi chipsel");
+ if (ret < 0) {
+ pr_err("cannot open spi chipsel gpio\n");
+ gpio = -ENOSYS;
+ return;
+ } else {
+ gpio = EVM_SPI_CS_GPIO;
+ gpio_direction_output(gpio, 0);
+ }
+ }
+
+ if (gpio < 0)
+ return;
+
+ return gpio_set_value(gpio, cs ? 1 : 0);
+}
+
+static const struct ti_ssp_spi_data spi_master_data = {
+ .num_cs = 2,
+ .select = spi_select_device,
+};
+
static struct ti_ssp_data ssp_config = {
.out_clock = 250 * 1000,
.dev_data = {
+ [1] = {
+ .dev_name = "ti-ssp-spi",
+ .iosel = SSP_PIN_SEL(0, SSP_CLOCK) |
+ SSP_PIN_SEL(1, SSP_DATA) |
+ SSP_PIN_SEL(2, SSP_CHIPSEL) |
+ SSP_PIN_SEL(3, SSP_IN) |
+ SSP_INPUT_SEL(3),
+ .pdata = &spi_master_data,
+ .pdata_sz = sizeof(spi_master_data),
+ },
},
};
@@ -217,6 +257,9 @@ static struct tnetv107x_device_info evm_device_info __initconst = {
.ssp_config = &ssp_config,
};
+static struct spi_board_info spi_info[] __initconst = {
+};
+
static __init void tnetv107x_evm_board_init(void)
{
davinci_cfg_reg_list(sdio1_pins);
@@ -224,6 +267,8 @@ static __init void tnetv107x_evm_board_init(void)
davinci_cfg_reg_list(ssp_pins);
tnetv107x_devices_init(&evm_device_info);
+
+ spi_register_board_info(spi_info, ARRAY_SIZE(spi_info));
}
#ifdef CONFIG_SERIAL_8250_CONSOLE
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v3 07/12] davinci: add tnetv107x evm regulators
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
` (4 preceding siblings ...)
2010-10-21 21:01 ` [PATCH v3 05/12] davinci: add spi devices on tnetv107x evm Cyril Chemparathy
@ 2010-10-21 21:01 ` Cyril Chemparathy
2010-10-21 21:01 ` [PATCH v3 08/12] gpio: add ti-ssp virtual gpio driver Cyril Chemparathy
` (4 subsequent siblings)
10 siblings, 0 replies; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
This patch adds regulator and spi board info definitions for the tps6524x
power management IC found on tnetv107x evm boards.
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-davinci/board-tnetv107x-evm.c | 85 +++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index c37c5c6..d4c3d18 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -26,6 +26,9 @@
#include <linux/input.h>
#include <linux/input/matrix_keypad.h>
#include <linux/spi/spi.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/consumer.h>
+#include <linux/regulator/driver.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
@@ -257,7 +260,89 @@ static struct tnetv107x_device_info evm_device_info __initconst = {
.ssp_config = &ssp_config,
};
+static struct regulator_consumer_supply usb_consumers[] = {
+ REGULATOR_SUPPLY("vbus", "musb_hdrc.1"),
+};
+
+static struct regulator_consumer_supply lcd_consumers[] = {
+ REGULATOR_SUPPLY("vlcd", "tps6116x"),
+};
+
+static struct regulator_init_data regulators[] = {
+ {
+ .constraints = {
+ .name = "DCDC1",
+ .min_uV = 1000000,
+ .max_uV = 1000000,
+ .always_on = 1,
+ .boot_on = 1,
+ },
+ },
+ {
+ .constraints = {
+ .name = "DCDC2",
+ .min_uV = 1800000,
+ .max_uV = 1800000,
+ .always_on = 1,
+ .boot_on = 1,
+ },
+ },
+ {
+ .constraints = {
+ .name = "DCDC3",
+ .min_uV = 3300000,
+ .max_uV = 3300000,
+ .always_on = 1,
+ .boot_on = 1,
+ },
+ },
+ {
+ .constraints = {
+ .name = "LDO1",
+ .min_uV = 4800000,
+ .max_uV = 4800000,
+ .always_on = 1,
+ .boot_on = 1,
+ },
+ },
+ {
+ .constraints = {
+ .name = "LDO1",
+ .min_uV = 3300000,
+ .max_uV = 3300000,
+ .always_on = 1,
+ .boot_on = 1,
+ },
+ },
+ {
+ .num_consumer_supplies = ARRAY_SIZE(usb_consumers),
+ .consumer_supplies = usb_consumers,
+ .constraints = {
+ .name = "USB",
+ .min_uA = 200000,
+ .max_uA = 1000000,
+ .valid_ops_mask = REGULATOR_CHANGE_CURRENT |
+ REGULATOR_CHANGE_STATUS,
+ },
+ },
+ {
+ .num_consumer_supplies = ARRAY_SIZE(lcd_consumers),
+ .consumer_supplies = lcd_consumers,
+ .constraints = {
+ .name = "LCD",
+ .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+ },
+ },
+};
+
static struct spi_board_info spi_info[] __initconst = {
+ {
+ .modalias = "tps6524x",
+ .bus_num = 1,
+ .chip_select = 0,
+ .mode = SPI_MODE_0,
+ .platform_data = regulators,
+ },
};
static __init void tnetv107x_evm_board_init(void)
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v3 08/12] gpio: add ti-ssp virtual gpio driver
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
` (5 preceding siblings ...)
2010-10-21 21:01 ` [PATCH v3 07/12] davinci: add tnetv107x evm regulators Cyril Chemparathy
@ 2010-10-21 21:01 ` Cyril Chemparathy
2010-10-21 21:01 ` [PATCH v3 09/12] davinci: add tnetv107x evm ti-ssp gpio device Cyril Chemparathy
` (3 subsequent siblings)
10 siblings, 0 replies; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
This patch adds a GPIO driver based on TI's SSP device. This driver does not
support GPIO-IRQs.
Acked-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-davinci/include/mach/ti_ssp.h | 4 +
drivers/gpio/Kconfig | 10 ++
drivers/gpio/Makefile | 1 +
drivers/gpio/ti-ssp-gpio.c | 200 +++++++++++++++++++++++++++
4 files changed, 215 insertions(+), 0 deletions(-)
create mode 100644 drivers/gpio/ti-ssp-gpio.c
diff --git a/arch/arm/mach-davinci/include/mach/ti_ssp.h b/arch/arm/mach-davinci/include/mach/ti_ssp.h
index 63c88fe..21f1429 100644
--- a/arch/arm/mach-davinci/include/mach/ti_ssp.h
+++ b/arch/arm/mach-davinci/include/mach/ti_ssp.h
@@ -39,6 +39,10 @@ struct ti_ssp_spi_data {
void (*select)(int cs);
};
+struct ti_ssp_gpio_data {
+ int start;
+};
+
/*
* Sequencer port IO pin configuration bits. These do not correlate 1-1 with
* the hardware. The iosel field in the port data combines iosel1 and iosel2,
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 510aa20..e400761 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -111,6 +111,16 @@ config GPIO_SCH
This driver can also be built as a module. If so, the module
will be called sch-gpio.
+config GPIO_TI_SSP
+ tristate "TI SSP Controller GPIO Driver"
+ depends on GPIOLIB && TI_SSP
+ help
+ Say yes here to support a virtual GPIO interface on TI SSP ports.
+ Each SSP port translates into 4 GPIOs, with no IRQ support.
+
+ This driver can also be built as a module. If so, the module
+ will be called ti-ssp-gpio.
+
comment "I2C GPIO expanders:"
config GPIO_MAX7300
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index fc6019d..98b4551 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_GPIO_PL061) += pl061.o
obj-$(CONFIG_GPIO_STMPE) += stmpe-gpio.o
obj-$(CONFIG_GPIO_TC35892) += tc35892-gpio.o
obj-$(CONFIG_GPIO_TIMBERDALE) += timbgpio.o
+obj-$(CONFIG_GPIO_TI_SSP) += ti-ssp-gpio.o
obj-$(CONFIG_GPIO_TWL4030) += twl4030-gpio.o
obj-$(CONFIG_GPIO_UCB1400) += ucb1400_gpio.o
obj-$(CONFIG_GPIO_XILINX) += xilinx_gpio.o
diff --git a/drivers/gpio/ti-ssp-gpio.c b/drivers/gpio/ti-ssp-gpio.c
new file mode 100644
index 0000000..c046713
--- /dev/null
+++ b/drivers/gpio/ti-ssp-gpio.c
@@ -0,0 +1,200 @@
+/*
+ * Sequencer Serial Port (SSP) based virtual GPIO driver
+ *
+ * Copyright (C) 2010 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <mach/ti_ssp.h>
+
+struct ti_ssp_gpio {
+ struct gpio_chip chip;
+#define chip2gpio(chip) container_of(chip, struct ti_ssp_gpio, chip)
+ struct device *dev;
+ spinlock_t lock;
+ u8 out;
+ u32 iosel;
+};
+
+static int direction_in(struct gpio_chip *chip, unsigned gpio_num)
+{
+ struct ti_ssp_gpio *gpio = chip2gpio(chip);
+ int error = 0;
+
+ spin_lock(&gpio->lock);
+
+ gpio->iosel &= ~SSP_PIN_MASK(gpio_num);
+ gpio->iosel |= SSP_PIN_SEL(gpio_num, SSP_IN);
+
+ error = ti_ssp_set_iosel(gpio->dev, gpio->iosel);
+
+ spin_unlock(&gpio->lock);
+
+ return error;
+}
+
+static int direction_out(struct gpio_chip *chip, unsigned gpio_num, int val)
+{
+ struct ti_ssp_gpio *gpio = chip2gpio(chip);
+ int error;
+
+ spin_lock(&gpio->lock);
+
+ gpio->iosel &= ~SSP_PIN_MASK(gpio_num);
+ gpio->iosel |= SSP_PIN_SEL(gpio_num, SSP_OUT);
+
+ error = ti_ssp_set_iosel(gpio->dev, gpio->iosel);
+
+ if (error < 0)
+ goto error;
+
+ if (val)
+ gpio->out |= BIT(gpio_num);
+ else
+ gpio->out &= ~BIT(gpio_num);
+
+ error = ti_ssp_raw_write(gpio->dev, gpio->out);
+
+error:
+ spin_unlock(&gpio->lock);
+ return error;
+}
+
+static int value_get(struct gpio_chip *chip, unsigned gpio_num)
+{
+ struct ti_ssp_gpio *gpio = chip2gpio(chip);
+ int ret;
+
+ spin_lock(&gpio->lock);
+
+ ret = ti_ssp_raw_read(gpio->dev);
+ if (ret >= 0)
+ ret = (ret & BIT(gpio_num)) ? 1 : 0;
+
+ spin_unlock(&gpio->lock);
+ return ret;
+}
+
+static void value_set(struct gpio_chip *chip, unsigned gpio_num, int val)
+{
+ struct ti_ssp_gpio *gpio = chip2gpio(chip);
+
+ spin_lock(&gpio->lock);
+
+ if (val)
+ gpio->out |= BIT(gpio_num);
+ else
+ gpio->out &= ~BIT(gpio_num);
+
+ ti_ssp_raw_write(gpio->dev, gpio->out);
+
+ spin_unlock(&gpio->lock);
+}
+
+static int __devinit ti_ssp_gpio_probe(struct platform_device *pdev)
+{
+ const struct ti_ssp_gpio_data *pdata = pdev->dev.platform_data;
+ struct device *dev = &pdev->dev;
+ struct ti_ssp_gpio *gpio;
+ int error;
+
+ if (!pdata) {
+ dev_err(dev, "platform data not found\n");
+ return -EINVAL;
+ }
+
+ gpio = kzalloc(sizeof(*gpio), GFP_KERNEL);
+ if (!gpio) {
+ dev_err(dev, "cannot allocate driver data\n");
+ return -ENOMEM;
+ }
+
+ gpio->dev = dev;
+ gpio->iosel = SSP_PIN_SEL(0, SSP_IN) | SSP_PIN_SEL(1, SSP_IN) |
+ SSP_PIN_SEL(2, SSP_IN) | SSP_PIN_SEL(3, SSP_IN);
+ spin_lock_init(&gpio->lock);
+ platform_set_drvdata(pdev, gpio);
+
+ gpio->chip.base = pdata->start;
+ gpio->chip.ngpio = 4;
+ gpio->chip.dev = &pdev->dev;
+ gpio->chip.label = "ti_ssp_gpio";
+ gpio->chip.owner = THIS_MODULE;
+ gpio->chip.get = value_get;
+ gpio->chip.set = value_set;
+ gpio->chip.direction_input = direction_in;
+ gpio->chip.direction_output = direction_out;
+
+ error = gpiochip_add(&gpio->chip);
+ if (error < 0) {
+ dev_err(dev, "gpio chip registration failed (%d)\n", error);
+ goto error;
+ }
+
+ dev_info(dev, "ssp gpio interface registered\n");
+ return 0;
+
+error:
+ kfree(gpio);
+ return error;
+}
+
+static int __devexit ti_ssp_gpio_remove(struct platform_device *pdev)
+{
+ struct ti_ssp_gpio *gpio = platform_get_drvdata(pdev);
+ int error;
+
+ error = gpiochip_remove(&gpio->chip);
+ if (error < 0)
+ return error;
+ kfree(gpio);
+ return 0;
+}
+
+static struct platform_driver ti_ssp_gpio_driver = {
+ .probe = ti_ssp_gpio_probe,
+ .remove = __devexit_p(ti_ssp_gpio_remove),
+ .driver = {
+ .name = "ti-ssp-gpio",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init ti_ssp_gpio_init(void)
+{
+ return platform_driver_register(&ti_ssp_gpio_driver);
+}
+subsys_initcall(ti_ssp_gpio_init);
+
+static void __exit ti_ssp_gpio_exit(void)
+{
+ platform_driver_unregister(&ti_ssp_gpio_driver);
+}
+module_exit(ti_ssp_gpio_exit);
+
+MODULE_DESCRIPTION("GPIO interface for TI-SSP");
+MODULE_AUTHOR("Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ti-ssp-gpio");
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v3 09/12] davinci: add tnetv107x evm ti-ssp gpio device
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
` (6 preceding siblings ...)
2010-10-21 21:01 ` [PATCH v3 08/12] gpio: add ti-ssp virtual gpio driver Cyril Chemparathy
@ 2010-10-21 21:01 ` Cyril Chemparathy
2010-10-21 21:01 ` [PATCH v3 10/12] backlight: add support for tps6116x controller Cyril Chemparathy
` (2 subsequent siblings)
10 siblings, 0 replies; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
This patch adds definitions to hook up one of the ti-ssp ports to the SSP GPIO
driver.
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-davinci/board-tnetv107x-evm.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index d4c3d18..270ba26 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -40,6 +40,8 @@
#include <mach/ti_ssp.h>
#include <mach/tnetv107x.h>
+#define SSP_GPIO_START 128
+
#define EVM_MMC_WP_GPIO 21
#define EVM_MMC_CD_GPIO 24
#define EVM_SPI_CS_GPIO 54
@@ -236,9 +238,22 @@ static const struct ti_ssp_spi_data spi_master_data = {
.select = spi_select_device,
};
+static const struct ti_ssp_gpio_data ssp_gpio_data = {
+ .start = SSP_GPIO_START,
+};
+
static struct ti_ssp_data ssp_config = {
.out_clock = 250 * 1000,
.dev_data = {
+ [0] = {
+ .dev_name = "ti-ssp-gpio",
+ .iosel = SSP_PIN_SEL(0, SSP_IN) |
+ SSP_PIN_SEL(1, SSP_IN) |
+ SSP_PIN_SEL(2, SSP_IN) |
+ SSP_PIN_SEL(3, SSP_IN),
+ .pdata = &ssp_gpio_data,
+ .pdata_sz = sizeof(ssp_gpio_data),
+ },
[1] = {
.dev_name = "ti-ssp-spi",
.iosel = SSP_PIN_SEL(0, SSP_CLOCK) |
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v3 10/12] backlight: add support for tps6116x controller
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
` (7 preceding siblings ...)
2010-10-21 21:01 ` [PATCH v3 09/12] davinci: add tnetv107x evm ti-ssp gpio device Cyril Chemparathy
@ 2010-10-21 21:01 ` Cyril Chemparathy
2010-10-21 21:19 ` Joe Perches
2010-10-21 21:01 ` [PATCH v3 11/12] davinci: add tnetv107x evm backlight device Cyril Chemparathy
2010-10-21 21:01 ` [PATCH v3 12/12] davinci: add tnetv107x evm i2c eeprom device Cyril Chemparathy
10 siblings, 1 reply; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
TPS6116x is an EasyScale backlight controller device. This driver supports
TPS6116x devices connected on a single GPIO.
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
drivers/video/backlight/Kconfig | 7 +
drivers/video/backlight/Makefile | 2 +-
drivers/video/backlight/tps6116x.c | 340 ++++++++++++++++++++++++++++++++++++
3 files changed, 348 insertions(+), 1 deletions(-)
create mode 100644 drivers/video/backlight/tps6116x.c
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index e54a337..06e868e 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -307,6 +307,13 @@ config BACKLIGHT_PCF50633
If you have a backlight driven by a NXP PCF50633 MFD, say Y here to
enable its driver.
+config BACKLIGHT_TPS6116X
+ tristate "TPS6116X LCD Backlight"
+ depends on GENERIC_GPIO
+ help
+ This driver controls the LCD backlight level for EasyScale capable
+ SSP connected backlight controllers.
+
endif # BACKLIGHT_CLASS_DEVICE
endif # BACKLIGHT_LCD_SUPPORT
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 44c0f81..5d407c8 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -35,4 +35,4 @@ obj-$(CONFIG_BACKLIGHT_ADP5520) += adp5520_bl.o
obj-$(CONFIG_BACKLIGHT_ADP8860) += adp8860_bl.o
obj-$(CONFIG_BACKLIGHT_88PM860X) += 88pm860x_bl.o
obj-$(CONFIG_BACKLIGHT_PCF50633) += pcf50633-backlight.o
-
+obj-$(CONFIG_BACKLIGHT_TPS6116X)+= tps6116x.o
diff --git a/drivers/video/backlight/tps6116x.c b/drivers/video/backlight/tps6116x.c
new file mode 100644
index 0000000..7a9f8ca
--- /dev/null
+++ b/drivers/video/backlight/tps6116x.c
@@ -0,0 +1,340 @@
+/*
+ * TPS6116X LCD Backlight Controller Driver
+ *
+ * Copyright (C) 2010 Texas Instruments
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
+ * whether express or implied; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/fb.h>
+#include <linux/err.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/backlight.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+
+#define TPS6116X_MAX_INTENSITY 31
+#define TPS6116X_DEFAULT_INTENSITY 10
+
+/* Easyscale timing w/ margin (usecs) */
+#define T_POWER_SETTLE 2000
+#define T_ES_DELAY 120
+#define T_ES_DETECT 280
+#define T_ES_WINDOW (1000 - T_ES_DELAY - T_ES_DETECT)
+#define T_START 3
+#define T_EOS 3
+#define T_INACTIVE 3
+#define T_ACTIVE (3 * T_INACTIVE)
+
+#define CMD_SET 0x72
+
+struct tps6116x {
+ struct ti_ssp_device *handle;
+ struct device *dev;
+ int gpio, gpio_initialized;
+ struct mutex lock;
+ int intensity;
+ int power;
+ struct backlight_properties props;
+ struct backlight_device *bl;
+ int suspended:1;
+ struct regulator *regulator;
+};
+
+static int __set_power(struct tps6116x *hw, int power)
+{
+ unsigned long flags;
+ int error;
+
+ power = !!power;
+ if (power == hw->power)
+ return 0; /* nothing to do */
+
+ /* disabling is simple... choke power */
+ if (!power) {
+ error = regulator_disable(hw->regulator);
+ goto done;
+ }
+
+ /* set ctrl pin init state for easyscale detection */
+ gpio_set_value(hw->gpio, 0);
+
+ error = regulator_enable(hw->regulator);
+ if (error < 0)
+ goto done;
+
+ udelay(T_POWER_SETTLE);
+
+ /*
+ * Now that the controller is powered up, we need to put it into 1-wire
+ * mode. This is a timing sensitive operation, hence the irq disable.
+ * Ideally, this should happen rarely, and mostly at init, so disabling
+ * interrupts for the duration should not be a problem.
+ */
+ local_irq_save(flags);
+
+ gpio_set_value(hw->gpio, 1);
+ udelay(T_ES_DELAY);
+ gpio_set_value(hw->gpio, 0);
+ udelay(T_ES_DETECT);
+ gpio_set_value(hw->gpio, 1);
+
+ local_irq_restore(flags);
+
+done:
+ if (error >= 0)
+ hw->power = power;
+
+ return error;
+}
+
+static void __write_byte(struct tps6116x *hw, u8 data)
+{
+ int bit;
+
+ gpio_set_value(hw->gpio, 1);
+ udelay(T_START);
+
+ for (bit = 0; bit < 8; bit++, data <<= 1) {
+ int val = data & 0x80;
+ int t_lo = val ? T_INACTIVE : T_ACTIVE;
+ int t_hi = val ? T_ACTIVE : T_INACTIVE;
+
+ gpio_set_value(hw->gpio, 0);
+ udelay(t_lo);
+ gpio_set_value(hw->gpio, 1);
+ udelay(t_hi);
+ }
+
+ gpio_set_value(hw->gpio, 0);
+ udelay(T_EOS);
+ gpio_set_value(hw->gpio, 1);
+}
+
+static void __set_intensity(struct tps6116x *hw, int intensity)
+{
+ unsigned long flags;
+
+ intensity = clamp(intensity, 0, TPS6116X_MAX_INTENSITY);
+
+ local_irq_save(flags);
+ __write_byte(hw, CMD_SET);
+ __write_byte(hw, intensity);
+ local_irq_restore(flags);
+}
+
+static int set_intensity(struct tps6116x *hw, int intensity)
+{
+ int error = 0;
+
+ if (intensity == hw->intensity)
+ return 0;
+
+ mutex_lock(&hw->lock);
+
+ if (!hw->gpio_initialized) {
+ error = gpio_request_one(hw->gpio, GPIOF_DIR_OUT,
+ dev_name(hw->dev));
+ if (error < 0)
+ goto error;
+ hw->gpio_initialized = 1;
+ }
+
+ error = __set_power(hw, intensity ? 1 : 0);
+ if (error < 0)
+ goto error;
+
+ if (intensity > 0)
+ __set_intensity(hw, intensity);
+
+ hw->intensity = intensity;
+error:
+ mutex_unlock(&hw->lock);
+
+ return error;
+}
+
+static ssize_t intensity_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct tps6116x *hw = dev_get_drvdata(dev);
+ ssize_t len = 0;
+
+ len += snprintf(buf+len, PAGE_SIZE-len, "%d\n", hw->intensity);
+
+ return len;
+}
+
+static ssize_t intensity_store(struct device *dev,
+ struct device_attribute *attr, const char *buf,
+ size_t count)
+{
+ struct tps6116x *hw = dev_get_drvdata(dev);
+ unsigned long intensity;
+ int error;
+
+ error = strict_strtoul(buf, 10, &intensity);
+ if (error < 0)
+ return error;
+
+ error = set_intensity(hw, intensity);
+ if (error < 0)
+ return error;
+
+ return count;
+}
+
+DEVICE_ATTR(intensity, S_IWUSR | S_IRUGO, intensity_show, intensity_store);
+
+static int get_brightness(struct backlight_device *bl)
+{
+ struct tps6116x *hw = bl_get_data(bl);
+
+ return hw->intensity;
+}
+
+static int update_status(struct backlight_device *bl)
+{
+ struct tps6116x *hw = bl_get_data(bl);
+ int intensity = bl->props.brightness;
+
+ if (hw->suspended)
+ intensity = 0;
+ if (bl->props.power != FB_BLANK_UNBLANK)
+ intensity = 0;
+ if (bl->props.fb_blank != FB_BLANK_UNBLANK)
+ intensity = 0;
+
+ return set_intensity(hw, intensity);
+}
+
+static const struct backlight_ops tps6116x_backlight_ops = {
+ .get_brightness = get_brightness,
+ .update_status = update_status,
+};
+
+static int __devinit tps6116x_probe(struct platform_device *pdev)
+{
+ struct tps6116x *hw;
+ struct device *dev = &pdev->dev;
+ struct backlight_properties props;
+ int error;
+
+ hw = kzalloc(sizeof(struct tps6116x), GFP_KERNEL);
+ if (!hw) {
+ error = -ENOMEM;
+ dev_err(dev, "cannot allocate driver data\n");
+ goto fail0;
+ }
+ platform_set_drvdata(pdev, hw);
+
+ memset(hw, 0, sizeof(struct tps6116x));
+ hw->gpio = (int)dev->platform_data;
+ hw->dev = dev;
+
+ mutex_init(&hw->lock);
+
+ error = device_create_file(dev, &dev_attr_intensity);
+ if (error < 0) {
+ dev_err(dev, "cannot create device attributes\n");
+ goto fail1;
+ }
+
+ hw->regulator = regulator_get(dev, "vlcd");
+ if (IS_ERR(hw->regulator)) {
+ error = PTR_ERR(hw->regulator);
+ dev_err(dev, "cannot claim regulator\n");
+ goto fail2;
+ }
+
+ memset(&props, 0, sizeof(props));
+ props.max_brightness = TPS6116X_MAX_INTENSITY;
+ props.brightness = TPS6116X_DEFAULT_INTENSITY;
+
+ hw->bl = backlight_device_register("tps6116x", hw->dev, hw,
+ &tps6116x_backlight_ops, &props);
+ if (IS_ERR(hw->bl)) {
+ error = PTR_ERR(hw->bl);
+ dev_err(dev, "backlight registration failed\n");
+ goto fail3;
+ }
+
+ dev_info(dev, "registered backlight controller\n");
+ return 0;
+
+fail3:
+ regulator_put(hw->regulator);
+fail2:
+ device_remove_file(dev, &dev_attr_intensity);
+fail1:
+ kfree(hw);
+ platform_set_drvdata(pdev, NULL);
+fail0:
+ return error;
+}
+
+static int __devexit tps6116x_remove(struct platform_device *pdev)
+{
+ struct tps6116x *hw = platform_get_drvdata(pdev);
+
+ backlight_device_unregister(hw->bl);
+ regulator_disable(hw->regulator);
+ regulator_put(hw->regulator);
+ device_remove_file(hw->dev, &dev_attr_intensity);
+ kfree(hw);
+ platform_set_drvdata(pdev, NULL);
+ return 0;
+}
+
+static int tps6116x_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ struct tps6116x *hw = platform_get_drvdata(pdev);
+ hw->suspended = 1;
+ update_status(hw->bl);
+ return 0;
+}
+
+static int tps6116x_resume(struct platform_device *pdev)
+{
+ struct tps6116x *hw = platform_get_drvdata(pdev);
+ hw->suspended = 0;
+ update_status(hw->bl);
+ return 0;
+}
+
+static struct platform_driver tps6116x_driver = {
+ .probe = tps6116x_probe,
+ .remove = __devexit_p(tps6116x_remove),
+ .suspend = tps6116x_suspend,
+ .resume = tps6116x_resume,
+ .driver = {
+ .name = "tps6116x",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init tps6116x_init(void)
+{
+ return platform_driver_register(&tps6116x_driver);
+}
+module_init(tps6116x_init);
+
+static void __exit tps6116x_exit(void)
+{
+ platform_driver_unregister(&tps6116x_driver);
+}
+module_exit(tps6116x_exit);
+
+MODULE_DESCRIPTION("SSP TPS6116X Driver");
+MODULE_AUTHOR("Cyril Chemparathy");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:tps6116x");
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH v3 10/12] backlight: add support for tps6116x controller
2010-10-21 21:01 ` [PATCH v3 10/12] backlight: add support for tps6116x controller Cyril Chemparathy
@ 2010-10-21 21:19 ` Joe Perches
0 siblings, 0 replies; 23+ messages in thread
From: Joe Perches @ 2010-10-21 21:19 UTC (permalink / raw)
To: Cyril Chemparathy
Cc: davinci-linux-open-source, spi-devel-general, broonie, lrg,
dbrownell, grant.likely, linux-arm-kernel, linux-kernel, rpurdie
On Thu, 2010-10-21 at 17:01 -0400, Cyril Chemparathy wrote:
> diff --git a/drivers/video/backlight/tps6116x.c b/drivers/video/backlight/tps6116x.c
just some trivia:
> @@ -0,0 +1,340 @@
[]
> +struct tps6116x {
> + struct ti_ssp_device *handle;
> + struct device *dev;
> + int gpio, gpio_initialized;
> + struct mutex lock;
> + int intensity;
> + int power;
> + struct backlight_properties props;
> + struct backlight_device *bl;
> + int suspended:1;
> + struct regulator *regulator;
> +};
Perhaps several of these should be bool.
gpio_initialized, power, suspended
[]
> +static int __devinit tps6116x_probe(struct platform_device *pdev)
> +{
> + struct tps6116x *hw;
> + struct device *dev = &pdev->dev;
> + struct backlight_properties props;
> + int error;
> +
> + hw = kzalloc(sizeof(struct tps6116x), GFP_KERNEL);
> + if (!hw) {
> + error = -ENOMEM;
> + dev_err(dev, "cannot allocate driver data\n");
> + goto fail0;
> + }
> + platform_set_drvdata(pdev, hw);
> +
> + memset(hw, 0, sizeof(struct tps6116x));
Unnecessary memset.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH v3 11/12] davinci: add tnetv107x evm backlight device
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
` (8 preceding siblings ...)
2010-10-21 21:01 ` [PATCH v3 10/12] backlight: add support for tps6116x controller Cyril Chemparathy
@ 2010-10-21 21:01 ` Cyril Chemparathy
2010-10-21 21:01 ` [PATCH v3 12/12] davinci: add tnetv107x evm i2c eeprom device Cyril Chemparathy
10 siblings, 0 replies; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
The tnetv107x evm board has a backlight device that is connected on one of the
SSP ports. This patch adds the board definitions necessary to plug the
backlight driver to the GPIO corresponding to this SSP pin.
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-davinci/board-tnetv107x-evm.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index 270ba26..ca61f8a 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -45,6 +45,7 @@
#define EVM_MMC_WP_GPIO 21
#define EVM_MMC_CD_GPIO 24
#define EVM_SPI_CS_GPIO 54
+#define EVM_BACKLIGHT_GPIO (SSP_GPIO_START + 2)
static int initialize_gpio(int gpio, char *desc)
{
@@ -360,6 +361,12 @@ static struct spi_board_info spi_info[] __initconst = {
},
};
+static struct platform_device backlight_device = {
+ .name = "tps6116x",
+ .id = -1,
+ .dev.platform_data = (void *)EVM_BACKLIGHT_GPIO,
+};
+
static __init void tnetv107x_evm_board_init(void)
{
davinci_cfg_reg_list(sdio1_pins);
@@ -368,6 +375,8 @@ static __init void tnetv107x_evm_board_init(void)
tnetv107x_devices_init(&evm_device_info);
+ platform_device_register(&backlight_device);
+
spi_register_board_info(spi_info, ARRAY_SIZE(spi_info));
}
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v3 12/12] davinci: add tnetv107x evm i2c eeprom device
[not found] ` <1287694873-12904-1-git-send-email-cyril-l0cyMroinI0@public.gmane.org>
` (9 preceding siblings ...)
2010-10-21 21:01 ` [PATCH v3 11/12] davinci: add tnetv107x evm backlight device Cyril Chemparathy
@ 2010-10-21 21:01 ` Cyril Chemparathy
10 siblings, 0 replies; 23+ messages in thread
From: Cyril Chemparathy @ 2010-10-21 21:01 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
lrg-kDsPt+C1G03kYMGBc/C6ZA,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, gra
Cc: Cyril Chemparathy
The tnetv107x evm board has an I2C device connected on one of the SSP ports.
This patch adds board definitions for a GPIO based I2C master, as well as
definitions for the eeprom device on these boards.
Signed-off-by: Cyril Chemparathy <cyril-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-davinci/board-tnetv107x-evm.c | 30 +++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index ca61f8a..8b94a63 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -29,6 +29,9 @@
#include <linux/regulator/machine.h>
#include <linux/regulator/consumer.h>
#include <linux/regulator/driver.h>
+#include <linux/i2c.h>
+#include <linux/i2c/at24.h>
+#include <linux/i2c-gpio.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
@@ -45,6 +48,8 @@
#define EVM_MMC_WP_GPIO 21
#define EVM_MMC_CD_GPIO 24
#define EVM_SPI_CS_GPIO 54
+#define EVM_I2C_SDA_GPIO (SSP_GPIO_START + 0)
+#define EVM_I2C_SCL_GPIO (SSP_GPIO_START + 1)
#define EVM_BACKLIGHT_GPIO (SSP_GPIO_START + 2)
static int initialize_gpio(int gpio, char *desc)
@@ -367,6 +372,29 @@ static struct platform_device backlight_device = {
.dev.platform_data = (void *)EVM_BACKLIGHT_GPIO,
};
+struct i2c_gpio_platform_data i2c_data = {
+ .sda_pin = EVM_I2C_SDA_GPIO,
+ .scl_pin = EVM_I2C_SCL_GPIO,
+};
+
+static struct platform_device i2c_device = {
+ .name = "i2c-gpio",
+ .id = 0,
+ .dev.platform_data = &i2c_data,
+};
+
+static struct at24_platform_data at24_config = {
+ .byte_len = SZ_16K / 8,
+ .page_size = 16,
+};
+
+static struct i2c_board_info i2c_info[] __initconst = {
+ {
+ I2C_BOARD_INFO("24c16", 0x50),
+ .platform_data = &at24_config,
+ },
+};
+
static __init void tnetv107x_evm_board_init(void)
{
davinci_cfg_reg_list(sdio1_pins);
@@ -376,8 +404,10 @@ static __init void tnetv107x_evm_board_init(void)
tnetv107x_devices_init(&evm_device_info);
platform_device_register(&backlight_device);
+ platform_device_register(&i2c_device);
spi_register_board_info(spi_info, ARRAY_SIZE(spi_info));
+ i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));
}
#ifdef CONFIG_SERIAL_8250_CONSOLE
--
1.7.0.4
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
^ permalink raw reply related [flat|nested] 23+ messages in thread