mirror of
https://git.yoctoproject.org/meta-raspberrypi
synced 2026-05-07 04:58:12 +00:00
linux-raspberrypi: Drop support for 3.14
General policy is to support three kernel versions; latest stable + two longterm versions. These are currently 4.4, 4.1, and 3.18. Signed-off-by: Petter Mabäcker <petter@technux.se>
This commit is contained in:
Petter Mabäcker
committed by
Andrei Gherzan
Andrei Gherzan
parent
e447357ec4
commit
e9e4b1bbd2
@@ -1,263 +0,0 @@
|
||||
From e73a69601c65103b0e032e6093af0f00a1e1af3a Mon Sep 17 00:00:00 2001
|
||||
From: Florian Meier <florian.meier@koalo.de>
|
||||
Date: Fri, 22 Nov 2013 14:33:38 +0100
|
||||
Subject: [PATCH 1/2] ASoC: Add BCM2708 fixes
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
(cherry-pick remaining parts of
|
||||
730cb8a1216f9da3d097072cd9bb06e0db348172)
|
||||
|
||||
bcm2708-i2s: Update bclk_ratio to more correct values
|
||||
|
||||
Move GPIO setup to hw_params.
|
||||
|
||||
This is used to stop the I2S driver from breaking
|
||||
the GPIO setup for other uses of the PCM interface
|
||||
|
||||
Configure GPIOs for I2S based on revision/card settings
|
||||
|
||||
With RPi model B+, assignment of the I2S GPIO pins has changed.
|
||||
This patch uses the board revision to auto-detect the GPIOs used
|
||||
for I2S. It also allows sound card drivers to set the GPIOs that
|
||||
should be used. This is especially important with the Compute
|
||||
Module.
|
||||
|
||||
bcm2708-i2s: Avoid leak from iomap when accessing gpio
|
||||
|
||||
bcm2708: Eliminate i2s debugfs directory error
|
||||
|
||||
Qualify the two regmap ranges uses by bcm2708-i2s ('-i2s' and '-clk')
|
||||
to avoid the name clash when registering debugfs entries.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Petter Mabäcker <petter@technux.se>
|
||||
|
||||
Conflicts:
|
||||
sound/soc/bcm/Kconfig
|
||||
sound/soc/bcm/Makefile
|
||||
sound/soc/bcm/bcm2708-i2s.c
|
||||
---
|
||||
sound/soc/bcm/bcm2708-i2s.c | 82 ++++++++++++++++++++++++++++++++++++---------
|
||||
sound/soc/bcm/bcm2708-i2s.h | 35 +++++++++++++++++++
|
||||
2 files changed, 102 insertions(+), 15 deletions(-)
|
||||
create mode 100644 sound/soc/bcm/bcm2708-i2s.h
|
||||
|
||||
diff --git a/sound/soc/bcm/bcm2708-i2s.c b/sound/soc/bcm/bcm2708-i2s.c
|
||||
index 9976571..3fcb740 100644
|
||||
--- a/sound/soc/bcm/bcm2708-i2s.c
|
||||
+++ b/sound/soc/bcm/bcm2708-i2s.c
|
||||
@@ -31,6 +31,8 @@
|
||||
* General Public License for more details.
|
||||
*/
|
||||
|
||||
+#include "bcm2708-i2s.h"
|
||||
+
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/device.h>
|
||||
@@ -38,6 +40,7 @@
|
||||
#include <linux/delay.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/clk.h>
|
||||
+#include <mach/gpio.h>
|
||||
|
||||
#include <sound/core.h>
|
||||
#include <sound/pcm.h>
|
||||
@@ -46,6 +49,8 @@
|
||||
#include <sound/soc.h>
|
||||
#include <sound/dmaengine_pcm.h>
|
||||
|
||||
+#include <asm/system_info.h>
|
||||
+
|
||||
/* Clock registers */
|
||||
#define BCM2708_CLK_PCMCTL_REG 0x00
|
||||
#define BCM2708_CLK_PCMDIV_REG 0x04
|
||||
@@ -163,6 +168,9 @@ static const unsigned int bcm2708_clk_freq[BCM2708_CLK_SRC_HDMI+1] = {
|
||||
#define BCM2708_DMA_DREQ_PCM_TX 2
|
||||
#define BCM2708_DMA_DREQ_PCM_RX 3
|
||||
|
||||
+/* I2S pin configuration */
|
||||
+static int bcm2708_i2s_gpio=BCM2708_I2S_GPIO_AUTO;
|
||||
+
|
||||
/* General device struct */
|
||||
struct bcm2708_i2s_dev {
|
||||
struct device *dev;
|
||||
@@ -174,6 +182,12 @@ struct bcm2708_i2s_dev {
|
||||
struct regmap *clk_regmap;
|
||||
};
|
||||
|
||||
+void bcm2708_i2s_set_gpio(int gpio) {
|
||||
+ bcm2708_i2s_gpio=gpio;
|
||||
+}
|
||||
+EXPORT_SYMBOL(bcm2708_i2s_set_gpio);
|
||||
+
|
||||
+
|
||||
static void bcm2708_i2s_start_clock(struct bcm2708_i2s_dev *dev)
|
||||
{
|
||||
/* Start the clock if in master mode */
|
||||
@@ -306,6 +320,25 @@ static int bcm2708_i2s_set_dai_bclk_ratio(struct snd_soc_dai *dai,
|
||||
}
|
||||
|
||||
|
||||
+static int bcm2708_i2s_set_function(unsigned offset, int function)
|
||||
+{
|
||||
+ #define GPIOFSEL(x) (0x00+(x)*4)
|
||||
+ void __iomem *gpio = __io_address(GPIO_BASE);
|
||||
+ unsigned alt = function <= 3 ? function + 4: function == 4 ? 3 : 2;
|
||||
+ unsigned gpiodir;
|
||||
+ unsigned gpio_bank = offset / 10;
|
||||
+ unsigned gpio_field_offset = (offset - 10 * gpio_bank) * 3;
|
||||
+
|
||||
+ if (offset >= BCM2708_NR_GPIOS)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ gpiodir = readl(gpio + GPIOFSEL(gpio_bank));
|
||||
+ gpiodir &= ~(7 << gpio_field_offset);
|
||||
+ gpiodir |= alt << gpio_field_offset;
|
||||
+ writel(gpiodir, gpio + GPIOFSEL(gpio_bank));
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static void bcm2708_i2s_setup_gpio(void)
|
||||
{
|
||||
/*
|
||||
@@ -314,20 +347,37 @@ static void bcm2708_i2s_setup_gpio(void)
|
||||
* TODO Better way would be to handle
|
||||
* this in the device tree!
|
||||
*/
|
||||
-#define INP_GPIO(g) *(gpio+((g)/10)) &= ~(7<<(((g)%10)*3))
|
||||
-#define SET_GPIO_ALT(g,a) *(gpio+(((g)/10))) |= (((a)<=3?(a)+4:(a)==4?3:2)<<(((g)%10)*3))
|
||||
+ int pin,pinconfig,startpin,alt;
|
||||
+
|
||||
+ /* SPI is on different GPIOs on different boards */
|
||||
+ /* for Raspberry Pi B+, this is pin GPIO18-21, for original on 28-31 */
|
||||
+ if (bcm2708_i2s_gpio==BCM2708_I2S_GPIO_AUTO) {
|
||||
+ if ((system_rev & 0xffffff) >= 0x10) {
|
||||
+ /* Model B+ */
|
||||
+ pinconfig=BCM2708_I2S_GPIO_PIN18;
|
||||
+ } else {
|
||||
+ /* original */
|
||||
+ pinconfig=BCM2708_I2S_GPIO_PIN28;
|
||||
+ }
|
||||
+ } else {
|
||||
+ pinconfig=bcm2708_i2s_gpio;
|
||||
+ }
|
||||
|
||||
- unsigned int *gpio;
|
||||
- int pin;
|
||||
- gpio = ioremap(GPIO_BASE, SZ_16K);
|
||||
+ if (pinconfig==BCM2708_I2S_GPIO_PIN18) {
|
||||
+ startpin=18;
|
||||
+ alt=BCM2708_I2S_GPIO_PIN18_ALT;
|
||||
+ } else if (pinconfig==BCM2708_I2S_GPIO_PIN28) {
|
||||
+ startpin=28;
|
||||
+ alt=BCM2708_I2S_GPIO_PIN28_ALT;
|
||||
+ } else {
|
||||
+ printk(KERN_INFO "Can't configure I2S GPIOs, unknown pin mode for I2S: %i\n",pinconfig);
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
- /* SPI is on GPIO 7..11 */
|
||||
- for (pin = 28; pin <= 31; pin++) {
|
||||
- INP_GPIO(pin); /* set mode to GPIO input first */
|
||||
- SET_GPIO_ALT(pin, 2); /* set mode to ALT 0 */
|
||||
+ /* configure I2S pins to correct ALT mode */
|
||||
+ for (pin = startpin; pin <= startpin+3; pin++) {
|
||||
+ bcm2708_i2s_set_function(pin, alt);
|
||||
}
|
||||
-#undef INP_GPIO
|
||||
-#undef SET_GPIO_ALT
|
||||
}
|
||||
|
||||
static int bcm2708_i2s_hw_params(struct snd_pcm_substream *substream,
|
||||
@@ -372,15 +422,15 @@ static int bcm2708_i2s_hw_params(struct snd_pcm_substream *substream,
|
||||
switch (params_format(params)) {
|
||||
case SNDRV_PCM_FORMAT_S16_LE:
|
||||
data_length = 16;
|
||||
- bclk_ratio = 40;
|
||||
+ bclk_ratio = 50;
|
||||
break;
|
||||
case SNDRV_PCM_FORMAT_S24_LE:
|
||||
data_length = 24;
|
||||
- bclk_ratio = 40;
|
||||
+ bclk_ratio = 50;
|
||||
break;
|
||||
case SNDRV_PCM_FORMAT_S32_LE:
|
||||
data_length = 32;
|
||||
- bclk_ratio = 80;
|
||||
+ bclk_ratio = 100;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
@@ -746,7 +796,7 @@ static struct snd_soc_dai_driver bcm2708_i2s_dai = {
|
||||
.channels_max = 2,
|
||||
.rates = SNDRV_PCM_RATE_8000_192000,
|
||||
.formats = SNDRV_PCM_FMTBIT_S16_LE
|
||||
- // | SNDRV_PCM_FMTBIT_S24_LE : disable for now, it causes white noise with xbmc
|
||||
+ | SNDRV_PCM_FMTBIT_S24_LE
|
||||
| SNDRV_PCM_FMTBIT_S32_LE
|
||||
},
|
||||
.capture = {
|
||||
@@ -803,6 +853,7 @@ static const struct regmap_config bcm2708_regmap_config[] = {
|
||||
.precious_reg = bcm2708_i2s_precious_reg,
|
||||
.volatile_reg = bcm2708_i2s_volatile_reg,
|
||||
.cache_type = REGCACHE_RBTREE,
|
||||
+ .name = "i2s",
|
||||
},
|
||||
{
|
||||
.reg_bits = 32,
|
||||
@@ -811,6 +862,7 @@ static const struct regmap_config bcm2708_regmap_config[] = {
|
||||
.max_register = BCM2708_CLK_PCMDIV_REG,
|
||||
.volatile_reg = bcm2708_clk_volatile_reg,
|
||||
.cache_type = REGCACHE_RBTREE,
|
||||
+ .name = "clk",
|
||||
},
|
||||
};
|
||||
|
||||
diff --git a/sound/soc/bcm/bcm2708-i2s.h b/sound/soc/bcm/bcm2708-i2s.h
|
||||
new file mode 100644
|
||||
index 0000000..94fed6a
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/bcm/bcm2708-i2s.h
|
||||
@@ -0,0 +1,35 @@
|
||||
+/*
|
||||
+ * I2S configuration for sound cards.
|
||||
+ *
|
||||
+ * Copyright (c) 2014 Daniel Matuschek <daniel@hifiberry.com>
|
||||
+ *
|
||||
+ * 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 BCM2708_I2S_H
|
||||
+#define BCM2708_I2S_H
|
||||
+
|
||||
+/* I2S pin assignment */
|
||||
+#define BCM2708_I2S_GPIO_AUTO 0
|
||||
+#define BCM2708_I2S_GPIO_PIN18 1
|
||||
+#define BCM2708_I2S_GPIO_PIN28 2
|
||||
+
|
||||
+/* Alt mode to enable I2S */
|
||||
+#define BCM2708_I2S_GPIO_PIN18_ALT 0
|
||||
+#define BCM2708_I2S_GPIO_PIN28_ALT 2
|
||||
+
|
||||
+extern void bcm2708_i2s_set_gpio(int gpio);
|
||||
+
|
||||
+#endif
|
||||
--
|
||||
1.9.1
|
||||
|
||||
-235
@@ -1,235 +0,0 @@
|
||||
From 2c84355bf200f4d19d7078dee2c63011ad715395 Mon Sep 17 00:00:00 2001
|
||||
From: jeanleflambeur <catalin.vasile@gmail.com>
|
||||
Date: Sun, 1 Feb 2015 12:35:38 +0100
|
||||
Subject: [PATCH 2/2] Fix grabbing lock from atomic context in i2c driver
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
(cherry-pick from 558d0bfc8fe80ccdccee7f03e881a80965ec987c)
|
||||
|
||||
2 main changes:
|
||||
- check for timeouts in the bcm2708_bsc_setup function as indicated by this comment:
|
||||
/* poll for transfer start bit (should only take 1-20 polls) */
|
||||
This implies that the setup function can now fail so account for this everywhere it's called
|
||||
- Removed the clk_get_rate call from inside the setup function as it locks a mutex and that's not ok since we call it from under a spin lock.
|
||||
|
||||
removed dead code and update comment
|
||||
|
||||
fixed typo in comment
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Petter Mabäcker <petter@technux.se>
|
||||
|
||||
Conflicts:
|
||||
drivers/i2c/busses/i2c-bcm2708.c
|
||||
---
|
||||
drivers/i2c/busses/i2c-bcm2708.c | 88 +++++++++++++++++++++++++++++-----------
|
||||
1 file changed, 65 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c
|
||||
index 05531db..886672c 100644
|
||||
--- a/drivers/i2c/busses/i2c-bcm2708.c
|
||||
+++ b/drivers/i2c/busses/i2c-bcm2708.c
|
||||
@@ -67,6 +67,7 @@
|
||||
#define BSC_S_TA 0x00000001
|
||||
|
||||
#define I2C_TIMEOUT_MS 150
|
||||
+#define I2C_WAIT_LOOP_COUNT 40
|
||||
|
||||
#define DRV_NAME "bcm2708_i2c"
|
||||
|
||||
@@ -85,6 +86,7 @@ struct bcm2708_i2c {
|
||||
void __iomem *base;
|
||||
int irq;
|
||||
struct clk *clk;
|
||||
+ u32 cdiv;
|
||||
|
||||
struct completion done;
|
||||
|
||||
@@ -108,10 +110,10 @@ static void bcm2708_i2c_init_pinmode(int id)
|
||||
int pin;
|
||||
u32 *gpio = ioremap(0x20200000, SZ_16K);
|
||||
|
||||
- BUG_ON(id != 0 && id != 1);
|
||||
+ BUG_ON(id != 0 && id != 1);
|
||||
/* BSC0 is on GPIO 0 & 1, BSC1 is on GPIO 2 & 3 */
|
||||
for (pin = id*2+0; pin <= id*2+1; pin++) {
|
||||
-printk("bcm2708_i2c_init_pinmode(%d,%d)\n", id, pin);
|
||||
+ printk("bcm2708_i2c_init_pinmode(%d,%d)\n", id, pin);
|
||||
INP_GPIO(pin); /* set mode to GPIO input first */
|
||||
SET_GPIO_ALT(pin, 0); /* set mode to ALT 0 */
|
||||
}
|
||||
@@ -150,16 +152,16 @@ static inline void bcm2708_bsc_fifo_fill(struct bcm2708_i2c *bi)
|
||||
bcm2708_wr(bi, BSC_FIFO, bi->msg->buf[bi->pos++]);
|
||||
}
|
||||
|
||||
-static inline void bcm2708_bsc_setup(struct bcm2708_i2c *bi)
|
||||
+static inline int bcm2708_bsc_setup(struct bcm2708_i2c *bi)
|
||||
{
|
||||
- unsigned long bus_hz;
|
||||
u32 cdiv, s;
|
||||
u32 c = BSC_C_I2CEN | BSC_C_INTD | BSC_C_ST | BSC_C_CLEAR_1;
|
||||
+ int wait_loops = I2C_WAIT_LOOP_COUNT;
|
||||
|
||||
- bus_hz = clk_get_rate(bi->clk);
|
||||
- cdiv = bus_hz / baudrate;
|
||||
- if (cdiv > 0xffff)
|
||||
- cdiv = 0xffff;
|
||||
+ /* Can't call clk_get_rate as it locks a mutex and here we are spinlocked.
|
||||
+ * Use the value that we cached in the probe.
|
||||
+ */
|
||||
+ cdiv = bi->cdiv;
|
||||
|
||||
if (bi->msg->flags & I2C_M_RD)
|
||||
c |= BSC_C_INTR | BSC_C_READ;
|
||||
@@ -176,17 +178,25 @@ static inline void bcm2708_bsc_setup(struct bcm2708_i2c *bi)
|
||||
- Both messages to same slave address
|
||||
- Write message can fit inside FIFO (16 bytes or less) */
|
||||
if ( (bi->nmsgs > 1) &&
|
||||
- !(bi->msg[0].flags & I2C_M_RD) && (bi->msg[1].flags & I2C_M_RD) &&
|
||||
- (bi->msg[0].addr == bi->msg[1].addr) && (bi->msg[0].len <= 16)) {
|
||||
+ !(bi->msg[0].flags & I2C_M_RD) && (bi->msg[1].flags & I2C_M_RD) &&
|
||||
+ (bi->msg[0].addr == bi->msg[1].addr) && (bi->msg[0].len <= 16)) {
|
||||
/* Fill FIFO with entire write message (16 byte FIFO) */
|
||||
- while (bi->pos < bi->msg->len)
|
||||
+ while (bi->pos < bi->msg->len) {
|
||||
bcm2708_wr(bi, BSC_FIFO, bi->msg->buf[bi->pos++]);
|
||||
+ }
|
||||
/* Start write transfer (no interrupts, don't clear FIFO) */
|
||||
bcm2708_wr(bi, BSC_C, BSC_C_I2CEN | BSC_C_ST);
|
||||
+
|
||||
/* poll for transfer start bit (should only take 1-20 polls) */
|
||||
do {
|
||||
s = bcm2708_rd(bi, BSC_S);
|
||||
- } while (!(s & (BSC_S_TA | BSC_S_ERR | BSC_S_CLKT | BSC_S_DONE)));
|
||||
+ } while (!(s & (BSC_S_TA | BSC_S_ERR | BSC_S_CLKT | BSC_S_DONE)) && --wait_loops >= 0);
|
||||
+
|
||||
+ /* did we time out or some error occured? */
|
||||
+ if (wait_loops < 0 || (s & (BSC_S_ERR | BSC_S_CLKT))) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
/* Send next read message before the write transfer finishes. */
|
||||
bi->nmsgs--;
|
||||
bi->msg++;
|
||||
@@ -196,6 +206,8 @@ static inline void bcm2708_bsc_setup(struct bcm2708_i2c *bi)
|
||||
}
|
||||
}
|
||||
bcm2708_wr(bi, BSC_C, c);
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static irqreturn_t bcm2708_i2c_interrupt(int irq, void *dev_id)
|
||||
@@ -203,13 +215,15 @@ static irqreturn_t bcm2708_i2c_interrupt(int irq, void *dev_id)
|
||||
struct bcm2708_i2c *bi = dev_id;
|
||||
bool handled = true;
|
||||
u32 s;
|
||||
+ int ret;
|
||||
|
||||
spin_lock(&bi->lock);
|
||||
|
||||
/* we may see camera interrupts on the "other" I2C channel
|
||||
- Just return if we've not sent anything */
|
||||
- if (!bi->nmsgs || !bi->msg )
|
||||
+ Just return if we've not sent anything */
|
||||
+ if (!bi->nmsgs || !bi->msg) {
|
||||
goto early_exit;
|
||||
+ }
|
||||
|
||||
s = bcm2708_rd(bi, BSC_S);
|
||||
|
||||
@@ -217,13 +231,16 @@ static irqreturn_t bcm2708_i2c_interrupt(int irq, void *dev_id)
|
||||
bcm2708_bsc_reset(bi);
|
||||
bi->error = true;
|
||||
|
||||
+ bi->msg = 0; /* to inform the that all work is done */
|
||||
+ bi->nmsgs = 0;
|
||||
/* wake up our bh */
|
||||
complete(&bi->done);
|
||||
} else if (s & BSC_S_DONE) {
|
||||
bi->nmsgs--;
|
||||
|
||||
- if (bi->msg->flags & I2C_M_RD)
|
||||
+ if (bi->msg->flags & I2C_M_RD) {
|
||||
bcm2708_bsc_fifo_drain(bi);
|
||||
+ }
|
||||
|
||||
bcm2708_bsc_reset(bi);
|
||||
|
||||
@@ -231,8 +248,19 @@ static irqreturn_t bcm2708_i2c_interrupt(int irq, void *dev_id)
|
||||
/* advance to next message */
|
||||
bi->msg++;
|
||||
bi->pos = 0;
|
||||
- bcm2708_bsc_setup(bi);
|
||||
+ ret = bcm2708_bsc_setup(bi);
|
||||
+ if (ret < 0) {
|
||||
+ bcm2708_bsc_reset(bi);
|
||||
+ bi->error = true;
|
||||
+ bi->msg = 0; /* to inform the that all work is done */
|
||||
+ bi->nmsgs = 0;
|
||||
+ /* wake up our bh */
|
||||
+ complete(&bi->done);
|
||||
+ goto early_exit;
|
||||
+ }
|
||||
} else {
|
||||
+ bi->msg = 0; /* to inform the that all work is done */
|
||||
+ bi->nmsgs = 0;
|
||||
/* wake up our bh */
|
||||
complete(&bi->done);
|
||||
}
|
||||
@@ -265,21 +293,34 @@ static int bcm2708_i2c_master_xfer(struct i2c_adapter *adap,
|
||||
bi->nmsgs = num;
|
||||
bi->error = false;
|
||||
|
||||
+ ret = bcm2708_bsc_setup(bi);
|
||||
spin_unlock_irqrestore(&bi->lock, flags);
|
||||
|
||||
bcm2708_bsc_setup(bi);
|
||||
|
||||
- ret = wait_for_completion_timeout(&bi->done,
|
||||
- msecs_to_jiffies(I2C_TIMEOUT_MS));
|
||||
+ /* check the result of the setup */
|
||||
+ if (ret < 0)
|
||||
+ {
|
||||
+ dev_err(&adap->dev, "transfer setup timed out\n");
|
||||
+ goto error_timeout;
|
||||
+ }
|
||||
+
|
||||
+ ret = wait_for_completion_timeout(&bi->done, msecs_to_jiffies(I2C_TIMEOUT_MS));
|
||||
if (ret == 0) {
|
||||
dev_err(&adap->dev, "transfer timed out\n");
|
||||
- spin_lock_irqsave(&bi->lock, flags);
|
||||
- bcm2708_bsc_reset(bi);
|
||||
- spin_unlock_irqrestore(&bi->lock, flags);
|
||||
- return -ETIMEDOUT;
|
||||
+ goto error_timeout;
|
||||
}
|
||||
|
||||
- return bi->error ? -EIO : num;
|
||||
+ ret = bi->error ? -EIO : num;
|
||||
+ return ret;
|
||||
+
|
||||
+error_timeout:
|
||||
+ spin_lock_irqsave(&bi->lock, flags);
|
||||
+ bcm2708_bsc_reset(bi);
|
||||
+ bi->msg = 0; /* to inform the interrupt handler that there's nothing else to be done */
|
||||
+ bi->nmsgs = 0;
|
||||
+ spin_unlock_irqrestore(&bi->lock, flags);
|
||||
+ return -ETIMEDOUT;
|
||||
}
|
||||
|
||||
static u32 bcm2708_i2c_functionality(struct i2c_adapter *adap)
|
||||
@@ -382,6 +423,7 @@ static int bcm2708_i2c_probe(struct platform_device *pdev)
|
||||
cdiv = 0xffff;
|
||||
baudrate = bus_hz / cdiv;
|
||||
}
|
||||
+ bi->cdiv = cdiv;
|
||||
|
||||
dev_info(&pdev->dev, "BSC%d Controller at 0x%08lx (irq %d) (baudrate %d)\n",
|
||||
pdev->id, (unsigned long)regs->start, irq, baudrate);
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
|
||||
|
||||
LINUX_VERSION ?= "3.14.28"
|
||||
|
||||
SRCREV = "e294028d7733a30f3befacc41d473c251096a515"
|
||||
SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.14.y \
|
||||
file://0001-ASoC-Add-BCM2708-fixes.patch \
|
||||
file://0002-Fix-grabbing-lock-from-atomic-context-in-i2c-driver.patch \
|
||||
"
|
||||
|
||||
require linux-raspberrypi.inc
|
||||
Reference in New Issue
Block a user