Skip to content

Commit

Permalink
3.12: update patchset to 3.12rc
Browse files Browse the repository at this point in the history 
Not even buildtested!

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  • Loading branch information
@koenkooi
koenkooi committed Sep 6, 2013
1 parent d46393d commit d6a4b99
Show file tree
Hide file tree
Showing 73 changed files with 250 additions and 1,344 deletions.
2 changes: 1 addition & 1 deletion configs/beaglebone
View file
Expand Up @@ -3931,7 +3931,7 @@ CONFIG_AD8366=m
#
CONFIG_HID_SENSOR_IIO_COMMON=m
CONFIG_HID_SENSOR_IIO_TRIGGER=m
# CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS is not set
CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS=y
CONFIG_IIO_ST_SENSORS_I2C=m
CONFIG_IIO_ST_SENSORS_SPI=m
CONFIG_IIO_ST_SENSORS_CORE=m
Expand Down
6 changes: 3 additions & 3 deletions patch.sh
View file
Expand Up @@ -12,8 +12,8 @@ DIR="$PWD"
PATCHPATH="${DIR}/patches"
EXPORTPATH="${DIR}/export"

RECIPEDIR="linux-3.11"
RECIPENAME="linux-mainline_3.11.bb"
RECIPEDIR="linux-3.12"
RECIPENAME="linux-mainline_3.12.bb"
RECIPEFILE="${DIR}/recipes/${RECIPENAME}"

#For TAG, use mainline Kernel tags
Expand All @@ -22,7 +22,7 @@ EXTRATAG=""

EXTERNAL_TREE="git://github.com/torvalds/linux.git"
EXTERNAL_BRANCH="master"
EXTERNAL_SHA="6e4664525b1db28f8c4e1130957f70a94c19213e"
EXTERNAL_SHA="2e032852245b3dcfe5461d7353e34eb6da095ccf"

PATCHSET="general-fixes dtc-fixes dtc-overlays of-fixes pdev-fixes dma-devel mmc-fixes dts-fixes i2c-fixes pinctrl-fixes capemgr reset capes lcdc-fixes net"

Expand Down
2 changes: 1 addition & 1 deletion patches/capemgr/0001-capemgr-Capemgr-makefiles-and-Kconfig-fragments.patch
View file
@@ -1,4 +1,4 @@
From a5710d6d524028065286e505c8916b9a3e04c42c Mon Sep 17 00:00:00 2001
From 25543c823e085fb708eade06ba7fafe0fe97c82d Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Fri, 28 Dec 2012 20:56:48 +0200
Subject: [PATCH 01/11] capemgr: Capemgr makefiles and Kconfig fragments.
Expand Down
6 changes: 3 additions & 3 deletions patches/capemgr/0002-capemgr-Beaglebone-capemanager.patch
View file
@@ -1,4 +1,4 @@
From 83dd61c02bf2b9b2bf01636ad2fa367e8a581299 Mon Sep 17 00:00:00 2001
From 48d93ac6b3b70db40d04d05f1dc3d2f9fe64fd25 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Fri, 28 Dec 2012 21:00:31 +0200
Subject: [PATCH 02/11] capemgr: Beaglebone capemanager
Expand All @@ -15,7 +15,7 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>

