mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-02-16 23:57:11 +00:00
Merge pull request #353 from moonman/master
core/linux-kirkwood to 3.7.2-0
This commit is contained in:
commit
262f0c35f6
7 changed files with 812 additions and 620 deletions
|
@ -7,9 +7,9 @@ pkgbase=linux-kirkwood
|
|||
pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
|
||||
#pkgname=linux-test # Build kernel with a different name
|
||||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.6.11
|
||||
_basekernel=3.7.2
|
||||
pkgver=${_basekernel}
|
||||
pkgrel=1
|
||||
pkgrel=0
|
||||
cryptover=1.5
|
||||
arch=('arm')
|
||||
url="http://www.kernel.org/"
|
||||
|
@ -24,40 +24,41 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
|
|||
'change-default-console-loglevel.patch'
|
||||
'usb-add-reset-resume-quirk-for-several-webcams.patch'
|
||||
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5r1/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.6.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5r1/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.6.patch"
|
||||
'aufs3-3.6.patch.xz')
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.7.0-v5r1/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.7.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.7.0-v5r1/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.7.patch"
|
||||
'aufs3-3.7.patch.xz')
|
||||
|
||||
md5sums=('3ff269b161f6cc319aa220b16963e213'
|
||||
'476141d343395dad559b7248c2ea0b2c'
|
||||
md5sums=('4ca51d06144cc31bac8468cc8129c734'
|
||||
'17c0496b7f3031c864f49894702b8911'
|
||||
'f5d3635da03cb45904bedd69b47133de'
|
||||
'30a81d9d734924992090c5160d063a4d'
|
||||
'9506a43fff451fda36d5d7b1f5eaed04'
|
||||
'ce89674fb4e888f5fffb41d5015f9693'
|
||||
'1f8103abb9c79b0745926acddec6ec85'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
'd00814b57448895e65fbbc800e8a58ba'
|
||||
'3a4b8d23c1708283e29477931d63ffb8'
|
||||
'5b36fdb524bc0fbc1c2dd7ff6e5f00c7'
|
||||
'ab32d82c03667836e0827158f128c755'
|
||||
'c8182bf611ab1f9fb3fbc314b61dd04c')
|
||||
'9daa5f662145f91b25b91b9fbeb874d9'
|
||||
'c80954ae588d8c168a0b1ae9ffe84c0e'
|
||||
'961e19a119443158f104a68ea4d0d9f1')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/linux-${_basekernel}"
|
||||
|
||||
# Add the USB_QUIRK_RESET_RESUME for several webcams
|
||||
msg "Add the USB_QUIRK_RESET_RESUME for several webcams"
|
||||
# FS#26528
|
||||
patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
|
||||
|
||||
# Add Arch Linux ARM patch for ARMv5te plug computers, requested additional support, mach-types
|
||||
msg "Add Arch Linux ARM patch for ARMv5te plug computers,"
|
||||
msg "requested additional support, mach-types"
|
||||
patch -Np1 -i "${srcdir}/archlinuxarm.patch"
|
||||
patch -Np1 -i "${srcdir}/support.patch"
|
||||
cp "${srcdir}/mach-types" arch/arm/tools
|
||||
|
||||
# Add AUFS3 patches
|
||||
patch -Np1 -i "${srcdir}/aufs3-3.6.patch"
|
||||
msg "Add AUFS3 patches"
|
||||
patch -Np1 -i "${srcdir}/aufs3-3.7.patch"
|
||||
|
||||
# Add BFQ patches
|
||||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.6.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.6.patch"
|
||||
msg "Add BFQ patches"
|
||||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.7.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.7.patch"
|
||||
|
||||
# add latest fixes from stable queue, if needed
|
||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||
|
@ -98,10 +99,10 @@ build() {
|
|||
|
||||
#yes "" | make config
|
||||
|
||||
# build!
|
||||
msg "building!"
|
||||
make ${MAKEFLAGS} uImage modules
|
||||
|
||||
# build cryptodev module
|
||||
msg "build cryptodev module"
|
||||
cd "${srcdir}/cryptodev-linux-${cryptover}"
|
||||
make KERNEL_DIR="${srcdir}/linux-${_basekernel}"
|
||||
}
|
||||
|
|
|
@ -1,6 +1,67 @@
|
|||
diff -urN a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts 1969-12-31 18:00:00.000000000 -0600
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,57 +0,0 @@
|
||||
-/dts-v1/;
|
||||
-
|
||||
-/include/ "kirkwood.dtsi"
|
||||
-
|
||||
-/ {
|
||||
- model = "Seagate FreeAgent Dockstar";
|
||||
- compatible = "seagate,dockstar", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
||||
-
|
||||
- memory {
|
||||
- device_type = "memory";
|
||||
- reg = <0x00000000 0x8000000>;
|
||||
- };
|
||||
-
|
||||
- chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
|
||||
- };
|
||||
-
|
||||
- ocp@f1000000 {
|
||||
- serial@12000 {
|
||||
- clock-frequency = <200000000>;
|
||||
- status = "ok";
|
||||
- };
|
||||
-
|
||||
- nand@3000000 {
|
||||
- status = "okay";
|
||||
-
|
||||
- partition@0 {
|
||||
- label = "u-boot";
|
||||
- reg = <0x0000000 0x100000>;
|
||||
- read-only;
|
||||
- };
|
||||
-
|
||||
- partition@100000 {
|
||||
- label = "uImage";
|
||||
- reg = <0x0100000 0x400000>;
|
||||
- };
|
||||
-
|
||||
- partition@500000 {
|
||||
- label = "data";
|
||||
- reg = <0x0500000 0xfb00000>;
|
||||
- };
|
||||
- };
|
||||
- };
|
||||
- gpio-leds {
|
||||
- compatible = "gpio-leds";
|
||||
-
|
||||
- health {
|
||||
- label = "status:green:health";
|
||||
- gpios = <&gpio1 14 1>;
|
||||
- linux,default-trigger = "default-on";
|
||||
- };
|
||||
- fault {
|
||||
- label = "status:orange:fault";
|
||||
- gpios = <&gpio1 15 1>;
|
||||
- };
|
||||
- };
|
||||
-};
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,99 +0,0 @@
|
||||
-/dts-v1/;
|
||||
-
|
||||
|
@ -101,10 +162,10 @@ diff -urN a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwoo
|
|||
- };
|
||||
- };
|
||||
-};
|
||||
diff -urN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts 1969-12-31 18:00:00.000000000 -0600
|
||||
@@ -1,72 +0,0 @@
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,120 +0,0 @@
|
||||
-/dts-v1/;
|
||||
-
|
||||
-/include/ "kirkwood.dtsi"
|
||||
|
@ -119,7 +180,7 @@ diff -urN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood
|
|||
- };
|
||||
-
|
||||
- chosen {
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk mtdparts=orion_nand:0xc0000@0x0(uboot),0x20000@0xa0000(env),0x300000@0x100000(zImage),0x300000@0x540000(initrd),0x1f400000@0x980000(boot)";
|
||||
- bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
- linux,initrd-start = <0x4500040>;
|
||||
- linux,initrd-end = <0x4800000>;
|
||||
- };
|
||||
|
@ -137,7 +198,37 @@ diff -urN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood
|
|||
- clock-frequency = <200000000>;
|
||||
- status = "ok";
|
||||
- };
|
||||
-
|
||||
- nand@3000000 {
|
||||
- status = "okay";
|
||||
-
|
||||
- partition@0 {
|
||||
- label = "uboot";
|
||||
- reg = <0x0000000 0xc0000>;
|
||||
- };
|
||||
-
|
||||
- partition@a0000 {
|
||||
- label = "env";
|
||||
- reg = <0xa0000 0x20000>;
|
||||
- };
|
||||
-
|
||||
- partition@100000 {
|
||||
- label = "zImage";
|
||||
- reg = <0x100000 0x300000>;
|
||||
- };
|
||||
-
|
||||
- partition@540000 {
|
||||
- label = "initrd";
|
||||
- reg = <0x540000 0x300000>;
|
||||
- };
|
||||
-
|
||||
- partition@980000 {
|
||||
- label = "boot";
|
||||
- reg = <0x980000 0x1f400000>;
|
||||
- };
|
||||
- };
|
||||
- };
|
||||
-
|
||||
- gpio-leds {
|
||||
- compatible = "gpio-leds";
|
||||
-
|
||||
|
@ -176,10 +267,28 @@ diff -urN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood
|
|||
- gpios = <&gpio1 16 0>;
|
||||
- };
|
||||
- };
|
||||
-
|
||||
- gpio_keys {
|
||||
- compatible = "gpio-keys";
|
||||
- #address-cells = <1>;
|
||||
- #size-cells = <0>;
|
||||
- button@1 {
|
||||
- label = "OTB Button";
|
||||
- linux,code = <133>;
|
||||
- gpios = <&gpio1 3 1>;
|
||||
- debounce-interval = <100>;
|
||||
- };
|
||||
- button@2 {
|
||||
- label = "Reset";
|
||||
- linux,code = <0x198>;
|
||||
- gpios = <&gpio0 12 1>;
|
||||
- debounce-interval = <100>;
|
||||
- };
|
||||
- };
|
||||
-};
|
||||
diff -urN a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts 1969-12-31 18:00:00.000000000 -0600
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,21 +0,0 @@
|
||||
-/dts-v1/;
|
||||
-
|
||||
|
@ -202,10 +311,10 @@ diff -urN a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwo
|
|||
- };
|
||||
- };
|
||||
-};
|
||||
\ No newline at end of file
|
||||
diff -urN a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts 1969-12-31 18:00:00.000000000 -0600
|
||||
\ Kein Zeilenumbruch am Dateiende.
|
||||
diff -ruN a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
|
||||
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,21 +0,0 @@
|
||||
-/dts-v1/;
|
||||
-
|
||||
|
@ -228,10 +337,10 @@ diff -urN a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwo
|
|||
- };
|
||||
- };
|
||||
-};
|
||||
\ No newline at end of file
|
||||
diff -urN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
|
||||
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi 1969-12-31 18:00:00.000000000 -0600
|
||||
\ Kein Zeilenumbruch am Dateiende.
|
||||
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 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,78 +0,0 @@
|
||||
-/include/ "kirkwood.dtsi"
|
||||
-
|
||||
|
@ -311,9 +420,9 @@ diff -urN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-t
|
|||
- };
|
||||
- };
|
||||
-};
|
||||
diff -urN a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
|
||||
--- a/arch/arm/mach-kirkwood/board-goflexnet.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c 1969-12-31 18:00:00.000000000 -0600
|
||||
diff -ruN a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
|
||||
--- a/arch/arm/mach-kirkwood/board-goflexnet.c 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,71 +0,0 @@
|
||||
-/*
|
||||
- * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
|
||||
|
@ -349,7 +458,7 @@ diff -urN a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/bo
|
|||
-#include <asm/mach/map.h>
|
||||
-#include <mach/kirkwood.h>
|
||||
-#include <mach/bridge-regs.h>
|
||||
-#include <plat/mvsdio.h>
|
||||
-#include <linux/platform_data/mmc-mvsdio.h>
|
||||
-#include "common.h"
|
||||
-#include "mpp.h"
|
||||
-
|
||||
|
@ -386,10 +495,10 @@ diff -urN a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/bo
|
|||
-
|
||||
- kirkwood_ge00_init(&goflexnet_ge00_data);
|
||||
-}
|
||||
diff -urN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
|
||||
--- a/arch/arm/mach-kirkwood/board-iconnect.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/board-iconnect.c 1969-12-31 18:00:00.000000000 -0600
|
||||
@@ -1,106 +0,0 @@
|
||||
diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
|
||||
--- a/arch/arm/mach-kirkwood/board-iconnect.c 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/board-iconnect.c 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,58 +0,0 @@
|
||||
-/*
|
||||
- * arch/arm/mach-kirkwood/board-iconnect.c
|
||||
- *
|
||||
|
@ -408,11 +517,8 @@ diff -urN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
|
|||
-#include <linux/of_fdt.h>
|
||||
-#include <linux/of_irq.h>
|
||||
-#include <linux/of_platform.h>
|
||||
-#include <linux/mtd/partitions.h>
|
||||
-#include <linux/mv643xx_eth.h>
|
||||
-#include <linux/gpio.h>
|
||||
-#include <linux/input.h>
|
||||
-#include <linux/gpio_keys.h>
|
||||
-#include <asm/mach/arch.h>
|
||||
-#include <mach/kirkwood.h>
|
||||
-#include "common.h"
|
||||
|
@ -436,57 +542,12 @@ diff -urN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
|
|||
- 0
|
||||
-};
|
||||
-
|
||||
-static struct mtd_partition iconnect_nand_parts[] = {
|
||||
- {
|
||||
- .name = "flash",
|
||||
- .offset = 0,
|
||||
- .size = MTDPART_SIZ_FULL,
|
||||
- },
|
||||
-};
|
||||
-
|
||||
-/* yikes... theses are the original input buttons */
|
||||
-/* but I'm not convinced by the sw event choices */
|
||||
-static struct gpio_keys_button iconnect_buttons[] = {
|
||||
- {
|
||||
- .type = EV_SW,
|
||||
- .code = SW_LID,
|
||||
- .gpio = 12,
|
||||
- .desc = "Reset Button",
|
||||
- .active_low = 1,
|
||||
- .debounce_interval = 100,
|
||||
- }, {
|
||||
- .type = EV_SW,
|
||||
- .code = SW_TABLET_MODE,
|
||||
- .gpio = 35,
|
||||
- .desc = "OTB Button",
|
||||
- .active_low = 1,
|
||||
- .debounce_interval = 100,
|
||||
- },
|
||||
-};
|
||||
-
|
||||
-static struct gpio_keys_platform_data iconnect_button_data = {
|
||||
- .buttons = iconnect_buttons,
|
||||
- .nbuttons = ARRAY_SIZE(iconnect_buttons),
|
||||
-};
|
||||
-
|
||||
-static struct platform_device iconnect_button_device = {
|
||||
- .name = "gpio-keys",
|
||||
- .id = -1,
|
||||
- .num_resources = 0,
|
||||
- .dev = {
|
||||
- .platform_data = &iconnect_button_data,
|
||||
- },
|
||||
-};
|
||||
-
|
||||
-void __init iconnect_init(void)
|
||||
-{
|
||||
- kirkwood_mpp_conf(iconnect_mpp_config);
|
||||
- kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25);
|
||||
-
|
||||
- kirkwood_ehci_init();
|
||||
- kirkwood_ge00_init(&iconnect_ge00_data);
|
||||
-
|
||||
- platform_device_register(&iconnect_button_device);
|
||||
-}
|
||||
-
|
||||
-static int __init iconnect_pci_init(void)
|
||||
|
@ -496,108 +557,10 @@ diff -urN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
|
|||
- return 0;
|
||||
-}
|
||||
-subsys_initcall(iconnect_pci_init);
|
||||
diff -urN a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
|
||||
--- a/arch/arm/mach-kirkwood/board-ts219.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/board-ts219.c 1969-12-31 18:00:00.000000000 -0600
|
||||
@@ -1,82 +0,0 @@
|
||||
-/*
|
||||
- *
|
||||
- * QNAP TS-11x/TS-21x Turbo NAS Board Setup via DT
|
||||
- *
|
||||
- * Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>
|
||||
- *
|
||||
- * Based on the board file ts219-setup.c:
|
||||
- *
|
||||
- * Copyright (C) 2009 Martin Michlmayr <tbm@cyrius.com>
|
||||
- * Copyright (C) 2008 Byron Bradley <byron.bbradley@gmail.com>
|
||||
- *
|
||||
- * This program is free software; you can redistribute it and/or
|
||||
- * modify it under the terms of the GNU General Public License
|
||||
- * as published by the Free Software Foundation; either version
|
||||
- * 2 of the License, or (at your option) any later version.
|
||||
- */
|
||||
-
|
||||
-#include <linux/kernel.h>
|
||||
-#include <linux/init.h>
|
||||
-#include <linux/platform_device.h>
|
||||
-#include <linux/mv643xx_eth.h>
|
||||
-#include <linux/ata_platform.h>
|
||||
-#include <linux/gpio_keys.h>
|
||||
-#include <linux/input.h>
|
||||
-#include <asm/mach-types.h>
|
||||
-#include <asm/mach/arch.h>
|
||||
-#include <mach/kirkwood.h>
|
||||
-#include "common.h"
|
||||
-#include "mpp.h"
|
||||
-#include "tsx1x-common.h"
|
||||
-
|
||||
-static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
|
||||
- .phy_addr = MV643XX_ETH_PHY_ADDR(8),
|
||||
-};
|
||||
-
|
||||
-static unsigned int qnap_ts219_mpp_config[] __initdata = {
|
||||
- MPP0_SPI_SCn,
|
||||
- MPP1_SPI_MOSI,
|
||||
- MPP2_SPI_SCK,
|
||||
- MPP3_SPI_MISO,
|
||||
- MPP4_SATA1_ACTn,
|
||||
- MPP5_SATA0_ACTn,
|
||||
- MPP8_TW0_SDA,
|
||||
- MPP9_TW0_SCK,
|
||||
- MPP10_UART0_TXD,
|
||||
- MPP11_UART0_RXD,
|
||||
- MPP13_UART1_TXD, /* PIC controller */
|
||||
- MPP14_UART1_RXD, /* PIC controller */
|
||||
- MPP15_GPIO, /* USB Copy button (on devices with 88F6281) */
|
||||
- MPP16_GPIO, /* Reset button (on devices with 88F6281) */
|
||||
- MPP36_GPIO, /* RAM: 0: 256 MB, 1: 512 MB */
|
||||
- MPP37_GPIO, /* Reset button (on devices with 88F6282) */
|
||||
- MPP43_GPIO, /* USB Copy button (on devices with 88F6282) */
|
||||
- MPP44_GPIO, /* Board ID: 0: TS-11x, 1: TS-21x */
|
||||
- 0
|
||||
-};
|
||||
-
|
||||
-void __init qnap_dt_ts219_init(void)
|
||||
-{
|
||||
- u32 dev, rev;
|
||||
-
|
||||
- kirkwood_mpp_conf(qnap_ts219_mpp_config);
|
||||
-
|
||||
- kirkwood_pcie_id(&dev, &rev);
|
||||
- if (dev == MV88F6282_DEV_ID)
|
||||
- qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
|
||||
-
|
||||
- kirkwood_ge00_init(&qnap_ts219_ge00_data);
|
||||
- kirkwood_ehci_init();
|
||||
-
|
||||
- pm_power_off = qnap_tsx1x_power_off;
|
||||
-}
|
||||
-
|
||||
-/* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
|
||||
-static int __init ts219_pci_init(void)
|
||||
-{
|
||||
- if (machine_is_ts219())
|
||||
- kirkwood_pcie_init(KW_PCIE0);
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-subsys_initcall(ts219_pci_init);
|
||||
diff -urN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
|
||||
--- a/arch/arm/mach-kirkwood/common.h 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/common.h 2013-01-13 14:28:41.158997296 -0600
|
||||
@@ -58,11 +58,6 @@
|
||||
#else
|
||||
static inline void dreamplug_init(void) {};
|
||||
#endif
|
||||
-#ifdef CONFIG_MACH_TS219_DT
|
||||
-void qnap_dt_ts219_init(void);
|
||||
-#else
|
||||
-static inline void qnap_dt_ts219_init(void) {};
|
||||
-#endif
|
||||
|
||||
#ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT
|
||||
void dnskw_init(void);
|
||||
@@ -70,24 +65,12 @@
|
||||
diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
|
||||
--- a/arch/arm/mach-kirkwood/common.h 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/common.h 2012-12-11 18:35:14.634683186 +0100
|
||||
@@ -70,12 +70,6 @@
|
||||
static inline void dnskw_init(void) {};
|
||||
#endif
|
||||
|
||||
|
@ -610,7 +573,8 @@ diff -urN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
|
|||
#ifdef CONFIG_MACH_IB62X0_DT
|
||||
void ib62x0_init(void);
|
||||
#else
|
||||
static inline void ib62x0_init(void) {};
|
||||
@@ -88,12 +82,6 @@
|
||||
static inline void dockstar_dt_init(void) {};
|
||||
#endif
|
||||
|
||||
-#ifdef CONFIG_MACH_GOFLEXNET_DT
|
||||
|
@ -622,9 +586,9 @@ diff -urN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
|
|||
#ifdef CONFIG_MACH_LSXL_DT
|
||||
void lsxl_init(void);
|
||||
#else
|
||||
diff -urN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/dockstar-setup.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2013-01-13 14:28:41.166810068 -0600
|
||||
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 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2012-12-11 18:34:46.744502480 +0100
|
||||
@@ -29,6 +29,10 @@
|
||||
.offset = 0,
|
||||
.size = SZ_1M
|
||||
|
@ -668,9 +632,9 @@ diff -urN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
|
|||
0
|
||||
};
|
||||
|
||||
diff -urN 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 18:00:00.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2013-01-13 14:28:41.166810068 -0600
|
||||
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 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2012-12-11 18:34:46.745502504 +0100
|
||||
@@ -0,0 +1,124 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/goflexhome-setup.c
|
||||
|
@ -796,9 +760,9 @@ diff -urN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
+
|
||||
diff -urN 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 18:00:00.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2013-01-13 14:28:41.166810068 -0600
|
||||
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 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2012-12-11 18:34:46.745502504 +0100
|
||||
@@ -0,0 +1,177 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/goflexnet-setup.c
|
||||
|
@ -977,9 +941,9 @@ diff -urN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
+
|
||||
diff -urN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/guruplug-setup.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2013-01-13 14:28:41.166810068 -0600
|
||||
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 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2012-12-11 18:34:46.745502504 +0100
|
||||
@@ -57,22 +57,24 @@
|
||||
|
||||
static struct gpio_led guruplug_led_pins[] = {
|
||||
|
@ -1009,9 +973,9 @@ diff -urN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
|
|||
.gpio = 49,
|
||||
.active_low = 1,
|
||||
},
|
||||
diff -urN 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 18:00:00.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2013-01-13 14:28:41.166810068 -0600
|
||||
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 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2012-12-11 18:34:46.745502504 +0100
|
||||
@@ -0,0 +1,204 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/iconnect-setup.c
|
||||
|
@ -1217,9 +1181,9 @@ diff -urN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
|
|||
+ .timer = &kirkwood_timer,
|
||||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -urN 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 18:00:00.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2013-01-13 14:28:41.166810068 -0600
|
||||
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 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2012-12-11 22:47:53.032899067 +0100
|
||||
@@ -0,0 +1,137 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/ionics-stratus-setup.c
|
||||
|
@ -1242,7 +1206,7 @@ diff -urN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
|
|||
+#include <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <mach/kirkwood.h>
|
||||
+#include <plat/mvsdio.h>
|
||||
+#include <linux/platform_data/mmc-mvsdio.h>
|
||||
+#include "common.h"
|
||||
+#include "mpp.h"
|
||||
+
|
||||
|
@ -1358,9 +1322,9 @@ diff -urN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
|
|||
+ .timer = &kirkwood_timer,
|
||||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -urN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
|
||||
--- a/arch/arm/mach-kirkwood/Kconfig 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/Kconfig 2013-01-13 14:28:41.158997296 -0600
|
||||
diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
|
||||
--- a/arch/arm/mach-kirkwood/Kconfig 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/Kconfig 2012-12-11 18:34:42.668479244 +0100
|
||||
@@ -58,12 +58,6 @@
|
||||
Say 'Y' here if you want your kernel to support the
|
||||
Marvell DreamPlug (Flattened Device Tree).
|
||||
|
@ -1374,7 +1338,7 @@ diff -urN 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
|
||||
@@ -80,27 +74,6 @@
|
||||
@@ -80,34 +74,6 @@
|
||||
RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
|
||||
Flattened Device Tree.
|
||||
|
||||
|
@ -1392,6 +1356,13 @@ diff -urN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
|
|||
- or MV6282. If you have the wrong one, the buttons will not
|
||||
- work.
|
||||
-
|
||||
-config MACH_DOCKSTAR_DT
|
||||
- bool "Seagate FreeAgent Dockstar (Flattened Device Tree)"
|
||||
- select ARCH_KIRKWOOD_DT
|
||||
- help
|
||||
- Say 'Y' here if you want your kernel to support the
|
||||
- Seagate FreeAgent Dockstar (Flattened Device Tree).
|
||||
-
|
||||
-config MACH_GOFLEXNET_DT
|
||||
- bool "Seagate GoFlex Net (Flattened Device Tree)"
|
||||
- select ARCH_KIRKWOOD_DT
|
||||
|
@ -1402,83 +1373,83 @@ diff -urN 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
|
||||
@@ -129,6 +102,54 @@
|
||||
@@ -150,6 +116,54 @@
|
||||
Say 'Y' here if you want your kernel to support the
|
||||
Seagate FreeAgent DockStar.
|
||||
|
||||
+config MACH_GOFLEXNET
|
||||
+ bool "Seagate GoFlex Net"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Seagate GoFlex Net.
|
||||
+ bool "Seagate GoFlex Net"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Seagate GoFlex Net.
|
||||
+
|
||||
+config MACH_GOFLEXHOME
|
||||
+ bool "Seagate GoFlex Home"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Seagate GoFlex Home.
|
||||
+ bool "Seagate GoFlex Home"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Seagate GoFlex Home.
|
||||
+
|
||||
+config MACH_ICONNECT
|
||||
+ bool "Iomega iConnect Wireless"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Iomega iConnect Wireless.
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Iomega iConnect Wireless.
|
||||
+
|
||||
+config MACH_POGOPLUGV4
|
||||
+ bool "Pogoplug Series 4"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Pogoplug Series 4.
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Pogoplug Series 4.
|
||||
+
|
||||
+config MACH_POGO_E02
|
||||
+ bool "CE Pogoplug E02"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ CloudEngines Pogoplug e02.
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ CloudEngines Pogoplug e02.
|
||||
+
|
||||
+config MACH_NAS6210
|
||||
+ bool "RaidSonic ICY BOX IB-NAS6210"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ RaidSonic ICY BOX IB-NAS6210 device.
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ RaidSonic ICY BOX IB-NAS6210 device.
|
||||
+
|
||||
+config MACH_TOPKICK
|
||||
+ bool "USI Topkick"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ USI Topkick.
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ USI Topkick.
|
||||
+
|
||||
+config MACH_IONICS_STRATUS
|
||||
+ bool "Ionics Stratus"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Ionics Stratus.
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ Ionics Stratus.
|
||||
+
|
||||
config MACH_OPENRD
|
||||
bool
|
||||
|
||||
@@ -195,6 +216,18 @@
|
||||
@@ -216,6 +230,18 @@
|
||||
Say 'Y' here if you want your kernel to support the
|
||||
HP t5325 Thin Client.
|
||||
|
||||
+config MACH_NSA310
|
||||
+ bool "ZyXEL NSA310 1-Bay Power Media Server"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ ZyXEL NSA310.
|
||||
+ bool "ZyXEL NSA310 1-Bay Power Media Server"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ ZyXEL NSA310.
|
||||
+
|
||||
+config MACH_NSA320
|
||||
+ bool "ZyXEL NSA320 2-Bay Power Media Server"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ ZyXel NSA320.
|
||||
+ bool "ZyXEL NSA320 2-Bay Power Media Server"
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the
|
||||
+ ZyXel NSA320.
|
||||
+
|
||||
endmenu
|
||||
|
||||
endif
|
||||
diff -urN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
|
||||
--- a/arch/arm/mach-kirkwood/Makefile 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/Makefile 2013-01-13 14:28:41.158997296 -0600
|
||||
diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
|
||||
--- a/arch/arm/mach-kirkwood/Makefile 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/Makefile 2012-12-11 18:36:03.060009252 +0100
|
||||
@@ -8,6 +8,14 @@
|
||||
obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
|
||||
obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
|
||||
|
@ -1494,7 +1465,7 @@ diff -urN 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,13 +26,12 @@
|
||||
@@ -18,16 +26,15 @@
|
||||
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
|
||||
|
@ -1508,25 +1479,14 @@ diff -urN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
|
|||
obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += board-dnskw.o
|
||||
obj-$(CONFIG_MACH_IB62X0_DT) += board-ib62x0.o
|
||||
-obj-$(CONFIG_MACH_TS219_DT) += board-ts219.o tsx1x-common.o
|
||||
obj-$(CONFIG_MACH_DOCKSTAR_DT) += board-dockstar.o
|
||||
-obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o
|
||||
obj-$(CONFIG_MACH_LSXL_DT) += board-lsxl.o
|
||||
diff -urN a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
|
||||
--- a/arch/arm/mach-kirkwood/Makefile.boot 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/Makefile.boot 2013-01-13 14:28:41.158997296 -0600
|
||||
@@ -5,10 +5,6 @@
|
||||
dtb-$(CONFIG_MACH_DREAMPLUG_DT) += kirkwood-dreamplug.dtb
|
||||
dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns320.dtb
|
||||
dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb
|
||||
-dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
|
||||
dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb
|
||||
-dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-ts219-6281.dtb
|
||||
-dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-ts219-6282.dtb
|
||||
-dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb
|
||||
dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb
|
||||
dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb
|
||||
diff -urN 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 18:00:00.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2013-01-13 14:28:41.174622840 -0600
|
||||
obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT) += board-iomega_ix2_200.o
|
||||
obj-$(CONFIG_MACH_KM_KIRKWOOD_DT) += board-km_kirkwood.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 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2012-12-11 18:34:46.746502525 +0100
|
||||
@@ -0,0 +1,186 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/nas6210-setup.c
|
||||
|
@ -1714,9 +1674,9 @@ diff -urN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
|
|||
+ .timer = &kirkwood_timer,
|
||||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -urN 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 18:00:00.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2013-01-13 14:28:41.174622840 -0600
|
||||
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 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2012-12-11 18:34:46.746502525 +0100
|
||||
@@ -0,0 +1,299 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/nsa310-setup.c
|
||||
|
@ -2017,10 +1977,10 @@ diff -urN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
|
|||
+ .timer = &kirkwood_timer,
|
||||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -urN 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 18:00:00.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2013-01-13 14:30:45.835209834 -0600
|
||||
@@ -0,0 +1,304 @@
|
||||
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 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2012-12-11 22:22:38.684227039 +0100
|
||||
@@ -0,0 +1,305 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/nsa320-setup.c
|
||||
+ *
|
||||
|
@ -2047,6 +2007,7 @@ diff -urN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
|
|||
+#include <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <mach/kirkwood.h>
|
||||
+#include <plat/orion-gpio.h>
|
||||
+#include "common.h"
|
||||
+#include "mpp.h"
|
||||
+
|
||||
|
@ -2301,10 +2262,10 @@ diff -urN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
|
|||
+ kirkwood_i2c_init();
|
||||
+ i2c_register_board_info(0, &nsa320_i2c_rtc, 1);
|
||||
+
|
||||
+ if (gpio_request(NSA320_GPIO_USB_POWER, "USB Power Enable") ||
|
||||
+ gpio_direction_output(NSA320_GPIO_USB_POWER, usb_power))
|
||||
+ pr_err("nsa320: failed to configure USB power enable GPIO)\n");
|
||||
+ gpio_free(NSA320_GPIO_USB_POWER);
|
||||
+ if (gpio_request(NSA320_GPIO_USB_POWER, "USB Power Enable") ||
|
||||
+ gpio_direction_output(NSA320_GPIO_USB_POWER, usb_power))
|
||||
+ pr_err("nsa320: failed to configure USB power enable GPIO)\n");
|
||||
+ gpio_free(NSA320_GPIO_USB_POWER);
|
||||
+
|
||||
+ kirkwood_ehci_init();
|
||||
+
|
||||
|
@ -2325,9 +2286,9 @@ diff -urN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
|
|||
+ .timer = &kirkwood_timer,
|
||||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -urN 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 18:00:00.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2013-01-13 14:28:41.174622840 -0600
|
||||
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 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2012-12-11 18:34:46.747502539 +0100
|
||||
@@ -0,0 +1,115 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/pogo_e02-setup.c
|
||||
|
@ -2444,10 +2405,10 @@ diff -urN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
|
|||
+ .timer = &kirkwood_timer,
|
||||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -urN 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 18:00:00.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2013-01-13 14:28:41.174622840 -0600
|
||||
@@ -0,0 +1,194 @@
|
||||
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 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2012-12-11 22:21:55.149950301 +0100
|
||||
@@ -0,0 +1,195 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/pogoplugv4-setup.c
|
||||
+ *
|
||||
|
@ -2475,7 +2436,8 @@ diff -urN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
|
|||
+#include <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <mach/kirkwood.h>
|
||||
+#include <plat/mvsdio.h>
|
||||
+#include <linux/platform_data/mmc-mvsdio.h>
|
||||
+#include <plat/orion-gpio.h>
|
||||
+#include "common.h"
|
||||
+#include "mpp.h"
|
||||
+
|
||||
|
@ -2642,9 +2604,9 @@ diff -urN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
|
|||
+ .timer = &kirkwood_timer,
|
||||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -urN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-01-13 14:28:41.174622840 -0600
|
||||
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 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2012-12-11 18:34:46.748502553 +0100
|
||||
@@ -43,7 +43,7 @@
|
||||
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
|
||||
};
|
||||
|
@ -2723,9 +2685,9 @@ diff -urN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
|
|||
else
|
||||
kirkwood_sdio_init(&sheevaplug_mvsdio_data);
|
||||
|
||||
diff -urN 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 18:00:00.000000000 -0600
|
||||
+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2013-01-13 14:28:41.182435612 -0600
|
||||
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 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2012-12-11 22:48:38.712199378 +0100
|
||||
@@ -0,0 +1,165 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/topkick-setup.c
|
||||
|
@ -2750,7 +2712,7 @@ diff -urN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
|
|||
+#include <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <mach/kirkwood.h>
|
||||
+#include <plat/mvsdio.h>
|
||||
+#include <linux/platform_data/mmc-mvsdio.h>
|
||||
+#include "common.h"
|
||||
+#include "mpp.h"
|
||||
+
|
||||
|
@ -2892,9 +2854,9 @@ diff -urN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
|
|||
+ .timer = &kirkwood_timer,
|
||||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -urN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
|
||||
--- a/arch/arm/plat-orion/common.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/arch/arm/plat-orion/common.c 2013-01-13 14:28:41.182435612 -0600
|
||||
diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
|
||||
--- a/arch/arm/plat-orion/common.c 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/arch/arm/plat-orion/common.c 2012-12-11 18:34:46.749502575 +0100
|
||||
@@ -253,7 +253,9 @@
|
||||
/*****************************************************************************
|
||||
* GE00
|
||||
|
@ -2906,9 +2868,9 @@ diff -urN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
|
|||
|
||||
static struct resource orion_ge00_shared_resources[] = {
|
||||
{
|
||||
diff -urN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
|
||||
--- a/drivers/ata/sata_mv.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/drivers/ata/sata_mv.c 2013-01-13 14:28:41.190248384 -0600
|
||||
diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
|
||||
--- a/drivers/ata/sata_mv.c 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/drivers/ata/sata_mv.c 2012-12-11 18:34:46.750502591 +0100
|
||||
@@ -71,6 +71,7 @@
|
||||
#include <scsi/scsi_cmnd.h>
|
||||
#include <scsi/scsi_device.h>
|
||||
|
@ -2917,7 +2879,7 @@ diff -urN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
|
|||
|
||||
#define DRV_NAME "sata_mv"
|
||||
#define DRV_VERSION "1.28"
|
||||
@@ -1155,6 +1156,8 @@
|
||||
@@ -1156,6 +1157,8 @@
|
||||
{
|
||||
int want_ncq = (protocol == ATA_PROT_NCQ);
|
||||
|
||||
|
@ -2926,10 +2888,10 @@ diff -urN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
|
|||
if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
|
||||
int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
|
||||
if (want_ncq != using_ncq)
|
||||
diff -urN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
|
||||
--- a/drivers/hwmon/Kconfig 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/drivers/hwmon/Kconfig 2013-01-13 14:28:41.205873928 -0600
|
||||
@@ -1411,6 +1411,19 @@
|
||||
diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
|
||||
--- a/drivers/hwmon/Kconfig 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/drivers/hwmon/Kconfig 2012-12-11 18:34:46.751502596 +0100
|
||||
@@ -1421,6 +1421,19 @@
|
||||
help
|
||||
Support for the A/D converter on MC13783 and MC13892 PMIC.
|
||||
|
||||
|
@ -2949,10 +2911,10 @@ diff -urN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
|
|||
if ACPI
|
||||
|
||||
comment "ACPI drivers"
|
||||
diff -urN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
|
||||
--- a/drivers/hwmon/Makefile 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/drivers/hwmon/Makefile 2013-01-13 14:28:41.205873928 -0600
|
||||
@@ -98,6 +98,7 @@
|
||||
diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
|
||||
--- a/drivers/hwmon/Makefile 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/drivers/hwmon/Makefile 2012-12-11 18:34:46.751502596 +0100
|
||||
@@ -99,6 +99,7 @@
|
||||
obj-$(CONFIG_SENSORS_MAX6642) += max6642.o
|
||||
obj-$(CONFIG_SENSORS_MAX6650) += max6650.o
|
||||
obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
|
||||
|
@ -2960,9 +2922,9 @@ diff -urN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
|
|||
obj-$(CONFIG_SENSORS_MCP3021) += mcp3021.o
|
||||
obj-$(CONFIG_SENSORS_NTC_THERMISTOR) += ntc_thermistor.o
|
||||
obj-$(CONFIG_SENSORS_PC87360) += pc87360.o
|
||||
diff -urN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
|
||||
--- a/drivers/hwmon/nsa3xx-hwmon.c 1969-12-31 18:00:00.000000000 -0600
|
||||
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2013-01-13 14:28:41.205873928 -0600
|
||||
diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
|
||||
--- a/drivers/hwmon/nsa3xx-hwmon.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2012-12-11 18:34:46.752502597 +0100
|
||||
@@ -0,0 +1,251 @@
|
||||
+/*
|
||||
+ * drivers/hwmon/nsa3xx-hwmon.c
|
||||
|
@ -3215,10 +3177,10 @@ diff -urN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
|
|||
+MODULE_DESCRIPTION("NSA3XX Hardware Monitoring");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS("platform:nsa3xx-hwmon");
|
||||
diff -urN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
|
||||
--- a/drivers/leds/Kconfig 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/drivers/leds/Kconfig 2013-01-13 14:28:41.213686699 -0600
|
||||
@@ -482,7 +482,6 @@
|
||||
diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
|
||||
--- a/drivers/leds/Kconfig 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/drivers/leds/Kconfig 2012-12-11 18:34:46.752502597 +0100
|
||||
@@ -494,7 +494,6 @@
|
||||
|
||||
config LEDS_TRIGGER_IDE_DISK
|
||||
bool "LED IDE Disk Trigger"
|
||||
|
@ -3226,10 +3188,10 @@ diff -urN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
|
|||
depends on LEDS_TRIGGERS
|
||||
help
|
||||
This allows LEDs to be controlled by IDE disk activity.
|
||||
diff -urN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
|
||||
--- a/drivers/mmc/core/core.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/drivers/mmc/core/core.c 2013-01-13 14:28:41.213686699 -0600
|
||||
@@ -546,7 +546,7 @@
|
||||
diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
|
||||
--- a/drivers/mmc/core/core.c 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/drivers/mmc/core/core.c 2012-12-11 18:34:46.753502597 +0100
|
||||
@@ -684,7 +684,7 @@
|
||||
*/
|
||||
limit_us = 3000000;
|
||||
else
|
||||
|
@ -3238,9 +3200,9 @@ diff -urN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
|
|||
|
||||
/*
|
||||
* SDHC cards always use these fixed values.
|
||||
diff -urN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
|
||||
--- a/drivers/mmc/core/sd.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/drivers/mmc/core/sd.c 2013-01-13 14:28:41.221499470 -0600
|
||||
diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
|
||||
--- a/drivers/mmc/core/sd.c 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/drivers/mmc/core/sd.c 2012-12-11 18:34:46.753502597 +0100
|
||||
@@ -355,6 +355,15 @@
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
@ -3257,9 +3219,9 @@ diff -urN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
|
|||
err = mmc_sd_switch(card, 1, 0, 1, status);
|
||||
if (err)
|
||||
goto out;
|
||||
diff -urN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
|
||||
--- a/drivers/mmc/host/mvsdio.c 2012-12-17 11:27:45.000000000 -0600
|
||||
+++ b/drivers/mmc/host/mvsdio.c 2013-01-13 14:28:41.229312242 -0600
|
||||
diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
|
||||
--- a/drivers/mmc/host/mvsdio.c 2012-12-11 04:30:57.000000000 +0100
|
||||
+++ b/drivers/mmc/host/mvsdio.c 2012-12-11 18:34:46.754502597 +0100
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <linux/clk.h>
|
||||
#include <linux/gpio.h>
|
||||
|
@ -3276,9 +3238,9 @@ diff -urN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
|
|||
|
||||
cmdreg = MVSD_CMD_INDEX(cmd->opcode);
|
||||
|
||||
diff -urN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
|
||||
--- a/include/linux/nsa3xx-hwmon.h 1969-12-31 18:00:00.000000000 -0600
|
||||
+++ b/include/linux/nsa3xx-hwmon.h 2013-01-13 14:28:41.229312242 -0600
|
||||
diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
|
||||
--- a/include/linux/nsa3xx-hwmon.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/include/linux/nsa3xx-hwmon.h 2012-12-11 18:34:46.754502597 +0100
|
||||
@@ -0,0 +1,21 @@
|
||||
+/*
|
||||
+ * include/linux/nsa3xx.hwmon.h
|
||||
|
|
Binary file not shown.
BIN
core/linux-kirkwood/aufs3-3.7.patch.xz
Normal file
BIN
core/linux-kirkwood/aufs3-3.7.patch.xz
Normal file
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
@ -2,7 +2,7 @@
|
|||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=-kirkwood
|
||||
KERNEL_VERSION=3.6.2-0-ARCH
|
||||
KERNEL_VERSION=3.7.2-0-ARCH
|
||||
|
||||
post_install () {
|
||||
# updating module dependencies
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#
|
||||
# http://www.arm.linux.org.uk/developer/machines/?action=new
|
||||
#
|
||||
# Last update: Fri Aug 10 18:34:12 2012
|
||||
# Last update: Tue Jan 15 01:20:54 2013
|
||||
#
|
||||
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
|
||||
#
|
||||
|
@ -3280,7 +3280,7 @@ shenzhou MACH_SHENZHOU SHENZHOU 3319
|
|||
cwme9210 MACH_CWME9210 CWME9210 3320
|
||||
cwme9210js MACH_CWME9210JS CWME9210JS 3321
|
||||
pgs_v1 MACH_PGS_SITARA PGS_SITARA 3322
|
||||
colibri_tegra2 MACH_COLIBRI_TEGRA2 COLIBRI_TEGRA2 3323
|
||||
colibri_t20 MACH_COLIBRI_TEGRA2 COLIBRI_TEGRA2 3323
|
||||
w21 MACH_W21 W21 3324
|
||||
polysat1 MACH_POLYSAT1 POLYSAT1 3325
|
||||
dataway MACH_DATAWAY DATAWAY 3326
|
||||
|
@ -3812,7 +3812,7 @@ farleys MACH_FARLEYS FARLEYS 3856
|
|||
efm32gg_dk3750 MACH_EFM32GG_DK3750 EFM32GG_DK3750 3857
|
||||
zeus_board MACH_ZEUS_BOARD ZEUS_BOARD 3858
|
||||
cc51 MACH_CC51 CC51 3859
|
||||
fxi_c210 MACH_FXI_C210 FXI_C210 3860
|
||||
cottoncandy MACH_FXI_C210 FXI_C210 3860
|
||||
msm8627_cdp MACH_MSM8627_CDP MSM8627_CDP 3861
|
||||
msm8627_mtp MACH_MSM8627_MTP MSM8627_MTP 3862
|
||||
armadillo800eva MACH_ARMADILLO800EVA ARMADILLO800EVA 3863
|
||||
|
@ -4072,7 +4072,7 @@ tam335x MACH_TAM335X TAM335X 4116
|
|||
grouper MACH_GROUPER GROUPER 4117
|
||||
mpcsa21_9g20 MACH_MPCSA21_9G20 MPCSA21_9G20 4118
|
||||
m6u_cpu MACH_M6U_CPU M6U_CPU 4119
|
||||
davinci_dp10 MACH_DAVINCI_DP10 DAVINCI_DP10 4120
|
||||
davinci_dp7 MACH_DAVINCI_DP10 DAVINCI_DP10 4120
|
||||
ginkgo MACH_GINKGO GINKGO 4121
|
||||
cgt_qmx6 MACH_CGT_QMX6 CGT_QMX6 4122
|
||||
profpga MACH_PROFPGA PROFPGA 4123
|
||||
|
@ -4257,3 +4257,197 @@ cpx2e_cell MACH_CPX2E_CELL CPX2E_CELL 4301
|
|||
amiro MACH_AMIRO AMIRO 4302
|
||||
mx6q_brassboard MACH_MX6Q_BRASSBOARD MX6Q_BRASSBOARD 4303
|
||||
dalmore MACH_DALMORE DALMORE 4304
|
||||
omap3_portal7cp MACH_OMAP3_PORTAL7CP OMAP3_PORTAL7CP 4305
|
||||
tegra_pluto MACH_TEGRA_PLUTO TEGRA_PLUTO 4306
|
||||
mx6sl_evk MACH_MX6SL_EVK MX6SL_EVK 4307
|
||||
m7 MACH_M7 M7 4308
|
||||
pxm2 MACH_PXM2 PXM2 4309
|
||||
haba_knx_lite MACH_HABA_KNX_LITE HABA_KNX_LITE 4310
|
||||
tai MACH_TAI TAI 4311
|
||||
prototd MACH_PROTOTD PROTOTD 4312
|
||||
dst_tonto MACH_DST_TONTO DST_TONTO 4313
|
||||
draco MACH_DRACO DRACO 4314
|
||||
dxr2 MACH_DXR2 DXR2 4315
|
||||
rut MACH_RUT RUT 4316
|
||||
am180x_wsc MACH_AM180X_WSC AM180X_WSC 4317
|
||||
deluxe_u MACH_DELUXE_U DELUXE_U 4318
|
||||
deluxe_ul MACH_DELUXE_UL DELUXE_UL 4319
|
||||
at91sam9260medths MACH_AT91SAM9260MEDTHS AT91SAM9260MEDTHS 4320
|
||||
matrix516 MACH_MATRIX516 MATRIX516 4321
|
||||
vid401x MACH_VID401X VID401X 4322
|
||||
helios_v5 MACH_HELIOS_V5 HELIOS_V5 4323
|
||||
playpaq2 MACH_PLAYPAQ2 PLAYPAQ2 4324
|
||||
igam MACH_IGAM IGAM 4325
|
||||
amico_i MACH_AMICO_I AMICO_I 4326
|
||||
amico_e MACH_AMICO_E AMICO_E 4327
|
||||
sentient_mm3_ck MACH_SENTIENT_MM3_CK SENTIENT_MM3_CK 4328
|
||||
smx6 MACH_SMX6 SMX6 4329
|
||||
pango MACH_PANGO PANGO 4330
|
||||
ns115_stick MACH_NS115_STICK NS115_STICK 4331
|
||||
bctrm3 MACH_BCTRM3 BCTRM3 4332
|
||||
doctorws MACH_DOCTORWS DOCTORWS 4333
|
||||
m2601 MACH_M2601 M2601 4334
|
||||
gco_mgmtt MACH_GRIDCO_TRINITY GRIDCO_TRINITY 4335
|
||||
pc73032 MACH_PC3032 PC3032 4336
|
||||
vgg1111 MACH_VGG1111 VGG1111 4337
|
||||
countach MACH_COUNTACH COUNTACH 4338
|
||||
visstrim_sm20 MACH_VISSTRIM_SM20 VISSTRIM_SM20 4339
|
||||
a639 MACH_A639 A639 4340
|
||||
spacemonkey MACH_SPACEMONKEY SPACEMONKEY 4341
|
||||
zpdu_stamp MACH_ZPDU_STAMP ZPDU_STAMP 4342
|
||||
htc_g7_clone MACH_HTC_G7_CLONE HTC_G7_CLONE 4343
|
||||
ft2080_corvus MACH_FT2080_CORVUS FT2080_CORVUS 4344
|
||||
fisland MACH_FISLAND FISLAND 4345
|
||||
zpdu MACH_ZPDU ZPDU 4346
|
||||
urt MACH_URT URT 4347
|
||||
conti_ovip MACH_CONTI_OVIP CONTI_OVIP 4348
|
||||
omapl138_nagra MACH_OMAPL138_NAGRA OMAPL138_NAGRA 4349
|
||||
da850_at3kp1 MACH_DA850_AT3KP1 DA850_AT3KP1 4350
|
||||
da850_at3kp2 MACH_DA850_AT3KP2 DA850_AT3KP2 4351
|
||||
surma MACH_SURMA SURMA 4352
|
||||
stm_b2092 MACH_STM_B2092 STM_B2092 4353
|
||||
mx535_ycr MACH_MX535_YCR MX535_YCR 4354
|
||||
m7_wl MACH_M7_WL M7_WL 4355
|
||||
m7_u MACH_M7_U M7_U 4356
|
||||
omap3_stndt_evm MACH_OMAP3_STNDT_EVM OMAP3_STNDT_EVM 4357
|
||||
m7_wlv MACH_M7_WLV M7_WLV 4358
|
||||
xam3517 MACH_XAM3517 XAM3517 4359
|
||||
a220 MACH_A220 A220 4360
|
||||
aclima_odie MACH_ACLIMA_ODIE ACLIMA_ODIE 4361
|
||||
vibble MACH_VIBBLE VIBBLE 4362
|
||||
k2_u MACH_K2_U K2_U 4363
|
||||
mx53_egf MACH_MX53_EGF MX53_EGF 4364
|
||||
novpek_imx53 MACH_NOVPEK_IMX53 NOVPEK_IMX53 4365
|
||||
novpek_imx6x MACH_NOVPEK_IMX6X NOVPEK_IMX6X 4366
|
||||
mx25_smartbox MACH_MX25_SMARTBOX MX25_SMARTBOX 4367
|
||||
eicg6410 MACH_EICG6410 EICG6410 4368
|
||||
picasso_e3 MACH_PICASSO_E3 PICASSO_E3 4369
|
||||
motonavigator MACH_MOTONAVIGATOR MOTONAVIGATOR 4370
|
||||
varioconnect2 MACH_VARIOCONNECT2 VARIOCONNECT2 4371
|
||||
deluxe_tw MACH_DELUXE_TW DELUXE_TW 4372
|
||||
kore3 MACH_KORE3 KORE3 4374
|
||||
mx6s_drs MACH_MX6S_DRS MX6S_DRS 4375
|
||||
cmimx6 MACH_CMIMX6 CMIMX6 4376
|
||||
roth MACH_ROTH ROTH 4377
|
||||
eq4ux MACH_EQ4UX EQ4UX 4378
|
||||
x1plus MACH_X1PLUS X1PLUS 4379
|
||||
modimx27 MACH_MODIMX27 MODIMX27 4380
|
||||
videon_hduac MACH_VIDEON_HDUAC VIDEON_HDUAC 4381
|
||||
blackbird MACH_BLACKBIRD BLACKBIRD 4382
|
||||
runmaster MACH_RUNMASTER RUNMASTER 4383
|
||||
ceres MACH_CERES CERES 4384
|
||||
nad435 MACH_NAD435 NAD435 4385
|
||||
ns115_proto_type MACH_NS115_PROTO_TYPE NS115_PROTO_TYPE 4386
|
||||
fs20_vcc MACH_FS20_VCC FS20_VCC 4387
|
||||
meson6tv_ref MACH_MESON6TV MESON6TV 4388
|
||||
meson6tv_skt MACH_MESON6TV_SKT MESON6TV_SKT 4389
|
||||
keystone MACH_KEYSTONE KEYSTONE 4390
|
||||
pcm052 MACH_PCM052 PCM052 4391
|
||||
rainbowg15_q7 MACH_TYPE TYPE 4392
|
||||
qrd_skud_prime MACH_QRD_SKUD_PRIME QRD_SKUD_PRIME 4393
|
||||
mx6_rainbow MACH_RAINBOWG15 RAINBOWG15 4394
|
||||
guf_santaro MACH_GUF_SANTARO GUF_SANTARO 4395
|
||||
sheepshead MACH_SHEEPSHEAD SHEEPSHEAD 4396
|
||||
mx6_iwg15m_mxm MACH_MX6_IWG15M_MXM MX6_IWG15M_MXM 4397
|
||||
mx6_iwg15m_q7 MACH_MX6_IWG15M_Q7 MX6_IWG15M_Q7 4398
|
||||
at91sam9263if8mic MACH_AT91SAM9263IF8MIC AT91SAM9263IF8MIC 4399
|
||||
ex MACH_EXCEL EXCEL 4400
|
||||
marcopolo MACH_MARCOPOLO MARCOPOLO 4401
|
||||
mx535_sdcr MACH_MX535_SDCR MX535_SDCR 4402
|
||||
mx53_csb2733 MACH_MX53_CSB2733 MX53_CSB2733 4403
|
||||
diva MACH_DIVA DIVA 4404
|
||||
ncr_7744 MACH_NCR_7744 NCR_7744 4405
|
||||
macallan MACH_MACALLAN MACALLAN 4406
|
||||
wnr3500 MACH_WNR3500 WNR3500 4407
|
||||
pgavrf MACH_PGAVRF PGAVRF 4408
|
||||
helios_v6 MACH_HELIOS_V6 HELIOS_V6 4409
|
||||
lcct MACH_LCCT LCCT 4410
|
||||
csndug MACH_CSNDUG CSNDUG 4411
|
||||
wandboard_imx6 MACH_WANDBOARD_IMX6 WANDBOARD_IMX6 4412
|
||||
omap4_jet MACH_OMAP4_JET OMAP4_JET 4413
|
||||
tegra_roth MACH_TEGRA_ROTH TEGRA_ROTH 4414
|
||||
m7dcg MACH_M7DCG M7DCG 4415
|
||||
m7dug MACH_M7DUG M7DUG 4416
|
||||
m7dtg MACH_M7DTG M7DTG 4417
|
||||
ap42x MACH_AP42X AP42X 4418
|
||||
var_som_mx6 MACH_VAR_SOM_MX6 VAR_SOM_MX6 4419
|
||||
pdlu MACH_PDLU PDLU 4420
|
||||
hydrogen MACH_HYDROGEN HYDROGEN 4421
|
||||
npa211e MACH_NPA211E NPA211E 4422
|
||||
arcadia MACH_ARCADIA ARCADIA 4423
|
||||
arcadia_l MACH_ARCADIA_L ARCADIA_L 4424
|
||||
msm8930dt MACH_MSM8930DT MSM8930DT 4425
|
||||
ktam3874 MACH_KTAM3874 KTAM3874 4426
|
||||
cec4 MACH_CEC4 CEC4 4427
|
||||
ape6evm MACH_APE6EVM APE6EVM 4428
|
||||
tx6 MACH_TX6 TX6 4429
|
||||
owen_som MACH_OWENSOM OWENSOM 4430
|
||||
cfa10037 MACH_CFA10037 CFA10037 4431
|
||||
nbrd_voip MACH_NATEKS_VOIP NATEKS_VOIP 4432
|
||||
ezp1000 MACH_EZP1000 EZP1000 4433
|
||||
wgr826v MACH_WGR826V WGR826V 4434
|
||||
exuma MACH_EXUMA EXUMA 4435
|
||||
fregate MACH_FREGATE FREGATE 4436
|
||||
osirisimx508 MACH_OSIRISIMX508 OSIRISIMX508 4437
|
||||
st_exigo MACH_ST_EXIGO ST_EXIGO 4438
|
||||
pismo MACH_PISMO PISMO 4439
|
||||
atc7 MACH_ATC7 ATC7 4440
|
||||
nspireclp MACH_NSPIRECLP NSPIRECLP 4441
|
||||
nspiretp MACH_NSPIRETP NSPIRETP 4442
|
||||
nspirecx MACH_NSPIRECX NSPIRECX 4443
|
||||
maya MACH_MAYA MAYA 4444
|
||||
wecct MACH_WECCT WECCT 4445
|
||||
m2s MACH_M2S M2S 4446
|
||||
msm8625q_evbd MACH_MSM8625Q_EVBD MSM8625Q_EVBD 4447
|
||||
tiny210 MACH_TINY210 TINY210 4448
|
||||
g3 MACH_G3 G3 4449
|
||||
hurricane MACH_HURRICANE HURRICANE 4450
|
||||
mx6_pod MACH_MX6_POD MX6_POD 4451
|
||||
elondcn MACH_ELONDCN ELONDCN 4452
|
||||
cwmx535 MACH_CWMX535 CWMX535 4453
|
||||
m7_wlj MACH_M7_WLJ M7_WLJ 4454
|
||||
qsp_arm MACH_QSP_ARM QSP_ARM 4455
|
||||
msm8625q_skud MACH_MSM8625Q_SKUD MSM8625Q_SKUD 4456
|
||||
htcmondrian MACH_HTCMONDRIAN HTCMONDRIAN 4457
|
||||
watson_ead MACH_WATSON_EAD WATSON_EAD 4458
|
||||
mitwoa MACH_MITWOA MITWOA 4459
|
||||
omap3_wolverine MACH_OMAP3_WOLVERINE OMAP3_WOLVERINE 4460
|
||||
mapletree MACH_MAPLETREE MAPLETREE 4461
|
||||
msm8625_fih_sae MACH_MSM8625_FIH_SAE MSM8625_FIH_SAE 4462
|
||||
epc35 MACH_EPC35 EPC35 4463
|
||||
smartrtu MACH_SMARTRTU SMARTRTU 4464
|
||||
rcm101 MACH_RCM101 RCM101 4465
|
||||
amx_imx53_mxx MACH_AMX_IMX53_MXX AMX_IMX53_MXX 4466
|
||||
cp3dcg MACH_CP3DCG CP3DCG 4467
|
||||
cp3dtg MACH_CP3DTG CP3DTG 4468
|
||||
cp3dug MACH_CP3DUG CP3DUG 4469
|
||||
acer_a12 MACH_ACER_A12 ACER_A12 4470
|
||||
sbc6x MACH_SBC6X SBC6X 4471
|
||||
u2 MACH_U2 U2 4472
|
||||
smdk4270 MACH_SMDK4270 SMDK4270 4473
|
||||
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
|
||||
mach_type_dep2410 MACH_MACH_TYPE_DEP2410 MACH_TYPE_DEP2410 4479
|
||||
bctre3 MACH_BCTRE3 BCTRE3 4480
|
||||
omap_m100 MACH_OMAP_M100 OMAP_M100 4481
|
||||
flo MACH_FLO FLO 4482
|
||||
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
|
||||
primominiu MACH_PRIMOMINIU PRIMOMINIU 4488
|
||||
mrt_35hd_dualnas_e MACH_MRT_35HD_DUALNAS_E MRT_35HD_DUALNAS_E 4489
|
||||
kiwi MACH_KIWI KIWI 4490
|
||||
hw90496 MACH_HW90496 HW90496 4491
|
||||
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
|
||||
imx233_dpxmtc MACH_DPXMTC DPXMTC 4497
|
||||
tt_stuttgart MACH_TT_STUTTGART TT_STUTTGART 4498
|
||||
miranda_apcii MACH_MIRANDA_APCII MIRANDA_APCII 4499
|
||||
|
|
Loading…
Reference in a new issue