ed6d07c
Bugzilla: 1012025
ed6d07c
Upstream-status: In beagle github repository https://github.com/beagleboard/kernel
ed6d07c
ed6d07c
From 82fe302f565e00cfde3e96c6132df93b39525e7b Mon Sep 17 00:00:00 2001
ed6d07c
From: Philipp Zabel <p.zabel@pengutronix.de>
ed6d07c
Date: Tue, 28 May 2013 17:06:15 +0200
ed6d07c
Subject: [PATCH] reset: Add driver for gpio-controlled reset pins
ed6d07c
ed6d07c
This driver implements a reset controller device that toggle a gpio
ed6d07c
connected to a reset pin of a peripheral IC. The delay between assertion
ed6d07c
and de-assertion of the reset signal can be configured via device tree.
ed6d07c
ed6d07c
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
ed6d07c
Reviewed-by: Stephen Warren <swarren@nvidia.com>
ed6d07c
---
ed6d07c
 .../devicetree/bindings/reset/gpio-reset.txt       |  35 +++++
ed6d07c
 drivers/reset/Kconfig                              |  11 ++
ed6d07c
 drivers/reset/Makefile                             |   1 +
ed6d07c
 drivers/reset/gpio-reset.c                         | 169 +++++++++++++++++++++
ed6d07c
 4 files changed, 216 insertions(+)
ed6d07c
 create mode 100644 Documentation/devicetree/bindings/reset/gpio-reset.txt
ed6d07c
 create mode 100644 drivers/reset/gpio-reset.c
ed6d07c
ed6d07c
diff --git a/Documentation/devicetree/bindings/reset/gpio-reset.txt b/Documentation/devicetree/bindings/reset/gpio-reset.txt
ed6d07c
new file mode 100644
ed6d07c
index 0000000..bca5348
ed6d07c
--- /dev/null
ed6d07c
+++ b/Documentation/devicetree/bindings/reset/gpio-reset.txt
ed6d07c
@@ -0,0 +1,35 @@
ed6d07c
+GPIO reset controller
ed6d07c
+=====================
ed6d07c
+
ed6d07c
+A GPIO reset controller controls a single GPIO that is connected to the reset
ed6d07c
+pin of a peripheral IC. Please also refer to reset.txt in this directory for
ed6d07c
+common reset controller binding usage.
ed6d07c
+
ed6d07c
+Required properties:
ed6d07c
+- compatible: Should be "gpio-reset"
ed6d07c
+- reset-gpios: A gpio used as reset line. The gpio specifier for this property
ed6d07c
+               depends on the gpio controller that provides the gpio.
ed6d07c
+- #reset-cells: 0, see below
ed6d07c
+
ed6d07c
+Optional properties:
ed6d07c
+- reset-delay-us: delay in microseconds. The gpio reset line will be asserted for
ed6d07c
+                  this duration to reset.
ed6d07c
+- initially-in-reset: boolean. If not set, the initial state should be a
ed6d07c
+                      deasserted reset line. If this property exists, the
ed6d07c
+                      reset line should be kept in reset.
ed6d07c
+
ed6d07c
+example:
ed6d07c
+
ed6d07c
+sii902x_reset: gpio-reset {
ed6d07c
+	compatible = "gpio-reset";
ed6d07c
+	reset-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
ed6d07c
+	reset-delay-us = <10000>;
ed6d07c
+	initially-in-reset;
ed6d07c
+	#reset-cells = <0>;
ed6d07c
+};
ed6d07c
+
ed6d07c
+/* Device with nRESET pin connected to GPIO5_0 */
ed6d07c
+sii902x@39 {
ed6d07c
+	/* ... */
ed6d07c
+	resets = <&sii902x_reset>; /* active-low GPIO5_0, 10 ms delay */
ed6d07c
+};
ed6d07c
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
ed6d07c
index c9d04f7..1a862df 100644
ed6d07c
--- a/drivers/reset/Kconfig
ed6d07c
+++ b/drivers/reset/Kconfig
ed6d07c
@@ -11,3 +11,14 @@ menuconfig RESET_CONTROLLER
ed6d07c
 	  via GPIOs or SoC-internal reset controller modules.
ed6d07c
 
ed6d07c
 	  If unsure, say no.