diff --git a/drivers/misc/cape/beaglebone/capemgr.c b/drivers/misc/cape/beaglebone/capemgr.c
new file mode 100644
index 0000000..651f48d
index 0000000..ee8508c
--- /dev/null
+++ b/drivers/misc/cape/beaglebone/capemgr.c
@@ -0,0 +1,1835 @@
Expand Down Expand Up @@ -50,7 +50,7 @@ index 0000000..651f48d
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_i2c.h>
+#include <linux/i2c.h>
+#include <linux/of_device.h>
+#include <linux/of_fdt.h>
+#include <linux/slab.h>
Expand Down
4 changes: 2 additions & 2 deletions patches/capemgr/0003-capemgr-Remove-__devinit-__devexit.patch
View file
@@ -1,4 +1,4 @@
From 7088e85d8789a5e8c449d4ec2ebaacb0425fe104 Mon Sep 17 00:00:00 2001
From 2b9b547e3d7d18c8842b88b3d8aef9d79c7014a3 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Tue, 15 Jan 2013 14:15:00 +0200
Subject: [PATCH 03/11] capemgr: Remove __devinit/__devexit
Expand All @@ -11,7 +11,7 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/cape/beaglebone/capemgr.c b/drivers/misc/cape/beaglebone/capemgr.c
index 651f48d..d828af7 100644
index ee8508c..6796063 100644
--- a/drivers/misc/cape/beaglebone/capemgr.c
+++ b/drivers/misc/cape/beaglebone/capemgr.c
@@ -1522,7 +1522,7 @@ static int bone_capemgr_loader(void *data)
Expand Down
4 changes: 2 additions & 2 deletions patches/capemgr/0004-bone-capemgr-Make-sure-cape-removal-works.patch
View file
@@ -1,4 +1,4 @@
From ad2d290d124761e1b001bc362a73ccc13a0dffa3 Mon Sep 17 00:00:00 2001
From 8612672a6705f35a8db28db04beca3e41e96e931 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Wed, 27 Feb 2013 11:32:20 +0200
Subject: [PATCH 04/11] bone-capemgr: Make sure cape removal works.
Expand All @@ -11,7 +11,7 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/drivers/misc/cape/beaglebone/capemgr.c b/drivers/misc/cape/beaglebone/capemgr.c
index d828af7..2656e3a 100644
index 6796063..0200be2 100644
--- a/drivers/misc/cape/beaglebone/capemgr.c
+++ b/drivers/misc/cape/beaglebone/capemgr.c
@@ -154,6 +154,7 @@ static int bone_slot_fill_override(struct bone_cape_slot *slot,
Expand Down
4 changes: 2 additions & 2 deletions patches/capemgr/0005-bone-capemgr-Fix-crash-when-trying-to-remove-non-exi.patch
View file
@@ -1,4 +1,4 @@
From 94fda4d3e3f83bf91031a9c2c01840dde6cf84ef Mon Sep 17 00:00:00 2001
From a1022cb3ac6ef3865354b1918fb79c323c60f976 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Wed, 27 Feb 2013 18:35:09 +0200
Subject: [PATCH 05/11] bone-capemgr: Fix crash when trying to remove
Expand All @@ -12,7 +12,7 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/misc/cape/beaglebone/capemgr.c b/drivers/misc/cape/beaglebone/capemgr.c
index 2656e3a..9f8da94 100644
index 0200be2..a0e118c 100644
--- a/drivers/misc/cape/beaglebone/capemgr.c
+++ b/drivers/misc/cape/beaglebone/capemgr.c
@@ -990,15 +990,12 @@ static ssize_t slots_store(struct device *dev, struct device_attribute *attr,
Expand Down
4 changes: 2 additions & 2 deletions patches/capemgr/0006-bone-capemgr-Force-a-slot-to-load-unconditionally.patch
View file
@@ -1,4 +1,4 @@
From f0a96a0be9274db6790e6ca79e96e5d712d5df10 Mon Sep 17 00:00:00 2001
From 9325277e605a94d1da1e1d14cae7bd7d131d8b95 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Fri, 8 Mar 2013 14:31:40 +0200
Subject: [PATCH 06/11] bone-capemgr: Force a slot to load unconditionally
Expand All @@ -12,7 +12,7 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
1 file changed, 4 insertions(+)

diff --git a/drivers/misc/cape/beaglebone/capemgr.c b/drivers/misc/cape/beaglebone/capemgr.c
index 9f8da94..255c491 100644
index a0e118c..371e9a9 100644
--- a/drivers/misc/cape/beaglebone/capemgr.c
+++ b/drivers/misc/cape/beaglebone/capemgr.c
@@ -568,6 +568,10 @@ static int bone_is_compatible_override(struct device_node *node,
Expand Down
4 changes: 2 additions & 2 deletions patches/capemgr/0007-capemgr-Added-module-param-descriptions.patch
View file
@@ -1,4 +1,4 @@
From c124c60e483ef9e5e687d549d5b33b0a7c83d18c Mon Sep 17 00:00:00 2001
From c2a2e7a1c204e71dde7f96c716f8ad7cedfba0f0 Mon Sep 17 00:00:00 2001
From: Matt Ranostay <mranostay@gmail.com>
Date: Tue, 19 Mar 2013 17:05:02 +0000
Subject: [PATCH 07/11] capemgr: Added module param descriptions
Expand All @@ -11,7 +11,7 @@ Signed-off-by: Matt Ranostay <mranostay@gmail.com>
1 file changed, 1 insertion(+)

diff --git a/drivers/misc/cape/beaglebone/capemgr.c b/drivers/misc/cape/beaglebone/capemgr.c
index 255c491..2ee7b11 100644
index 371e9a9..b22bf42 100644
--- a/drivers/misc/cape/beaglebone/capemgr.c
+++ b/drivers/misc/cape/beaglebone/capemgr.c
@@ -47,6 +47,7 @@
Expand Down
4 changes: 2 additions & 2 deletions patches/capemgr/0008-capemgr-Implement-disable-overrides-on-the-cmd-line.patch
View file
@@ -1,4 +1,4 @@
From 2c60428d1b0d039bfd014e084a425c86bf30c206 Mon Sep 17 00:00:00 2001
From 613376ebb53e7ea51ab351054630ff77cc43afd9 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Mon, 1 Apr 2013 18:20:35 +0300
Subject: [PATCH 08/11] capemgr: Implement disable overrides on the cmd line
Expand All @@ -11,7 +11,7 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
1 file changed, 88 insertions(+), 45 deletions(-)

diff --git a/drivers/misc/cape/beaglebone/capemgr.c b/drivers/misc/cape/beaglebone/capemgr.c
index 2ee7b11..5d87088 100644
index b22bf42..f1cedec 100644
--- a/drivers/misc/cape/beaglebone/capemgr.c
+++ b/drivers/misc/cape/beaglebone/capemgr.c
@@ -47,7 +47,14 @@
Expand Down
4 changes: 2 additions & 2 deletions patches/capemgr/0009-capemgr-Implement-cape-priorities.patch
View file
@@ -1,4 +1,4 @@
From d497f2276fc959dc1d4307fbd701c980bc9cbf28 Mon Sep 17 00:00:00 2001
From c0274eabb6752c698b06c879fbfa1008617a8bcd Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Mon, 22 Apr 2013 17:11:17 +0300
Subject: [PATCH 09/11] capemgr: Implement cape priorities
Expand All @@ -13,7 +13,7 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
1 file changed, 119 insertions(+), 20 deletions(-)

diff --git a/drivers/misc/cape/beaglebone/capemgr.c b/drivers/misc/cape/beaglebone/capemgr.c
index 5d87088..820852d 100644
index f1cedec..70c9db8 100644
--- a/drivers/misc/cape/beaglebone/capemgr.c
+++ b/drivers/misc/cape/beaglebone/capemgr.c
@@ -43,6 +43,7 @@
Expand Down
4 changes: 2 additions & 2 deletions patches/capemgr/0010-bone-capemgr-Introduce-simple-resource-tracking.patch
View file
@@ -1,4 +1,4 @@
From 29584d55c3f6fcf45274c480d45a1911c2fcf8a3 Mon Sep 17 00:00:00 2001
From 1ae5d9a1afb47abb0fdfa31361120cc40eb1205a Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Thu, 16 May 2013 18:11:19 +0300
Subject: [PATCH 10/11] bone: capemgr: Introduce simple resource tracking
Expand All @@ -11,7 +11,7 @@ Attempting to load a cape that uses the same resource will fail.
1 file changed, 125 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/cape/beaglebone/capemgr.c b/drivers/misc/cape/beaglebone/capemgr.c
index 820852d..2820e39 100644
index 70c9db8..5dd496b 100644
--- a/drivers/misc/cape/beaglebone/capemgr.c
+++ b/drivers/misc/cape/beaglebone/capemgr.c
@@ -1149,6 +1149,116 @@ static void bone_capemgr_info_sysfs_unregister(struct bone_capemgr_info *info)
Expand Down
4 changes: 2 additions & 2 deletions patches/capemgr/0011-capemgr-Add-enable_partno-parameter.patch
View file
@@ -1,4 +1,4 @@
From 5ace0d2cbdf1a0a9df85ef5755cdb3ba94ad3102 Mon Sep 17 00:00:00 2001
From edb6e397af9e394f0c116a7d355fe1bfc2102474 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Tue, 4 Jun 2013 19:42:45 +0300
Subject: [PATCH 11/11] capemgr: Add enable_partno parameter
Expand All @@ -12,7 +12,7 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
1 file changed, 66 insertions(+)

diff --git a/drivers/misc/cape/beaglebone/capemgr.c b/drivers/misc/cape/beaglebone/capemgr.c
index 2820e39..b1a8b65 100644
index 5dd496b..198624f 100644
--- a/drivers/misc/cape/beaglebone/capemgr.c
+++ b/drivers/misc/cape/beaglebone/capemgr.c
@@ -57,6 +57,13 @@ module_param(disable_partno, charp, 0444);
Expand Down
2 changes: 1 addition & 1 deletion patches/capes/0001-capemgr-firmware-makefiles-for-DT-objects.patch
View file
@@ -1,4 +1,4 @@
From 661b3e7e3d40714faa4cd8696c80e8fa536e858c Mon Sep 17 00:00:00 2001
From 7014d14ae58ef0195234b10cf96474ad208648da Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Fri, 28 Dec 2012 21:05:28 +0200
Subject: [PATCH 1/2] capemgr: firmware makefiles for DT objects
Expand Down
2 changes: 1 addition & 1 deletion patches/capes/0002-firmare-add-cape-definitions-from-3.8-based-tree.patch
View file
@@ -1,4 +1,4 @@
From fc92092fad3eb87bfb68e7377eb288436ed88c00 Mon Sep 17 00:00:00 2001
From d50645c27db6b736c3b5ad9d91884cc0192dad2b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Thu, 1 Aug 2013 12:49:10 +0200
Subject: [PATCH 2/2] firmare: add cape definitions from 3.8 based tree
Expand Down
2 changes: 1 addition & 1 deletion patches/dma-devel/0001-ARM-davinci-uart-move-to-devid-based-clk_get.patch
View file
@@ -1,4 +1,4 @@
From da41a8e42998c4bff8b19ee3d9fdfed6a5951c3f Mon Sep 17 00:00:00 2001
From 1a015b4cdf168b45bd03167a7d4005b135b5710a Mon Sep 17 00:00:00 2001
From: "Manjunathappa, Prakash" <prakash.pm@ti.com>
Date: Wed, 19 Jun 2013 14:45:38 +0530
Subject: [PATCH 01/13] ARM: davinci: uart: move to devid based clk_get
Expand Down
2 changes: 1 addition & 1 deletion patches/dma-devel/0002-dma-edma-add-device_slave_sg_limits-support.patch
View file
@@ -1,4 +1,4 @@
From 6077fbf31d4263222eb1815f1c4edf67e90a3434 Mon Sep 17 00:00:00 2001
From 5d7a64e3a539dcf1be9936918ea69e1e583093e4 Mon Sep 17 00:00:00 2001
From: Matt Porter <mporter@ti.com>
Date: Wed, 6 Mar 2013 19:56:06 +0000
Subject: [PATCH 02/13] dma: edma: add device_slave_sg_limits() support
Expand Down
4 changes: 2 additions & 2 deletions patches/dma-devel/0003-dmaengine-add-dma_get_slave_sg_limits.patch
View file
@@ -1,4 +1,4 @@
From c8ff7a795bf883c61b7d7f506b0bb7796db6cb01 Mon Sep 17 00:00:00 2001
From d9bb4c1ec32e997fec2b3eb81897572234d71997 Mon Sep 17 00:00:00 2001
From: Matt Porter <mporter@ti.com>
Date: Wed, 6 Mar 2013 19:56:05 +0000
Subject: [PATCH 03/13] dmaengine: add dma_get_slave_sg_limits()
Expand All @@ -19,7 +19,7 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
1 file changed, 39 insertions(+)

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index cb286b1..d71fe5d 100644
index cb286b1a..d71fe5d 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -370,6 +370,18 @@ struct dma_slave_config {
Expand Down
2 changes: 1 addition & 1 deletion patches/dma-devel/0004-mmc-omap_hsmmc-set-max_segs-based-on-dma-engine-limi.patch
View file
@@ -1,4 +1,4 @@
From e1e06db0fb0ae8cfc2b3dc9c08b3237a050e2789 Mon Sep 17 00:00:00 2001
From c23edffa83b9d659c13d82ead83a3aee40a6f439 Mon Sep 17 00:00:00 2001
From: Matt Porter <mporter@ti.com>
Date: Thu, 7 Mar 2013 04:16:38 +0000
Subject: [PATCH 04/13] mmc: omap_hsmmc: set max_segs based on dma engine
Expand Down
2 changes: 1 addition & 1 deletion patches/dma-devel/0005-da8xx-config-Enable-MMC-and-FS-options.patch
View file
@@ -1,4 +1,4 @@
From bb43e18a5c1626fadb8674b287224905358751be Mon Sep 17 00:00:00 2001
From 04de863dc45a18138f797e14d801a943cc8d7be5 Mon Sep 17 00:00:00 2001
From: Joel A Fernandes <agnel.joel@gmail.com>
Date: Thu, 20 Jun 2013 15:07:40 -0500
Subject: [PATCH 05/13] da8xx: config: Enable MMC and FS options
Expand Down
6 changes: 3 additions & 3 deletions patches/dma-devel/0006-ARM-dts-add-AM33XX-EDMA-support.patch
View file
@@ -1,4 +1,4 @@
From b9e4382015c702fbc1be1753074fce93a0965ac0 Mon Sep 17 00:00:00 2001
From 47a6202d476db221c75629ae4c5df30f74b037fa Mon Sep 17 00:00:00 2001
From: Matt Porter <mdp@ti.com>
Date: Mon, 27 May 2013 21:52:12 -0500
Subject: [PATCH 06/13] ARM: dts: add AM33XX EDMA support
Expand All @@ -17,10 +17,10 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
1 file changed, 12 insertions(+)

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 38b446b..784f774 100644
index f9c5da9..19a1c1d 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -96,6 +96,18 @@
@@ -100,6 +100,18 @@
reg = <0x48200000 0x1000>;
};

Expand Down
8 changes: 4 additions & 4 deletions patches/dma-devel/0007-ARM-dts-add-AM33XX-SPI-DMA-support.patch
View file
@@ -1,4 +1,4 @@
From 16649496dc8c4334ab72a0a5a407953e3dcf4c83 Mon Sep 17 00:00:00 2001
From 9439b631b30e20ab22c44f2d2f8306c4cebedb23 Mon Sep 17 00:00:00 2001
From: Matt Porter <mporter@ti.com>
Date: Thu, 10 Jan 2013 19:09:50 -0500
Subject: [PATCH 07/13] ARM: dts: add AM33XX SPI DMA support
Expand All @@ -12,10 +12,10 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
1 file changed, 10 insertions(+)

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 784f774..0fdb949 100644
index 19a1c1d..9ce85e5 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -331,6 +331,11 @@
@@ -335,6 +335,11 @@
interrupts = <65>;
ti,spi-num-cs = <2>;
ti,hwmods = "spi0";
Expand All @@ -27,7 +27,7 @@ index 784f774..0fdb949 100644
status = "disabled";
};

@@ -342,6 +347,11 @@
@@ -346,6 +351,11 @@
interrupts = <125>;
ti,spi-num-cs = <2>;
ti,hwmods = "spi1";
Expand Down
24 changes: 12 additions & 12 deletions patches/dma-devel/0008-ARM-dts-add-AM33XX-MMC-support.patch
View file
@@ -1,4 +1,4 @@
From 1aa00b457ea36f6eeb78b66be076e16a2d3fafe0 Mon Sep 17 00:00:00 2001
From a1f0a4f03147ef84be34c94c76fdd6887c40e9f9 Mon Sep 17 00:00:00 2001
From: Matt Porter <mporter@ti.com>
Date: Thu, 7 Mar 2013 04:16:39 +0000
Subject: [PATCH 08/13] ARM: dts: add AM33XX MMC support
Expand Down Expand Up @@ -72,10 +72,10 @@ index ed271fc..8c8908a 100644
+ dma-names = "tx", "rx";
};
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index 444b4ed..b8debea 100644
index d318987..71e6ce9 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -203,6 +203,8 @@
@@ -232,6 +232,8 @@
};

