archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-28 22:57:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs

Browse source
This commit is contained in:
Kevin Mihelich 2013-05-09 12:29:54 +00:00
commit 1e9db572cc
12 changed files with 632 additions and 301 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
core/linux-kirkwood/0001-block-bfq-attempt-to-fix-use-after-free-which-3.3.0-to-3.8.0.patch Normal file → Executable file
View file

55
core/linux-kirkwood/0001-block-bfq-use-the-uninitialized_var-macro-when-neede.patch Executable file
View file

@ -0,0 +1,55 @@
From cb439ee574d4496ca0d14566e7c4bbf4fe20cbf4 Mon Sep 17 00:00:00 2001
From: Arianna Avanzini <avanzini.arianna@gmail.com>
Date: Fri, 3 May 2013 20:45:49 +0200
Subject: [PATCH] block, bfq: use the uninitialized_var() macro when needed
It may happen that a variable is initialized in a function that is
called by the function that defined it. Use the uninitialized_var()
macro in these cases.
---
block/bfq-iosched.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index c9d57b0..b94aa24 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -3023,7 +3023,7 @@ static ssize_t \
__FUNC(struct elevator_queue *e, const char *page, size_t count) \
{ \
struct bfq_data *bfqd = e->elevator_data; \
- unsigned long __data; \
+ unsigned long uninitialized_var(__data); \
int ret = bfq_var_store(&__data, (page), count); \
if (__data < (MIN)) \
__data = (MIN); \
@@ -3083,7 +3083,7 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e,
const char *page, size_t count)
{
struct bfq_data *bfqd = e->elevator_data;
- unsigned long __data;
+ unsigned long uninitialized_var(__data);
int ret = bfq_var_store(&__data, (page), count);
if (__data == 0)
@@ -3103,7 +3103,7 @@ static ssize_t bfq_timeout_sync_store(struct elevator_queue *e,
const char *page, size_t count)
{
struct bfq_data *bfqd = e->elevator_data;
- unsigned long __data;
+ unsigned long uninitialized_var(__data);
int ret = bfq_var_store(&__data, (page), count);
if (__data < 1)
@@ -3122,7 +3122,7 @@ static ssize_t bfq_low_latency_store(struct elevator_queue *e,
const char *page, size_t count)
{
struct bfq_data *bfqd = e->elevator_data;
- unsigned long __data;
+ unsigned long uninitialized_var(__data);
int ret = bfq_var_store(&__data, (page), count);
if (__data > 1)
--
1.8.1.4

26
core/linux-kirkwood/0001-block-cgroups-kconfig-build-bits-for-BFQ-v6-3.8.patch → core/linux-kirkwood/0001-block-cgroups-kconfig-build-bits-for-BFQ-v6-3.9.patch Normal file → Executable file
View file

@ -1,31 +1,27 @@
From 59fd22f37d9acfa07186a02bb1cd2d64785d82b1 Mon Sep 17 00:00:00 2001
From: Arianna Avanzini <avanzini.arianna@gmail.com>
Date: Sat, 4 Feb 2012 10:55:51 +0100
Subject: [PATCH 1/2] block: cgroups, kconfig, build bits for BFQ-v6-3.8
From bfbdf60074337d435f84bb3947c7ed4738405945 Mon Sep 17 00:00:00 2001
From: ponce <matteo.bernardini@gmail.com>
Date: Sat, 4 May 2013 08:44:53 +0200
Subject: [PATCH 1/2] block: cgroups, kconfig, build bits for BFQ-v6-3.9
Update Kconfig.iosched and do the related Makefile changes to include
kernel configuration options for BFQ. Also add the bfqio controller
to the cgroups subsystem.
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
---
block/Kconfig.iosched | 26 ++++++++++++++++++++++++++
block/Kconfig.iosched | 25 +++++++++++++++++++++++++
block/Makefile | 1 +
include/linux/cgroup_subsys.h | 6 ++++++
3 files changed, 33 insertions(+)
3 files changed, 32 insertions(+)
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index 421bef9..56474b2 100644
index 421bef9..695e064 100644
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -39,6 +39,28 @@ config CFQ_GROUP_IOSCHED
@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
---help---
Enable group IO scheduling in CFQ.
+config IOSCHED_BFQ
+ tristate "BFQ I/O scheduler"
+ depends on EXPERIMENTAL
+ default n
+ ---help---
+ The BFQ I/O scheduler tries to distribute bandwidth among
@ -48,7 +44,7 @@ index 421bef9..56474b2 100644
choice
prompt "Default I/O scheduler"
default DEFAULT_CFQ
@@ -52,6 +74,9 @@ choice
@@ -52,6 +73,9 @@ choice
config DEFAULT_CFQ
bool "CFQ" if IOSCHED_CFQ=y
@ -58,7 +54,7 @@ index 421bef9..56474b2 100644
config DEFAULT_NOOP
bool "No-op"
@@ -61,6 +86,7 @@ config DEFAULT_IOSCHED
@@ -61,6 +85,7 @@ config DEFAULT_IOSCHED
string
default "deadline" if DEFAULT_DEADLINE
default "cfq" if DEFAULT_CFQ
@ -93,5 +89,5 @@ index f204a7a..b999bfa 100644
+
+/* */
--
1.8.1.2
1.8.2

94
core/linux-kirkwood/0002-block-introduce-the-BFQ-v6-I-O-sched-for-3.8.patch → core/linux-kirkwood/0002-block-introduce-the-BFQ-v6-I-O-sched-for-3.9.patch Normal file → Executable file
View file

@ -1,26 +1,28 @@
From d2ba3dc4196b2b1579f6ccbb64880e662684b8ba Mon Sep 17 00:00:00 2001
From: Arianna Avanzini <avanzini.arianna@gmail.com>
Date: Sun, 5 Feb 2012 01:04:27 +0100
Subject: [PATCH 2/2] block: introduce the BFQ-v6 I/O sched for 3.8
From a02b3c46da38110f8f95a22d2a769569ce3fb65e Mon Sep 17 00:00:00 2001
From: ponce <matteo.bernardini@gmail.com>
Date: Sat, 4 May 2013 08:49:43 +0200
Subject: [PATCH 2/2] block: introduce the BFQ-v6 I/O sched for 3.9
Add the BFQ-v6 I/O scheduler to 3.8.
The general structure is borrowed from CFQ, as much code. A (bfq_)queue is
associated to each task doing I/O on a device, and each time a scheduling
decision has to be made a queue is selected and served until it expires.
Add the BFQ-v6 I/O scheduler to 3.9.
The general structure is borrowed from CFQ, as much code. A (bfq_)queue
is associated to each task doing I/O on a device, and each time a
scheduling decision has to be made a queue is selected and served until
it expires.
- Slices are given in the service domain: tasks are assigned budgets,
measured in number of sectors. Once got the disk, a task must
however consume its assigned budget within a configurable maximum time
(by default, the maximum possible value of the budgets is automatically
computed to comply with this timeout). This allows the desired latency
vs "throughput boosting" tradeoff to be set.
- Slices are given in the service domain: tasks are assigned
budgets, measured in number of sectors. Once got the disk, a task
must however consume its assigned budget within a configurable
maximum time (by default, the maximum possible value of the
budgets is automatically computed to comply with this timeout).
This allows the desired latency vs "throughput boosting" tradeoff
to be set.
- Budgets are scheduled according to a variant of WF2Q+, implemented
using an augmented rb-tree to take eligibility into account while
preserving an O(log N) overall complexity.
- A low-latency tunable is provided; if enabled, both interactive and soft
real-time applications are guaranteed very low latency.
- A low-latency tunable is provided; if enabled, both interactive
and soft real-time applications are guaranteed very low latency.
- Latency guarantees are preserved also in presence of NCQ.
@ -29,38 +31,37 @@ decision has to be made a queue is selected and served until it expires.
- A useful feature borrowed from CFQ: static fallback queue for OOM.
- Differently from CFQ, BFQ uses a unified mechanism (Early Queue Merge,
EQM) to get a sequential read pattern, and hence a high throughput,
with any set of processes performing interleaved I/O. EQM also
preserves low latency. The code for detecting whether two queues have
to be merged is a slightly modified version of the CFQ code for
detecting whether two queues belong to cooperating processes and whether
the service of a queue should be preempted to boost the throughput.
- Differently from CFQ, BFQ uses a unified mechanism (Early Queue
Merge, EQM) to get a sequential read pattern, and hence a high
throughput, with any set of processes performing interleaved I/O.
EQM also preserves low latency. The code for detecting whether two
queues have to be merged is a slightly modified version of the CFQ
code for detecting whether two queues belong to cooperating
processes and whether the service of a queue should be preempted
to boost the throughput.
- BFQ supports full hierarchical scheduling, exporting a cgroups
interface. Each node has a full scheduler, so each group can
be assigned its own ioprio (mapped to a weight, see next point)
and an ioprio_class.
- If the cgroups interface is used, weights can be explictly assigned,
otherwise ioprio values are mapped to weights using the relation
weight = IOPRIO_BE_NR - ioprio.
- If the cgroups interface is used, weights can be explictly
assigned, otherwise ioprio values are mapped to weights using the
relation weight = IOPRIO_BE_NR - ioprio.
- ioprio classes are served in strict priority order, i.e., lower
priority queues are not served as long as there are higher priority
queues. Among queues in the same class the bandwidth is distributed
in proportion to the weight of each queue. A very thin extra bandwidth
is however guaranteed to the Idle class, to prevent it from starving.
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
priority queues are not served as long as there are higher
priority queues. Among queues in the same class the bandwidth is
distributed in proportion to the weight of each queue. A very
thin extra bandwidth is however guaranteed to the Idle class, to
prevent it from starving.
---
block/bfq-cgroup.c | 838 ++++++++++++++
block/bfq-cgroup.c | 835 +++++++++++++
block/bfq-ioc.c | 36 +
block/bfq-iosched.c | 3218 +++++++++++++++++++++++++++++++++++++++++++++++++++
block/bfq-sched.c | 1044 +++++++++++++++++
block/bfq.h | 617 ++++++++++
5 files changed, 5753 insertions(+)
5 files changed, 5750 insertions(+)
create mode 100644 block/bfq-cgroup.c
create mode 100644 block/bfq-ioc.c
create mode 100644 block/bfq-iosched.c
@ -69,10 +70,10 @@ Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
new file mode 100644
index 0000000..1ae54d1
index 0000000..2c4d4d2
--- /dev/null
+++ b/block/bfq-cgroup.c
@@ -0,0 +1,838 @@
@@ -0,0 +1,835 @@
+/*
+ * BFQ: CGROUPS support.
+ *
@ -119,10 +120,9 @@ index 0000000..1ae54d1
+ struct bfq_data *bfqd)
+{
+ struct bfq_group *bfqg;
+ struct hlist_node *n;
+ void *key;
+
+ hlist_for_each_entry_rcu(bfqg, n, &bgrp->group_data, group_node) {
+ hlist_for_each_entry_rcu(bfqg, &bgrp->group_data, group_node) {
+ key = rcu_dereference(bfqg->bfqd);
+ if (key == bfqd)
+ return bfqg;
@ -604,11 +604,11 @@ index 0000000..1ae54d1
+ */
+static void bfq_disconnect_groups(struct bfq_data *bfqd)
+{
+ struct hlist_node *pos, *n;
+ struct hlist_node *tmp;
+ struct bfq_group *bfqg;
+
+ bfq_log(bfqd, "disconnect_groups beginning") ;
+ hlist_for_each_entry_safe(bfqg, pos, n, &bfqd->group_list, bfqd_node) {
+ hlist_for_each_entry_safe(bfqg, tmp, &bfqd->group_list, bfqd_node) {
+ hlist_del(&bfqg->bfqd_node);
+
+ __bfq_deactivate_entity(bfqg->my_entity, 0);
@ -701,7 +701,6 @@ index 0000000..1ae54d1
+{ \
+ struct bfqio_cgroup *bgrp; \
+ struct bfq_group *bfqg; \
+ struct hlist_node *n; \
+ \
+ if (val < (__MIN) || val > (__MAX)) \
+ return -EINVAL; \
@ -713,7 +712,7 @@ index 0000000..1ae54d1
+ \
+ spin_lock_irq(&bgrp->lock); \
+ bgrp->__VAR = (unsigned short)val; \
+ hlist_for_each_entry(bfqg, n, &bgrp->group_data, group_node) { \
+ hlist_for_each_entry(bfqg, &bgrp->group_data, group_node) { \
+ bfqg->entity.new_##__VAR = (unsigned short)val; \
+ smp_wmb(); \
+ bfqg->entity.ioprio_changed = 1; \
@ -807,7 +806,6 @@ index 0000000..1ae54d1
+ struct task_struct *task;
+ struct io_context *ioc;
+ struct io_cq *icq;
+ struct hlist_node *n;
+
+ /*
+ * IMPORTANT NOTE: The move of more than one process at a time to a
@ -820,7 +818,7 @@ index 0000000..1ae54d1
+ * Handle cgroup change here.
+ */
+ rcu_read_lock();
+ hlist_for_each_entry_rcu(icq, n, &ioc->icq_list, ioc_node)
+ hlist_for_each_entry_rcu(icq, &ioc->icq_list, ioc_node)
+ if (!strncmp(icq->q->elevator->type->elevator_name,
+ "bfq", ELV_NAME_MAX))
+ bfq_bic_change_cgroup(icq_to_bic(icq),
@ -834,7 +832,7 @@ index 0000000..1ae54d1
+static void bfqio_destroy(struct cgroup *cgroup)
+{
+ struct bfqio_cgroup *bgrp = cgroup_to_bfqio(cgroup);
+ struct hlist_node *n, *tmp;
+ struct hlist_node *tmp;
+ struct bfq_group *bfqg;
+
+ /*
@ -844,7 +842,7 @@ index 0000000..1ae54d1
+ * cgroup is RCU-safe); bgrp->group_data will not be accessed by
+ * anything else and we don't need any synchronization.
+ */
+ hlist_for_each_entry_safe(bfqg, n, tmp, &bgrp->group_data, group_node)
+ hlist_for_each_entry_safe(bfqg, tmp, &bgrp->group_data, group_node)
+ bfq_destroy_group(bgrp, bfqg);
+
+ BUG_ON(!hlist_empty(&bgrp->group_data));
@ -5851,5 +5849,5 @@ index 0000000..ce3c474
+static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);
+#endif
--
1.8.1.2
1.8.2

39
core/linux-kirkwood/PKGBUILD
View file

@ -7,15 +7,15 @@ pkgbase=linux-kirkwood
pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
#pkgname=linux-test # Build kernel with a different name
_kernelname=${pkgname#linux}
_basekernel=3.8.12
_basekernel=3.9.1
pkgver=${_basekernel}
pkgrel=1
cryptover=1.5
cryptover=1.6
bfqver=v6
arch=('arm')
url="http://www.kernel.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage')
makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'bc')
options=('!strip')
source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2"
'archlinuxarm.patch'
@ -27,23 +27,26 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
'aufs3-3.8.patch.xz'
'aufs3-3.9.patch.xz'
#Temporary fix. Need to be removed after new BFQ release
#when its merged ( > v6)
"http://dl.dropbox.com/u/15043728/ArchLinuxArm/kernels/0001-block-bfq-attempt-to-fix-use-after-free-which-3.3.0-to-3.8.0.patch")
'0001-block-bfq-attempt-to-fix-use-after-free-which-3.3.0-to-3.8.0.patch'
'0001-block-bfq-use-the-uninitialized_var-macro-when-neede.patch')
md5sums=('47e9ee2c503ce85442119805922015b9'
'ddabf9f75419d6e811f30eeb985654d5'
md5sums=('22936d4c4e82ee3b957b2950d81a7f3f'
'ae6b481fcd630df6affcef18327d30da'
'f5d3635da03cb45904bedd69b47133de'
'ba2f776f7a4c7bc41a9d780d645c8736'
'96fc4f78d37d8f824401b2ca66a5dc0a'
'9d3c56a4b999c8bfbd4018089a62f662'
'd00814b57448895e65fbbc800e8a58ba'
'3a4b8d23c1708283e29477931d63ffb8'
'03eca1c188c076041f8d74100d55d659'
'90b11395c702610bf4b42e72913f23f8'
'd819af0969e0726cbf9ae6be5e044a75'
'5c76a198d2242acd66fc4a0a3f955461')
'b515ad1ddce3bdeede46f18735c2b82f'
'73e81c21600fe1bab1baffa537bb3dbe'
'80b2fb500e6811495c6b072d7e6fd112'
'9b5a265440abf57d2052838f31486a3a'
'eade38998313c25fd7934719cdf8a2ea'
'eca0d65e1fa790c334ad93f40adf545e'
'ba6027b85b363ddb5a736e6d63503657'
'30ed1ba9b6c391e371d022fbcf79f7ed'
'5c76a198d2242acd66fc4a0a3f955461'
'984207865dd160368d16f30004522468')
build() {
cd "${srcdir}/linux-${_basekernel}"
@ -59,13 +62,15 @@ msg2 "requested additional support, mach-types"
cp "${srcdir}/mach-types" arch/arm/tools
msg2 "Add AUFS3 patches"
patch -Np1 -i "${srcdir}/aufs3-3.8.patch"
patch -Np1 -i "${srcdir}/aufs3-3.9.patch"
msg2 "Add BFQ patches"
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
#Remove after new BFQ release (> v6)
msg2 "Fix BFQ bug"
patch -Np1 -i "${srcdir}/0001-block-bfq-use-the-uninitialized_var-macro-when-neede.patch"
patch -Np1 -i "${srcdir}/0001-block-bfq-attempt-to-fix-use-after-free-which-3.3.0-to-3.8.0.patch"
# add latest fixes from stable queue, if needed

166
core/linux-kirkwood/archlinuxarm.patch
View file

@ -1,5 +1,5 @@
diff -ruN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi 2013-02-18 16:58:34.000000000 -0700
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi 2013-05-07 21:58:03.000000000 -0600
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi 1969-12-31 17:00:00.000000000 -0700
@@ -1,78 +0,0 @@
-/include/ "kirkwood.dtsi"
@ -81,9 +81,9 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-t
- };
-};
diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
--- a/arch/arm/mach-kirkwood/common.h 2013-02-18 16:58:34.000000000 -0700
+++ b/arch/arm/mach-kirkwood/common.h 2013-02-20 06:31:32.000000000 -0700
@@ -71,12 +71,6 @@
--- a/arch/arm/mach-kirkwood/common.h 2013-05-07 21:58:03.000000000 -0600
+++ b/arch/arm/mach-kirkwood/common.h 2013-05-08 23:05:13.000000000 -0600
@@ -77,12 +77,6 @@
static inline void dnskw_init(void) {};
#endif
@ -96,7 +96,7 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
#ifdef CONFIG_MACH_IB62X0_DT
void ib62x0_init(void);
#else
@@ -89,12 +83,6 @@
@@ -95,12 +89,6 @@
static inline void dockstar_dt_init(void) {};
#endif
@ -109,23 +109,10 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
#ifdef CONFIG_MACH_LSXL_DT
void lsxl_init(void);
#else
@@ -129,12 +117,6 @@
static inline void ns2_init(void) {};
#endif
-#ifdef CONFIG_MACH_NSA310_DT
-void nsa310_init(void);
-#else
-static inline void nsa310_init(void) {};
-#endif
-
#ifdef CONFIG_MACH_OPENBLOCKS_A6_DT
void openblocks_a6_init(void);
#else
diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
--- a/arch/arm/mach-kirkwood/dockstar-setup.c 2013-02-18 16:58:34.000000000 -0700
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2013-02-20 06:29:01.000000000 -0700
@@ -29,6 +29,10 @@
--- a/arch/arm/mach-kirkwood/dockstar-setup.c 2013-05-07 21:58:03.000000000 -0600
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2013-05-08 23:05:13.000000000 -0600
@@ -28,6 +28,10 @@
.offset = 0,
.size = SZ_1M
}, {
@ -136,7 +123,7 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
.name = "uImage",
.offset = MTDPART_OFS_NXTBLK,
.size = SZ_4M
@@ -45,17 +49,17 @@
@@ -44,17 +48,17 @@
static struct gpio_led dockstar_led_pins[] = {
{
@ -157,7 +144,7 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
};
static struct gpio_led_platform_data dockstar_led_data = {
@@ -73,8 +77,8 @@
@@ -72,8 +76,8 @@
static unsigned int dockstar_mpp_config[] __initdata = {
MPP29_GPIO, /* USB Power Enable */
@ -170,7 +157,7 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c
--- a/arch/arm/mach-kirkwood/goflexhome-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2013-02-20 06:29:01.000000000 -0700
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2013-05-08 23:05:13.000000000 -0600
@@ -0,0 +1,124 @@
+/*
+ * arch/arm/mach-kirkwood/goflexhome-setup.c
@ -292,13 +279,13 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
+
diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c
--- a/arch/arm/mach-kirkwood/goflexnet-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2013-02-20 06:29:01.000000000 -0700
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2013-05-08 23:05:13.000000000 -0600
@@ -0,0 +1,177 @@
+/*
+ * arch/arm/mach-kirkwood/goflexnet-setup.c
@ -473,14 +460,14 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
+
diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
--- a/arch/arm/mach-kirkwood/guruplug-setup.c 2013-02-18 16:58:34.000000000 -0700
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2013-02-20 06:29:01.000000000 -0700
@@ -57,22 +57,24 @@
--- a/arch/arm/mach-kirkwood/guruplug-setup.c 2013-05-07 21:58:03.000000000 -0600
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2013-05-08 23:05:13.000000000 -0600
@@ -59,22 +59,24 @@
static struct gpio_led guruplug_led_pins[] = {
{
@ -511,7 +498,7 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
},
diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c
--- a/arch/arm/mach-kirkwood/iconnect-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2013-02-20 06:29:01.000000000 -0700
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2013-05-08 23:05:13.000000000 -0600
@@ -0,0 +1,204 @@
+/*
+ * arch/arm/mach-kirkwood/iconnect-setup.c
@ -714,12 +701,12 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c
--- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2013-02-20 06:29:01.000000000 -0700
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2013-05-08 23:05:13.000000000 -0600
@@ -0,0 +1,137 @@
+/*
+ * arch/arm/mach-kirkwood/ionics-stratus-setup.c
@ -855,13 +842,13 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Kconfig 2013-02-18 16:58:34.000000000 -0700
+++ b/arch/arm/mach-kirkwood/Kconfig 2013-02-20 06:29:01.000000000 -0700
@@ -65,12 +65,6 @@
--- a/arch/arm/mach-kirkwood/Kconfig 2013-05-07 21:58:03.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Kconfig 2013-05-08 23:05:13.000000000 -0600
@@ -72,12 +72,6 @@
Say 'Y' here if you want your kernel to support the
Marvell DreamPlug (Flattened Device Tree).
@ -874,7 +861,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
config MACH_DLINK_KIRKWOOD_DT
bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"
select ARCH_KIRKWOOD_DT
@@ -87,34 +81,6 @@
@@ -94,34 +88,6 @@
RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
Flattened Device Tree.
@ -909,7 +896,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
config MACH_LSXL_DT
bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"
select ARCH_KIRKWOOD_DT
@@ -214,6 +180,54 @@
@@ -221,6 +187,54 @@
Say 'Y' here if you want your kernel to support the
Seagate FreeAgent DockStar.
@ -964,7 +951,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
config MACH_OPENRD
bool
@@ -288,6 +302,18 @@
@@ -295,6 +309,18 @@
Say 'Y' here if you want your kernel to support the
ZyXEL NSA-310 board (Flattened Device Tree).
@ -984,8 +971,8 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
endif
diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
--- a/arch/arm/mach-kirkwood/Makefile 2013-02-18 16:58:34.000000000 -0700
+++ b/arch/arm/mach-kirkwood/Makefile 2013-02-20 06:30:41.000000000 -0700
--- a/arch/arm/mach-kirkwood/Makefile 2013-05-07 21:58:03.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Makefile 2013-05-08 23:05:14.000000000 -0600
@@ -8,6 +8,14 @@
obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
@ -1001,16 +988,17 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o
obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o
@@ -18,16 +26,15 @@
@@ -18,16 +26,16 @@
obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
obj-$(CONFIG_MACH_T5325) += t5325-setup.o
+obj-$(CONFIG_MACH_NSA310) += nsa310-setup.o
+obj-$(CONFIG_MACH_NSA320) += nsa320-setup.o
+obj-$(CONFIG_MACH_NSA310) += nsa310-setup.o
+obj-$(CONFIG_MACH_NSA320) += nsa320-setup.o
+
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o
obj-$(CONFIG_MACH_DREAMPLUG_DT) += board-dreamplug.o
obj-$(CONFIG_MACH_GURUPLUG_DT) += board-guruplug.o
-obj-$(CONFIG_MACH_ICONNECT_DT) += board-iconnect.o
obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += board-dnskw.o
obj-$(CONFIG_MACH_IB62X0_DT) += board-ib62x0.o
@ -1020,7 +1008,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
obj-$(CONFIG_MACH_LSXL_DT) += board-lsxl.o
obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT) += board-iomega_ix2_200.o
obj-$(CONFIG_MACH_KM_KIRKWOOD_DT) += board-km_kirkwood.o
@@ -37,6 +44,5 @@
@@ -37,6 +45,5 @@
obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT) += board-ns2.o
obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT) += board-ns2.o
obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT) += board-ns2.o
@ -1029,7 +1017,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
obj-$(CONFIG_MACH_TOPKICK_DT) += board-usi_topkick.o
diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c
--- a/arch/arm/mach-kirkwood/nas6210-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2013-02-20 06:29:01.000000000 -0700
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2013-05-08 23:05:14.000000000 -0600
@@ -0,0 +1,186 @@
+/*
+ * arch/arm/mach-kirkwood/nas6210-setup.c
@ -1214,12 +1202,12 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa310-setup.c
--- a/arch/arm/mach-kirkwood/nsa310-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2013-02-20 06:29:01.000000000 -0700
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2013-05-08 23:05:14.000000000 -0600
@@ -0,0 +1,299 @@
+/*
+ * arch/arm/mach-kirkwood/nsa310-setup.c
@ -1517,12 +1505,12 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa320-setup.c
--- a/arch/arm/mach-kirkwood/nsa320-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2013-02-20 06:29:01.000000000 -0700
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2013-05-08 23:05:14.000000000 -0600
@@ -0,0 +1,305 @@
+/*
+ * arch/arm/mach-kirkwood/nsa320-setup.c
@ -1826,12 +1814,12 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c
--- a/arch/arm/mach-kirkwood/pogo_e02-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2013-02-20 06:29:01.000000000 -0700
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2013-05-08 23:05:14.000000000 -0600
@@ -0,0 +1,115 @@
+/*
+ * arch/arm/mach-kirkwood/pogo_e02-setup.c
@ -1945,12 +1933,12 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c
--- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2013-02-20 06:29:01.000000000 -0700
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2013-05-08 23:05:14.000000000 -0600
@@ -0,0 +1,195 @@
+/*
+ * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@ -2144,12 +2132,12 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-02-18 16:58:34.000000000 -0700
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-02-20 06:29:01.000000000 -0700
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-05-07 21:58:03.000000000 -0600
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-05-08 23:05:14.000000000 -0600
@@ -43,7 +43,7 @@
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
};
@ -2230,7 +2218,7 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topkick-setup.c
--- a/arch/arm/mach-kirkwood/topkick-setup.c 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2013-02-20 06:29:01.000000000 -0700
+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2013-05-08 23:05:14.000000000 -0600
@@ -0,0 +1,165 @@
+/*
+ * arch/arm/mach-kirkwood/topkick-setup.c
@ -2394,12 +2382,12 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
--- a/arch/arm/plat-orion/common.c 2013-02-18 16:58:34.000000000 -0700
+++ b/arch/arm/plat-orion/common.c 2013-02-20 06:29:01.000000000 -0700
--- a/arch/arm/plat-orion/common.c 2013-05-07 21:58:03.000000000 -0600
+++ b/arch/arm/plat-orion/common.c 2013-05-08 23:05:14.000000000 -0600
@@ -253,7 +253,9 @@
/*****************************************************************************
* GE00
@ -2412,8 +2400,8 @@ diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
static struct resource orion_ge00_shared_resources[] = {
{
diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
--- a/drivers/ata/sata_mv.c 2013-02-18 16:58:34.000000000 -0700
+++ b/drivers/ata/sata_mv.c 2013-02-20 06:29:01.000000000 -0700
--- a/drivers/ata/sata_mv.c 2013-05-07 21:58:03.000000000 -0600
+++ b/drivers/ata/sata_mv.c 2013-05-08 23:05:14.000000000 -0600
@@ -71,6 +71,7 @@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
@ -2432,9 +2420,9 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
if (want_ncq != using_ncq)
diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/Kconfig 2013-02-18 16:58:34.000000000 -0700
+++ b/drivers/hwmon/Kconfig 2013-02-20 06:29:01.000000000 -0700
@@ -1440,6 +1440,19 @@
--- a/drivers/hwmon/Kconfig 2013-05-07 21:58:03.000000000 -0600
+++ b/drivers/hwmon/Kconfig 2013-05-08 23:05:14.000000000 -0600
@@ -1462,6 +1462,19 @@
help
Support for the A/D converter on MC13783 and MC13892 PMIC.
@ -2455,11 +2443,11 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
comment "ACPI drivers"
diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
--- a/drivers/hwmon/Makefile 2013-02-18 16:58:34.000000000 -0700
+++ b/drivers/hwmon/Makefile 2013-02-20 06:29:01.000000000 -0700
@@ -100,6 +100,7 @@
obj-$(CONFIG_SENSORS_MAX6642) += max6642.o
--- a/drivers/hwmon/Makefile 2013-05-07 21:58:03.000000000 -0600
+++ b/drivers/hwmon/Makefile 2013-05-08 23:05:14.000000000 -0600
@@ -102,6 +102,7 @@
obj-$(CONFIG_SENSORS_MAX6650) += max6650.o
obj-$(CONFIG_SENSORS_MAX6697) += max6697.o
obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
+obj-$(CONFIG_SENSORS_NSA3XX) += nsa3xx-hwmon.o
obj-$(CONFIG_SENSORS_MCP3021) += mcp3021.o
@ -2467,7 +2455,7 @@ diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
obj-$(CONFIG_SENSORS_PC87360) += pc87360.o
diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
--- a/drivers/hwmon/nsa3xx-hwmon.c 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2013-02-20 06:29:01.000000000 -0700
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2013-05-08 23:05:14.000000000 -0600
@@ -0,0 +1,251 @@
+/*
+ * drivers/hwmon/nsa3xx-hwmon.c
@ -2721,9 +2709,9 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:nsa3xx-hwmon");
diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
--- a/drivers/leds/Kconfig 2013-02-18 16:58:34.000000000 -0700
+++ b/drivers/leds/Kconfig 2013-02-20 06:29:01.000000000 -0700
@@ -496,7 +496,6 @@
--- a/drivers/leds/Kconfig 2013-05-07 21:58:03.000000000 -0600
+++ b/drivers/leds/Kconfig 2013-05-08 23:05:14.000000000 -0600
@@ -506,7 +506,6 @@
config LEDS_TRIGGER_IDE_DISK
bool "LED IDE Disk Trigger"
@ -2732,9 +2720,9 @@ diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
help
This allows LEDs to be controlled by IDE disk activity.
diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
--- a/drivers/mmc/core/core.c 2013-02-18 16:58:34.000000000 -0700
+++ b/drivers/mmc/core/core.c 2013-02-20 06:29:01.000000000 -0700
@@ -687,7 +687,7 @@
--- a/drivers/mmc/core/core.c 2013-05-07 21:58:03.000000000 -0600
+++ b/drivers/mmc/core/core.c 2013-05-08 23:05:14.000000000 -0600
@@ -785,7 +785,7 @@
*/
limit_us = 3000000;
else
@ -2744,8 +2732,8 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
/*
* SDHC cards always use these fixed values.
diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
--- a/drivers/mmc/core/sd.c 2013-02-18 16:58:34.000000000 -0700
+++ b/drivers/mmc/core/sd.c 2013-02-20 06:29:01.000000000 -0700
--- a/drivers/mmc/core/sd.c 2013-05-07 21:58:03.000000000 -0600
+++ b/drivers/mmc/core/sd.c 2013-05-08 23:05:14.000000000 -0600
@@ -355,6 +355,15 @@
return -ENOMEM;
}
@ -2763,17 +2751,17 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
if (err)
goto out;
diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
--- a/drivers/mmc/host/mvsdio.c 2013-02-18 16:58:34.000000000 -0700
+++ b/drivers/mmc/host/mvsdio.c 2013-02-20 06:29:01.000000000 -0700
@@ -22,6 +22,7 @@
#include <linux/clk.h>
#include <linux/gpio.h>
--- a/drivers/mmc/host/mvsdio.c 2013-05-07 21:58:03.000000000 -0600
+++ b/drivers/mmc/host/mvsdio.c 2013-05-08 23:05:14.000000000 -0600
@@ -25,6 +25,7 @@
#include <linux/of_irq.h>
#include <linux/mmc/host.h>
#include <linux/mmc/slot-gpio.h>
+#include <linux/mmc/sd.h>
#include <linux/pinctrl/consumer.h>
#include <asm/sizes.h>
#include <asm/unaligned.h>
@@ -148,6 +149,7 @@
@@ -150,6 +151,7 @@
dev_dbg(host->dev, "cmd %d (hw state 0x%04x)\n",
cmd->opcode, mvsd_read(MVSD_HW_STATE));
@ -2783,7 +2771,7 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
--- a/include/linux/nsa3xx-hwmon.h 1969-12-31 17:00:00.000000000 -0700
+++ b/include/linux/nsa3xx-hwmon.h 2013-02-20 06:29:01.000000000 -0700
+++ b/include/linux/nsa3xx-hwmon.h 2013-05-08 23:05:14.000000000 -0600
@@ -0,0 +1,21 @@
+/*
+ * include/linux/nsa3xx.hwmon.h

BIN
core/linux-kirkwood/aufs3-3.8.patch.xz
View file

Binary file not shown.

BIN
core/linux-kirkwood/aufs3-3.9.patch.xz Normal file
View file

Binary file not shown.

12
core/linux-kirkwood/change-default-console-loglevel.patch
View file

@ -1,12 +1,12 @@
diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
--- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300
+++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300
@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
diff -ruN a/kernel/printk.c b/kernel/printk.c
--- a/kernel/printk.c 2013-05-07 21:58:03.000000000 -0600
+++ b/kernel/printk.c 2013-05-08 23:24:39.000000000 -0600
@@ -61,7 +61,7 @@
/* We show everything that is MORE important than this.. */
#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */
DECLARE_WAIT_QUEUE_HEAD(log_wait);
int console_printk[4] = {
DEFAULT_CONSOLE_LOGLEVEL, /* console_loglevel */

324
core/linux-kirkwood/config
View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.8.8-1 Kernel Configuration
# Linux/arm 3.9.1-1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -18,14 +18,12 @@ CONFIG_VECTORS_BASE=0xffff0000
CONFIG_ARM_PATCH_PHYS_VIRT=y
CONFIG_GENERIC_BUG=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_HAVE_IRQ_WORK=y
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
@ -61,6 +59,7 @@ CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_DOMAIN=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set
# CONFIG_ALWAYS_USE_PERSISTENT_CLOCK is not set
CONFIG_KTIME_SCALAR=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@ -86,8 +85,10 @@ CONFIG_TASK_IO_ACCOUNTING=y
#
# RCU Subsystem
#
# CONFIG_TREE_PREEMPT_RCU is not set
CONFIG_TINY_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_STALL_COMMON is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_BOOST is not set
CONFIG_IKCONFIG=y
@ -167,6 +168,7 @@ CONFIG_OPROFILE=m
CONFIG_HAVE_OPROFILE=y
CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_KRETPROBES=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
@ -183,6 +185,8 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_MODULES_USE_ELF_REL=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_OLD_SIGACTION=y
#
# GCOV-based kernel profiling
@ -296,8 +300,7 @@ CONFIG_ARCH_KIRKWOOD=y
# CONFIG_ARCH_NOMADIK is not set
# CONFIG_PLAT_SPEAR is not set
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_ARCH_VT8500_SINGLE is not set
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_GPIO_PCA953X is not set
# CONFIG_KEYBOARD_GPIO_POLLED is not set
@ -312,6 +315,7 @@ CONFIG_MACH_SHEEVAPLUG=y
CONFIG_MACH_ESATA_SHEEVAPLUG=y
CONFIG_MACH_GURUPLUG=y
# CONFIG_ARCH_KIRKWOOD_DT is not set
# CONFIG_MACH_GURUPLUG_DT is not set
# CONFIG_MACH_DREAMPLUG_DT is not set
# CONFIG_MACH_DLINK_KIRKWOOD_DT is not set
# CONFIG_MACH_IB62X0_DT is not set
@ -351,7 +355,6 @@ CONFIG_MACH_T5325=y
# CONFIG_MACH_NSA310_DT is not set
CONFIG_MACH_NSA310=y
CONFIG_MACH_NSA320=y
# CONFIG_ARCH_VT8500 is not set
CONFIG_PLAT_ORION=y
CONFIG_PLAT_ORION_LEGACY=y
@ -410,6 +413,7 @@ CONFIG_ARCH_NR_GPIO=0
CONFIG_PREEMPT=y
CONFIG_PREEMPT_COUNT=y
CONFIG_HZ=100
CONFIG_SCHED_HRTICK=y
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
@ -417,17 +421,15 @@ CONFIG_AEABI=y
CONFIG_HAVE_ARCH_PFN_VALID=y
# CONFIG_HIGHMEM is not set
CONFIG_HW_PERF_EVENTS=y
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_HAVE_MEMBLOCK=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=999999
# CONFIG_COMPACTION is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=0
CONFIG_VIRT_TO_BUS=y
CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_CROSS_MEMORY_ATTACH=y
@ -463,6 +465,7 @@ CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
CONFIG_CPU_IDLE_KIRKWOOD=y
#
# Floating point emulation
@ -598,6 +601,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
CONFIG_NF_CONNTRACK_EVENTS=y
# CONFIG_NF_CONNTRACK_TIMEOUT is not set
CONFIG_NF_CONNTRACK_TIMESTAMP=y
CONFIG_NF_CONNTRACK_LABELS=y
CONFIG_NF_CT_PROTO_DCCP=m
CONFIG_NF_CT_PROTO_GRE=m
CONFIG_NF_CT_PROTO_SCTP=m
@ -667,9 +671,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
# Xtables matches
#
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
CONFIG_NETFILTER_XT_MATCH_BPF=m
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
@ -727,7 +733,6 @@ CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@ -818,11 +823,13 @@ CONFIG_L2TP=m
CONFIG_STP=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_BRIDGE_VLAN_FILTERING=y
CONFIG_HAVE_NET_DSA=y
CONFIG_NET_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_VLAN_8021Q=m
# CONFIG_VLAN_8021Q_GVRP is not set
# CONFIG_VLAN_8021Q_MVRP is not set
# CONFIG_DECNET is not set
CONFIG_LLC=m
# CONFIG_LLC2 is not set
@ -834,7 +841,6 @@ CONFIG_IPDDP=m
# CONFIG_IPDDP_DECAP is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
CONFIG_WAN_ROUTER=m
# CONFIG_PHONET is not set
# CONFIG_IEEE802154 is not set
CONFIG_NET_SCHED=y
@ -904,6 +910,7 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_DNS_RESOLVER=y
# CONFIG_BATMAN_ADV is not set
# CONFIG_OPENVSWITCH is not set
CONFIG_VSOCKETS=m
# CONFIG_NETPRIO_CGROUP is not set
CONFIG_BQL=y
# CONFIG_BPF_JIT is not set
@ -983,7 +990,6 @@ CONFIG_KS959_DONGLE=m
#
CONFIG_USB_IRDA=m
CONFIG_SIGMATEL_FIR=m
# CONFIG_TOSHIBA_FIR is not set
CONFIG_VLSI_FIR=m
CONFIG_MCS_FIR=m
CONFIG_BT=m
@ -1075,6 +1081,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
@ -1200,7 +1207,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
@ -1221,6 +1227,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_ATA_OVER_ETH=m
# CONFIG_MG_DISK is not set
# CONFIG_BLK_DEV_RBD is not set
# CONFIG_BLK_DEV_RSXX is not set
#
# Misc devices
@ -1236,6 +1243,7 @@ CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
CONFIG_ICS932S401=m
# CONFIG_ATMEL_SSC is not set
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_HP_ILO=m
# CONFIG_APDS9802ALS is not set
@ -1252,6 +1260,7 @@ CONFIG_TI_DAC7512=m
# CONFIG_BMP085_SPI is not set
# CONFIG_PCH_PHUB is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_LATTICE_ECP3_CONFIG is not set
CONFIG_C2PORT=m
#
@ -1337,8 +1346,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m
# CONFIG_SCSI_AIC94XX is not set
# CONFIG_SCSI_MVSAS is not set
# CONFIG_SCSI_MVUMI is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_SCSI_ARCMSR is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
@ -1481,6 +1488,7 @@ CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
# CONFIG_DM_THIN_PROVISIONING is not set
# CONFIG_DM_CACHE is not set
CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m
# CONFIG_DM_LOG_USERSPACE is not set
@ -1508,7 +1516,6 @@ CONFIG_ISCSI_TARGET=m
CONFIG_I2O=m
CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
CONFIG_I2O_EXT_ADAPTEC=y
# CONFIG_I2O_CONFIG is not set
# CONFIG_I2O_BUS is not set
# CONFIG_I2O_BLOCK is not set
# CONFIG_I2O_SCSI is not set
@ -1656,7 +1663,6 @@ CONFIG_NET_VENDOR_REALTEK=y
CONFIG_NET_VENDOR_RDC=y
# CONFIG_R6040 is not set
CONFIG_NET_VENDOR_SEEQ=y
# CONFIG_SEEQ8005 is not set
CONFIG_NET_VENDOR_SILAN=y
# CONFIG_SC92031 is not set
CONFIG_NET_VENDOR_SIS=y
@ -1740,6 +1746,7 @@ CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
CONFIG_USB_USBNET=m
CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_CDCETHER=m
# CONFIG_USB_NET_CDC_EEM is not set
CONFIG_USB_NET_CDC_NCM=m
@ -1883,6 +1890,7 @@ CONFIG_RT2800USB_RT35XX=y
# CONFIG_RT2800USB_RT53XX is not set
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800_LIB=m
CONFIG_RT2X00_LIB_MMIO=m
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2X00_LIB_USB=m
CONFIG_RT2X00_LIB=m
@ -1890,13 +1898,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
CONFIG_RT2X00_LIB_LEDS=y
# CONFIG_RT2X00_DEBUG is not set
CONFIG_RTLWIFI=m
CONFIG_RTLWIFI_DEBUG=y
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
CONFIG_RTL8723AE=m
CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
CONFIG_RTLWIFI_DEBUG=y
CONFIG_RTL8192C_COMMON=m
# CONFIG_WL_TI is not set
CONFIG_ZD1211RW=m
@ -1966,6 +1974,7 @@ CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ALPS=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
CONFIG_MOUSE_PS2_CYPRESS=y
CONFIG_MOUSE_PS2_TRACKPOINT=y
# CONFIG_MOUSE_PS2_ELANTECH is not set
# CONFIG_MOUSE_PS2_SENTELIC is not set
@ -1973,6 +1982,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
CONFIG_MOUSE_SERIAL=m
CONFIG_MOUSE_APPLETOUCH=m
CONFIG_MOUSE_BCM5974=m
# CONFIG_MOUSE_CYAPA is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_MOUSE_GPIO is not set
CONFIG_MOUSE_SYNAPTICS_I2C=m
@ -2061,6 +2071,7 @@ CONFIG_SERIO_LIBPS2=m
#
# Character devices
#
CONFIG_TTY=y
CONFIG_VT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
@ -2080,11 +2091,14 @@ CONFIG_LEGACY_PTY_COUNT=16
# Serial drivers
#
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_DMA=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
# CONFIG_SERIAL_8250_EXTENDED is not set
# CONFIG_SERIAL_8250_DW is not set
# CONFIG_SERIAL_8250_EM is not set
#
@ -2103,6 +2117,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_IFX6X60 is not set
# CONFIG_SERIAL_PCH_UART is not set
# CONFIG_SERIAL_ARC is not set
# CONFIG_SERIAL_RP2 is not set
# CONFIG_HVC_DCC is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM is not set
@ -2184,6 +2199,7 @@ CONFIG_SPI_MASTER=y
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_ORION=y
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_PXA2XX_PCI is not set
# CONFIG_SPI_SC18IS602 is not set
# CONFIG_SPI_TOPCLIFF_PCH is not set
@ -2237,6 +2253,7 @@ CONFIG_PINCTRL_MVEBU=y
CONFIG_PINCTRL_KIRKWOOD=y
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIO_DEVRES=y
CONFIG_GPIOLIB=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@ -2301,6 +2318,7 @@ CONFIG_W1_MASTER_GPIO=m
CONFIG_W1_SLAVE_THERM=m
CONFIG_W1_SLAVE_SMEM=m
# CONFIG_W1_SLAVE_DS2408 is not set
# CONFIG_W1_SLAVE_DS2413 is not set
CONFIG_W1_SLAVE_DS2423=m
CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2433=m
@ -2313,6 +2331,7 @@ CONFIG_W1_SLAVE_BQ27000=m
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
# CONFIG_GENERIC_ADC_BATTERY is not set
# CONFIG_TEST_POWER is not set
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_DS2780 is not set
@ -2327,7 +2346,9 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_POWER_RESET is not set
# CONFIG_POWER_RESET_RESTART is not set
# CONFIG_POWER_AVS is not set
CONFIG_HWMON=m
# CONFIG_HWMON_VID is not set
@ -2394,6 +2415,7 @@ CONFIG_SENSORS_LM90=m
# CONFIG_SENSORS_MAX6639 is not set
# CONFIG_SENSORS_MAX6642 is not set
# CONFIG_SENSORS_MAX6650 is not set
# CONFIG_SENSORS_MAX6697 is not set
# CONFIG_SENSORS_MCP3021 is not set
# CONFIG_SENSORS_NTC_THERMISTOR is not set
# CONFIG_SENSORS_PC87360 is not set
@ -2418,6 +2440,7 @@ CONFIG_SENSORS_LM90=m
# CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_ADS7871 is not set
# CONFIG_SENSORS_AMC6821 is not set
# CONFIG_SENSORS_INA209 is not set
# CONFIG_SENSORS_INA2XX is not set
# CONFIG_SENSORS_THMC50 is not set
# CONFIG_SENSORS_TMP102 is not set
@ -2441,9 +2464,10 @@ CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
# CONFIG_FAIR_SHARE is not set
CONFIG_STEP_WISE=y
# CONFIG_USER_SPACE is not set
# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
CONFIG_THERMAL_GOV_STEP_WISE=y
# CONFIG_THERMAL_GOV_USER_SPACE is not set
# CONFIG_THERMAL_EMULATION is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@ -2558,8 +2582,10 @@ CONFIG_VIDEOBUF2_CORE=m
CONFIG_VIDEOBUF2_MEMOPS=m
CONFIG_VIDEOBUF2_DMA_CONTIG=m
CONFIG_VIDEOBUF2_VMALLOC=m
CONFIG_VIDEO_V4L2_INT_DEVICE=m
CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_MAX_ADAPTERS=8
CONFIG_DVB_DYNAMIC_MINORS=y
@ -2654,7 +2680,6 @@ CONFIG_USB_S2255=m
#
# Analog TV USB devices
#
CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_SYSFS=y
CONFIG_VIDEO_PVRUSB2_DVB=y
@ -2668,6 +2693,8 @@ CONFIG_VIDEO_STK1160_AC97=y
#
# Analog/digital TV USB devices
#
CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_V4L2=y
CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
@ -2743,7 +2770,6 @@ CONFIG_MEDIA_PCI_SUPPORT=y
# Media capture/analog TV support
#
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_MXB is not set
@ -2762,7 +2788,6 @@ CONFIG_MEDIA_PCI_SUPPORT=y
#
# Media digital TV PCI Adapters
#
CONFIG_TTPCI_EEPROM=m
# CONFIG_DVB_AV7110 is not set
# CONFIG_DVB_BUDGET_CORE is not set
# CONFIG_DVB_B2C2_FLEXCOP_PCI is not set
@ -2796,6 +2821,7 @@ CONFIG_RADIO_SHARK2=m
CONFIG_I2C_SI4713=m
CONFIG_RADIO_SI4713=m
CONFIG_USB_KEENE=m
CONFIG_USB_MA901=m
CONFIG_RADIO_TEA5764=m
CONFIG_RADIO_SAA7706H=m
CONFIG_RADIO_TEF6862=m
@ -2810,15 +2836,16 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
#
# common driver options
#
CONFIG_VIDEO_CX2341X=m
CONFIG_VIDEO_TVEEPROM=m
CONFIG_DVB_B2C2_FLEXCOP=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
#
# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
CONFIG_VIDEO_TVEEPROM=m
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
CONFIG_VIDEO_IR_I2C=m
#
@ -2844,11 +2871,6 @@ CONFIG_VIDEO_TVP5150=m
#
CONFIG_VIDEO_CX25840=m
#
# MPEG video encoders
#
CONFIG_VIDEO_CX2341X=m
#
# Video encoders
#
@ -2955,6 +2977,7 @@ CONFIG_DVB_TUNER_CX24113=m
CONFIG_DVB_TDA826X=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_TS2020=m
CONFIG_DVB_DS3000=m
CONFIG_DVB_TDA10071=m
@ -3040,7 +3063,6 @@ CONFIG_DVB_AF9033=m
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=16
# CONFIG_DRM is not set
# CONFIG_STUB_POULSBO is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=m
@ -3093,6 +3115,7 @@ CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_TMIO is not set
# CONFIG_FB_SMSCUFX is not set
CONFIG_FB_UDL=m
# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
@ -3111,6 +3134,8 @@ CONFIG_LCD_CLASS_DEVICE=m
# CONFIG_LCD_S6E63M0 is not set
# CONFIG_LCD_LD9040 is not set
# CONFIG_LCD_AMS369FG06 is not set
# CONFIG_LCD_LMS501KF03 is not set
# CONFIG_LCD_HX8357 is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_GENERIC=m
# CONFIG_BACKLIGHT_ADP8860 is not set
@ -3244,6 +3269,7 @@ CONFIG_HID_ROCCAT=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
CONFIG_HID_SPEEDLINK=m
# CONFIG_HID_STEELSERIES is not set
CONFIG_HID_SUNPLUS=m
CONFIG_HID_GREENASIA=m
CONFIG_GREENASIA_FF=y
@ -3251,6 +3277,7 @@ CONFIG_HID_SMARTJOYPLUS=m
CONFIG_SMARTJOYPLUS_FF=y
# CONFIG_HID_TIVO is not set
CONFIG_HID_TOPSEED=m
CONFIG_HID_THINGM=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
@ -3288,6 +3315,7 @@ CONFIG_USB=y
# CONFIG_USB_DYNAMIC_MINORS is not set
CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_DWC3 is not set
# CONFIG_USB_MON is not set
CONFIG_USB_WUSB=m
# CONFIG_USB_WUSB_CBAF is not set
@ -3419,6 +3447,7 @@ CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_SERIAL_OMNINET=m
CONFIG_USB_SERIAL_OPTICON=m
# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
CONFIG_USB_SERIAL_XSENS_MT=m
# CONFIG_USB_SERIAL_ZIO is not set
CONFIG_USB_SERIAL_ZTE=m
# CONFIG_USB_SERIAL_SSU100 is not set
@ -3450,10 +3479,13 @@ CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_ISIGHTFW=m
# CONFIG_USB_YUREX is not set
CONFIG_USB_EZUSB_FX2=m
CONFIG_USB_HSIC_USB3503=m
#
# USB Physical Layer drivers
#
# CONFIG_OMAP_USB3 is not set
# CONFIG_OMAP_CONTROL_USB is not set
# CONFIG_USB_ISP1301 is not set
# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
@ -3547,6 +3579,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
@ -3595,6 +3628,7 @@ CONFIG_RTC_DRV_S35390A=m
# CONFIG_RTC_DRV_RS5C348 is not set
# CONFIG_RTC_DRV_DS3234 is not set
# CONFIG_RTC_DRV_PCF2123 is not set
# CONFIG_RTC_DRV_RX4581 is not set
#
# Platform RTC drivers
@ -3618,6 +3652,11 @@ CONFIG_RTC_DRV_S35390A=m
# on-CPU RTC drivers
#
CONFIG_RTC_DRV_MV=y
#
# HID Sensor RTC drivers
#
CONFIG_RTC_DRV_HID_SENSOR_TIME=m
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@ -3657,6 +3696,7 @@ CONFIG_USBIP_HOST=m
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
# CONFIG_ECHO is not set
# CONFIG_COMEDI is not set
CONFIG_ASUS_OLED=m
CONFIG_R8187SE=m
CONFIG_RTL8192U=m
@ -3670,6 +3710,104 @@ CONFIG_USB_SERIAL_QUATECH2=m
# CONFIG_VT6655 is not set
# CONFIG_VT6656 is not set
# CONFIG_DX_SEP is not set
#
# IIO staging drivers
#
# CONFIG_IIO_ST_HWMON is not set
#
# Accelerometers
#
# CONFIG_ADIS16201 is not set
# CONFIG_ADIS16203 is not set
# CONFIG_ADIS16204 is not set
# CONFIG_ADIS16209 is not set
# CONFIG_ADIS16220 is not set
# CONFIG_ADIS16240 is not set
# CONFIG_LIS3L02DQ is not set
#
# Analog to digital converters
#
# CONFIG_AD7291 is not set
# CONFIG_AD7606 is not set
# CONFIG_AD799X is not set
# CONFIG_AD7780 is not set
# CONFIG_AD7816 is not set
# CONFIG_AD7192 is not set
# CONFIG_ADT7410 is not set
# CONFIG_AD7280 is not set
#
# Analog digital bi-direction converters
#
# CONFIG_ADT7316 is not set
#
# Capacitance to digital converters
#
# CONFIG_AD7150 is not set
# CONFIG_AD7152 is not set
# CONFIG_AD7746 is not set
#
# Direct Digital Synthesis
#
# CONFIG_AD5930 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
# CONFIG_AD9850 is not set
# CONFIG_AD9852 is not set
# CONFIG_AD9910 is not set
# CONFIG_AD9951 is not set
#
# Digital gyroscope sensors
#
# CONFIG_ADIS16060 is not set
# CONFIG_ADIS16130 is not set
# CONFIG_ADIS16260 is not set
#
# Network Analyzer, Impedance Converters
#
# CONFIG_AD5933 is not set
#
# Light sensors
#
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
# CONFIG_TSL2583 is not set
# CONFIG_TSL2x7x is not set
#
# Magnetometer sensors
#
# CONFIG_SENSORS_AK8975 is not set
# CONFIG_SENSORS_HMC5843 is not set
#
# Active energy metering IC
#
# CONFIG_ADE7753 is not set
# CONFIG_ADE7754 is not set
# CONFIG_ADE7758 is not set
# CONFIG_ADE7759 is not set
# CONFIG_ADE7854 is not set
#
# Resolver to digital converters
#
# CONFIG_AD2S90 is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
#
# Triggers - standalone
#
# CONFIG_IIO_SIMPLE_DUMMY is not set
# CONFIG_ZSMALLOC is not set
# CONFIG_FB_SM7XX is not set
# CONFIG_CRYSTALHD is not set
@ -3711,21 +3849,118 @@ CONFIG_COMMON_CLK=y
# Hardware Spinlock drivers
#
CONFIG_CLKSRC_MMIO=y
# CONFIG_MAILBOX is not set
CONFIG_IOMMU_SUPPORT=y
#
# Remoteproc drivers (EXPERIMENTAL)
# Remoteproc drivers
#
# CONFIG_STE_MODEM_RPROC is not set
#
# Rpmsg drivers (EXPERIMENTAL)
# Rpmsg drivers
#
# CONFIG_VIRT_DRIVERS is not set
# CONFIG_PM_DEVFREQ is not set
# CONFIG_EXTCON is not set
# CONFIG_MEMORY is not set
# CONFIG_IIO is not set
CONFIG_IIO=m
# CONFIG_IIO_BUFFER is not set
# CONFIG_IIO_TRIGGER is not set
#
# Accelerometers
#
# CONFIG_HID_SENSOR_ACCEL_3D is not set
# CONFIG_KXSD9 is not set
# CONFIG_IIO_ST_ACCEL_3AXIS is not set
#
# Analog to digital converters
#
# CONFIG_AD7266 is not set
# CONFIG_AD7298 is not set
# CONFIG_AD7791 is not set
# CONFIG_AD7793 is not set
# CONFIG_AD7476 is not set
# CONFIG_AD7887 is not set
# CONFIG_MAX1363 is not set
# CONFIG_TI_ADC081C is not set
#
# Amplifiers
#
# CONFIG_AD8366 is not set
#
# Hid Sensor IIO Common
#
CONFIG_HID_SENSOR_IIO_COMMON=m
# CONFIG_HID_SENSOR_IIO_TRIGGER is not set
# CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS is not set
#
# Digital to analog converters
#
# CONFIG_AD5064 is not set
# CONFIG_AD5360 is not set
# CONFIG_AD5380 is not set
# CONFIG_AD5421 is not set
# CONFIG_AD5624R_SPI is not set
# CONFIG_AD5446 is not set
# CONFIG_AD5449 is not set
# CONFIG_AD5504 is not set
# CONFIG_AD5755 is not set
# CONFIG_AD5764 is not set
# CONFIG_AD5791 is not set
# CONFIG_AD5686 is not set
# CONFIG_MAX517 is not set
# CONFIG_MCP4725 is not set
#
# Frequency Synthesizers DDS/PLL
#
#
# Clock Generator/Distribution
#
# CONFIG_AD9523 is not set
#
# Phase-Locked Loop (PLL) frequency synthesizers
#
# CONFIG_ADF4350 is not set
#
# Digital gyroscope sensors
#
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16136 is not set
# CONFIG_ADXRS450 is not set
# CONFIG_HID_SENSOR_GYRO_3D is not set
# CONFIG_IIO_ST_GYRO_3AXIS is not set
# CONFIG_ITG3200 is not set
#
# Inertial measurement units
#
# CONFIG_ADIS16400 is not set
# CONFIG_ADIS16480 is not set
# CONFIG_INV_MPU6050_IIO is not set
#
# Light sensors
#
# CONFIG_ADJD_S311 is not set
# CONFIG_SENSORS_TSL2563 is not set
# CONFIG_VCNL4000 is not set
# CONFIG_HID_SENSOR_ALS is not set
#
# Magnetometer sensors
#
# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
# CONFIG_IIO_ST_MAGN_3AXIS is not set
# CONFIG_VME_BUS is not set
# CONFIG_PWM is not set
# CONFIG_IPACK_BUS is not set
@ -4038,8 +4273,6 @@ CONFIG_DEBUG_PREEMPT=y
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
# CONFIG_PROVE_LOCKING is not set
# CONFIG_PROVE_RCU_DELAY is not set
# CONFIG_SPARSE_RCU_POINTER is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
@ -4057,6 +4290,12 @@ CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_CREDENTIALS is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
#
# RCU Debugging
#
# CONFIG_PROVE_RCU_DELAY is not set
# CONFIG_SPARSE_RCU_POINTER is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_TRACE is not set
# CONFIG_KPROBES_SANITY_TEST is not set
@ -4078,7 +4317,6 @@ CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACE_CLOCK=y
CONFIG_RING_BUFFER=y
CONFIG_EVENT_TRACING=y
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_TRACING=y
@ -4090,6 +4328,7 @@ CONFIG_FTRACE=y
# CONFIG_SCHED_TRACER is not set
# CONFIG_ENABLE_DEFAULT_TRACERS is not set
# CONFIG_FTRACE_SYSCALLS is not set
# CONFIG_TRACER_SNAPSHOT is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
@ -4211,6 +4450,7 @@ CONFIG_CRYPTO_VMAC=m
# Digest
#
CONFIG_CRYPTO_CRC32C=y
# CONFIG_CRYPTO_CRC32 is not set
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
@ -4220,7 +4460,7 @@ CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA1=m
# CONFIG_CRYPTO_SHA1_ARM is not set
CONFIG_CRYPTO_SHA1_ARM=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_TGR192=m
@ -4230,7 +4470,7 @@ CONFIG_CRYPTO_WP512=m
# Ciphers
#
CONFIG_CRYPTO_AES=y
# CONFIG_CRYPTO_AES_ARM is not set
CONFIG_CRYPTO_AES_ARM=y
CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=y
CONFIG_CRYPTO_BLOWFISH=m
@ -4277,7 +4517,6 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IO=y
CONFIG_PERCPU_RWSEM=y
CONFIG_CRC_CCITT=y
CONFIG_CRC16=y
# CONFIG_CRC_T10DIF is not set
@ -4325,3 +4564,4 @@ CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
# CONFIG_CORDIC is not set
# CONFIG_DDR is not set
# CONFIG_VIRTUALIZATION is not set

117
core/linux-kirkwood/mach-types
View file

@ -12,7 +12,7 @@
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
#
# Last update: Mon Feb 11 23:53:10 2013
# Last update: Thu May 9 05:28:23 2013
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
@ -4429,7 +4429,7 @@ priscillag MACH_PRISCILLAG PRISCILLAG 4474
priscillac MACH_PRISCILLAC PRISCILLAC 4475
priscilla MACH_PRISCILLA PRISCILLA 4476
innova_shpu_v2 MACH_INNOVA_SHPU_V2 INNOVA_SHPU_V2 4477
m7c_dtu MACH_M7CDTU M7CDTU 4478
auriga MACH_M7CDTU M7CDTU 4478
mach_type_dep2410 MACH_MACH_TYPE_DEP2410 MACH_TYPE_DEP2410 4479
bctre3 MACH_BCTRE3 BCTRE3 4480
omap_m100 MACH_OMAP_M100 OMAP_M100 4481
@ -4438,7 +4438,7 @@ nanobone MACH_NANOBONE NANOBONE 4483
stm_b2105 MACH_STM_B2105 STM_B2105 4484
omap4_bsc_bap_v3 MACH_OMAP4_BSC_BAP_V3 OMAP4_BSC_BAP_V3 4485
ss1pam MACH_SS1PAM SS1PAM 4486
dlxp_wl MACH_DLXP_WL DLXP_WL 4487
caelum MACH_DLXP_WL DLXP_WL 4487
primominiu MACH_PRIMOMINIU PRIMOMINIU 4488
mrt_35hd_dualnas_e MACH_MRT_35HD_DUALNAS_E MRT_35HD_DUALNAS_E 4489
kiwi MACH_KIWI KIWI 4490
@ -4447,7 +4447,7 @@ mep2440 MACH_MEP2440 MEP2440 4492
colibri_t30 MACH_COLIBRI_T30 COLIBRI_T30 4493
cwv1 MACH_CWV1 CWV1 4494
nsa325 MACH_NSA325 NSA325 4495
dlxp_ul MACH_DLXP_UL DLXP_UL 4496
camelopardalis MACH_DLXP_UL DLXP_UL 4496
dpxmtc MACH_DPXMTC DPXMTC 4497
tt_stuttgart MACH_TT_STUTTGART TT_STUTTGART 4498
miranda_apcii MACH_MIRANDA_APCII MIRANDA_APCII 4499
@ -4455,7 +4455,7 @@ mx6q_moderox MACH_MX6Q_MODEROX MX6Q_MODEROX 4500
mudskipper MACH_MUDSKIPPER MUDSKIPPER 4501
urania MACH_URANIA URANIA 4502
stm_b2112 MACH_STM_B2112 STM_B2112 4503
gtou MACH_GTOU GTOU 4504
ara MACH_GTOU GTOU 4504
mx6q_ats_phoenix MACH_MX6Q_ATS_PHOENIX MX6Q_ATS_PHOENIX 4505
stm_b2116 MACH_STM_B2116 STM_B2116 4506
mythology MACH_MYTHOLOGY MYTHOLOGY 4507
@ -4473,8 +4473,8 @@ ar6mxs MACH_AR6MXS AR6MXS 4518
deto_mx6apos MACH_DETO_APOS_MX6 DETO_APOS_MX6 4519
gwventana MACH_GWVENTANA GWVENTANA 4520
igep0033 MACH_IGEP0033 IGEP0033 4521
raca MACH_RACA RACA 4522
applesoda MACH_APPLESODA APPLESODA 4523
antlia MACH_RACA RACA 4522
apus MACH_APPLESODA APPLESODA 4523
h52c1_concerto MACH_H52C1_CONCERTO H52C1_CONCERTO 4524
fcmbrd MACH_FCMBRD FCMBRD 4525
pcaaxs1 MACH_PCAAXS1 PCAAXS1 4526
@ -4484,3 +4484,106 @@ mx6s_lp507_gvci MACH_MX6S_LP507_GVCI MX6S_LP507_GVCI 4529
dido MACH_DIDO DIDO 4530
swarco_itc3_9g20 MACH_SWARCO_ITC3_9G20 SWARCO_ITC3_9G20 4531
robo_roady MACH_ROBO_ROADY ROBO_ROADY 4532
rskrza1 MACH_RSKRZA1 RSKRZA1 4533
swarco_sid MACH_SWARCO_SID SWARCO_SID 4534
mx6_iwg15s_sbc MACH_MX6_IWG15S_SBC MX6_IWG15S_SBC 4535
mx6q_camaro MACH_MX6Q_CAMARO MX6Q_CAMARO 4536
hb6mxs MACH_HB6MXS HB6MXS 4537
lager MACH_LAGER LAGER 4538
lp8x4x MACH_LP8X4X LP8X4X 4539
tegratab7 MACH_TEGRATAB7 TEGRATAB7 4540
andromeda MACH_ANDROMEDA ANDROMEDA 4541
bootes MACH_BOOTES BOOTES 4542
nethmi MACH_NETHMI NETHMI 4543
tegratab MACH_TEGRATAB TEGRATAB 4544
som5_evb MACH_SOM5_EVB SOM5_EVB 4545
venaticorum MACH_VENATICORUM VENATICORUM 4546
stm_b2110 MACH_STM_B2110 STM_B2110 4547
elux_hathor MACH_ELUX_HATHOR ELUX_HATHOR 4548
helios_v7 MACH_HELIOS_V7 HELIOS_V7 4549
xc10v1 MACH_XC10V1 XC10V1 4550
cp2u MACH_CP2U CP2U 4551
iap_f MACH_IAP_F IAP_F 4552
iap_g MACH_IAP_G IAP_G 4553
aae MACH_AAE AAE 4554
pegasus MACH_PEGASUS PEGASUS 4555
cygnus MACH_CYGNUS CYGNUS 4556
centaurus MACH_CENTAURUS CENTAURUS 4557
msm8930_qrd8930 MACH_MSM8930_QRD8930 MSM8930_QRD8930 4558
quby_tim MACH_QUBY_TIM QUBY_TIM 4559
zedi3250a MACH_ZEDI3250A ZEDI3250A 4560
grus MACH_GRUS GRUS 4561
apollo3 MACH_APOLLO3 APOLLO3 4562
cowon_r7 MACH_COWON_R7 COWON_R7 4563
tonga3 MACH_TONGA3 TONGA3 4564
p535 MACH_P535 P535 4565
sa3874i MACH_SA3874I SA3874I 4566
mx6_navico_com MACH_MX6_NAVICO_COM MX6_NAVICO_COM 4567
proxmobil2 MACH_PROXMOBIL2 PROXMOBIL2 4568
ubinux1 MACH_UBINUX1 UBINUX1 4569
istos MACH_ISTOS ISTOS 4570
benvolio4 MACH_BENVOLIO4 BENVOLIO4 4571
eco5_bx2 MACH_ECO5_BX2 ECO5_BX2 4572
eukrea_cpuimx28sd MACH_EUKREA_CPUIMX28SD EUKREA_CPUIMX28SD 4573
domotab MACH_DOMOTAB DOMOTAB 4574
pfla03 MACH_PFLA03 PFLA03 4575
et_cpu_301_16 MACH_ET_CPU_301_16 ET_CPU_301_16 4576
skywalker MACH_SKYWALKER SKYWALKER 4577
scorpius MACH_SCORPIUS SCORPIUS 4578
capricornus MACH_CAPRICORNUS CAPRICORNUS 4579
lyra MACH_LYRA LYRA 4580
gatero MACH_GATERO GATERO 4581
gatero01 MACH_GATERO01 GATERO01 4582
z4dtg MACH_Z4DTG Z4DTG 4583
lupus MACH_LUPUS LUPUS 4584
leap101 MACH_LEAP101 LEAP101 4585
cm_t335 MACH_CM_T335 CM_T335 4586
pna MACH_PNA PNA 4587
ecoforest_cpu2013 MACH_ECOFOREST_CPU2013 ECOFOREST_CPU2013 4588
apq8064_dma MACH_APQ8064_DMA APQ8064_DMA 4589
mx53_armour MACH_MX53_ARMOUR MX53_ARMOUR 4590
eurofunk_aepl3 MACH_EUROFUNK_AEPL3 EUROFUNK_AEPL3 4591
eurofunk_mhls3 MACH_EUROFUNK_MHLS3 EUROFUNK_MHLS3 4592
eurofunk_e1if MACH_EUROFUNK_E1IF EUROFUNK_E1IF 4593
lepus MACH_LEPUS LEPUS 4594
bora MACH_BORA BORA 4595
ads4011 MACH_ADS4011 ADS4011 4596
beaver MACH_BEAVER BEAVER 4597
imx233_iungo MACH_IMX233_IUNGO IMX233_IUNGO 4598
cepheus MACH_CEPHEUS CEPHEUS 4599
cetus MACH_CETUS CETUS 4600
chamaeleon MACH_CHAMAELEON CHAMAELEON 4601
ardbeg MACH_ARDBEG ARDBEG 4602
ixora MACH_IXORA IXORA 4603
juglans MACH_JUGLANS JUGLANS 4604
canismajor MACH_CANISMAJOR CANISMAJOR 4605
at91sam9263mib MACH_AT91SAM9263MIB AT91SAM9263MIB 4606
cosino_9g35 MACH_COSINO_9G35 COSINO_9G35 4607
tiny4412 MACH_TINY4412 TINY4412 4608
balloon4 MACH_BALLOON4 BALLOON4 4609
pgg MACH_PGG PGG 4610
xxsq701 MACH_XXSQ701 XXSQ701 4611
mx6_navico_rdr MACH_MX6_NAVICO_RDR MX6_NAVICO_RDR 4612
phantom MACH_PHANTOM PHANTOM 4613
canisminorh MACH_CANISMINORH CANISMINORH 4614
carina MACH_CARINA CARINA 4615
e1859 MACH_E1859 E1859 4616
armstonea5 MACH_ARMSTONEA5 ARMSTONEA5 4617
picocoma5 MACH_PICOCOMA5 PICOCOMA5 4618
netdcua5 MACH_NETDCUA5 NETDCUA5 4619
molly MACH_MOLLY MOLLY 4620
maserati MACH_MASERATI MASERATI 4621
mx53_idebx MACH_MX53_IDEBX MX53_IDEBX 4622
mx53_c2cb MACH_MX53_C2CB MX53_C2CB 4623
mipsee MACH_MIPSEE MIPSEE 4624
seeklop MACH_SEEKLOP SEEKLOP 4625
audisee MACH_AUDISEE AUDISEE 4626
tx48 MACH_TX48 TX48 4627
tl7689_pad_ref MACH_TL7689_PAD_REF TL7689_PAD_REF 4628
tl7689_pad_test MACH_TL7689_PAD_TEST TL7689_PAD_TEST 4629
tl7689_phone_ref MACH_TL7689_PHONE_REF TL7689_PHONE_REF 4630
tl7689_phone_test MACH_TL7689_PHONE_TEST TL7689_PHONE_TEST 4631
swarco_scc_wks MACH_SWARCO_SCC_WKS SWARCO_SCC_WKS 4632
accordo2 MACH_ACCORDO2 ACCORDO2 4633
trizeps7 MACH_TRIZEPS7 TRIZEPS7 4634
f100 MACH_F100 F100 4635

100
core/linux-kirkwood/usb-add-reset-resume-quirk-for-several-webcams.patch
View file

@ -1,39 +1,25 @@
commit 2394d67e446bf616a0885167d5f0d397bdacfdfc
Author: Oliver Neukum <oneukum@suse.de>
Date: Tue Sep 13 08:42:21 2011 +0200
USB: add RESET_RESUME for webcams shown to be quirky
The new runtime PM code has shown that many webcams suffer
from a race condition that may crash them upon resume.
Runtime PM is especially prone to show the problem because
it retains power to the cameras at all times. However
system suspension may also crash the devices and retain
power to the devices.
The only way to solve this problem without races is in
usbcore with the RESET_RESUME quirk.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 81ce6a8..38f0510 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -38,6 +38,24 @@ static const struct usb_device_id usb_quirk_list[] = {
/* Creative SB Audigy 2 NX */
{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
diff -ruN a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
--- a/drivers/usb/core/quirks.c 2013-05-07 21:58:03.000000000 -0600
+++ b/drivers/usb/core/quirks.c 2013-05-08 23:15:23.000000000 -0600
@@ -64,6 +64,30 @@
/* Logitech Quickcam OEM Cisco VT Camera II */
{ USB_DEVICE(0x046d, 0x08c7), .driver_info = USB_QUIRK_RESET_RESUME },
+ /* Logitech Webcam C200 */
+ { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C250 */
+ { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C300 */
+ { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam B/C500 */
+ { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C600 */
+ { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam Pro 9000 */
+ { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
+
@ -43,56 +29,16 @@ index 81ce6a8..38f0510 100644
+ /* Logitech Webcam C270 */
+ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
+
/* Logitech Harmony 700-series */
{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
@@ -69,6 +87,9 @@ static const struct usb_device_id usb_quirk_list[] = {
{ USB_DEVICE(0x06a3, 0x0006), .driver_info =
USB_QUIRK_CONFIG_INTF_STRINGS },
/* Logitech Harmony 700-series */
{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
@@ -108,6 +132,9 @@
/* Midiman M-Audio Keystation 88es */
{ USB_DEVICE(0x0763, 0x0192), .driver_info = USB_QUIRK_RESET_RESUME },
+ /* Guillemot Webcam Hercules Dualpix Exchange*/
+ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
+
/* M-Systems Flash Disk Pioneers */
{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
commit 5b253d88cc6c65a23cefc457a5a4ef139913c5fc
Author: Jon Levell <linuxusb@coralbark.net>
Date: Thu Sep 29 20:42:52 2011 +0100
USB: add quirk for Logitech C300 web cam
My webcam is a Logitech C300 and I get "chipmunk"ed squeaky sound.
The following trivial patch fixes it.
Signed-off-by: Jon Levell <linuxusb@coralbark.net>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 38f0510..d6a8d82 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = {
/* Logitech Webcam C250 */
{ USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
+ /* Logitech Webcam C300 */
+ { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
+
/* Logitech Webcam B/C500 */
{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index d6a8d82..caa1991 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = {
/* Logitech Webcam B/C500 */
{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
+ /* Logitech Webcam C600 */
+ { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
+
/* Logitech Webcam Pro 9000 */
{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
/* M-Systems Flash Disk Pioneers */
{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },