summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-10-10 14:45:46 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2014-10-10 14:45:46 -0500
commitf0a578df945e3680efb0dffc7915accf19e60716 (patch)
tree9b3fdefeb325c8767d9056d43ef68f5df74e17c3 /target
parent72cfec1a2d1238f1cafc3c67ee8853908a347cee (diff)
fix I2S support
Diffstat (limited to 'target')
-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
3 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