ldo3_reg: regulator@5 {
Expand All @@ -84,7 +84,7 @@ index 444b4ed..b8debea 100644
regulator-always-on;
};

@@ -234,3 +236,8 @@
@@ -263,3 +265,8 @@
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
};
Expand All @@ -94,10 +94,10 @@ index 444b4ed..b8debea 100644
+ vmmc-supply = <&ldo3_reg>;
+};
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 3aee1a4..44e69d9 100644
index e8ec875..bc4a69d 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -448,6 +448,8 @@
@@ -477,6 +477,8 @@
};

vmmc_reg: regulator@12 {
Expand All @@ -106,7 +106,7 @@ index 3aee1a4..44e69d9 100644
regulator-always-on;
};
};
@@ -488,3 +490,8 @@
@@ -517,3 +519,8 @@
ti,adc-channels = <4 5 6 7>;
};
};
Expand All @@ -116,10 +116,10 @@ index 3aee1a4..44e69d9 100644
+ vmmc-supply = <&vmmc_reg>;
+};
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 0c8ad17..4e355d6 100644
index 4f339fa..55fd194 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -376,6 +376,8 @@
@@ -393,6 +393,8 @@
};

vmmc_reg: regulator@12 {
Expand All @@ -128,7 +128,7 @@ index 0c8ad17..4e355d6 100644
regulator-always-on;
};
};
@@ -402,3 +404,8 @@
@@ -419,3 +421,8 @@
phy_id = <&davinci_mdio>, <1>;
phy-mode = "rgmii-txid";
};
Expand All @@ -138,10 +138,10 @@ index 0c8ad17..4e355d6 100644
+ vmmc-supply = <&vmmc_reg>;
+};
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 0fdb949..969c81b 100644
index 9ce85e5..0a82fca 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -236,6 +236,44 @@
@@ -240,6 +240,44 @@
status = "disabled";
};