ed6d07c
+
ed6d07c
+if RESET_CONTROLLER
ed6d07c
+
ed6d07c
+config RESET_GPIO
ed6d07c
+	tristate "GPIO reset controller support"
ed6d07c
+	depends on GPIOLIB && OF
ed6d07c
+	help
ed6d07c
+	  This driver provides support for reset lines that are controlled
ed6d07c
+	  directly by GPIOs.
ed6d07c
+
ed6d07c
+endif
ed6d07c
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
ed6d07c
index 1e2d83f..b854f20 100644
ed6d07c
--- a/drivers/reset/Makefile
ed6d07c
+++ b/drivers/reset/Makefile
ed6d07c
@@ -1 +1,2 @@
ed6d07c
 obj-$(CONFIG_RESET_CONTROLLER) += core.o
ed6d07c
+obj-$(CONFIG_RESET_GPIO) += gpio-reset.o
ed6d07c
diff --git a/drivers/reset/gpio-reset.c b/drivers/reset/gpio-reset.c
ed6d07c
new file mode 100644
ed6d07c
index 0000000..acc1076
ed6d07c
--- /dev/null
ed6d07c
+++ b/drivers/reset/gpio-reset.c
ed6d07c
@@ -0,0 +1,169 @@
ed6d07c
+/*
ed6d07c
+ * GPIO Reset Controller driver
ed6d07c
+ *
ed6d07c
+ * Copyright 2013 Philipp Zabel, Pengutronix
ed6d07c
+ *
ed6d07c
+ * This program is free software; you can redistribute it and/or modify
ed6d07c
+ * it under the terms of the GNU General Public License as published by
ed6d07c
+ * the Free Software Foundation; either version 2 of the License, or
ed6d07c
+ * (at your option) any later version.
ed6d07c
+ */
ed6d07c
+#include <linux/delay.h>
ed6d07c
+#include <linux/err.h>
ed6d07c
+#include <linux/gpio.h>
ed6d07c
+#include <linux/module.h>
ed6d07c
+#include <linux/of_gpio.h>
ed6d07c
+#include <linux/platform_device.h>
ed6d07c
+#include <linux/reset-controller.h>
ed6d07c
+
ed6d07c
+struct gpio_reset_data {
ed6d07c
+	struct reset_controller_dev rcdev;
ed6d07c
+	unsigned int gpio;
ed6d07c
+	bool active_low;
ed6d07c
+	u32 delay_us;
ed6d07c
+};
ed6d07c
+
ed6d07c
+static void __gpio_reset_set(struct reset_controller_dev *rcdev, int asserted)
ed6d07c
+{
ed6d07c
+	struct gpio_reset_data *drvdata = container_of(rcdev,
ed6d07c
+			struct gpio_reset_data, rcdev);
ed6d07c
+	int value = asserted;
ed6d07c
+
ed6d07c
+	if (drvdata->active_low)
ed6d07c
+		value = !value;
ed6d07c
+
ed6d07c
+	gpio_set_value(drvdata->gpio, value);
ed6d07c
+}
ed6d07c
+
ed6d07c
+static int gpio_reset(struct reset_controller_dev *rcdev, unsigned long id)
ed6d07c
+{
ed6d07c
+	struct gpio_reset_data *drvdata = container_of(rcdev,
ed6d07c
+			struct gpio_reset_data, rcdev);
ed6d07c
+
ed6d07c
+	if (drvdata->delay_us < 0)
ed6d07c
+		return -ENOSYS;
ed6d07c
+
ed6d07c
+	__gpio_reset_set(rcdev, 1);
ed6d07c
+	udelay(drvdata->delay_us);
ed6d07c
+	__gpio_reset_set(rcdev, 0);
ed6d07c
+
ed6d07c
+	return 0;
ed6d07c
+}
ed6d07c
+
ed6d07c
+static int gpio_reset_assert(struct reset_controller_dev *rcdev,
ed6d07c
+		unsigned long id)
ed6d07c
+{
ed6d07c
+	__gpio_reset_set(rcdev, 1);
ed6d07c
+
ed6d07c
+	return 0;
ed6d07c
+}
ed6d07c
+
ed6d07c
+static int gpio_reset_deassert(struct reset_controller_dev *rcdev,
ed6d07c
+		unsigned long id)
ed6d07c
+{
ed6d07c
+	__gpio_reset_set(rcdev, 0);
ed6d07c
+
ed6d07c
+	return 0;
ed6d07c
+}
ed6d07c
+
ed6d07c
+static struct reset_control_ops gpio_reset_ops = {
ed6d07c
+	.reset = gpio_reset,
ed6d07c
+	.assert = gpio_reset_assert,
ed6d07c
+	.deassert = gpio_reset_deassert,
ed6d07c
+};
ed6d07c
+
ed6d07c
+static int of_gpio_reset_xlate(struct reset_controller_dev *rcdev,
ed6d07c
+			       const struct of_phandle_args *reset_spec)
ed6d07c
+{
ed6d07c
+	if (WARN_ON(reset_spec->args_count != 0))
ed6d07c
+		return -EINVAL;
ed6d07c
+
ed6d07c
+	return 0;
ed6d07c
+}
ed6d07c
+
ed6d07c
+static int gpio_reset_probe(struct platform_device *pdev)
ed6d07c
+{
ed6d07c
+	struct device_node *np = pdev->dev.of_node;
ed6d07c
+	struct gpio_reset_data *drvdata;
ed6d07c
+	enum of_gpio_flags flags;
ed6d07c
+	unsigned long gpio_flags;
ed6d07c
+	bool initially_in_reset;
ed6d07c
+	int ret;
ed6d07c
+
ed6d07c
+	drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
ed6d07c
+	if (drvdata == NULL)
ed6d07c
+		return -ENOMEM;
ed6d07c
+
ed6d07c
+	if (of_gpio_named_count(np, "reset-gpios") != 1)
ed6d07c
+		return -EINVAL;
ed6d07c
+
ed6d07c
+	drvdata->gpio = of_get_named_gpio_flags(np, "reset-gpios", 0, &flags);
ed6d07c
+	if (drvdata->gpio == -EPROBE_DEFER) {
ed6d07c
+		return drvdata->gpio;
ed6d07c
+	} else if (!gpio_is_valid(drvdata->gpio)) {
ed6d07c
+		dev_err(&pdev->dev, "invalid reset gpio: %d\n", drvdata->gpio);
ed6d07c
+		return drvdata->gpio;
ed6d07c
+	}
ed6d07c
+
ed6d07c
+	drvdata->active_low = flags & OF_GPIO_ACTIVE_LOW;
ed6d07c
+
ed6d07c
+	ret = of_property_read_u32(np, "reset-delay-us", &drvdata->delay_us);
ed6d07c
+	if (ret < 0)
ed6d07c
+		return ret;
ed6d07c
+
ed6d07c
+	initially_in_reset = of_property_read_bool(np, "initially-in-reset");
ed6d07c
+	if (drvdata->active_low ^ initially_in_reset)
ed6d07c
+		gpio_flags = GPIOF_OUT_INIT_HIGH;
ed6d07c
+	else
ed6d07c
+		gpio_flags = GPIOF_OUT_INIT_LOW;
ed6d07c
+
ed6d07c
+	ret = devm_gpio_request_one(&pdev->dev, drvdata->gpio, gpio_flags, NULL);
ed6d07c
+	if (ret < 0) {
ed6d07c
+		dev_err(&pdev->dev, "failed to request gpio %d: %d\n",
ed6d07c
+			drvdata->gpio, ret);
ed6d07c
+		return ret;
ed6d07c
+	}
ed6d07c
+
ed6d07c
+	drvdata->rcdev.of_node = np;
ed6d07c
+	drvdata->rcdev.owner = THIS_MODULE;
ed6d07c
+	drvdata->rcdev.nr_resets = 1;
ed6d07c
+	drvdata->rcdev.ops = &gpio_reset_ops;
ed6d07c
+	drvdata->rcdev.of_xlate = of_gpio_reset_xlate;
ed6d07c
+	reset_controller_register(&drvdata->rcdev);
ed6d07c
+
ed6d07c
+	platform_set_drvdata(pdev, drvdata);
ed6d07c
+
ed6d07c
+	return 0;
ed6d07c
+}
ed6d07c
+
ed6d07c
+static int gpio_reset_remove(struct platform_device *pdev)
ed6d07c
+{
ed6d07c
+	struct gpio_reset_data *drvdata = platform_get_drvdata(pdev);
ed6d07c
+
ed6d07c
+	reset_controller_unregister(&drvdata->rcdev);
ed6d07c
+
ed6d07c
+	return 0;
ed6d07c
+}
ed6d07c
+
ed6d07c
+static struct of_device_id gpio_reset_dt_ids[] = {
ed6d07c
+	{ .compatible = "gpio-reset" },
ed6d07c
+	{ }
ed6d07c
+};
ed6d07c
+
ed6d07c
+static struct platform_driver gpio_reset_driver = {
ed6d07c
+	.probe = gpio_reset_probe,
ed6d07c
+	.remove = gpio_reset_remove,
ed6d07c
+	.driver = {
ed6d07c
+		.name = "gpio-reset",
ed6d07c
+		.owner = THIS_MODULE,
ed6d07c
+		.of_match_table = of_match_ptr(gpio_reset_dt_ids),
ed6d07c
+	},
ed6d07c
+};
ed6d07c
+
ed6d07c
+module_platform_driver(gpio_reset_driver);
ed6d07c
+
ed6d07c
+MODULE_AUTHOR("Philipp Zabel <p.zabel@pengutronix.de>");
ed6d07c
+MODULE_DESCRIPTION("gpio reset controller");
ed6d07c
+MODULE_LICENSE("GPL");
ed6d07c
+MODULE_ALIAS("platform:gpio-reset");
ed6d07c
+MODULE_DEVICE_TABLE(of, gpio_reset_dt_ids);
ed6d07c
-- 
ed6d07c
1.8.2.1
ed6d07c
ed6d07c
From 03664ac63b20b55af9522449bbad048476d259d5 Mon Sep 17 00:00:00 2001
ed6d07c
From: Joel Fernandes <joelf@ti.com>
ed6d07c
Date: Wed, 3 Jul 2013 17:29:44 -0500
ed6d07c
Subject: [PATCH 2/2] sound: soc: soc-dmaengine-pcm: Add support for new
ed6d07c
 DMAEngine request API
