From 72643c01d84163c85e8b65aaa7e963e67a06a7ed Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Tue, 20 Nov 2012 17:20:40 +0100
Subject: [PATCH] 3.7: import new capebus patches

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 ...01-i2c-EEPROM-Export-memory-accessor.patch |   4 +-
 ..._hwmod_lookup-omap_device_build-omap.patch |   4 +-
 .../capebus/0003-gpio-keys-Pinctrl-fy.patch   |   4 +-
 ...lacement-elsewhere-than-parent-mfd-d.patch |   4 +-
 .../0005-pwm-export-of_pwm_request.patch      |   4 +-
 ...c-Export-capability-to-probe-devices.patch |   4 +-
 .../0007-pwm-backlight-Pinctrl-fy.patch       |   4 +-
 ...Export-OF-interfaces-for-capebus-use.patch |   4 +-
 patches/capebus/0009-w1-gpio-Pinctrl-fy.patch |   4 +-
 ...-w1-gpio-Simplify-get-rid-of-defines.patch |   4 +-
 .../0011-arm-dt-Enable-DT-proc-updates.patch  |   4 +-
 ...d-a-uImage-with-dtb-already-appended.patch |   4 +-
 ...e-a-shared-dtsi-for-beaglebone-based.patch |   4 +-
 ...14-beaglebone-enable-emmc-for-bonelt.patch |   4 +-
 ...xx-dt-Create-da8xx-DT-adapter-device.patch | 236 +++++++++
 ...reate-ti-tscadc-dt-DT-adapter-device.patch | 192 +++++++
 ...> 0017-capebus-Core-capebus-support.patch} |  17 +-
 ...apebus-Add-beaglebone-board-support.patch} | 299 +----------
 ...bus-Beaglebone-generic-cape-support.patch} |  43 +-
 ...ebus-Beaglebone-geiger-cape-support.patch} |  38 +-
 ...apebus-Beaglebone-capebus-DT-update.patch} |   8 +-
 .../0022-capebus-Document-DT-bindings.patch   | 475 ++++++++++++++++++
 ...apebus-Documentation-capebus-summary.patch |  62 +++
 ...e-Update-default-config-for-capebus.patch} |   5 +-
 ...-capebus-Geiger-Cape-config-bugfixs.patch} |   8 +-
 25 files changed, 1084 insertions(+), 355 deletions(-)
 create mode 100644 patches/capebus/0015-da8xx-dt-Create-da8xx-DT-adapter-device.patch
 create mode 100644 patches/capebus/0016-ti-tscadc-dt-Create-ti-tscadc-dt-DT-adapter-device.patch
 rename patches/capebus/{0015-capebus-Core-capebus-support.patch => 0017-capebus-Core-capebus-support.patch} (98%)
 rename patches/capebus/{0016-capebus-Add-beaglebone-board-support.patch => 0018-capebus-Add-beaglebone-board-support.patch} (85%)
 rename patches/capebus/{0017-capebus-Beaglebone-generic-board.patch => 0019-capebus-Beaglebone-generic-cape-support.patch} (78%)
 rename patches/capebus/{0018-capebus-Add-beaglebone-geiger-cape.patch => 0020-capebus-Beaglebone-geiger-cape-support.patch} (91%)
 rename patches/capebus/{0019-capebus-Beaglebone-capebus-DT-update.patch => 0021-capebus-Beaglebone-capebus-DT-update.patch} (98%)
 create mode 100644 patches/capebus/0022-capebus-Document-DT-bindings.patch
 create mode 100644 patches/capebus/0023-capebus-Documentation-capebus-summary.patch
 rename patches/capebus/{0020-beaglebone-Update-default-config-for-capebus.patch => 0024-beaglebone-Update-default-config-for-capebus.patch} (99%)
 rename patches/capebus/{0021-capebus-Geiger-Cape-config-bugfixs.patch => 0025-capebus-Geiger-Cape-config-bugfixs.patch} (79%)

diff --git a/patches/capebus/0001-i2c-EEPROM-Export-memory-accessor.patch b/patches/capebus/0001-i2c-EEPROM-Export-memory-accessor.patch
index 3742df39..13958f5a 100644
--- a/patches/capebus/0001-i2c-EEPROM-Export-memory-accessor.patch
+++ b/patches/capebus/0001-i2c-EEPROM-Export-memory-accessor.patch
@@ -1,7 +1,7 @@
-From d5fbd4d6acac21aabae1e1820565c72f767d06f7 Mon Sep 17 00:00:00 2001
+From f815a8a203c045f7e40f04851a75ed7849f6e720 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Sat, 13 Oct 2012 16:06:48 +0300
-Subject: [PATCH 01/21] i2c-EEPROM: Export memory accessor
+Subject: [PATCH 01/25] i2c-EEPROM: Export memory accessor
 
 Various platforms need access to the EEPROM in other
 places besides their platform registration callbacks.
diff --git a/patches/capebus/0002-omap-Export-omap_hwmod_lookup-omap_device_build-omap.patch b/patches/capebus/0002-omap-Export-omap_hwmod_lookup-omap_device_build-omap.patch
index 594e8f01..63f8f3d5 100644
--- a/patches/capebus/0002-omap-Export-omap_hwmod_lookup-omap_device_build-omap.patch
+++ b/patches/capebus/0002-omap-Export-omap_hwmod_lookup-omap_device_build-omap.patch
@@ -1,7 +1,7 @@
-From 402e0aa80c64c2ddc0b39adf733fda3105a9ebb5 Mon Sep 17 00:00:00 2001
+From 7c077538bb2fe95173d9f986cefe96bff9a37ae7 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Sat, 13 Oct 2012 16:34:44 +0300
-Subject: [PATCH 02/21] omap: Export
+Subject: [PATCH 02/25] omap: Export
  omap_hwmod_lookup/omap_device_build/omap_device_build_ss
 
 These functions can be used just fine by modules, there's no need not
diff --git a/patches/capebus/0003-gpio-keys-Pinctrl-fy.patch b/patches/capebus/0003-gpio-keys-Pinctrl-fy.patch
index 80558eb1..ca1c0755 100644
--- a/patches/capebus/0003-gpio-keys-Pinctrl-fy.patch
+++ b/patches/capebus/0003-gpio-keys-Pinctrl-fy.patch
@@ -1,7 +1,7 @@
-From b2be8368eacadababf0f8c7b3948289b0e0ea33a Mon Sep 17 00:00:00 2001
+From 5ceb5ea1e8e57004cb1ddba79b4193e9f507e7b5 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Wed, 17 Oct 2012 20:17:36 +0300
-Subject: [PATCH 03/21] gpio-keys: Pinctrl-fy
+Subject: [PATCH 03/25] gpio-keys: Pinctrl-fy
 
 ---
  drivers/input/keyboard/gpio_keys.c |    6 ++++++
diff --git a/patches/capebus/0004-tps65217-Allow-placement-elsewhere-than-parent-mfd-d.patch b/patches/capebus/0004-tps65217-Allow-placement-elsewhere-than-parent-mfd-d.patch
index dff75d04..4c2621cd 100644
--- a/patches/capebus/0004-tps65217-Allow-placement-elsewhere-than-parent-mfd-d.patch
+++ b/patches/capebus/0004-tps65217-Allow-placement-elsewhere-than-parent-mfd-d.patch
@@ -1,7 +1,7 @@
-From 840afa1b249d87f29034e84ff793e43dba3ba3a7 Mon Sep 17 00:00:00 2001
+From 79a7e230aecc97f38dc3505eea4557c9bbfeb73c Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Wed, 17 Oct 2012 20:17:57 +0300
-Subject: [PATCH 04/21] tps65217: Allow placement elsewhere than parent mfd
+Subject: [PATCH 04/25] tps65217: Allow placement elsewhere than parent mfd
  device.
 
 The current code expect the configuration of the backlight to stay
diff --git a/patches/capebus/0005-pwm-export-of_pwm_request.patch b/patches/capebus/0005-pwm-export-of_pwm_request.patch
index 074ffb45..cb829f87 100644
--- a/patches/capebus/0005-pwm-export-of_pwm_request.patch
+++ b/patches/capebus/0005-pwm-export-of_pwm_request.patch
@@ -1,7 +1,7 @@
-From f9b4e9164af73f01eb25cac910ef5c97b2e29096 Mon Sep 17 00:00:00 2001
+From 5b049ca7257e0a626d8b0dba13d16b9b29e872ff Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Fri, 19 Oct 2012 10:38:00 +0300
-Subject: [PATCH 05/21] pwm: export of_pwm_request
+Subject: [PATCH 05/25] pwm: export of_pwm_request
 
 No need to hide this, it's useful.
 ---
diff --git a/patches/capebus/0006-i2c-Export-capability-to-probe-devices.patch b/patches/capebus/0006-i2c-Export-capability-to-probe-devices.patch
index 3a78495e..938ee572 100644
--- a/patches/capebus/0006-i2c-Export-capability-to-probe-devices.patch
+++ b/patches/capebus/0006-i2c-Export-capability-to-probe-devices.patch
@@ -1,7 +1,7 @@
-From 71459bed48859ab510971b1224b57d3b24de14e1 Mon Sep 17 00:00:00 2001
+From b4acef0dc7425b2019ff36261caf7ff45b200916 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Sat, 20 Oct 2012 14:08:17 +0300
-Subject: [PATCH 06/21] i2c: Export capability to probe devices
+Subject: [PATCH 06/25] i2c: Export capability to probe devices
 
 Probe devices for a node other that the adapter node.
 ---
diff --git a/patches/capebus/0007-pwm-backlight-Pinctrl-fy.patch b/patches/capebus/0007-pwm-backlight-Pinctrl-fy.patch
index 271a477c..7c90a563 100644
--- a/patches/capebus/0007-pwm-backlight-Pinctrl-fy.patch
+++ b/patches/capebus/0007-pwm-backlight-Pinctrl-fy.patch
@@ -1,7 +1,7 @@
-From 79cb89df4af29215f91a278696552e782eb86703 Mon Sep 17 00:00:00 2001
+From 1d774ca27c1c4de7e010a47305eebd3fe7b2837e Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Tue, 23 Oct 2012 11:48:58 +0300
-Subject: [PATCH 07/21] pwm-backlight: Pinctrl-fy
+Subject: [PATCH 07/25] pwm-backlight: Pinctrl-fy
 
 ---
  drivers/video/backlight/pwm_bl.c |    7 +++++++
