sync with angstrom

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
cdsteinkuehler · Jul 29, 2013 · 0513c61 · 0513c61
1 parent e979197
commit 0513c61
Show file tree

Hide file tree

Showing 639 changed files with 2,508 additions and 1,808 deletions.
diff --git a/patch.sh b/patch.sh
@@ -119,12 +119,11 @@ am33x () {
 	${git} "${DIR}/patches/adc/0013-input-ti_am335x_tsc-return-IRQ_NONE-if-there-was-no-.patch"
 	${git} "${DIR}/patches/adc/0014-iio-ti_am335x_adc-Allow-to-specify-input-line.patch"
 	${git} "${DIR}/patches/adc/0015-iio-ti_am335x_adc-check-if-we-found-the-value.patch"
-	${git} "${DIR}/patches/adc/0016-MFD-ti_tscadc-disable-TSC-control.patch"
+	${git} "${DIR}/patches/adc/0016-MFD-ti_tscadc-disable-TSC-control-register-bits-when.patch"
 	${git} "${DIR}/patches/adc/0017-IIO-ADC-ti_adc-Fix-1st-sample-read.patch"
 	${git} "${DIR}/patches/adc/0018-input-ti_tsc-Enable-shared-IRQ-TSC.patch"
-	${git} "${DIR}/patches/adc/0019-Revert.-Backport-IIO.patch"
-	${git} "${DIR}/patches/adc/0020-iio-ti_am335x_adc-Added-iio_voltageX_scale.patch"
-	${git} "${DIR}/patches/adc/0021-iio-ti_am335x_adc-Add-the-in-kernel-IIO-map-interfac.patch"
+	${git} "${DIR}/patches/adc/0019-iio-ti_am335x_adc-Add-continuous-sampling-and-trigge.patch"
+	${git} "${DIR}/patches/adc/0020-iio-ti_am335x_adc-Add-IIO-map-interface.patch"
 
 	echo "dir: i2c"
 	${git} "${DIR}/patches/i2c/0001-pinctrl-pinctrl-single-must-be-initialized-early.patch"
@@ -279,6 +278,7 @@ arm () {
 
 omap () {
 	echo "dir: omap"
+
 	#Fixes 800Mhz boot lockup: http://www.spinics.net/lists/linux-omap/msg83737.html
 	${git} "${DIR}/patches/omap/0001-regulator-core-if-voltage-scaling-fails-restore-orig.patch"
 	${git} "${DIR}/patches/omap/0002-omap2-twl-common-Add-default-power-configuration.patch"
@@ -571,7 +571,7 @@ am33x_after () {
 	echo "dir: PG2"
 	${git} "${DIR}/patches/PG2/0001-beaglebone-black-1ghz-hack.patch"
 
-	echo "dir: hacks"
+	echo "dir: reboot"
 	${git} "${DIR}/patches/reboot/0001-ARM-AM33xx-Add-SoC-specific-restart-hook.patch"
 
 	echo "dir: iio"
@@ -777,6 +777,8 @@ am33x_after () {
 	${git} "${DIR}/patches/resources/0019-bone-add-PPS-to-BB-BONE-RTC-cape.patch"
 	${git} "${DIR}/patches/resources/0020-firmware-remove-rule-for-cape-bone-adafruit-lcd-00A0.patch"
 	${git} "${DIR}/patches/resources/0021-hwmon-add-driver-for-the-AM335x-bandgap-temperature-.patch"
+	${git} "${DIR}/patches/resources/0022-fw-Make-firmware-timeout-loading-value-configurable.patch"
+	${git} "${DIR}/patches/resources/0023-capemgr-Retry-loading-when-failure-to-find-firmware.patch"
 
 	echo "dir: pmic"
 	${git} "${DIR}/patches/pmic/0001-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch"

diff --git a/patches/6lowpan/0001-6lowpan-Refactor-packet-delivery-into-a-function.patch b/patches/6lowpan/0001-6lowpan-Refactor-packet-delivery-into-a-function.patch
@@ -1,4 +1,4 @@
-From 7f1a51fffd6885e19678204fbc52c8879ccf85ce Mon Sep 17 00:00:00 2001
+From ad13a094dab6342fd89a4ba50fc939698ab8d63d Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Wed, 16 Jan 2013 19:09:47 +0000
 Subject: [PATCH 01/23] 6lowpan: Refactor packet delivery into a function
@@ -9,7 +9,7 @@ function.
 Signed-off-by: Alan Ott <alan@signal11.us>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
- net/ieee802154/6lowpan.c | 38 ++++++++++++++++++++++++--------------
+ net/ieee802154/6lowpan.c |   38 ++++++++++++++++++++++++--------------
  1 file changed, 24 insertions(+), 14 deletions(-)
 
 diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
@@ -72,5 +72,5 @@ index 76c3d0a..9d39f5b 100644
  	kfree_skb(new);
 
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0002-6lowpan-Handle-uncompressed-IPv6-packets-over-6LoWPA.patch b/patches/6lowpan/0002-6lowpan-Handle-uncompressed-IPv6-packets-over-6LoWPA.patch
@@ -1,4 +1,4 @@
-From 86021942d4947445234042c7f7898e51f7774bfd Mon Sep 17 00:00:00 2001
+From 81fa9936f533635e0385ea356ed4f79a8bfa0470 Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Wed, 16 Jan 2013 19:09:48 +0000
 Subject: [PATCH 02/23] 6lowpan: Handle uncompressed IPv6 packets over 6LoWPAN
@@ -8,7 +8,7 @@ Handle the reception of uncompressed packets (dispatch type = IPv6).
 Signed-off-by: Alan Ott <alan@signal11.us>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
- net/ieee802154/6lowpan.c | 41 ++++++++++++++++++++++++++++++++---------
+ net/ieee802154/6lowpan.c |   41 ++++++++++++++++++++++++++++++++---------
  1 file changed, 32 insertions(+), 9 deletions(-)
 
 diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
@@ -68,5 +68,5 @@ index 9d39f5b..f62c3b9 100644
 
  	return NET_RX_SUCCESS;
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0003-wpan-whitespace-fix.patch b/patches/6lowpan/0003-wpan-whitespace-fix.patch
@@ -1,12 +1,12 @@
-From d52187124e3f7f4018f8eb01c1dbfe6f38fabaab Mon Sep 17 00:00:00 2001
+From 71d4c4dc93ada2cf15a904754238e5d5956adfa0 Mon Sep 17 00:00:00 2001
 From: Alexander Aring <alex.aring@gmail.com>
 Date: Tue, 5 Feb 2013 04:25:35 +0000
 Subject: [PATCH 03/23] wpan: whitespace fix
 
 Signed-off-by: Alexander Aring <alex.aring@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
- net/mac802154/wpan.c | 2 +-
+ net/mac802154/wpan.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
@@ -23,5 +23,5 @@ index 199b922..98c867b 100644
  	return 0;
  }
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0004-6lowpan-use-stack-buffer-instead-of-heap.patch b/patches/6lowpan/0004-6lowpan-use-stack-buffer-instead-of-heap.patch
@@ -1,4 +1,4 @@
-From 1b0d0179a2c58fdbf62517d99130c384dd349c1c Mon Sep 17 00:00:00 2001
+From 3a228d9c03dd5485a595e9b7a389a476e320e339 Mon Sep 17 00:00:00 2001
 From: Alexander Aring <alex.aring@gmail.com>
 Date: Tue, 5 Feb 2013 10:23:43 +0000
 Subject: [PATCH 04/23] 6lowpan: use stack buffer instead of heap
@@ -11,7 +11,7 @@ Also fixed a comment codestyle issue.
 Signed-off-by: Alexander Aring <alex.aring@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
- net/ieee802154/6lowpan.c | 13 ++++---------
+ net/ieee802154/6lowpan.c |   13 ++++---------
  1 file changed, 4 insertions(+), 9 deletions(-)
 
 diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
@@ -50,5 +50,5 @@ index f62c3b9..43b95ca 100644
  				skb->len);
 
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0005-wpan-use-stack-buffer-instead-of-heap.patch b/patches/6lowpan/0005-wpan-use-stack-buffer-instead-of-heap.patch
@@ -1,4 +1,4 @@
-From 371fc26f385abf27a0faf2e1f7b2323373d6d262 Mon Sep 17 00:00:00 2001
+From 8105eff067b3ca880dcf94148d6be8eb13e86b6e Mon Sep 17 00:00:00 2001
 From: Alexander Aring <alex.aring@gmail.com>
 Date: Tue, 5 Feb 2013 10:23:44 +0000
 Subject: [PATCH 05/23] wpan: use stack buffer instead of heap
@@ -9,7 +9,7 @@ So it's not necessary to put it on the heap.
 Signed-off-by: Alexander Aring <alex.aring@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
- net/mac802154/wpan.c | 7 +------
+ net/mac802154/wpan.c |    7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
@@ -43,5 +43,5 @@ index 98c867b..d20c6d3 100644
  	return pos;
  }
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0006-mrf24j40-pinctrl-support.patch b/patches/6lowpan/0006-mrf24j40-pinctrl-support.patch
@@ -1,4 +1,4 @@
-From 9f5aadb619a827d703af848ed4b7196b0944df7a Mon Sep 17 00:00:00 2001
+From da0cc066435a893d263d87366cdc93a468508db3 Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Mon, 18 Mar 2013 00:39:48 -0400
 Subject: [PATCH 06/23] mrf24j40: pinctrl support
@@ -7,7 +7,7 @@ Activate pinctrl settings when used with a DT system.
 
 Signed-off-by: Alan Ott <alan@signal11.us>
 ---
- drivers/net/ieee802154/mrf24j40.c | 7 +++++++
+ drivers/net/ieee802154/mrf24j40.c |    7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
@@ -43,5 +43,5 @@ index 3f2c7aa..3106895 100644
  	if (spi->max_speed_hz > MAX_SPI_SPEED_HZ)
  		spi->max_speed_hz = MAX_SPI_SPEED_HZ;
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0007-mrf24j40-Warn-if-transmit-interrupts-timeout.patch b/patches/6lowpan/0007-mrf24j40-Warn-if-transmit-interrupts-timeout.patch
@@ -1,4 +1,4 @@
-From da27babaf33d1cf2ca622bcb658bc8bd1bce7c69 Mon Sep 17 00:00:00 2001
+From e715628aaa21947605a5c5b853b792454b1e051a Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Mon, 18 Mar 2013 00:49:02 -0400
 Subject: [PATCH 07/23] mrf24j40: Warn if transmit interrupts timeout
@@ -7,7 +7,7 @@ Issue a warning if a transmit complete interrupt doesn't happen in time.
 
 Signed-off-by: Alan Ott <alan@signal11.us>
 ---
- drivers/net/ieee802154/mrf24j40.c | 1 +
+ drivers/net/ieee802154/mrf24j40.c |    1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
@@ -23,5 +23,5 @@ index 3106895..bb7e613 100644
  	}
 
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0008-mrf24j40-Increase-max-SPI-speed-to-10MHz.patch b/patches/6lowpan/0008-mrf24j40-Increase-max-SPI-speed-to-10MHz.patch
@@ -1,4 +1,4 @@
-From 4578208258a6e0c4f55d60375712b40cc7d8bf66 Mon Sep 17 00:00:00 2001
+From e2bf8f31bb8f6bfae74c480f289926fffe30ab79 Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Mon, 18 Mar 2013 01:17:05 -0400
 Subject: [PATCH 08/23] mrf24j40: Increase max SPI speed to 10MHz
@@ -8,7 +8,7 @@ for SCK at 10MHz.
 
 Signed-off-by: Alan Ott <alan@signal11.us>
 ---
- drivers/net/ieee802154/mrf24j40.c | 5 ++---
+ drivers/net/ieee802154/mrf24j40.c |    5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
@@ -28,5 +28,5 @@ index bb7e613..f6e723e 100644
  #define printdev(X) (&X->spi->dev)
 
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0009-mrf24j40-Fix-byte-order-of-IEEE-address.patch b/patches/6lowpan/0009-mrf24j40-Fix-byte-order-of-IEEE-address.patch
@@ -1,4 +1,4 @@
-From 168818700acba74d3b05a845ae91bed8cab0f78f Mon Sep 17 00:00:00 2001
+From 46c3e45c4d6fbb8ce1f7398edfc5b05f96a37a65 Mon Sep 17 00:00:00 2001
 From: Alan Ott <alan@signal11.us>
 Date: Mon, 18 Mar 2013 01:26:01 -0400
 Subject: [PATCH 09/23] mrf24j40: Fix byte-order of IEEE address
@@ -8,7 +8,7 @@ byte order.
 
 Signed-off-by: Alan Ott <alan@signal11.us>
 ---
- drivers/net/ieee802154/mrf24j40.c | 2 +-
+ drivers/net/ieee802154/mrf24j40.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
@@ -25,5 +25,5 @@ index f6e723e..6481faf 100644
  #ifdef DEBUG
  		printk(KERN_DEBUG "Set long addr to: ");
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0010-6lowpan-lowpan_is_iid_16_bit_compressable-does-not-d.patch b/patches/6lowpan/0010-6lowpan-lowpan_is_iid_16_bit_compressable-does-not-d.patch
@@ -1,4 +1,4 @@
-From c91402a0d175742abc917fe99ab77d9aa9884683 Mon Sep 17 00:00:00 2001
+From 052cf0a60e4cd830e95027a949882c5828a9c5a0 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:21 -0400
 Subject: [PATCH 10/23] 6lowpan: lowpan_is_iid_16_bit_compressable() does not
@@ -9,7 +9,7 @@ and fixed in Contiki. This patch is basically a port of their fix.
 
 Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
 ---
- net/ieee802154/6lowpan.h | 7 ++++---
+ net/ieee802154/6lowpan.h |    7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/net/ieee802154/6lowpan.h b/net/ieee802154/6lowpan.h
@@ -31,5 +31,5 @@ index bba5f83..4b8f917 100644
  /* multicast address */
  #define is_addr_mcast(a) (((a)->s6_addr[0]) == 0xFF)
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0011-6lowpan-next-header-is-not-properly-set-upon-decompr.patch b/patches/6lowpan/0011-6lowpan-next-header-is-not-properly-set-upon-decompr.patch
@@ -1,4 +1,4 @@
-From 59be413a2f9978a3ad2151306fc3aa990a97264a Mon Sep 17 00:00:00 2001
+From 45a4a516404a5a6cc853f75db43255467993dee9 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:22 -0400
 Subject: [PATCH 11/23] 6lowpan: next header is not properly set upon
@@ -8,7 +8,7 @@ This causes a drop of the UDP packet.
 
 Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
 ---
- net/ieee802154/6lowpan.c | 4 +++-
+ net/ieee802154/6lowpan.c |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
@@ -29,5 +29,5 @@ index 43b95ca..9f53904 100644
  	/* Not fragmented package */
  	hdr.payload_len = htons(skb->len);
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0012-6lowpan-always-enable-link-layer-acknowledgments.patch b/patches/6lowpan/0012-6lowpan-always-enable-link-layer-acknowledgments.patch
@@ -1,4 +1,4 @@
-From 9c66c9424a5e7867c741ba3d6db417762bd996ed Mon Sep 17 00:00:00 2001
+From a7cac194490f2ab41af4eceaf6c36c3087148f8a Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:23 -0400
 Subject: [PATCH 12/23] 6lowpan: always enable link-layer acknowledgments
@@ -11,7 +11,7 @@ acknowledgments even if this is set.
 
 Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
 ---
- net/ieee802154/6lowpan.c | 4 ++++
+ net/ieee802154/6lowpan.c |    4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
@@ -30,5 +30,5 @@ index 9f53904..e7f61de 100644
  				type, (void *)&da, (void *)&sa, skb->len);
  	}
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0013-mac802154-turn-on-ACK-when-enabled-by-the-upper-laye.patch b/patches/6lowpan/0013-mac802154-turn-on-ACK-when-enabled-by-the-upper-laye.patch
@@ -1,11 +1,12 @@
-From 5ae67779a6023a024f7108b9489d9e8d040a30e3 Mon Sep 17 00:00:00 2001
+From 5e0a3705115a1c62a1be2d663bf9de3d29c11bbb Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:24 -0400
-Subject: [PATCH 13/23] mac802154: turn on ACK when enabled by the upper layers
+Subject: [PATCH 13/23] mac802154: turn on ACK when enabled by the upper
+ layers
 
 Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
 ---
