Skip to content

Commit

Permalink
ADC fixes. Backport mfd-next , Forward port arago
Browse files Browse the repository at this point in the history
This commit does a ton of things. Mostly documented in a blog
post. But I'll try and summarize
Removed existing patches for ADC.
Took 21 patches from mfd-next and downported them.
Downported IIO changes from 3.8 to 3.11
Forward ported some improvements from Arago tree. 3.2

Added IIO Scale voltage myself of which I'm kinda proud of :)
My first real patch. The others are mostly tweaks.

Things to note are.
ADC channels in DT are numbered 0 1 2 3 4 5 6 7. Not a simple 8/4.
bone-iio-helper won't work.
  • Loading branch information
ZubairLK committed Jun 29, 2013
1 parent b379285 commit 30dca92
Show file tree
Hide file tree
Showing 638 changed files with 5,110 additions and 3,877 deletions.
@@ -1,4 +1,4 @@
From 7f1a51fffd6885e19678204fbc52c8879ccf85ce Mon Sep 17 00:00:00 2001
From 830e8527399dbb11bf1df4862f741618b1a3c44b 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
Expand All @@ -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
Expand Down Expand Up @@ -72,5 +72,5 @@ index 76c3d0a..9d39f5b 100644
kfree_skb(new);

--
1.8.1.4
1.7.9.5

@@ -1,4 +1,4 @@
From 86021942d4947445234042c7f7898e51f7774bfd Mon Sep 17 00:00:00 2001
From a84b85b660975ea80f3379fcc38b69983740fecb 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
Expand All @@ -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
Expand Down Expand Up @@ -68,5 +68,5 @@ index 9d39f5b..f62c3b9 100644

return NET_RX_SUCCESS;
--
1.8.1.4
1.7.9.5

6 changes: 3 additions & 3 deletions patches/6lowpan/0003-wpan-whitespace-fix.patch
@@ -1,12 +1,12 @@
From d52187124e3f7f4018f8eb01c1dbfe6f38fabaab Mon Sep 17 00:00:00 2001
From f587a0e8db5ab11816ce3b7c5dbd1c1a0bc4ba3f 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
Expand All @@ -23,5 +23,5 @@ index 199b922..98c867b 100644
return 0;
}
--
1.8.1.4
1.7.9.5

@@ -1,4 +1,4 @@
From 1b0d0179a2c58fdbf62517d99130c384dd349c1c Mon Sep 17 00:00:00 2001
From d1974e74804d32f2d107e367eb336321326419d7 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
Expand All @@ -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
Expand Down Expand Up @@ -50,5 +50,5 @@ index f62c3b9..43b95ca 100644
skb->len);

--
1.8.1.4
1.7.9.5

@@ -1,4 +1,4 @@
From 371fc26f385abf27a0faf2e1f7b2323373d6d262 Mon Sep 17 00:00:00 2001
From c6aed47f6497ca911cf91dabb7036b46471477e8 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
Expand All @@ -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
Expand Down Expand Up @@ -43,5 +43,5 @@ index 98c867b..d20c6d3 100644
return pos;
}
--
1.8.1.4
1.7.9.5

6 changes: 3 additions & 3 deletions patches/6lowpan/0006-mrf24j40-pinctrl-support.patch
@@ -1,4 +1,4 @@
From 9f5aadb619a827d703af848ed4b7196b0944df7a Mon Sep 17 00:00:00 2001
From 6e9fdf9d6b9564e9e313d9605400675a2a228c86 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
Expand All @@ -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
Expand Down Expand Up @@ -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.9.5

@@ -1,4 +1,4 @@
From da27babaf33d1cf2ca622bcb658bc8bd1bce7c69 Mon Sep 17 00:00:00 2001
From 87958c66f99fc55fd777db5ca97da90e3473ce25 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
Expand All @@ -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
Expand All @@ -23,5 +23,5 @@ index 3106895..bb7e613 100644
}

--
1.8.1.4
1.7.9.5

@@ -1,4 +1,4 @@
From 4578208258a6e0c4f55d60375712b40cc7d8bf66 Mon Sep 17 00:00:00 2001
From e60a69a7acbec439c4adb7367c0b5dc999f6689a 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
Expand All @@ -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
Expand All @@ -28,5 +28,5 @@ index bb7e613..f6e723e 100644
#define printdev(X) (&X->spi->dev)

--
1.8.1.4
1.7.9.5

@@ -1,4 +1,4 @@
From 168818700acba74d3b05a845ae91bed8cab0f78f Mon Sep 17 00:00:00 2001
From 968f7ca458efe46ac9eb8f04d706c54c14027adc 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
Expand All @@ -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
Expand All @@ -25,5 +25,5 @@ index f6e723e..6481faf 100644
#ifdef DEBUG
printk(KERN_DEBUG "Set long addr to: ");
--
1.8.1.4
1.7.9.5

@@ -1,4 +1,4 @@
From c91402a0d175742abc917fe99ab77d9aa9884683 Mon Sep 17 00:00:00 2001
From a7ceb817638cb492b14025eec6bd88fdc4d5cbe7 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
Expand All @@ -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
Expand All @@ -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.9.5

@@ -1,4 +1,4 @@
From 59be413a2f9978a3ad2151306fc3aa990a97264a Mon Sep 17 00:00:00 2001
From 1447fc2614e05e191429edba841ef9a8b307f21a 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
Expand All @@ -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
Expand All @@ -29,5 +29,5 @@ index 43b95ca..9f53904 100644
/* Not fragmented package */
hdr.payload_len = htons(skb->len);
--
1.8.1.4
1.7.9.5

@@ -1,4 +1,4 @@
From 9c66c9424a5e7867c741ba3d6db417762bd996ed Mon Sep 17 00:00:00 2001
From 55bd0a06c1232a9666bd18f80a0f26890a1b9de6 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
Expand All @@ -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
Expand All @@ -30,5 +30,5 @@ index 9f53904..e7f61de 100644
type, (void *)&da, (void *)&sa, skb->len);
}
--
1.8.1.4
1.7.9.5

@@ -1,11 +1,12 @@
From 5ae67779a6023a024f7108b9489d9e8d040a30e3 Mon Sep 17 00:00:00 2001
From c3d94f8e4e52d3dca16cc6508ed3463269c441c3 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
Expand All @@ -22,5 +23,5 @@ index d20c6d3..7d3f659 100644
if (!saddr) {
spin_lock_bh(&priv->mib_lock);
--
1.8.1.4
1.7.9.5

@@ -1,4 +1,4 @@
From 46df33d2b4da28af3920fe34f1bf437fe43bbc5d Mon Sep 17 00:00:00 2001
From f5f743f5fb6b6cd2c4d4f43d1d47f5982ca93595 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
Expand All @@ -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
Expand Down Expand Up @@ -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.9.5

@@ -1,4 +1,4 @@
From 5f4dd208c9f5ce553e539242006d393993020596 Mon Sep 17 00:00:00 2001
From a4ed4b8b71744485e2e5ee65461054e3d7474ab4 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
Expand All @@ -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)
Expand Down Expand Up @@ -119,5 +119,5 @@ index 0eebb96..4a622896 100644
}

--
1.8.1.4
1.7.9.5

@@ -1,4 +1,4 @@
From 7759cb8839a8085d8c8fb756cc1aac011bdc85ea Mon Sep 17 00:00:00 2001
From a83a97940c3201471b4e8bf4445038263fbb1976 Mon Sep 17 00:00:00 2001
From: Tony Cheneau <tony.cheneau@amnesiak.org>
Date: Mon, 25 Mar 2013 23:59:27 -0400
Subject: [PATCH 16/23] 6lowpan: add debug messages for 6LoWPAN fragmentation
Expand All @@ -8,11 +8,11 @@ reassembly.

Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
---
net/ieee802154/6lowpan.c | 25 +++++++++++++++++++++----
net/ieee802154/6lowpan.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index 4a622896..61eee9d 100644
index 4a62289..61eee9d 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -742,10 +742,16 @@ lowpan_process_data(struct sk_buff *skb)
Expand Down Expand Up @@ -80,5 +80,5 @@ index 4a622896..61eee9d 100644
offset += len;
}
--
1.8.1.4
1.7.9.5

@@ -1,12 +1,12 @@
From abc8426123c3318ffe236dae466f1a9ca912b0ec Mon Sep 17 00:00:00 2001
From fa1e23265f99e2df45373b34276a6033398a7bba Mon Sep 17 00:00:00 2001
From: Tony Cheneau <tony.cheneau@amnesiak.org>
Date: Mon, 25 Mar 2013 23:59:28 -0400
Subject: [PATCH 17/23] 6lowpan: store fragment tag values per device instead
of net stack wide

Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
---
net/ieee802154/6lowpan.c | 9 +++++----
net/ieee802154/6lowpan.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
Expand Down Expand Up @@ -64,5 +64,5 @@ index 61eee9d..f952451 100644

entry = kzalloc(sizeof(struct lowpan_dev_record), GFP_KERNEL);
--
1.8.1.4
1.7.9.5

0 comments on commit 30dca92

Please sign in to comment.