ed6d07c
ed6d07c
Formerly these resources were coming HWMOD on OMAP-like SoCs. With the
ed6d07c
impending removal of HWMOD data, drivers are being converted to use the
ed6d07c
"of-dma" method of requesting DMA channels which from DT and can be obtained
ed6d07c
using the dma_request_slave_channel API. Add support to the soc-dmaengine-pcm
ed6d07c
helpers so that we can fetch and open channels using this method.
ed6d07c
ed6d07c
Signed-off-by: Joel Fernandes <joelf@ti.com>
ed6d07c
---
ed6d07c
 sound/core/pcm_dmaengine.c | 22 ++++++++++++++++++++++
ed6d07c
 1 file changed, 22 insertions(+)
ed6d07c
ed6d07c
diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c
ed6d07c
index aa924d9..461fe4f 100644
ed6d07c
--- a/sound/core/pcm_dmaengine.c
ed6d07c
+++ b/sound/core/pcm_dmaengine.c
ed6d07c
@@ -276,6 +276,16 @@ struct dma_chan *snd_dmaengine_pcm_request_channel(dma_filter_fn filter_fn,
ed6d07c
 }
ed6d07c
 EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_request_channel);
ed6d07c
 
ed6d07c
+struct dma_chan *snd_dmaengine_pcm_request_slave_channel(
ed6d07c
+	struct snd_pcm_substream *substream, char *name)
ed6d07c
+{
ed6d07c
+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
ed6d07c
+	struct device *dev = snd_soc_dai_get_drvdata(rtd->cpu_dai);
ed6d07c
+
ed6d07c
+	return dma_request_slave_channel(dev, name);
ed6d07c
+}
ed6d07c
+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_request_slave_channel);
ed6d07c
+
ed6d07c
 /**
ed6d07c
  * snd_dmaengine_pcm_open - Open a dmaengine based PCM substream
ed6d07c
  * @substream: PCM substream
ed6d07c
@@ -334,6 +344,18 @@ int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream,
ed6d07c
 }
ed6d07c
 EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan);
ed6d07c
 
ed6d07c
+int snd_dmaengine_pcm_open_request_slave_chan(struct snd_pcm_substream *substream, char *name)
ed6d07c
+{
ed6d07c
+	if(substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
ed6d07c
+		return snd_dmaengine_pcm_open(substream,
ed6d07c
+			    snd_dmaengine_pcm_request_slave_channel(substream, "tx"));
ed6d07c
+	} else {
ed6d07c
+		return snd_dmaengine_pcm_open(substream,
ed6d07c
+			    snd_dmaengine_pcm_request_slave_channel(substream, "rx"));
ed6d07c
+	}
ed6d07c
+}
ed6d07c
+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_slave_chan);
ed6d07c
+
ed6d07c
 /**
ed6d07c
  * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream
ed6d07c
  * @substream: PCM substream
ed6d07c
-- 
ed6d07c
1.8.4.rc3
ed6d07c
ed6d07c
From ae38683badc8c80b29ccc8aa4e059f900b603551 Mon Sep 17 00:00:00 2001
ed6d07c
From: Pantelis Antoniou <panto@antoniou-consulting.com>
ed6d07c
Date: Fri, 26 Oct 2012 15:48:00 +0300
ed6d07c
Subject: [PATCH 1/2] omap-hsmmc: Correct usage of of_find_node_by_name
ed6d07c
ed6d07c
of_find_node_by_name expect to have the parent node reference taken.
ed6d07c
---
ed6d07c
 drivers/mmc/host/omap_hsmmc.c | 10 ++++++++++
ed6d07c
 1 file changed, 10 insertions(+)
ed6d07c
ed6d07c
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
ed6d07c
index 6ac63df..f5b660c 100644
ed6d07c
--- a/drivers/mmc/host/omap_hsmmc.c
ed6d07c
+++ b/drivers/mmc/host/omap_hsmmc.c
ed6d07c
@@ -1893,6 +1893,16 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
ed6d07c
 	 * as we want. */
ed6d07c
 	mmc->max_segs = 1024;
ed6d07c
 
ed6d07c
+	/* Eventually we should get our max_segs limitation for EDMA by
ed6d07c
+	 * querying the dmaengine API */
ed6d07c
+	if (pdev->dev.of_node) {
ed6d07c
+		struct device_node *parent = of_node_get(pdev->dev.of_node->parent);
ed6d07c
+		struct device_node *node;
ed6d07c
+		node = of_find_node_by_name(parent, "edma");
ed6d07c
+		if (node)
ed6d07c
+			mmc->max_segs = 16;
ed6d07c
+	}
ed6d07c
+
ed6d07c
 	mmc->max_blk_size = 512;       /* Block Length at max can be 1024 */
ed6d07c
 	mmc->max_blk_count = 0xFFFF;    /* No. of Blocks is 16 bits */
ed6d07c
 	mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
ed6d07c
-- 
ed6d07c
1.8.2.1
ed6d07c
ed6d07c
From 5d93a65cfc4ff6aaf78ab49f71daa2a644ea2ace Mon Sep 17 00:00:00 2001
ed6d07c
From: Pantelis Antoniou <panto@antoniou-consulting.com>
ed6d07c
Date: Fri, 30 Nov 2012 12:18:16 +0200
ed6d07c
Subject: [PATCH 2/2] omap_hsmmc: Add reset gpio
ed6d07c
ed6d07c
Add a gpio property for controlling reset of the mmc device.
ed6d07c
eMMC on the beaglebone black requires it.
ed6d07c
ed6d07c
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
ed6d07c
---
ed6d07c
 drivers/mmc/host/omap_hsmmc.c          | 40 +++++++++++++++++++++++++++++++++-
ed6d07c
 include/linux/platform_data/mmc-omap.h |  3 +++
ed6d07c
 2 files changed, 42 insertions(+), 1 deletion(-)
ed6d07c
ed6d07c
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
ed6d07c
index f5b660c..1bdb90f 100644
ed6d07c
--- a/drivers/mmc/host/omap_hsmmc.c
ed6d07c
+++ b/drivers/mmc/host/omap_hsmmc.c
ed6d07c
@@ -41,6 +41,8 @@
ed6d07c
 #include <linux/pinctrl/consumer.h>
ed6d07c
 #include <linux/pm_runtime.h>
ed6d07c
 #include <linux/platform_data/mmc-omap.h>
ed6d07c
+#include <linux/pinctrl/consumer.h>
ed6d07c
+#include <linux/err.h>
ed6d07c
 
ed6d07c
 /* OMAP HSMMC Host Controller Registers */
ed6d07c
 #define OMAP_HSMMC_SYSSTATUS	0x0014
ed6d07c
@@ -392,6 +394,7 @@ static inline int omap_hsmmc_have_reg(void)
ed6d07c
 static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
ed6d07c
 {
ed6d07c
 	int ret;
ed6d07c
+	unsigned long flags;
ed6d07c
 
ed6d07c
 	if (gpio_is_valid(pdata->slots[0].switch_pin)) {
ed6d07c
 		if (pdata->slots[0].cover)
ed6d07c
@@ -421,6 +424,24 @@ static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
ed6d07c
 	} else
ed6d07c
 		pdata->slots[0].gpio_wp = -EINVAL;
ed6d07c
 
ed6d07c
+	if (gpio_is_valid(pdata->slots[0].gpio_reset)) {
ed6d07c
+		flags = pdata->slots[0].gpio_reset_active_low ?
ed6d07c
+				GPIOF_OUT_INIT_LOW : GPIOF_OUT_INIT_HIGH;
ed6d07c
+		ret = gpio_request_one(pdata->slots[0].gpio_reset, flags,
ed6d07c
+				"mmc_reset");
ed6d07c
+		if (ret)
ed6d07c
+			goto err_free_wp;
ed6d07c
+
ed6d07c
+		/* hold reset */
ed6d07c
+		udelay(pdata->slots[0].gpio_reset_hold_us);
ed6d07c
+
ed6d07c
+		gpio_set_value(pdata->slots[0].gpio_reset,
ed6d07c
+				!pdata->slots[0].gpio_reset_active_low);
ed6d07c
+
ed6d07c
+	} else
ed6d07c
+		pdata->slots[0].gpio_reset = -EINVAL;
ed6d07c
+
ed6d07c
+
ed6d07c
 	return 0;
ed6d07c
 
ed6d07c
 err_free_wp:
ed6d07c
@@ -434,6 +455,8 @@ err_free_sp:
ed6d07c
 
ed6d07c
 static void omap_hsmmc_gpio_free(struct omap_mmc_platform_data *pdata)
ed6d07c
 {
ed6d07c
+	if (gpio_is_valid(pdata->slots[0].gpio_reset))
ed6d07c
+		gpio_free(pdata->slots[0].gpio_reset);
ed6d07c
 	if (gpio_is_valid(pdata->slots[0].gpio_wp))
ed6d07c
 		gpio_free(pdata->slots[0].gpio_wp);
ed6d07c
 	if (gpio_is_valid(pdata->slots[0].switch_pin))
ed6d07c
@@ -788,7 +811,7 @@ omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd,
ed6d07c
 	 * ac, bc, adtc, bcr. Only commands ending an open ended transfer need
ed6d07c
 	 * a val of 0x3, rest 0x0.
ed6d07c
 	 */
ed6d07c
-	if (cmd == host->mrq->stop)
ed6d07c
+	if (host->mrq && cmd == host->mrq->stop)
ed6d07c
 		cmdtype = 0x3;
ed6d07c
 
ed6d07c
 	cmdreg = (cmd->opcode << 24) | (resptype << 16) | (cmdtype << 22);
ed6d07c
@@ -830,6 +853,8 @@ static void omap_hsmmc_request_done(struct omap_hsmmc_host *host, struct mmc_req
ed6d07c
 	int dma_ch;
ed6d07c
 	unsigned long flags;
ed6d07c
 
ed6d07c
+	BUG_ON(mrq == NULL);
ed6d07c
+
ed6d07c
 	spin_lock_irqsave(&host->irq_lock, flags);
ed6d07c
 	host->req_in_progress = 0;
ed6d07c
 	dma_ch = host->dma_ch;
ed6d07c
@@ -1720,6 +1745,7 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
ed6d07c
 	struct device_node *np = dev->of_node;
ed6d07c
 	u32 bus_width, max_freq;
ed6d07c
 	int cd_gpio, wp_gpio;
ed6d07c
+	enum of_gpio_flags reset_flags;
ed6d07c
 
ed6d07c
 	cd_gpio = of_get_named_gpio(np, "cd-gpios", 0);
ed6d07c
 	wp_gpio = of_get_named_gpio(np, "wp-gpios", 0);
ed6d07c
@@ -1737,6 +1763,14 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
ed6d07c
 	pdata->nr_slots = 1;
ed6d07c
 	pdata->slots[0].switch_pin = cd_gpio;
ed6d07c
 	pdata->slots[0].gpio_wp = wp_gpio;
ed6d07c
+	reset_flags = 0;
ed6d07c
+	pdata->slots[0].gpio_reset = of_get_named_gpio_flags(np,
ed6d07c
+			"reset-gpios", 0, &reset_flags);
ed6d07c
+	pdata->slots[0].gpio_reset_active_low =
ed6d07c
+		(reset_flags & OF_GPIO_ACTIVE_LOW) != 0;
ed6d07c
+	pdata->slots[0].gpio_reset_hold_us = 100;	/* default */
ed6d07c
+	of_property_read_u32(np, "reset-gpio-hold-us",
ed6d07c
+			&pdata->slots[0].gpio_reset_hold_us);
ed6d07c
 
ed6d07c
 	if (of_find_property(np, "ti,non-removable", NULL)) {
ed6d07c
 		pdata->slots[0].nonremovable = true;
ed6d07c
@@ -1802,6 +1836,10 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
ed6d07c
 		return -ENXIO;
ed6d07c
 	}
ed6d07c
 
ed6d07c
+	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
ed6d07c
+	if (IS_ERR(pinctrl))
ed6d07c
+		dev_warn(&pdev->dev, "unable to select pin group\n");
ed6d07c
+
ed6d07c
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
ed6d07c
 	irq = platform_get_irq(pdev, 0);
ed6d07c
 	if (res == NULL || irq < 0)
ed6d07c
diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h
ed6d07c
index 2bf1b30..d548994 100644
ed6d07c
--- a/include/linux/platform_data/mmc-omap.h
ed6d07c
+++ b/include/linux/platform_data/mmc-omap.h
ed6d07c
@@ -115,6 +115,9 @@ struct omap_mmc_platform_data {
ed6d07c
 
ed6d07c
 		int switch_pin;			/* gpio (card detect) */
ed6d07c
 		int gpio_wp;			/* gpio (write protect) */
ed6d07c
+		int gpio_reset;			/* gpio (reset) */
ed6d07c
+		int gpio_reset_active_low;	/* 1 if reset is active low */
ed6d07c
+		u32 gpio_reset_hold_us;		/* time to hold in us */
ed6d07c
 
ed6d07c
 		int (*set_bus_mode)(struct device *dev, int slot, int bus_mode);
ed6d07c
 		int (*set_power)(struct device *dev, int slot,
ed6d07c
-- 
ed6d07c
1.8.2.1
ed6d07c
ed6d07c
From b45e4df71f07f2178db133db540e3f15e0b4ec05 Mon Sep 17 00:00:00 2001
ed6d07c
From: Pantelis Antoniou <panto@antoniou-consulting.com>
ed6d07c
Date: Sat, 15 Sep 2012 12:00:41 +0300
ed6d07c
Subject: [PATCH] pinctrl: pinctrl-single must be initialized early.
ed6d07c
ed6d07c
When using pinctrl-single to handle i2c initialization, it has
ed6d07c
to be done early. Whether this is the best way to do so, is an
ed6d07c
exercise left to the reader.
ed6d07c
---
ed6d07c
 drivers/pinctrl/pinctrl-single.c | 12 +++++++++++-
ed6d07c
 1 file changed, 11 insertions(+), 1 deletion(-)
ed6d07c
ed6d07c
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
ed6d07c
index a82ace4..aeef35d 100644
ed6d07c
--- a/drivers/pinctrl/pinctrl-single.c
ed6d07c
+++ b/drivers/pinctrl/pinctrl-single.c
ed6d07c
@@ -1673,7 +1673,17 @@ static struct platform_driver pcs_driver = {
ed6d07c
 #endif
ed6d07c
 };
ed6d07c
 
ed6d07c
-module_platform_driver(pcs_driver);
ed6d07c
+static int __init pcs_init(void)
ed6d07c
+{
ed6d07c
+	return platform_driver_register(&pcs_driver);
ed6d07c
+}
ed6d07c
+postcore_initcall(pcs_init);
ed6d07c
+
ed6d07c
+static void __exit pcs_exit(void)
ed6d07c
+{
ed6d07c
+	platform_driver_unregister(&pcs_driver);
ed6d07c
+}
ed6d07c
+module_exit(pcs_exit);
ed6d07c
 
ed6d07c
 MODULE_AUTHOR("Tony Lindgren <tony@atomide.com>");
ed6d07c
 MODULE_DESCRIPTION("One-register-per-pin type device tree based pinctrl driver");
ed6d07c
-- 
ed6d07c
1.8.2.1
ed6d07c
ed6d07c
From e5e7abd2de7d8d4c74b5a1ccc6d47988250bd17d Mon Sep 17 00:00:00 2001
ed6d07c
From: Pantelis Antoniou <panto@antoniou-consulting.com>
ed6d07c
Date: Fri, 28 Jun 2013 18:39:55 +0300
ed6d07c
Subject: [PATCH 1/4] dts: beaglebone: Add I2C definitions for EEPROMs & capes
ed6d07c
ed6d07c
Add the I2C definitions for the EEPROM devices on the baseboard
ed6d07c
and on the possibly connected capes.
ed6d07c
ed6d07c
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
ed6d07c
---
ed6d07c
 arch/arm/boot/dts/am335x-bone-common.dtsi | 39 +++++++++++++++++++++++++++++++
ed6d07c
 1 file changed, 39 insertions(+)
ed6d07c
ed6d07c
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
ed6d07c
index e3f27ec..2d12775 100644
ed6d07c
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
ed6d07c
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
ed6d07c
@@ -84,6 +84,13 @@
ed6d07c
 		>;
ed6d07c
 	};
ed6d07c
 
ed6d07c
+	i2c2_pins: pinmux_i2c2_pins {
ed6d07c
+		pinctrl-single,pins = <
ed6d07c
+			0x178 0x73 	/* uart1_ctsn.i2c2_sda, SLEWCTRL_SLOW | INPUT_PULLUP | MODE3 */
ed6d07c
+			0x17c 0x73	/* uart1_rtsn.i2c2_scl, SLEWCTRL_SLOW | INPUT_PULLUP | MODE3 */
ed6d07c
+		>;
ed6d07c
+	};
ed6d07c
+
ed6d07c
 	uart0_pins: pinmux_uart0_pins {
ed6d07c
 		pinctrl-single,pins = <
ed6d07c
 			0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
ed6d07c
@@ -220,6 +227,38 @@
ed6d07c
 		reg = <0x24>;
ed6d07c
 	};
ed6d07c
 
ed6d07c
+	baseboard_eeprom: baseboard_eeprom@50 {
ed6d07c
+		compatible = "at,24c256";
ed6d07c
+		reg = <0x50>;
ed6d07c
+	};
ed6d07c
+};
ed6d07c
+
ed6d07c
+&i2c2 {
ed6d07c
+	pinctrl-names = "default";
ed6d07c
+	pinctrl-0 = <&i2c2_pins>;
ed6d07c
+
ed6d07c
+	status = "okay";
ed6d07c
+	clock-frequency = <100000>;
ed6d07c
+
ed6d07c
+	cape_eeprom0: cape_eeprom0@54 {
ed6d07c
+		compatible = "at,24c256";
ed6d07c
+		reg = <0x54>;
ed6d07c
+	};
ed6d07c
+
ed6d07c
+	cape_eeprom1: cape_eeprom1@55 {
ed6d07c
+		compatible = "at,24c256";
ed6d07c
+		reg = <0x55>;
ed6d07c
+	};
ed6d07c
+
ed6d07c
+	cape_eeprom2: cape_eeprom2@56 {
ed6d07c
+		compatible = "at,24c256";
ed6d07c
+		reg = <0x56>;
ed6d07c
+	};
ed6d07c
+
ed6d07c
+	cape_eeprom3: cape_eeprom3@57 {
ed6d07c
+		compatible = "at,24c256";
ed6d07c
+		reg = <0x57>;
ed6d07c
+	};
ed6d07c
 };
ed6d07c
 
ed6d07c
 /include/ "tps65217.dtsi"
ed6d07c
-- 
ed6d07c
1.8.4.rc3