Expand Down
2 changes: 1 addition & 1 deletion patches/dma-devel/0009-DMA-EDMA-Split-out-PaRAM-set-calculations-into-its-o.patch
View file
@@ -1,4 +1,4 @@
From 14c120151d8ae2e335dd8728c88d6cd1a52863c8 Mon Sep 17 00:00:00 2001
From b41811451e98a8550c888731f8c1db697af55cd4 Mon Sep 17 00:00:00 2001
From: Joel Fernandes <joelf@ti.com>
Date: Tue, 25 Jun 2013 09:35:33 -0500
Subject: [PATCH 09/13] DMA: EDMA: Split out PaRAM set calculations into its
Expand Down
2 changes: 1 addition & 1 deletion patches/dma-devel/0010-DMA-EDMA-Add-support-for-Cyclic-DMA.patch
View file
@@ -1,4 +1,4 @@
From caf38f4702a75c7ba13d5d80d902812c5faa8501 Mon Sep 17 00:00:00 2001
From 071bffe3b0fbb509ca921a2e3b905cd44a577205 Mon Sep 17 00:00:00 2001
From: Joel Fernandes <joelf@ti.com>
Date: Thu, 27 Jun 2013 20:18:52 -0500
Subject: [PATCH 10/13] DMA: EDMA: Add support for Cyclic DMA
Expand Down

0 comments on commit d6a4b99

Please sign in to comment.