- net/mac802154/wpan.c | 2 ++
+ net/mac802154/wpan.c |    2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
@@ -22,5 +23,5 @@ index d20c6d3..7d3f659 100644
  	if (!saddr) {
  		spin_lock_bh(&priv->mib_lock);
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0014-6lowpan-use-short-IEEE-802.15.4-addresses-for-broadc.patch b/patches/6lowpan/0014-6lowpan-use-short-IEEE-802.15.4-addresses-for-broadc.patch
@@ -1,4 +1,4 @@
-From 46df33d2b4da28af3920fe34f1bf437fe43bbc5d Mon Sep 17 00:00:00 2001
+From 8299397506589dbaf79b2374061777b6f018ea6c Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:25 -0400
 Subject: [PATCH 14/23] 6lowpan: use short IEEE 802.15.4 addresses for
@@ -9,7 +9,7 @@ broadcasting.
 
 Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
 ---
- net/ieee802154/6lowpan.c | 23 +++++++++++++++--------
+ net/ieee802154/6lowpan.c |   23 +++++++++++++++--------
  1 file changed, 15 insertions(+), 8 deletions(-)
 
 diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
@@ -54,5 +54,5 @@ index e7f61de..0eebb96 100644
  		return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev,
  				type, (void *)&da, (void *)&sa, skb->len);
 -- 
