diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-07 06:24:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-07 06:24:31 +0200 |
| commit | a5393320f05f681006915fcffe5631da874daee8 (patch) | |
| tree | 0bc9563da6929ec872bad3263a23519426ec91d4 /target/linux | |
| parent | c9712ddbbaf32cbf5bcdfd8154a733f2c2c84f6a (diff) | |
| parent | c59a468aae2eb6522e97d877992f3b059b4e6242 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.audio | 10 | ||||
| -rw-r--r-- | target/linux/config/Config.in.i2c | 16 | ||||
| -rw-r--r-- | target/linux/config/Config.in.spi | 13 |
3 files changed, 32 insertions, 7 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d354ba0d3..f9bea1260 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -81,6 +81,10 @@ config ADK_KERNEL_SND_SOC_PCM5102A boolean select ADK_KERNEL_SND_SOC_I2C_AND_SPI +config ADK_KERNEL_SND_SOC_PCM512x_I2C + boolean + select ADK_KERNEL_SND_SOC_I2C_AND_SPI + config ADK_KERNEL_SND_PCM_DMAENGINE boolean @@ -165,7 +169,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_DMAENGINE_PCM select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM select ADK_KERNEL_REGMAP_MMIO - select ADK_KERNEL_SND_SOC_PCM5102A depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n @@ -174,8 +177,8 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC boolean select ADK_KERNEL_DMA_BCM2708 select ADK_KERNEL_SND_BCM2708_SOC_I2S + select ADK_KERNEL_SND_SOC_PCM5102A depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_PKG_MPDBOX default n config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI @@ -193,7 +196,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC select ADK_KERNEL_DMA_BCM2708 select ADK_KERNEL_SND_BCM2708_SOC_I2S depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_PKG_MPDBOX default n config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC @@ -201,8 +203,8 @@ config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC boolean select ADK_KERNEL_DMA_BCM2708 select ADK_KERNEL_SND_BCM2708_SOC_I2S + select ADK_KERNEL_SND_SOC_PCM512x_I2C depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_PKG_MPDBOX default n config ADK_KERNEL_SND_IMX_SOC diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c index bc4da73f6..83ef3a1fa 100644 --- a/target/linux/config/Config.in.i2c +++ b/target/linux/config/Config.in.i2c @@ -7,13 +7,25 @@ config ADK_KERNEL_I2C config ADK_KERNEL_I2C_CHARDEV tristate +config ADK_KERNEL_I2C_BCM2835 + prompt "I2C driver for Raspberry PI" + tristate + select ADK_KERNEL_I2C + select ADK_KERNEL_REGMAP_I2C + select ADK_KERNEL_I2C_CHARDEV + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + help + I2C driver for Raspberry PI. + config ADK_KERNEL_I2C_IMX - prompt "I2C driver for IMX6" + prompt "I2C driver for Solidrun IMX6" tristate - depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_KERNEL_I2C select ADK_KERNEL_REGMAP_I2C select ADK_KERNEL_I2C_CHARDEV + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index 12637f9cb..9a6e6e337 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -26,12 +26,23 @@ config ADK_KERNEL_SPI_PXA2XX tristate select ADK_KERNEL_SPI +config ADK_KERNEL_SPI_BCM2835 + prompt "SPI driver for Raspberry PI" + tristate + select ADK_KERNEL_SPI + select ADK_KERNEL_SPI_MASTER + select ADK_KERNEL_SPI_BITBANG + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + config ADK_KERNEL_SPI_IMX - prompt "SPI driver for Solidrun Cubox-i/Hummingboard" + prompt "SPI driver for Solidrun IMX6" tristate select ADK_KERNEL_SPI select ADK_KERNEL_SPI_MASTER select ADK_KERNEL_SPI_BITBANG + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n |