summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-10-11 08:37:48 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-10-11 08:37:48 +0200
commite9f0638ef97a854899fd3cca734a91e682e3953c (patch)
treecd9b1e54d9354fca34e465a13d7e95e244df36b0 /target/linux
parent618e0b61bc296740d04485167f8370536a25e7fd (diff)
parentf0a578df945e3680efb0dffc7915accf19e60716 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/config/Config.in.audio10
-rw-r--r--target/linux/config/Config.in.i2c2
-rw-r--r--target/linux/config/Config.in.spi4
-rw-r--r--target/linux/patches/3.16.4/bsd-compatibility.patch (renamed from target/linux/patches/3.16.2/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.16.4/cleankernel.patch (renamed from target/linux/patches/3.16.2/cleankernel.patch)0
-rw-r--r--target/linux/patches/3.16.4/cris-header.patch (renamed from target/linux/patches/3.16.2/cris-header.patch)0
-rw-r--r--target/linux/patches/3.16.4/defaults.patch (renamed from target/linux/patches/3.16.2/defaults.patch)0
-rw-r--r--target/linux/patches/3.16.4/disable-netfilter.patch (renamed from target/linux/patches/3.16.2/disable-netfilter.patch)0
-rw-r--r--target/linux/patches/3.16.4/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.16.2/export-symbol-for-exmap.patch)0
-rw-r--r--target/linux/patches/3.16.4/gemalto.patch (renamed from target/linux/patches/3.16.2/gemalto.patch)0
-rw-r--r--target/linux/patches/3.16.4/initramfs-nosizelimit.patch (renamed from target/linux/patches/3.16.2/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/3.16.4/lemote-rfkill.patch (renamed from target/linux/patches/3.16.2/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.16.4/microblaze-axi.patch (renamed from target/linux/patches/3.16.2/microblaze-axi.patch)0
-rw-r--r--target/linux/patches/3.16.4/microblaze-ethernet.patch (renamed from target/linux/patches/3.16.2/microblaze-ethernet.patch)0
-rw-r--r--target/linux/patches/3.16.4/mkpiggy.patch (renamed from target/linux/patches/3.16.2/mkpiggy.patch)0
-rw-r--r--target/linux/patches/3.16.4/mtd-rootfs.patch (renamed from target/linux/patches/3.16.2/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.16.4/nfsv3-tcp.patch (renamed from target/linux/patches/3.16.2/nfsv3-tcp.patch)0
-rw-r--r--target/linux/patches/3.16.4/non-static.patch (renamed from target/linux/patches/3.16.2/non-static.patch)0
-rw-r--r--target/linux/patches/3.16.4/patch-fblogo (renamed from target/linux/patches/3.16.2/patch-fblogo)0
-rw-r--r--target/linux/patches/3.16.4/patch-yaffs2 (renamed from target/linux/patches/3.16.2/patch-yaffs2)0
-rw-r--r--target/linux/patches/3.16.4/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.16.2/ppc64-missing-zlib.patch)0
-rw-r--r--target/linux/patches/3.16.4/regmap-boolean.patch (renamed from target/linux/patches/3.16.2/regmap-boolean.patch)0
-rw-r--r--target/linux/patches/3.16.4/relocs.patch (renamed from target/linux/patches/3.16.2/relocs.patch)0
-rw-r--r--target/linux/patches/3.16.4/sgidefs.patch (renamed from target/linux/patches/3.16.2/sgidefs.patch)0
-rw-r--r--target/linux/patches/3.16.4/sortext.patch (renamed from target/linux/patches/3.16.2/sortext.patch)0
-rw-r--r--target/linux/patches/3.16.4/sparc-memset.patch (renamed from target/linux/patches/3.16.2/sparc-memset.patch)0
-rw-r--r--target/linux/patches/3.16.4/startup.patch (renamed from target/linux/patches/3.16.2/startup.patch)0
-rw-r--r--target/linux/patches/3.16.4/wlan-cf.patch (renamed from target/linux/patches/3.16.2/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.16.4/xargs.patch (renamed from target/linux/patches/3.16.2/xargs.patch)0
29 files changed, 9 insertions, 7 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index f9bea1260..594274c40 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -161,7 +161,7 @@ config ADK_KERNEL_SND_BCM2835
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
-config ADK_KERNEL_SND_BCM2708_SOC_I2S
+config ADK_KERNEL_SND_BCM2835_SOC_I2S
boolean
select ADK_KERNEL_SND
select ADK_KERNEL_SND_ARM
@@ -176,7 +176,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
prompt "Raspberry PI hifiberry DAC"
boolean
select ADK_KERNEL_DMA_BCM2708
- select ADK_KERNEL_SND_BCM2708_SOC_I2S
+ select ADK_KERNEL_SND_BCM2835_SOC_I2S
select ADK_KERNEL_SND_SOC_PCM5102A
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
@@ -185,7 +185,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
prompt "Raspberry PI hifiberry DIGI"
boolean
select ADK_KERNEL_DMA_BCM2708
- select ADK_KERNEL_SND_BCM2708_SOC_I2S
+ select ADK_KERNEL_SND_BCM2835_SOC_I2S
select ADK_KERNEL_SND_SOC_WM8804
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
@@ -194,7 +194,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC
prompt "Raspberry PI RPI-DAC"
boolean
select ADK_KERNEL_DMA_BCM2708
- select ADK_KERNEL_SND_BCM2708_SOC_I2S
+ select ADK_KERNEL_SND_BCM2835_SOC_I2S
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
@@ -202,7 +202,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
prompt "Raspberry PI IQAudio-DAC"
boolean
select ADK_KERNEL_DMA_BCM2708
- select ADK_KERNEL_SND_BCM2708_SOC_I2S
+ select ADK_KERNEL_SND_BCM2835_SOC_I2S
select ADK_KERNEL_SND_SOC_PCM512x_I2C
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index 83ef3a1fa..feb06eaea 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -7,7 +7,7 @@ config ADK_KERNEL_I2C
config ADK_KERNEL_I2C_CHARDEV
tristate
-config ADK_KERNEL_I2C_BCM2835
+config ADK_KERNEL_I2C_BCM2708
prompt "I2C driver for Raspberry PI"
tristate
select ADK_KERNEL_I2C
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index 9a6e6e337..d58215eab 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -26,12 +26,13 @@ config ADK_KERNEL_SPI_PXA2XX
tristate
select ADK_KERNEL_SPI
-config ADK_KERNEL_SPI_BCM2835
+config ADK_KERNEL_SPI_BCM2708
prompt "SPI driver for Raspberry PI"
tristate
select ADK_KERNEL_SPI
select ADK_KERNEL_SPI_MASTER
select ADK_KERNEL_SPI_BITBANG
+ select ADK_KERNEL_REGMAP_SPI
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
@@ -42,6 +43,7 @@ config ADK_KERNEL_SPI_IMX
select ADK_KERNEL_SPI
select ADK_KERNEL_SPI_MASTER
select ADK_KERNEL_SPI_BITBANG
+ select ADK_KERNEL_REGMAP_SPI
depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
default n
diff --git a/target/linux/patches/3.16.2/bsd-compatibility.patch b/target/linux/patches/3.16.4/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.16.2/bsd-compatibility.patch
+++ b/target/linux/patches/3.16.4/bsd-compatibility.patch
diff --git a/target/linux/patches/3.16.2/cleankernel.patch b/target/linux/patches/3.16.4/cleankernel.patch
index d8c055dc3..d8c055dc3 100644
--- a/target/linux/patches/3.16.2/cleankernel.patch
+++ b/target/linux/patches/3.16.4/cleankernel.patch
diff --git a/target/linux/patches/3.16.2/cris-header.patch b/target/linux/patches/3.16.4/cris-header.patch
index 3db07e530..3db07e530 100644
--- a/target/linux/patches/3.16.2/cris-header.patch
+++ b/target/linux/patches/3.16.4/cris-header.patch
diff --git a/target/linux/patches/3.16.2/defaults.patch b/target/linux/patches/3.16.4/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.16.2/defaults.patch
+++ b/target/linux/patches/3.16.4/defaults.patch
diff --git a/target/linux/patches/3.16.2/disable-netfilter.patch b/target/linux/patches/3.16.4/disable-netfilter.patch
index 7b1ca013a..7b1ca013a 100644
--- a/target/linux/patches/3.16.2/disable-netfilter.patch
+++ b/target/linux/patches/3.16.4/disable-netfilter.patch
diff --git a/target/linux/patches/3.16.2/export-symbol-for-exmap.patch b/target/linux/patches/3.16.4/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.16.2/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.16.4/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.16.2/gemalto.patch b/target/linux/patches/3.16.4/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.16.2/gemalto.patch
+++ b/target/linux/patches/3.16.4/gemalto.patch
diff --git a/target/linux/patches/3.16.2/initramfs-nosizelimit.patch b/target/linux/patches/3.16.4/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/3.16.2/initramfs-nosizelimit.patch
+++ b/target/linux/patches/3.16.4/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/3.16.2/lemote-rfkill.patch b/target/linux/patches/3.16.4/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.16.2/lemote-rfkill.patch
+++ b/target/linux/patches/3.16.4/lemote-rfkill.patch
diff --git a/target/linux/patches/3.16.2/microblaze-axi.patch b/target/linux/patches/3.16.4/microblaze-axi.patch
index 1a4b17d8c..1a4b17d8c 100644
--- a/target/linux/patches/3.16.2/microblaze-axi.patch
+++ b/target/linux/patches/3.16.4/microblaze-axi.patch
diff --git a/target/linux/patches/3.16.2/microblaze-ethernet.patch b/target/linux/patches/3.16.4/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.16.2/microblaze-ethernet.patch
+++ b/target/linux/patches/3.16.4/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.16.2/mkpiggy.patch b/target/linux/patches/3.16.4/mkpiggy.patch
index 751678b74..751678b74 100644
--- a/target/linux/patches/3.16.2/mkpiggy.patch
+++ b/target/linux/patches/3.16.4/mkpiggy.patch
diff --git a/target/linux/patches/3.16.2/mtd-rootfs.patch b/target/linux/patches/3.16.4/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.16.2/mtd-rootfs.patch
+++ b/target/linux/patches/3.16.4/mtd-rootfs.patch
diff --git a/target/linux/patches/3.16.2/nfsv3-tcp.patch b/target/linux/patches/3.16.4/nfsv3-tcp.patch
index d5e07e1c2..d5e07e1c2 100644
--- a/target/linux/patches/3.16.2/nfsv3-tcp.patch
+++ b/target/linux/patches/3.16.4/nfsv3-tcp.patch
diff --git a/target/linux/patches/3.16.2/non-static.patch b/target/linux/patches/3.16.4/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.16.2/non-static.patch
+++ b/target/linux/patches/3.16.4/non-static.patch
diff --git a/target/linux/patches/3.16.2/patch-fblogo b/target/linux/patches/3.16.4/patch-fblogo
index f1fad64c1..f1fad64c1 100644
--- a/target/linux/patches/3.16.2/patch-fblogo
+++ b/target/linux/patches/3.16.4/patch-fblogo
diff --git a/target/linux/patches/3.16.2/patch-yaffs2 b/target/linux/patches/3.16.4/patch-yaffs2
index bb244c7ca..bb244c7ca 100644
--- a/target/linux/patches/3.16.2/patch-yaffs2
+++ b/target/linux/patches/3.16.4/patch-yaffs2
diff --git a/target/linux/patches/3.16.2/ppc64-missing-zlib.patch b/target/linux/patches/3.16.4/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.16.2/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.16.4/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.16.2/regmap-boolean.patch b/target/linux/patches/3.16.4/regmap-boolean.patch
index b61c4792a..b61c4792a 100644
--- a/target/linux/patches/3.16.2/regmap-boolean.patch
+++ b/target/linux/patches/3.16.4/regmap-boolean.patch
diff --git a/target/linux/patches/3.16.2/relocs.patch b/target/linux/patches/3.16.4/relocs.patch
index 69a7c88a9..69a7c88a9 100644
--- a/target/linux/patches/3.16.2/relocs.patch
+++ b/target/linux/patches/3.16.4/relocs.patch
diff --git a/target/linux/patches/3.16.2/sgidefs.patch b/target/linux/patches/3.16.4/sgidefs.patch
index f00a284d9..f00a284d9 100644
--- a/target/linux/patches/3.16.2/sgidefs.patch
+++ b/target/linux/patches/3.16.4/sgidefs.patch
diff --git a/target/linux/patches/3.16.2/sortext.patch b/target/linux/patches/3.16.4/sortext.patch
index 8fd4e1d6b..8fd4e1d6b 100644
--- a/target/linux/patches/3.16.2/sortext.patch
+++ b/target/linux/patches/3.16.4/sortext.patch
diff --git a/target/linux/patches/3.16.2/sparc-memset.patch b/target/linux/patches/3.16.4/sparc-memset.patch
index 022c87b3a..022c87b3a 100644
--- a/target/linux/patches/3.16.2/sparc-memset.patch
+++ b/target/linux/patches/3.16.4/sparc-memset.patch
diff --git a/target/linux/patches/3.16.2/startup.patch b/target/linux/patches/3.16.4/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/3.16.2/startup.patch
+++ b/target/linux/patches/3.16.4/startup.patch
diff --git a/target/linux/patches/3.16.2/wlan-cf.patch b/target/linux/patches/3.16.4/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.16.2/wlan-cf.patch
+++ b/target/linux/patches/3.16.4/wlan-cf.patch
diff --git a/target/linux/patches/3.16.2/xargs.patch b/target/linux/patches/3.16.4/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.16.2/xargs.patch
+++ b/target/linux/patches/3.16.4/xargs.patch