-1.8.1.4
+1.7.10.4
 
diff --git a/patches/6lowpan/0015-6lowpan-fix-first-fragment-FRAG1-handling.patch b/patches/6lowpan/0015-6lowpan-fix-first-fragment-FRAG1-handling.patch
@@ -1,4 +1,4 @@
-From 5f4dd208c9f5ce553e539242006d393993020596 Mon Sep 17 00:00:00 2001
+From 1b60dec35b671c2362e4a5d418bf8a6779180d37 Mon Sep 17 00:00:00 2001
 From: Tony Cheneau <tony.cheneau@amnesiak.org>
 Date: Mon, 25 Mar 2013 23:59:26 -0400
 Subject: [PATCH 15/23] 6lowpan: fix first fragment (FRAG1) handling
@@ -19,11 +19,11 @@ not properly initialized.
 
 Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
 ---
- net/ieee802154/6lowpan.c | 36 +++++++++++++++++++++++-------------
+ net/ieee802154/6lowpan.c |   36 +++++++++++++++++++++++-------------
  1 file changed, 23 insertions(+), 13 deletions(-)
 
 diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
-index 0eebb96..4a622896 100644
+index 0eebb96..4a62289 100644
 --- a/net/ieee802154/6lowpan.c
 +++ b/net/ieee802154/6lowpan.c
 @@ -661,7 +661,7 @@ static void lowpan_fragment_timer_expired(unsigned long entry_addr)
@@ -119,5 +119,5 @@ index 0eebb96..4a622896 100644
  }
 
 -- 
-1.8.1.4
+1.7.10.4