diff --git a/patches/capebus/0008-spi-Export-OF-interfaces-for-capebus-use.patch b/patches/capebus/0008-spi-Export-OF-interfaces-for-capebus-use.patch
index 475659df..83647151 100644
--- a/patches/capebus/0008-spi-Export-OF-interfaces-for-capebus-use.patch
+++ b/patches/capebus/0008-spi-Export-OF-interfaces-for-capebus-use.patch
@@ -1,7 +1,7 @@
-From 3cf9cd9b8ec4e09a6fed5cd733c28ec6caf4f7f4 Mon Sep 17 00:00:00 2001
+From 4a58d974e3e45fd294466fa29b83aeed6f4c33f1 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Tue, 23 Oct 2012 13:23:14 +0300
-Subject: [PATCH 08/21] spi: Export OF interfaces for capebus use.
+Subject: [PATCH 08/25] spi: Export OF interfaces for capebus use.
 
 ---
  drivers/spi/spi.c       |   31 +++++++++++++++++++++++--------
diff --git a/patches/capebus/0009-w1-gpio-Pinctrl-fy.patch b/patches/capebus/0009-w1-gpio-Pinctrl-fy.patch
index b45d76a5..f83c29bd 100644
--- a/patches/capebus/0009-w1-gpio-Pinctrl-fy.patch
+++ b/patches/capebus/0009-w1-gpio-Pinctrl-fy.patch
@@ -1,7 +1,7 @@
-From 56425bf7ffe0f2629b7b3b7469eb9251d1483243 Mon Sep 17 00:00:00 2001
+From bfb3f0c421f2de41d7391a2502f8ecd36f67094a Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Wed, 24 Oct 2012 09:54:37 +0300
-Subject: [PATCH 09/21] w1-gpio: Pinctrl-fy
+Subject: [PATCH 09/25] w1-gpio: Pinctrl-fy
 
 ---
  drivers/w1/masters/w1-gpio.c |    7 +++++++
diff --git a/patches/capebus/0010-w1-gpio-Simplify-get-rid-of-defines.patch b/patches/capebus/0010-w1-gpio-Simplify-get-rid-of-defines.patch
index 6fafc627..dd5bf146 100644
--- a/patches/capebus/0010-w1-gpio-Simplify-get-rid-of-defines.patch
+++ b/patches/capebus/0010-w1-gpio-Simplify-get-rid-of-defines.patch
@@ -1,7 +1,7 @@
-From a8acbf2b5eb81764f54612aed8cd078cb3789e2b Mon Sep 17 00:00:00 2001
+From f6627c0e9b946c7d40a516a90e3cd66cb5bece08 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Wed, 24 Oct 2012 16:49:53 +0300
-Subject: [PATCH 10/21] w1-gpio: Simplify & get rid of defines
+Subject: [PATCH 10/25] w1-gpio: Simplify & get rid of defines
 
 ---
  drivers/w1/masters/w1-gpio.c |   58 ++++++++++++++++++-----------------------
diff --git a/patches/capebus/0011-arm-dt-Enable-DT-proc-updates.patch b/patches/capebus/0011-arm-dt-Enable-DT-proc-updates.patch
index 338afa9e..2af7cb30 100644
--- a/patches/capebus/0011-arm-dt-Enable-DT-proc-updates.patch
+++ b/patches/capebus/0011-arm-dt-Enable-DT-proc-updates.patch
@@ -1,7 +1,7 @@
-From 9c08abcbd0986d219a1e22257b74fdf0037d4936 Mon Sep 17 00:00:00 2001
+From 7c1a7bbbd55bd1b07abfa1749b55617d29e0b418 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Fri, 26 Oct 2012 16:11:46 +0300
-Subject: [PATCH 11/21] arm-dt: Enable DT proc updates.
+Subject: [PATCH 11/25] arm-dt: Enable DT proc updates.
 
 ---
  arch/arm/include/asm/prom.h |    2 ++
diff --git a/patches/capebus/0012-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch b/patches/capebus/0012-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch
index 47572f46..9274f83c 100644
--- a/patches/capebus/0012-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch
+++ b/patches/capebus/0012-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch
@@ -1,7 +1,7 @@
-From 91b32a07485b593eee468d9c4f9dd5e28024c0dd Mon Sep 17 00:00:00 2001
+From 5bf29791172a5681001bd8ccae5c5607a48b4ef9 Mon Sep 17 00:00:00 2001
 From: Grant Likely <grant.likely@secretlab.ca>
 Date: Tue, 2 Aug 2011 15:30:09 +0100
-Subject: [PATCH 12/21] ARM: CUSTOM: Build a uImage with dtb already appended
+Subject: [PATCH 12/25] ARM: CUSTOM: Build a uImage with dtb already appended
 
 Do not commit to mainline; this is a useful hack only for now.
 
diff --git a/patches/capebus/0013-beaglebone-create-a-shared-dtsi-for-beaglebone-based.patch b/patches/capebus/0013-beaglebone-create-a-shared-dtsi-for-beaglebone-based.patch
index 392ab0dc..2ff080e8 100644
--- a/patches/capebus/0013-beaglebone-create-a-shared-dtsi-for-beaglebone-based.patch
+++ b/patches/capebus/0013-beaglebone-create-a-shared-dtsi-for-beaglebone-based.patch
@@ -1,7 +1,7 @@
-From 48f84a261e4997ca2ce4139caaca15fbf127b4c1 Mon Sep 17 00:00:00 2001
+From 57b277e165e198e8ce078167dff3eb5806067371 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 30 Oct 2012 12:30:18 +0100
-Subject: [PATCH 13/21] beaglebone: create a shared dtsi for beaglebone based
+Subject: [PATCH 13/25] beaglebone: create a shared dtsi for beaglebone based
  boards and add a new dts for bonelt
 
 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
diff --git a/patches/capebus/0014-beaglebone-enable-emmc-for-bonelt.patch b/patches/capebus/0014-beaglebone-enable-emmc-for-bonelt.patch
index b23759f5..bbbd6d1b 100644
--- a/patches/capebus/0014-beaglebone-enable-emmc-for-bonelt.patch
+++ b/patches/capebus/0014-beaglebone-enable-emmc-for-bonelt.patch
@@ -1,7 +1,7 @@
-From c812d3d90e68c81fd4c84f97746df6ebeb959b4a Mon Sep 17 00:00:00 2001
+From 17b3317ec784bf30450642cd324ecf584c9dff0e Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 24 Oct 2012 11:47:13 +0200
-Subject: [PATCH 14/21] beaglebone: enable emmc for bonelt
+Subject: [PATCH 14/25] beaglebone: enable emmc for bonelt
 
 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 ---
diff --git a/patches/capebus/0015-da8xx-dt-Create-da8xx-DT-adapter-device.patch b/patches/capebus/0015-da8xx-dt-Create-da8xx-DT-adapter-device.patch
new file mode 100644
index 00000000..2b0208bf
--- /dev/null
+++ b/patches/capebus/0015-da8xx-dt-Create-da8xx-DT-adapter-device.patch
@@ -0,0 +1,236 @@
+From 9134d736dc803f90c4f571f78bfa09f9ce2b8fb0 Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Thu, 1 Nov 2012 15:19:35 +0200
+Subject: [PATCH 15/25] da8xx-dt: Create da8xx DT adapter device
+
+omap_device is going private.
+
+Move the da8xx-dt adapter device to arch/arm/mach-omap2.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
+---
+ arch/arm/mach-omap2/Makefile   |    3 +
+ arch/arm/mach-omap2/da8xx-dt.c |  197 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 200 insertions(+), 0 deletions(-)
+ create mode 100644 arch/arm/mach-omap2/da8xx-dt.c
+
+diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
+index fe40d9e..3a9a0ff 100644
+--- a/arch/arm/mach-omap2/Makefile
++++ b/arch/arm/mach-omap2/Makefile
+@@ -200,6 +200,9 @@ ifneq ($(CONFIG_DRM_OMAP),)
+ obj-y					+= drm.o
+ endif
+ 
++# AM3XX Device Tree adapters for legacy drivers
++obj-$(CONFIG_SOC_AM33XX)		+= da8xx-dt.o
++
+ # Specific board support
+ obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o
+ obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o
+diff --git a/arch/arm/mach-omap2/da8xx-dt.c b/arch/arm/mach-omap2/da8xx-dt.c
+new file mode 100644
+index 0000000..d3c6f48
+--- /dev/null
++++ b/arch/arm/mach-omap2/da8xx-dt.c
+@@ -0,0 +1,197 @@
++/*
++ * DA8XX-DT: Device tree adapter using the legacy driver
++ *
++ * Copyright (C) 2012 Pantelis Antoniou <panto@antoniou-consulting.com>
++ * Copyright (C) 2012 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., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/init.h>
++#include <linux/err.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/of_gpio.h>
++#include <video/da8xx-fb.h>
++#include <linux/pinctrl/pinctrl.h>
++#include <linux/pinctrl/pinmux.h>
++#include <linux/pinctrl/consumer.h>
++#include <linux/clk.h>
++#include <plat/clock.h>
++#include <plat/omap_device.h>
++
++struct da8xx_priv {
++	struct da8xx_lcdc_platform_data lcd_pdata;
++	struct lcd_ctrl_config lcd_cfg;
++	struct display_panel lcd_panel;
++	struct platform_device *lcdc_pdev;
++	struct omap_hwmod *lcdc_oh;
++	struct resource lcdc_res[1];
++	int power_dn_gpio;
++};
++
++static const struct of_device_id of_da8xx_dt_match[] = {
++	{ .compatible = "da8xx-dt", },
++	{},
++};
++
++static int __devinit da8xx_dt_probe(struct platform_device *pdev)
++{
++	struct da8xx_priv *priv;
++	struct clk *disp_pll;
++	struct pinctrl *pinctrl;
++	u32 disp_pll_val;
++	const char *panel_type;
++	int ret = -EINVAL;
++
++	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
++	if (priv == NULL) {
++		dev_err(&pdev->dev, "Failed to allocate priv\n");
++		return -ENOMEM;
++	}
++	priv->power_dn_gpio = -1;
++
++	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
++	if (IS_ERR(pinctrl))
++		dev_warn(&pdev->dev,
++			"pins are not configured from the driver\n");
++
++	ret = of_property_read_u32(pdev->dev.of_node, "disp-pll",
++			&disp_pll_val);
++	if (ret != 0) {
++		dev_err(&pdev->dev, "Failed to read disp-pll property\n");
++		return ret;
++	}
++
++	ret = of_property_read_string(pdev->dev.of_node, "panel-type",
++			&panel_type);
++	if (ret != 0) {
++		dev_err(&pdev->dev, "Failed to read panel-type property\n");
++		return ret;
++	}
++
++	/* conf_disp_pll(disp_pll); */
++	disp_pll = clk_get(NULL, "dpll_disp_ck");
++	if (IS_ERR(disp_pll)) {
++		dev_err(&pdev->dev, "Cannot clk_get disp_pll\n");
++		return PTR_ERR(disp_pll);
++	}
++	ret = clk_set_rate(disp_pll, disp_pll_val);
++	clk_put(disp_pll);
++	if (ret != 0) {
++		dev_err(&pdev->dev, "Failed to set disp_pll\n");
++		return ret;
++	}
++
++	ret = of_get_named_gpio_flags(pdev->dev.of_node, "powerdn-gpio",
++			0, NULL);
++	if (IS_ERR_VALUE(ret)) {
++		dev_info(&pdev->dev, "No power down GPIO\n");
++	} else {
++		priv->power_dn_gpio = ret;
++
++		ret = devm_gpio_request(&pdev->dev, priv->power_dn_gpio,
++				"da8xx-dt:PDN");
++		if (ret != 0) {
++			dev_err(&pdev->dev, "Failed to gpio_request\n");
++			return ret;
++		}
++
++		ret = gpio_direction_output(priv->power_dn_gpio, 1);
++		if (ret != 0) {
++			dev_err(&pdev->dev, "Failed to set powerdn to 1\n");
++			return ret;
++		}
++	}
++
++	/* display_panel */
++	priv->lcd_panel.panel_type	= QVGA;
++	priv->lcd_panel.max_bpp		= 16;
++	priv->lcd_panel.min_bpp		= 16;
++	priv->lcd_panel.panel_shade	= COLOR_ACTIVE;
++
++	/* lcd_ctrl_config */
++	priv->lcd_cfg.p_disp_panel	= &priv->lcd_panel;
++	priv->lcd_cfg.ac_bias		= 255;
++	priv->lcd_cfg.ac_bias_intrpt	= 0;
++	priv->lcd_cfg.dma_burst_sz	= 16;
++	priv->lcd_cfg.bpp		= 16;
++	priv->lcd_cfg.fdd		= 0x80;
++	priv->lcd_cfg.tft_alt_mode	= 0;
++	priv->lcd_cfg.stn_565_mode	= 0;
++	priv->lcd_cfg.mono_8bit_mode	= 0;
++	priv->lcd_cfg.invert_line_clock	= 1;
++	priv->lcd_cfg.invert_frm_clock	= 1;
++	priv->lcd_cfg.sync_edge		= 0;
++	priv->lcd_cfg.sync_ctrl		= 1;
++	priv->lcd_cfg.raster_order	= 0;
++
++	/* da8xx_lcdc_platform_data */
++	strcpy(priv->lcd_pdata.manu_name, "BBToys");
++	priv->lcd_pdata.controller_data = &priv->lcd_cfg;
++	strcpy(priv->lcd_pdata.type, panel_type);
++
++	priv->lcdc_oh = omap_hwmod_lookup("lcdc");
++	if (priv->lcdc_oh == NULL) {
++		dev_err(&pdev->dev, "Failed to lookup omap_hwmod lcdc\n");
++		return -ENODEV;
++	}
++
++	priv->lcdc_pdev = omap_device_build("da8xx_lcdc", 0, priv->lcdc_oh,
++			&priv->lcd_pdata,
++			sizeof(struct da8xx_lcdc_platform_data),
++			NULL, 0, 0);
++	if (priv->lcdc_pdev == NULL) {
++		dev_err(&pdev->dev, "Failed to build LCDC device\n");
++		return -ENODEV;
++	}
++
++	dev_info(&pdev->dev, "Registered bone LCDC OK.\n");
++
++	platform_set_drvdata(pdev, priv);
++
++	return 0;
++}
++
++static int __devexit da8xx_dt_remove(struct platform_device *pdev)
++{
++	return -EINVAL;	/* not supporting removal yet */
++}
++
++static struct platform_driver da8xx_dt_driver = {
++	.probe		= da8xx_dt_probe,
++	.remove		= __devexit_p(da8xx_dt_remove),
++	.driver		= {
++		.name	= "da8xx-dt",
++		.owner	= THIS_MODULE,
++		.of_match_table = of_da8xx_dt_match,
++	},
++};
++
++static __init int da8xx_dt_init(void)
++{
++	return platform_driver_register(&da8xx_dt_driver);
++}
++
++static __exit void da8xx_dt_exit(void)
++{
++	platform_driver_unregister(&da8xx_dt_driver);
++}
++
++postcore_initcall(da8xx_dt_init);
++module_exit(da8xx_dt_exit);
+-- 
+1.7.7.6
+
diff --git a/patches/capebus/0016-ti-tscadc-dt-Create-ti-tscadc-dt-DT-adapter-device.patch b/patches/capebus/0016-ti-tscadc-dt-Create-ti-tscadc-dt-DT-adapter-device.patch
new file mode 100644
index 00000000..80237986
--- /dev/null
+++ b/patches/capebus/0016-ti-tscadc-dt-Create-ti-tscadc-dt-DT-adapter-device.patch
@@ -0,0 +1,192 @@
+From f76a2f4cee4a87d86d4e67522c4c87a9fb30dde1 Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Thu, 1 Nov 2012 15:44:39 +0200
+Subject: [PATCH 16/25] ti-tscadc-dt: Create ti-tscadc-dt DT adapter device
+
+omap_device is going private.
+
+Move the ti-tscadc-dt adapter device to arch/arm/mach-omap2.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
+---
+ arch/arm/mach-omap2/Makefile       |    1 +
+ arch/arm/mach-omap2/ti-tscadc-dt.c |  155 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 156 insertions(+), 0 deletions(-)
+ create mode 100644 arch/arm/mach-omap2/ti-tscadc-dt.c
+
+diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
+index 3a9a0ff..1eab37b 100644
+--- a/arch/arm/mach-omap2/Makefile
++++ b/arch/arm/mach-omap2/Makefile
+@@ -202,6 +202,7 @@ endif
+ 
+ # AM3XX Device Tree adapters for legacy drivers
+ obj-$(CONFIG_SOC_AM33XX)		+= da8xx-dt.o
++obj-$(CONFIG_SOC_AM33XX)		+= ti-tscadc-dt.o
+ 
+ # Specific board support
+ obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o
+diff --git a/arch/arm/mach-omap2/ti-tscadc-dt.c b/arch/arm/mach-omap2/ti-tscadc-dt.c
+new file mode 100644
+index 0000000..0a1a17a
+--- /dev/null
++++ b/arch/arm/mach-omap2/ti-tscadc-dt.c
+@@ -0,0 +1,155 @@
++/*
++ * TI-TSCADC-DT: Device tree adapter using the legacy driver
++ *
++ * Copyright (C) 2012 Pantelis Antoniou <panto@antoniou-consulting.com>
++ * Copyright (C) 2012 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., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/init.h>
++#include <linux/err.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/pinctrl/pinctrl.h>
++#include <linux/pinctrl/pinmux.h>
++#include <linux/pinctrl/consumer.h>
++#include <linux/clk.h>
++#include <linux/input/ti_am335x_tsc.h>
++#include <linux/platform_data/ti_am335x_adc.h>
++#include <linux/mfd/ti_am335x_tscadc.h>
++#include <plat/clock.h>
++#include <plat/omap_device.h>
++
++struct ti_tscadc_priv {
++	struct omap_hwmod *tsc_oh;
++	struct tsc_data tsc_data;
++	struct adc_data adc_data;
++	struct mfd_tscadc_board tscadc_data;
++	struct platform_device *tscadc_pdev;
++};
++
++static const struct of_device_id of_ti_tscadc_dt_match[] = {
++	{ .compatible = "ti-tscadc-dt", },
++	{},
++};
++
++static int __devinit ti_tscadc_dt_probe(struct platform_device *pdev)
++{
++	struct ti_tscadc_priv *priv;
++	struct pinctrl *pinctrl;
++	u32 val;
++	int ret;
++
++	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
++	if (priv == NULL) {
++		dev_err(&pdev->dev, "Failed to allocate priv\n");
++		return -ENOMEM;
++	}
++
++	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
++	if (IS_ERR(pinctrl))
++		dev_warn(&pdev->dev,
++			"pins are not configured from the driver\n");
++
++	ret = of_property_read_u32(pdev->dev.of_node, "tsc-wires", &val);
++	if (ret != 0) {
++		dev_info(&pdev->dev, "no tsc-wires property; disabling TSC\n");
++		val = 0;
++	}
++	priv->tsc_data.wires = val;
++
++	if (priv->tsc_data.wires > 0) {
++		ret = of_property_read_u32(pdev->dev.of_node,
++				"tsc-x-plate-resistance", &val);
++		if (ret != 0) {
++			dev_err(&pdev->dev, "Failed to read "
++					"tsc-x-plate-resistance property\n");
++			return ret;
++		}
++		priv->tsc_data.x_plate_resistance = val;
++
++		ret = of_property_read_u32(pdev->dev.of_node,
++				"tsc-steps", &val);
++		if (ret != 0) {
++			dev_err(&pdev->dev, "Failed to read "
++					"tsc-steps property\n");
++			return ret;
++		}
++		priv->tsc_data.steps_to_configure = val;
++	}
++
++	ret = of_property_read_u32(pdev->dev.of_node, "adc-channels", &val);
++	if (ret != 0) {
++		dev_info(&pdev->dev, "No adc-channels property; "
++				"disabling adc\n");
++		val = 0;
++	}
++	priv->adc_data.adc_channels = val;
++
++	priv->tscadc_data.tsc_init = &priv->tsc_data;
++	priv->tscadc_data.adc_init = &priv->adc_data;
++
++	priv->tsc_oh = omap_hwmod_lookup("adc_tsc");
++	if (priv->tsc_oh == NULL) {
++		dev_err(&pdev->dev, "Could not lookup HWMOD %s\n", "adc_tsc");
++		return -ENODEV;
++	}
++
++	priv->tscadc_pdev = omap_device_build("ti_tscadc", -1, priv->tsc_oh,
++			&priv->tscadc_data, sizeof(priv->tscadc_data),
++			NULL, 0, 0);
++	if (priv->tscadc_pdev == NULL) {
++		dev_err(&pdev->dev, "Could not create tsc_adc device\n");
++		return -ENODEV;
++	}
++
++	dev_info(&pdev->dev, "TI tscadc pdev created OK\n");
++
++	platform_set_drvdata(pdev, priv);
++
++	return 0;
++}
++
++static int __devexit ti_tscadc_dt_remove(struct platform_device *pdev)
++{
++	return -EINVAL;	/* not supporting removal yet */
++}
++
++static struct platform_driver ti_tscadc_dt_driver = {
++	.probe		= ti_tscadc_dt_probe,
++	.remove		= __devexit_p(ti_tscadc_dt_remove),
++	.driver		= {
++		.name	= "ti_tscadc-dt",
++		.owner	= THIS_MODULE,
++		.of_match_table = of_ti_tscadc_dt_match,
++	},
++};
++
++static __init int ti_tscadc_dt_init(void)
++{
++	return platform_driver_register(&ti_tscadc_dt_driver);
++}
++
++static __exit void ti_tscadc_dt_exit(void)
++{
++	platform_driver_unregister(&ti_tscadc_dt_driver);
++}
++
++postcore_initcall(ti_tscadc_dt_init);
++module_exit(ti_tscadc_dt_exit);
+-- 
+1.7.7.6
+
diff --git a/patches/capebus/0015-capebus-Core-capebus-support.patch b/patches/capebus/0017-capebus-Core-capebus-support.patch
similarity index 98%
rename from patches/capebus/0015-capebus-Core-capebus-support.patch
rename to patches/capebus/0017-capebus-Core-capebus-support.patch
index 951aa3c2..92a29d6d 100644
--- a/patches/capebus/0015-capebus-Core-capebus-support.patch
+++ b/patches/capebus/0017-capebus-Core-capebus-support.patch
@@ -1,8 +1,21 @@
-From efd9c414580e3630fbb98ac84321a4805da46832 Mon Sep 17 00:00:00 2001
+From df681e9d2dd10a61aa5832da2da69b546c8e0b4c Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Tue, 30 Oct 2012 21:06:06 +0200
-Subject: [PATCH 15/21] capebus: Core capebus support
+Subject: [PATCH 17/25] capebus: Core capebus support
 
+Introducing capebus; a bus that allows small boards (capes) to connect
+to a complex SoC using simple expansion connectors.
+
+Up to now to support these kind of boards, one had to hack the board files,
+and do all sort of gymnastics to handle all the different cases of
+conflict resolution.
+
+Capebus provides abstractions that keep the pain to a minimum.
+
+This part of the series is introducing the core capebus functionality
+dealing with the basic bus & driver probe functions.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
 ---
  drivers/Kconfig                  |    2 +
  drivers/Makefile                 |    3 +
diff --git a/patches/capebus/0016-capebus-Add-beaglebone-board-support.patch b/patches/capebus/0018-capebus-Add-beaglebone-board-support.patch
similarity index 85%
rename from patches/capebus/0016-capebus-Add-beaglebone-board-support.patch
rename to patches/capebus/0018-capebus-Add-beaglebone-board-support.patch
index 53e63768..55809491 100644
--- a/patches/capebus/0016-capebus-Add-beaglebone-board-support.patch
+++ b/patches/capebus/0018-capebus-Add-beaglebone-board-support.patch
@@ -1,16 +1,29 @@
-From e11d2907385f16794c596d262cca5aa09a772fcd Mon Sep 17 00:00:00 2001
+From bcb823b59a649d3dbf699c08490faf6a461c8e8b Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Tue, 30 Oct 2012 21:07:50 +0200
-Subject: [PATCH 16/21] capebus: Add beaglebone board support
+Subject: [PATCH 18/25] capebus: Add beaglebone board support
 
+Introduce beaglebone capebus board support.
+
+This patch creates the beaglebone's board cape bus controller.
+
+The board controller is responsible for the probing of capes
+at the well defined I2C address for capes, parsing the EEPROM
+info and matching them to specific cape drivers.
+
+On top of that, adapter DT enabled devices are created for
+am33xx devices that have no DT bindings yet, as well as generic
+devices that can be used as building blocks for the cape drivers.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
 ---
  drivers/capebus/boards/Kconfig                |    6 +
  drivers/capebus/boards/Makefile               |    3 +
  drivers/capebus/boards/capebus-bone-generic.c |  237 +++++++
- drivers/capebus/boards/capebus-bone-pdevs.c   |  602 ++++++++++++++++
+ drivers/capebus/boards/capebus-bone-pdevs.c   |  328 +++++++++
  drivers/capebus/boards/capebus-bone.c         |  931 +++++++++++++++++++++++++
  include/linux/capebus/capebus-bone.h          |  120 ++++
- 6 files changed, 1899 insertions(+), 0 deletions(-)
+ 6 files changed, 1625 insertions(+), 0 deletions(-)
  create mode 100644 drivers/capebus/boards/Kconfig
  create mode 100644 drivers/capebus/boards/Makefile
  create mode 100644 drivers/capebus/boards/capebus-bone-generic.c
@@ -284,10 +297,10 @@ index 0000000..b1b79eb
 +EXPORT_SYMBOL(bone_capebus_remove_generic);
 diff --git a/drivers/capebus/boards/capebus-bone-pdevs.c b/drivers/capebus/boards/capebus-bone-pdevs.c
 new file mode 100644
-index 0000000..a55aad6
+index 0000000..f32134a
 --- /dev/null
 +++ b/drivers/capebus/boards/capebus-bone-pdevs.c
-@@ -0,0 +1,602 @@
+@@ -0,0 +1,328 @@
 +/*
 + * TI Beaglebone capebus controller - Platform adapters
 + *
@@ -321,282 +334,18 @@ index 0000000..a55aad6
 +#include <linux/of.h>
 +#include <linux/of_device.h>
 +#include <linux/of_gpio.h>
-+#include <video/da8xx-fb.h>
 +#include <linux/pinctrl/pinctrl.h>
 +#include <linux/pinctrl/pinmux.h>
 +#include <linux/pinctrl/consumer.h>
 +#include <linux/atomic.h>
 +#include <linux/clk.h>
 +#include <asm/barrier.h>
-+#include <plat/clock.h>
-+#include <plat/omap_device.h>
-+#include <linux/clkdev.h>
-+#include <linux/input/ti_am335x_tsc.h>
-+#include <linux/platform_data/ti_am335x_adc.h>
-+#include <linux/mfd/ti_am335x_tscadc.h>
 +#include <linux/i2c.h>
 +#include <linux/of_i2c.h>
 +#include <linux/spi/spi.h>
 +
 +#include <linux/capebus/capebus-bone.h>
 +
-+#if defined(CONFIG_FB_DA8XX) || defined(CONFIG_FB_DA8XX_MODULE)
-+
-+struct da8xx_priv {
-+	struct da8xx_lcdc_platform_data lcd_pdata;
-+	struct lcd_ctrl_config lcd_cfg;
-+	struct display_panel lcd_panel;
-+	struct platform_device *lcdc_pdev;
-+	struct omap_hwmod *lcdc_oh;
-+	struct resource lcdc_res[1];
-+	int power_dn_gpio;
-+};
-+
-+static const struct of_device_id of_da8xx_dt_match[] = {
-+	{ .compatible = "da8xx-dt", },
-+	{},
-+};
-+
-+static int __devinit da8xx_dt_probe(struct platform_device *pdev)
-+{
-+	struct da8xx_priv *priv;
-+	struct clk *disp_pll;
-+	struct pinctrl *pinctrl;
-+	u32 disp_pll_val;
-+	const char *panel_type;
-+	int ret = -EINVAL;
-+
-+	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-+	if (priv == NULL) {
-+		dev_err(&pdev->dev, "Failed to allocate priv\n");
-+		return -ENOMEM;
-+	}
-+	priv->power_dn_gpio = -1;
-+
-+	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-+	if (IS_ERR(pinctrl))
-+		dev_warn(&pdev->dev,
-+			"pins are not configured from the driver\n");
-+
-+	ret = of_property_read_u32(pdev->dev.of_node, "disp-pll", &disp_pll_val);
-+	if (ret != 0) {
-+		dev_err(&pdev->dev, "Failed to read disp-pll property\n");
-+		return ret;
-+	}
-+
-+	ret = of_property_read_string(pdev->dev.of_node, "panel-type", &panel_type);
-+	if (ret != 0) {
-+		dev_err(&pdev->dev, "Failed to read panel-type property\n");
-+		return ret;
-+	}
-+
-+	/* conf_disp_pll(disp_pll); */
-+	disp_pll = clk_get(NULL, "dpll_disp_ck");
-+	if (IS_ERR(disp_pll)) {
-+		dev_err(&pdev->dev, "Cannot clk_get disp_pll\n");
-+		return PTR_ERR(disp_pll);
-+	}
-+	ret = clk_set_rate(disp_pll, disp_pll_val);
-+	clk_put(disp_pll);
-+	if (ret != 0) {
-+		dev_err(&pdev->dev, "Failed to set disp_pll\n");
-+		return ret;
-+	}
-+
-+	ret = of_get_named_gpio_flags(pdev->dev.of_node, "powerdn-gpio",
-+			0, NULL);
-+	if (IS_ERR_VALUE(ret)) {
-+		dev_info(&pdev->dev, "No power down GPIO\n");
-+	} else {
-+		priv->power_dn_gpio = ret;
-+
-+		ret = devm_gpio_request(&pdev->dev, priv->power_dn_gpio, "bone-dvi-cape:DVI_PDN");
-+		if (ret != 0) {
-+			dev_err(&pdev->dev, "Failed to gpio_request\n");
-+			return ret;
-+		}
-+
-+		ret = gpio_direction_output(priv->power_dn_gpio, 1);
-+		if (ret != 0) {
-+			dev_err(&pdev->dev, "Failed to set powerdn to 1\n");
-+			return ret;
-+		}
-+	}
-+
-+	/* display_panel */
-+	priv->lcd_panel.panel_type	= QVGA;
-+	priv->lcd_panel.max_bpp		= 16;
-+	priv->lcd_panel.min_bpp		= 16;
-+	priv->lcd_panel.panel_shade	= COLOR_ACTIVE;
-+
-+	/* lcd_ctrl_config */
-+	priv->lcd_cfg.p_disp_panel	= &priv->lcd_panel;
-+	priv->lcd_cfg.ac_bias		= 255;
-+	priv->lcd_cfg.ac_bias_intrpt	= 0;
-+	priv->lcd_cfg.dma_burst_sz	= 16;
-+	priv->lcd_cfg.bpp		= 16;
-+	priv->lcd_cfg.fdd		= 0x80;
-+	priv->lcd_cfg.tft_alt_mode	= 0;
-+	priv->lcd_cfg.stn_565_mode	= 0;
-+	priv->lcd_cfg.mono_8bit_mode	= 0;
-+	priv->lcd_cfg.invert_line_clock	= 1;
-+	priv->lcd_cfg.invert_frm_clock	= 1;
-+	priv->lcd_cfg.sync_edge		= 0;
-+	priv->lcd_cfg.sync_ctrl		= 1;
-+	priv->lcd_cfg.raster_order	= 0;
-+
-+	/* da8xx_lcdc_platform_data */
-+	strcpy(priv->lcd_pdata.manu_name, "BBToys");
-+	priv->lcd_pdata.controller_data = &priv->lcd_cfg;
-+	strcpy(priv->lcd_pdata.type, panel_type);
-+
-+	priv->lcdc_oh = omap_hwmod_lookup("lcdc");
-+	if (priv->lcdc_oh == NULL) {
-+		dev_err(&pdev->dev, "Failed to lookup omap_hwmod lcdc\n");
-+		return -ENODEV;
-+	}
-+
-+	priv->lcdc_pdev = omap_device_build("da8xx_lcdc", 0, priv->lcdc_oh,
-+			&priv->lcd_pdata,
-+			sizeof(struct da8xx_lcdc_platform_data),
-+			NULL, 0, 0);
-+	if (priv->lcdc_pdev == NULL) {
-+		dev_err(&pdev->dev, "Failed to build LCDC device\n");
-+		return -ENODEV;
-+	}
-+
-+	dev_info(&pdev->dev, "Registered bone LCDC OK.\n");
-+
-+	platform_set_drvdata(pdev, priv);
-+
-+	return 0;
-+}
-+
-+static int __devexit da8xx_dt_remove(struct platform_device *pdev)
-+{
-+	return -EINVAL;	/* not supporting removal yet */
-+}
-+
-+static struct platform_driver da8xx_dt_driver = {
-+	.probe		= da8xx_dt_probe,
-+	.remove		= __devexit_p(da8xx_dt_remove),
-+	.driver		= {
-+		.name	= "da8xx-dt",
-+		.owner	= THIS_MODULE,
-+		.of_match_table = of_da8xx_dt_match,
-+	},
-+};
-+
-+#endif
-+
-+#if defined(CONFIG_MFD_TI_AM335X_TSCADC) || defined(CONFIG_MFD_TI_AM335X_TSCADC_MODULE)
-+
-+struct ti_tscadc_priv {
-+	struct omap_hwmod *tsc_oh;
-+	struct tsc_data tsc_data;
-+	struct adc_data adc_data;
-+	struct mfd_tscadc_board tscadc_data;
-+	struct platform_device *tscadc_pdev;
-+};
-+
-+static const struct of_device_id of_ti_tscadc_dt_match[] = {
-+	{ .compatible = "ti-tscadc-dt", },
-+	{},
-+};
-+
-+static int __devinit ti_tscadc_dt_probe(struct platform_device *pdev)
-+{
-+	struct ti_tscadc_priv *priv;
-+	struct pinctrl *pinctrl;
-+	u32 val;
-+	int ret;
-+
-+	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-+	if (priv == NULL) {
-+		dev_err(&pdev->dev, "Failed to allocate priv\n");
-+		return -ENOMEM;
-+	}
-+
-+	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-+	if (IS_ERR(pinctrl))
-+		dev_warn(&pdev->dev,
-+			"pins are not configured from the driver\n");
-+
-+	ret = of_property_read_u32(pdev->dev.of_node, "tsc-wires", &val);
-+	if (ret != 0) {
-+		dev_info(&pdev->dev, "no tsc-wires property; disabling TSC\n");
-+		val = 0;
-+	}
-+	priv->tsc_data.wires = val;
-+
-+	if (priv->tsc_data.wires > 0) {
-+		ret = of_property_read_u32(pdev->dev.of_node,
-+				"tsc-x-plate-resistance", &val);
-+		if (ret != 0) {
-+			dev_err(&pdev->dev, "Failed to read "
-+					"tsc-x-plate-resistance property\n");
-+			return ret;
-+		}
-+		priv->tsc_data.x_plate_resistance = val;
-+
-+		ret = of_property_read_u32(pdev->dev.of_node,
-+				"tsc-steps", &val);
-+		if (ret != 0) {
-+			dev_err(&pdev->dev, "Failed to read "
-+					"tsc-steps property\n");
-+			return ret;
-+		}
-+		priv->tsc_data.steps_to_configure = val;
-+	}
-+
-+	ret = of_property_read_u32(pdev->dev.of_node, "adc-channels", &val);
-+	if (ret != 0) {
-+		dev_info(&pdev->dev, "No adc-channels property; disabling adc\n");
-+		val = 0;
-+	}
-+	priv->adc_data.adc_channels = val;
-+
-+	priv->tscadc_data.tsc_init = &priv->tsc_data;
-+	priv->tscadc_data.adc_init = &priv->adc_data;
-+
-+	priv->tsc_oh = omap_hwmod_lookup("adc_tsc");
-+	if (priv->tsc_oh == NULL) {
-+		dev_err(&pdev->dev, "Could not lookup HWMOD %s\n", "adc_tsc");
-+		return -ENODEV;
-+	}
-+
-+	priv->tscadc_pdev = omap_device_build("ti_tscadc", -1, priv->tsc_oh,
-+			&priv->tscadc_data, sizeof(priv->tscadc_data),
-+			NULL, 0, 0);
-+	if (priv->tscadc_pdev == NULL) {
-+		dev_err(&pdev->dev, "Could not create tsc_adc device\n");
-+		return -ENODEV;
-+	}
-+
-+	dev_info(&pdev->dev, "TI tscadc pdev created OK\n");
-+
-+	platform_set_drvdata(pdev, priv);
-+
-+	return 0;
-+}
-+
-+static int __devexit ti_tscadc_dt_remove(struct platform_device *pdev)
-+{
-+	return -EINVAL;	/* not supporting removal yet */
-+}
-+
-+static struct platform_driver ti_tscadc_dt_driver = {
-+	.probe		= ti_tscadc_dt_probe,
-+	.remove		= __devexit_p(ti_tscadc_dt_remove),
-+	.driver		= {
-+		.name	= "ti_tscadc-dt",
-+		.owner	= THIS_MODULE,
-+		.of_match_table = of_ti_tscadc_dt_match,
-+	},
-+};
-+
-+#endif
-+
 +struct i2c_priv {
 +	struct i2c_adapter *i2c_adapter;
 +	phandle parent_handle;
@@ -810,16 +559,6 @@ index 0000000..a55aad6
 +};
 +
 +static struct bone_capebus_pdev_driver pdev_drivers[] = {
-+#if defined(CONFIG_FB_DA8XX) || defined(CONFIG_FB_DA8XX_MODULE)
-+	{
-+		.driver		= &da8xx_dt_driver,
-+	},
-+#endif
-+#if defined(CONFIG_MFD_TI_AM335X_TSCADC) || defined(CONFIG_MFD_TI_AM335X_TSCADC_MODULE)
-+	{
-+		.driver		= &ti_tscadc_dt_driver,
-+	},
-+#endif
 +	{
 +		.driver		= &i2c_dt_driver,
 +	},
diff --git a/patches/capebus/0017-capebus-Beaglebone-generic-board.patch b/patches/capebus/0019-capebus-Beaglebone-generic-cape-support.patch
similarity index 78%
rename from patches/capebus/0017-capebus-Beaglebone-generic-board.patch
rename to patches/capebus/0019-capebus-Beaglebone-generic-cape-support.patch
index f0cf9786..30617aaf 100644
--- a/patches/capebus/0017-capebus-Beaglebone-generic-board.patch
+++ b/patches/capebus/0019-capebus-Beaglebone-generic-cape-support.patch
@@ -1,13 +1,23 @@
-From 9a0f821c5b5909a1f97dbd117f3246d08334f591 Mon Sep 17 00:00:00 2001
+From 4335d37bc1c8217f692065799f9cdc266640396c Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Tue, 30 Oct 2012 21:09:49 +0200
-Subject: [PATCH 17/21] capebus: Beaglebone generic board
+Subject: [PATCH 19/25] capebus: Beaglebone generic cape support
 
+Introducing beaglebone generic cape support.
+
+With this you can create almost any kind of cape driver
+that doesn't require complex interconnection of the parts.
+
+Most beaglebone capes can be created with this, including
+all the display capes (DVI/VGA/LCD) with touchscreen or not,
+capes that only use i2c or spi devices, gpio-keys, leds etc.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
 ---
  drivers/capebus/capes/Kconfig             |    6 ++
  drivers/capebus/capes/Makefile            |    1 +
- drivers/capebus/capes/bone-generic-cape.c |   96 +++++++++++++++++++++++++++++
- 3 files changed, 103 insertions(+), 0 deletions(-)
+ drivers/capebus/capes/bone-generic-cape.c |   75 +++++++++++++++++++++++++++++
+ 3 files changed, 82 insertions(+), 0 deletions(-)
  create mode 100644 drivers/capebus/capes/Kconfig
  create mode 100644 drivers/capebus/capes/Makefile
  create mode 100644 drivers/capebus/capes/bone-generic-cape.c
@@ -33,10 +43,10 @@ index 0000000..83da381
 +obj-$(CONFIG_CAPEBUS_BONE_GENERIC)	+= bone-generic-cape.o
 diff --git a/drivers/capebus/capes/bone-generic-cape.c b/drivers/capebus/capes/bone-generic-cape.c
 new file mode 100644
-index 0000000..70be50a
+index 0000000..b364614
 --- /dev/null
 +++ b/drivers/capebus/capes/bone-generic-cape.c
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,75 @@
 +/*
 + * Generic cape support
 + *
@@ -60,28 +70,7 @@ index 0000000..70be50a
 +
 +#include <linux/module.h>
 +#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/timer.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/bitops.h>
 +#include <linux/err.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/of_gpio.h>
-+#include <linux/pinctrl/pinctrl.h>
-+#include <linux/pinctrl/pinmux.h>
-+#include <linux/pinctrl/consumer.h>
-+#include <linux/atomic.h>
-+#include <linux/clk.h>
-+#include <asm/barrier.h>
-+#include <plat/clock.h>
-+#include <plat/omap_device.h>
-+#include <linux/clkdev.h>
-+#include <linux/input/ti_am335x_tsc.h>
-+#include <linux/platform_data/ti_am335x_adc.h>
-+#include <linux/mfd/ti_am335x_tscadc.h>
 +
 +#include <linux/capebus/capebus-bone.h>
 +
diff --git a/patches/capebus/0018-capebus-Add-beaglebone-geiger-cape.patch b/patches/capebus/0020-capebus-Beaglebone-geiger-cape-support.patch
similarity index 91%
rename from patches/capebus/0018-capebus-Add-beaglebone-geiger-cape.patch
rename to patches/capebus/0020-capebus-Beaglebone-geiger-cape-support.patch
index b2bd9821..ff81b0d7 100644
--- a/patches/capebus/0018-capebus-Add-beaglebone-geiger-cape.patch
+++ b/patches/capebus/0020-capebus-Beaglebone-geiger-cape-support.patch
@@ -1,13 +1,20 @@
-From eb706504605d4d679b0f0dd4a37083041baa22a7 Mon Sep 17 00:00:00 2001
+From dd37cb30d99f6feccf0aabaddf08f6595b30f0dd Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Tue, 30 Oct 2012 21:12:20 +0200
-Subject: [PATCH 18/21] capebus: Add beaglebone geiger cape
+Subject: [PATCH 20/25] capebus: Beaglebone geiger cape support
 
+Support beaglebone's geiger cape.
+
+The geiger cape allows you to measure the amount of
+ionising radiation in your area, and as an example
+of how to create a complex non-generic cape driver.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
 ---
  drivers/capebus/capes/Kconfig            |    7 +
  drivers/capebus/capes/Makefile           |    1 +
- drivers/capebus/capes/bone-geiger-cape.c |  506 ++++++++++++++++++++++++++++++
- 3 files changed, 514 insertions(+), 0 deletions(-)
+ drivers/capebus/capes/bone-geiger-cape.c |  517 ++++++++++++++++++++++++++++++
+ 3 files changed, 525 insertions(+), 0 deletions(-)
  create mode 100644 drivers/capebus/capes/bone-geiger-cape.c
 
 diff --git a/drivers/capebus/capes/Kconfig b/drivers/capebus/capes/Kconfig
@@ -34,13 +41,28 @@ index 83da381..d6f94ce 100644
 +obj-$(CONFIG_CAPEBUS_BONE_GEIGER)	+= bone-geiger-cape.o
 diff --git a/drivers/capebus/capes/bone-geiger-cape.c b/drivers/capebus/capes/bone-geiger-cape.c
 new file mode 100644
-index 0000000..880eaae
+index 0000000..9b3a83d
 --- /dev/null
 +++ b/drivers/capebus/capes/bone-geiger-cape.c
-@@ -0,0 +1,506 @@
+@@ -0,0 +1,517 @@
 +/*
 + * Driver for beaglebone Geiger cape
 + *
++ * Copyright (C) 2012 Pantelis Antoniou <panto@antoniou-consulting.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., 675 Mass Ave, Cambridge, MA 02139, USA.
 + */
 +
 +#include <linux/module.h>
@@ -61,9 +83,6 @@ index 0000000..880eaae
 +#include <linux/atomic.h>
 +#include <linux/clk.h>
 +#include <linux/interrupt.h>
-+#include <asm/barrier.h>
-+#include <plat/clock.h>
-+#include <plat/omap_device.h>
 +#include <linux/clkdev.h>
 +#include <linux/pwm.h>
 +#include <linux/math64.h>
@@ -72,7 +91,6 @@ index 0000000..880eaae
 +#include <linux/input/ti_am335x_tsc.h>
 +#include <linux/platform_data/ti_am335x_adc.h>
 +#include <linux/mfd/ti_am335x_tscadc.h>
-+#include <plat/omap_device.h>
 +#include <linux/iio/iio.h>
 +#include <linux/iio/machine.h>
 +#include <linux/iio/consumer.h>
diff --git a/patches/capebus/0019-capebus-Beaglebone-capebus-DT-update.patch b/patches/capebus/0021-capebus-Beaglebone-capebus-DT-update.patch
similarity index 98%
rename from patches/capebus/0019-capebus-Beaglebone-capebus-DT-update.patch
rename to patches/capebus/0021-capebus-Beaglebone-capebus-DT-update.patch
index 0def7ddc..4d29c67e 100644
--- a/patches/capebus/0019-capebus-Beaglebone-capebus-DT-update.patch
+++ b/patches/capebus/0021-capebus-Beaglebone-capebus-DT-update.patch
@@ -1,8 +1,12 @@
-From 80a6e1a418c67f68375aa988ba430234f815f28c Mon Sep 17 00:00:00 2001
+From 94080421dd70c43fb8d9784081a1fec730a3f588 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Tue, 30 Oct 2012 21:16:57 +0200
-Subject: [PATCH 19/21] capebus: Beaglebone capebus DT update
+Subject: [PATCH 21/25] capebus: Beaglebone capebus DT update
 
+Update the common beaglebone's DTS with the required DT
+entries for all known working capes as of now.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
 ---
  arch/arm/boot/dts/am335x-bone-common.dtsi |  689 +++++++++++++++++++++++++++--
  1 files changed, 659 insertions(+), 30 deletions(-)
diff --git a/patches/capebus/0022-capebus-Document-DT-bindings.patch b/patches/capebus/0022-capebus-Document-DT-bindings.patch
new file mode 100644
index 00000000..f3805c16
--- /dev/null
+++ b/patches/capebus/0022-capebus-Document-DT-bindings.patch
@@ -0,0 +1,475 @@
+From 7d47c19abf123bc655ea0c5efd5760a2770c0cbb Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Wed, 31 Oct 2012 16:16:44 +0200
+Subject: [PATCH 22/25] capebus: Document DT bindings
+
+Describe capebus DT bindings in detail.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
+---
+ .../capebus/bone-capebus-slot-override.txt         |   28 ++++++
+ .../devicetree/bindings/capebus/bone-capebus.txt   |   50 ++++++++++
+ .../bindings/capebus/bone-geiger-cape.txt          |   78 ++++++++++++++++
+ .../bindings/capebus/bone-generic-cape.txt         |   97 ++++++++++++++++++++
+ .../devicetree/bindings/capebus/da8xx-dt.txt       |   31 ++++++
+ .../devicetree/bindings/capebus/i2c-dt.txt         |   42 +++++++++
+ .../devicetree/bindings/capebus/spi-dt.txt         |   37 ++++++++
+ .../devicetree/bindings/capebus/ti-tscadc-dt.txt   |   34 +++++++
+ 8 files changed, 397 insertions(+), 0 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/capebus/bone-capebus-slot-override.txt
+ create mode 100644 Documentation/devicetree/bindings/capebus/bone-capebus.txt
+ create mode 100644 Documentation/devicetree/bindings/capebus/bone-geiger-cape.txt
+ create mode 100644 Documentation/devicetree/bindings/capebus/bone-generic-cape.txt
+ create mode 100644 Documentation/devicetree/bindings/capebus/da8xx-dt.txt
+ create mode 100644 Documentation/devicetree/bindings/capebus/i2c-dt.txt
+ create mode 100644 Documentation/devicetree/bindings/capebus/spi-dt.txt
+ create mode 100644 Documentation/devicetree/bindings/capebus/ti-tscadc-dt.txt
+
+diff --git a/Documentation/devicetree/bindings/capebus/bone-capebus-slot-override.txt b/Documentation/devicetree/bindings/capebus/bone-capebus-slot-override.txt
+new file mode 100644
+index 0000000..733d977
+--- /dev/null
++++ b/Documentation/devicetree/bindings/capebus/bone-capebus-slot-override.txt
+@@ -0,0 +1,28 @@
++* Beagle bone capebus slot override bindings
++
++The beagle bone capebus node can have slot override nodes. These nodes describe
++  an override that will take place in the specified slot.
++  Many boards during the prototype phase don't have an EEPROM (or are even
++  wired in such a way that an eeprom cannot be added). In that case you can
++  specify an override that will make everything work as if a real EEPROM was
++  there.
++
++Required properties:
++- compatible: Override node must have the form "bone-capebus-slot-override"
++- slot: Identifies the slot# to override.
++- board-name: The cape's name as if provided by the board-name EEPROM field
++
++Optional properties:
++- version: The cape's version as if provided by the version EEPROM field.
++- manufacturer: The cape's manufacturer as if provided by the manufacturer
++  EEPROM field.
++
++Example:
++
++override@1 {
++	compatible = "bone-capebus-slot-override";
++	slot = <1>;
++	board-name = "Adafruit 1.8 Cape";
++	version = "00A0";
++	manufacturer = "Adafruit";
++};
+diff --git a/Documentation/devicetree/bindings/capebus/bone-capebus.txt b/Documentation/devicetree/bindings/capebus/bone-capebus.txt
+new file mode 100644
+index 0000000..6d8a08d
+--- /dev/null
++++ b/Documentation/devicetree/bindings/capebus/bone-capebus.txt
+@@ -0,0 +1,50 @@
++* Beagle bone capebus bindings
++
++The beaglebone capebus implementation is using a single capebus
++node contained in the root node. A beaglebone cape is identified
++at by reading an EEPROM at on of 4 possible addresses on the I2C2 bus.
++
++Required properties:
++- compatible: Every beaglebone compatible capebus node shall have the 
++  form "bone-capebus";
++- slots: An array of phandles pointing to the I2C node of an EEPROM that 
++  contains the cape information.
++
++Optional properties:
++
++The child nodes of the capebus node can contain either cape nodes
++or override nodes. Those cape nodes are described in their respective
++binding files.
++
++- override nodes: Describe an override that will take place in the specified
++  slot. Many boards during the prototype phase don't have an EEPROM (or are even
++  wired in such a way that an eeprom cannot be added). In that case you can
++  specify an override that will make everything work as if a real EEPROM was
++  there.
++
++Override node required properties:
++- compatible: For override node must have the form "bone-capebus-slot-override"
++- slot: Identifies the slot# to override.
++- board-name: The cape's name as if provided by the board-name EEPROM field
++
++Override node optional properties:
++- version: The cape's version as if provided by the version EEPROM field.
++- manufacturer: The cape's manufacturer as if provided by the manufacturer
++  EEPROM field.
++
++Example:
++
++capebus: capebus@0 {
++	compatible = "bone-capebus";
++
++	slots = <&cape_eeprom_0 &cape_eeprom_1 &cape_eeprom_2 &cape_eeprom_3>;
++
++	[cape-nodes]
++	[override-nodes]
++
++	bone_adafruit_cape: cape@5 {
++		compatible = "bone-generic-cape";
++		// read the bone-generic-cape bindings for the rest
++		...
++	};
++};
+diff --git a/Documentation/devicetree/bindings/capebus/bone-geiger-cape.txt b/Documentation/devicetree/bindings/capebus/bone-geiger-cape.txt
+new file mode 100644
+index 0000000..a2ed81c
+--- /dev/null
++++ b/Documentation/devicetree/bindings/capebus/bone-geiger-cape.txt
+@@ -0,0 +1,78 @@
++* Beagle bone geiger cape
++
++  A geiger cape is your run of the mill particle detector measuring
++  ionizing radiation. It is also the first example of how a non-generic
++  cape can be supported by capebus.
++
++  The geiger cape can not be created via instantiation of a generic cape 
++  since the component need to work together.
++
++Required properties:
++- compatible: Generic cape nodes must have the form "bone-geiger-cape"
++- board-name: The cape's name as if provided by the board-name EEPROM field
++- pwms: Pointer to the PWM we require
++- pwm-names: Name of the PWM.
++- pwm-frequency: Frequency of the PWM in Hz
++- pwm-duty-cycle: Duty cycle in percent
++- event-blink-delay: Blink delay of the event led
++- gpios: GPIO on which an event is detected
++- vsense-name: Name of the analog input for vsense
++- vsense-scale: Vsense scale to convert to mVolts
++- ti-tscadc-dt compatible node for the ADC configuration
++- gpio-leds compatible node for the LED configuration
++
++Optional properties:
++
++The geiger cape supports the standard pinctrl properties.
++
++Example:
++
++bone_geiger_cape: cape@1 {
++	compatible = "bone-geiger-cape";
++	board-name = "Geiger Cape";
++
++	/* note that these can't be versioned... */
++	pinctrl-names = "default";
++	pinctrl-0 = <&bone_geiger_cape_pins>;
++
++	pwms = <&ehrpwm1 0 500000 0>;
++	pwm-names = "bone-geiger-cape";
++
++	pwm-frequency  = <20000>;	/* 20KHz */
++	pwm-duty-cycle = <60>;		/* 60% */
++
++	event-blink-delay = <30>;	/* 30ms */
++
++	gpios = <&gpio4 17 0>;		/* pulse */
++
++	vsense-name = "AIN5";		/* analog vsense */
++	vsense-scale = <37325>;		/* scaling */
++
++	tscadc {
++		compatible = "ti-tscadc-dt";
++
++		ti,hwmods = "adc_tsc";
++
++		adc-channels = <8>;
++	};
++
++	gpio-leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&bone_geiger_cape_led_pins>;
++
++		geiger-led0 {
++			label = "geiger:green:usr0";
++			gpios = <&gpio3 23 0>;
++			linux,default-trigger = "geiger-run";
++			default-state = "off";
++		};
++
++		geiger-led1 {
++			label = "geiger:red:usr1";
++			gpios = <&gpio3 25 0>;
++			linux,default-trigger = "geiger-event";
++			default-state = "off";
++		};
++	};
++};
+diff --git a/Documentation/devicetree/bindings/capebus/bone-generic-cape.txt b/Documentation/devicetree/bindings/capebus/bone-generic-cape.txt
+new file mode 100644
+index 0000000..71ad2f4
+--- /dev/null
++++ b/Documentation/devicetree/bindings/capebus/bone-generic-cape.txt
+@@ -0,0 +1,97 @@
++* Beagle bone generic cape
++
++  A generic cape is one form of cape that doesn't require any per-cape
++  driver for it to function. It is enough for the cape's node to be
++  instantiated in the right manner and the functions that the cape provides
++  will be available to Linux. A large number of capes fall in this category
++  like LCD/DVI/VGA capes, audio capes, capes with a number of gpio buttons,
++  capes with standard I2C/SPI/W1 parts etc.
++  All that's required is to describe the parts of the cape in the DT and 
++  how they utilize the SoC peripherals and it will work, without having
++  to write any other driver, or modify the board support package.
++
++  As a sidenote, a large part of the complexity of capes have to do
++  with version management. A cape as it goes through various steps of evolution
++  changes. These changes are codified by the version field on the EEPROM.
++  It is important that version management can be kept as simple as possible.
++
++  The generic concept works by instantiating the child nodes that are
++  contained in the cape node. By default nodes that are present in the
++  root of the node are activated for any version. Version nodes can 
++  contain per-version changes. In the example the da8xx-dt node differs
++  in the way it's instantiated, and this is expressed by the version nodes.
++
++Required properties:
++- compatible: Generic cape nodes must have the form "bone-generic-cape"
++- board-name: The cape's name as if provided by the board-name EEPROM field
++
++Optional properties:
++- version: Only valid in a version node, and it contains the list of compatible
++  versions this node contains.
++
++The standard supported nodes of the generic cape are:
++
++gpio-leds, tps65217-backlight, gpio-keys, w1-gpio, pwm-backlight
++
++The following nodes are supported via a capebus specific bridge devices, and
++their bindings described in their respective files:
++
++ti-tscadc-dt, da8xx-dt, i2c-dt, spi-dt
++
++Example:
++
++bone_dvi_cape: cape@0 {
++
++	compatible = "bone-generic-cape";
++	board-name = "BeagleBone DVI-D CAPE";
++
++	/* hacky, since this is not a proper DT platform device */
++	/* but until we have DT bindings... */
++	version@00A0 {
++		version = "00A0";
++		dvi {
++			compatible = "da8xx-dt";
++			pinctrl-names = "default";
++			pinctrl-0 = <&bone_dvi_cape_dvi_00A0_pins>;
++			ti,hwmods = "lcdc";
++
++			disp-pll = <560000000>;
++			panel-type = "1024x768@60";
++			powerdn-gpio = <&gpio2 7 0>;
++		};
++	};
++
++	version@00A1 {
++		version = "00A1", "01";
++		dvi {
++			compatible = "da8xx-dt";
++			pinctrl-names = "default";
++			pinctrl-0 = <&bone_dvi_cape_dvi_00A1_pins>;
++			ti,hwmods = "lcdc";
++
++			disp-pll = <560000000>;
++			panel-type = "1024x768@60";
++			powerdn-gpio = <&gpio2 31 0>;
++		};
++	};
++
++	gpio-leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&bone_dvi_cape_led_pins>;
++
++		dvi-led0 {
++			label = "dvi:green:usr0";
++			gpios = <&gpio2 18 0>;
++			linux,default-trigger = "heartbeat";
++			default-state = "off";
++		};
++
++		dvi-led1 {
++			label = "dvi:green:usr1";
++			gpios = <&gpio2 19 0>;
++			linux,default-trigger = "mmc0";
++			default-state = "off";
++		};
++	};
++};
+diff --git a/Documentation/devicetree/bindings/capebus/da8xx-dt.txt b/Documentation/devicetree/bindings/capebus/da8xx-dt.txt
+new file mode 100644
+index 0000000..0b84063
+--- /dev/null
++++ b/Documentation/devicetree/bindings/capebus/da8xx-dt.txt
+@@ -0,0 +1,31 @@
++* DA8XX DT bindins
++
++  This is an adapter device for use in device tree cases, since the
++  drivers DT bindings are not yet ready. It is bound to get away once
++  they are in place. Note that there is no capebus prefix, since there's
++  not really any dependence on capebus; the drivers can be moved out of
++  capebus if need be.
++
++Required properties:
++- compatible: Must have the form "da8xx-dt"
++- ti,hwmods: Must have the form "lcdc" (until hwmod DT is complete)
++- disp-pll: PLL value
++- panel-type: Name of the panel type connected
++
++Optional properties:
++powerdn-gpio: GPIO controlling power
++
++Note that the pinctrl bindings are supported.
++
++Example:
++
++dvi {
++	compatible = "da8xx-dt";
++	pinctrl-names = "default";
++	pinctrl-0 = <&bone_dvi_cape_dvi_00A0_pins>;
++	ti,hwmods = "lcdc";
++
++	disp-pll = <560000000>;
++	panel-type = "1024x768@60";
++	powerdn-gpio = <&gpio2 7 0>;
++};
+diff --git a/Documentation/devicetree/bindings/capebus/i2c-dt.txt b/Documentation/devicetree/bindings/capebus/i2c-dt.txt
+new file mode 100644
+index 0000000..79a042a
+--- /dev/null
++++ b/Documentation/devicetree/bindings/capebus/i2c-dt.txt
+@@ -0,0 +1,42 @@
++* I2C DT bindings
++
++  This is an adapter device for use in device tree cases.
++  What we want to do is to add a number of I2C devices connected
++  to a specified i2c adapter node, and instantiate them on
++  successful cape match. Not only that, normally I2C adapters
++  are disabled in the DT tree, so in that case we enable them
++  first and then go about our business.
++
++Required properties:
++- compatible: Must have the form "i2c-dt"
++- parent: The phandle of the i2c adapter node
++- #address-cells: The same as the parent i2c adapter node
++- #size-cells: The same as the parent i2c adapter node
++
++Example:
++
++i2c2-devices {
++	compatible = "i2c-dt";
++	#address-cells = <1>;
++	#size-cells = <0>;
++
++	parent = <&i2c2>;
++
++	/* Ambient light sensor */
++	tsl2550@39 {
++		compatible = "tsl,tsl2550";
++		reg = <0x39>;
++	};
++
++	/* Humidity Sensor */
++	sht21@40 {
++		compatible = "sensiron,sht21";
++		reg = <0x40>;
++	};
++
++	/* Barometric pressure sensor */
++	bmp085@77 {
++		compatible = "bosch,bmp085";
++		reg = <0x77>;
++	};
++};
+diff --git a/Documentation/devicetree/bindings/capebus/spi-dt.txt b/Documentation/devicetree/bindings/capebus/spi-dt.txt
+new file mode 100644
+index 0000000..fd70fc4
+--- /dev/null
++++ b/Documentation/devicetree/bindings/capebus/spi-dt.txt
+@@ -0,0 +1,37 @@
++* SPI DT bindings
++
++  This is an adapter device for use in device tree cases.
++  What we want to do is to add a number of SPI devices connected
++  to a specified spi node, and instantiate them on
++  successful cape match. Not only that, normally SPI nodes
++  are disabled in the DT tree, so in that case we enable them
++  first and then go about our business.
++
++Required properties:
++- compatible: Must have the form "spi-dt"
++- parent: The phandle of the spi node
++- #address-cells: The same as the parent spi node
++- #size-cells: The same as the parent spi node
++
++Example:
++
++spi1-devices {
++	compatible = "spi-dt";
++	#address-cells = <1>;
++	#size-cells = <0>;
++
++	parent = <&spi1>;
++
++	lcd@0 {
++		compatible = "adafruit,tft-lcd-1.8-red", "sitronix,st7735";
++		spi-max-frequency = <8000000>;
++		reg = <0>;
++		spi-cpol;
++		spi-cpha;
++		pinctrl-names = "default";
++		pinctrl-0 = <&lcd_pins>;
++		st7735-rst = <&gpio4 19 0>;
++		st7735-dc = <&gpio4 21 0>;
++	};
++
++};
+diff --git a/Documentation/devicetree/bindings/capebus/ti-tscadc-dt.txt b/Documentation/devicetree/bindings/capebus/ti-tscadc-dt.txt
+new file mode 100644
+index 0000000..44ad4f2
+--- /dev/null
++++ b/Documentation/devicetree/bindings/capebus/ti-tscadc-dt.txt
+@@ -0,0 +1,34 @@
++* TI's TSCADC Device Tree adapter
++
++  This is an adapter device for use in device tree cases, since the
++  drivers DT bindings are not yet ready. It is bound to get away once
++  they are in place. Note that there is no capebus prefix, since there's
++  not really any dependence on capebus; the drivers can be moved out of
++  capebus if need be.
++
++Required properties:
++- compatible: Must have the form "ti-tscadc-dt"
++- ti,hwmods: Must have the form "adc_tsc" (until hwmod DT is complete)
++
++Optional properties:
++- adc-channels: Number of ADC channels the driver should provide.
++- tsc-wires: Number of touchscreen wires
++- tsc-x-plate-resistance: Touchscreen X plate resistance value
++- tsc-steps: Touchscreen steps
++
++Note if either adc-channels or tsc-wires are missing their respective
++values are set to 0.
++
++Example:
++
++tscadc {
++	compatible = "ti-tscadc-dt";
++
++	ti,hwmods = "adc_tsc";
++
++	tsc-wires = <4>;
++	tsc-x-plate-resistance = <200>;
++	tsc-steps = <6>;
++
++	adc-channels = <4>;
++};
+-- 
+1.7.7.6
+
diff --git a/patches/capebus/0023-capebus-Documentation-capebus-summary.patch b/patches/capebus/0023-capebus-Documentation-capebus-summary.patch
new file mode 100644
index 00000000..854ab03b
--- /dev/null
+++ b/patches/capebus/0023-capebus-Documentation-capebus-summary.patch
@@ -0,0 +1,62 @@
+From 2ee6c56e4f0a233c765f537677584e22ae143e9d Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Wed, 31 Oct 2012 16:49:14 +0200
+Subject: [PATCH 23/25] capebus: Documentation; capebus-summary
+
+Small summary of capebus.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
+---
+ Documentation/capebus/capebus-summary |   40 +++++++++++++++++++++++++++++++++
+ 1 files changed, 40 insertions(+), 0 deletions(-)
+ create mode 100644 Documentation/capebus/capebus-summary
+
+diff --git a/Documentation/capebus/capebus-summary b/Documentation/capebus/capebus-summary
+new file mode 100644
+index 0000000..742e33c
+--- /dev/null
++++ b/Documentation/capebus/capebus-summary
+@@ -0,0 +1,40 @@
++Overview of Linux kernel Capebus support
++========================================
++
++30-Oct-2012
++
++What is Capebus?
++----------------
++Capebus is an abstract concept. There's no such thing as a vanilla physical
++capebus, what is there is a concept and a method on how various capebus
++based implementations can be made.
++
++Capebus is created to address the problem of many SoCs that can provide a
++multitude of hardware interfaces but in order to keep costs down the main
++boards only support a limited number of them. The rest are typically brought
++out to pin connectors on to which other boards, named capes are connected and
++allow those peripherals to be used.
++
++These capes connect to the SoC interfaces but might also contain various other
++parts that may need some kind of driver to work.
++
++Since SoCs have limited pins and pin muxing options, not all capes can work
++together so some kind of resource tracking (at least for the pins in use) is
++required.
++
++Before capebus all of this took place in the board support file, and frankly
++for boards with too many capes it was becoming unmanageable.
++
++Capebus provides a virtual bus, which along with a board specific controller,
++cape drivers can be written using the standard Linux device model.
++
++What kind of systems/boards capebus supports?
++---------------------------------------------
++
++The core capebus infrastructure is not depended on any specific board.
++However capebus needs a board controller to provide services to the cape devices
++it controls. Services like addressing and resource reservation are provided
++by the board controller.
++
++Capebus at the moment only support TI's Beaglebone platform.
++
+-- 
+1.7.7.6
+
diff --git a/patches/capebus/0020-beaglebone-Update-default-config-for-capebus.patch b/patches/capebus/0024-beaglebone-Update-default-config-for-capebus.patch
similarity index 99%
rename from patches/capebus/0020-beaglebone-Update-default-config-for-capebus.patch
rename to patches/capebus/0024-beaglebone-Update-default-config-for-capebus.patch
index dbda8616..0ca575a2 100644
--- a/patches/capebus/0020-beaglebone-Update-default-config-for-capebus.patch
+++ b/patches/capebus/0024-beaglebone-Update-default-config-for-capebus.patch
@@ -1,8 +1,9 @@
-From a4c7691f6ddcec627b388d020323abd9c589f404 Mon Sep 17 00:00:00 2001
+From a2967458f6e665547fdc7bdaf70933b6d2fb5c85 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Tue, 30 Oct 2012 21:17:39 +0200
-Subject: [PATCH 20/21] beaglebone: Update default config for capebus
+Subject: [PATCH 24/25] beaglebone: Update default config for capebus
 
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
 ---
  defconfig | 3893 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 files changed, 3893 insertions(+), 0 deletions(-)
diff --git a/patches/capebus/0021-capebus-Geiger-Cape-config-bugfixs.patch b/patches/capebus/0025-capebus-Geiger-Cape-config-bugfixs.patch
similarity index 79%
rename from patches/capebus/0021-capebus-Geiger-Cape-config-bugfixs.patch
rename to patches/capebus/0025-capebus-Geiger-Cape-config-bugfixs.patch
index ec53809d..7f1943c0 100644
--- a/patches/capebus/0021-capebus-Geiger-Cape-config-bugfixs.patch
+++ b/patches/capebus/0025-capebus-Geiger-Cape-config-bugfixs.patch
@@ -1,7 +1,7 @@
-From 5eb644e8069dbd6a10d157c1d0df8859af9d6ff2 Mon Sep 17 00:00:00 2001
+From 7d9c00e7aa6bd921a53571d67414906a6b3b1cda Mon Sep 17 00:00:00 2001
 From: Matt Ranostay <mranostay@gmail.com>
 Date: Sun, 18 Nov 2012 23:26:20 +0000
-Subject: [PATCH 21/21] capebus: Geiger Cape config bugfixs
+Subject: [PATCH 25/25] capebus: Geiger Cape config bugfixs
 
 The display of 'vsense-name' default is incorrect.
 
@@ -11,10 +11,10 @@ Signed-off-by: Matt Ranostay <mranostay@gmail.com>
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/capebus/capes/bone-geiger-cape.c b/drivers/capebus/capes/bone-geiger-cape.c
-index 880eaae..9e53d8d 100644
+index 9b3a83d..d972622 100644
 --- a/drivers/capebus/capes/bone-geiger-cape.c
 +++ b/drivers/capebus/capes/bone-geiger-cape.c
-@@ -417,8 +417,8 @@ static int bonegeiger_probe(struct cape_dev *dev, const struct cape_device_id *i
+@@ -428,8 +428,8 @@ static int bonegeiger_probe(struct cape_dev *dev, const struct cape_device_id *i
  				"vsense-name", &info->vsense_name) != 0) {
  		info->vsense_name = "AIN5";
  		dev_warn(&dev->dev, "Could not read vsense-name property; "