diff options
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.audio | 42 | ||||
| -rw-r--r-- | target/linux/config/Config.in.dma | 5 | ||||
| -rw-r--r-- | target/linux/config/Config.in.gpio | 11 | ||||
| -rw-r--r-- | target/linux/config/Config.in.i2c | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.misc | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.regmap | 25 | ||||
| -rw-r--r-- | target/linux/config/Config.in.regulator | 25 | ||||
| -rw-r--r-- | target/linux/config/Config.in.spi | 2 |
8 files changed, 68 insertions, 45 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 594274c40..7ff42afe9 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -74,15 +74,25 @@ config ADK_KERNEL_SND_SOC_I2C_AND_SPI boolean config ADK_KERNEL_SND_SOC_WM8804 - boolean + tristate select ADK_KERNEL_SND_SOC_I2C_AND_SPI config ADK_KERNEL_SND_SOC_PCM5102A - boolean + tristate + select ADK_KERNEL_SND_SOC_I2C_AND_SPI + +config ADK_KERNEL_SND_SOC_PCM512x + tristate select ADK_KERNEL_SND_SOC_I2C_AND_SPI config ADK_KERNEL_SND_SOC_PCM512x_I2C - boolean + tristate + select ADK_KERNEL_SND_SOC_PCM512x + select ADK_KERNEL_SND_SOC_I2C_AND_SPI + +config ADK_KERNEL_SND_SOC_PCM512x_SPI + tristate + select ADK_KERNEL_SND_SOC_PCM512x select ADK_KERNEL_SND_SOC_I2C_AND_SPI config ADK_KERNEL_SND_PCM_DMAENGINE @@ -161,11 +171,13 @@ config ADK_KERNEL_SND_BCM2835 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n -config ADK_KERNEL_SND_BCM2835_SOC_I2S - boolean +config ADK_KERNEL_SND_BCM2708_SOC_I2S + tristate select ADK_KERNEL_SND select ADK_KERNEL_SND_ARM select ADK_KERNEL_SND_SOC + select ADK_KERNEL_SND_BCM2835 + select ADK_KERNEL_DMA_BCM2835 select ADK_KERNEL_SND_DMAENGINE_PCM select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM select ADK_KERNEL_REGMAP_MMIO @@ -174,35 +186,31 @@ config ADK_KERNEL_SND_BCM2835_SOC_I2S config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC prompt "Raspberry PI hifiberry DAC" - boolean - select ADK_KERNEL_DMA_BCM2708 - select ADK_KERNEL_SND_BCM2835_SOC_I2S + tristate + select ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_SOC_PCM5102A depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI prompt "Raspberry PI hifiberry DIGI" - boolean - select ADK_KERNEL_DMA_BCM2708 - select ADK_KERNEL_SND_BCM2835_SOC_I2S + tristate + select ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_SOC_WM8804 depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC prompt "Raspberry PI RPI-DAC" - boolean - select ADK_KERNEL_DMA_BCM2708 - select ADK_KERNEL_SND_BCM2835_SOC_I2S + tristate + select ADK_KERNEL_SND_BCM2708_SOC_I2S depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC prompt "Raspberry PI IQAudio-DAC" - boolean - select ADK_KERNEL_DMA_BCM2708 - select ADK_KERNEL_SND_BCM2835_SOC_I2S + tristate + select ADK_KERNEL_SND_BCM2708_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.dma b/target/linux/config/Config.in.dma index 9ea4a2e12..6a8f8f1a4 100644 --- a/target/linux/config/Config.in.dma +++ b/target/linux/config/Config.in.dma @@ -1,9 +1,12 @@ config ADK_KERNEL_DMADEVICES boolean -config ADK_KERNEL_DMA_BCM2708 +config ADK_KERNEL_DMA_BCM2835 boolean select ADK_KERNEL_DMADEVICES + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n config ADK_KERNEL_IMX_SDMA boolean diff --git a/target/linux/config/Config.in.gpio b/target/linux/config/Config.in.gpio index 678b04674..64b4c46ab 100644 --- a/target/linux/config/Config.in.gpio +++ b/target/linux/config/Config.in.gpio @@ -13,6 +13,16 @@ config ADK_KERNEL_GPIO_SYSFS config ADK_KERNEL_GPIO_GENERIC boolean +config ADK_KERNEL_BCM2708_GPIO + boolean + select ADK_KERNEL_GPIOLIB + select ADK_KERNEL_GPIO_SYSFS + select ADK_KERNEL_GPIO_GENERIC + select ADK_KERNEL_RESET_CONTROLLER + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + config ADK_KERNEL_GPIO_MXC boolean select ADK_KERNEL_GPIOLIB @@ -20,5 +30,6 @@ config ADK_KERNEL_GPIO_MXC select ADK_KERNEL_GPIO_GENERIC select ADK_KERNEL_RESET_CONTROLLER select ADK_KERNEL_RESET_GPIO + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c index feb06eaea..83ef3a1fa 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_BCM2708 +config ADK_KERNEL_I2C_BCM2835 prompt "I2C driver for Raspberry PI" tristate select ADK_KERNEL_I2C diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 6823ee612..931bda8a8 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -31,6 +31,7 @@ source "target/linux/config/Config.in.leds" source "target/linux/config/Config.in.watchdog" source "target/linux/config/Config.in.i2c" source "target/linux/config/Config.in.spi" +source "target/linux/config/Config.in.regmap" source "target/linux/config/Config.in.regulator" source "target/linux/config/Config.in.gpio" source "target/linux/config/Config.in.dma" diff --git a/target/linux/config/Config.in.regmap b/target/linux/config/Config.in.regmap new file mode 100644 index 000000000..44a8bcca0 --- /dev/null +++ b/target/linux/config/Config.in.regmap @@ -0,0 +1,25 @@ +config ADK_KERNEL_REGMAP + boolean + select ADK_KERNEL_LZO_COMPRESS + select ADK_KERNEL_LZO_DECOMPRESS + default n + +config ADK_KERNEL_REGMAP_I2C + boolean + select ADK_KERNEL_REGMAP + default n + +config ADK_KERNEL_REGMAP_SPI + boolean + select ADK_KERNEL_REGMAP + default n + +config ADK_KERNEL_REGMAP_MMIO + boolean + select ADK_KERNEL_REGMAP + default n + +config ADK_KERNEL_REGMAP_IRQ + boolean + select ADK_KERNEL_REGMAP + default n diff --git a/target/linux/config/Config.in.regulator b/target/linux/config/Config.in.regulator index 6e8f8dfd1..a6a6c90a7 100644 --- a/target/linux/config/Config.in.regulator +++ b/target/linux/config/Config.in.regulator @@ -37,28 +37,3 @@ config ADK_KERNEL_REGULATOR_PFUZE100 select ADK_KERNEL_REGULATOR default n -config ADK_KERNEL_REGMAP - boolean - select ADK_KERNEL_LZO_COMPRESS - select ADK_KERNEL_LZO_DECOMPRESS - default n - -config ADK_KERNEL_REGMAP_I2C - boolean - select ADK_KERNEL_REGMAP - default n - -config ADK_KERNEL_REGMAP_SPI - boolean - select ADK_KERNEL_REGMAP - default n - -config ADK_KERNEL_REGMAP_MMIO - boolean - select ADK_KERNEL_REGMAP - default n - -config ADK_KERNEL_REGMAP_IRQ - boolean - select ADK_KERNEL_REGMAP - default n diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index d58215eab..ff5286804 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -26,7 +26,7 @@ config ADK_KERNEL_SPI_PXA2XX tristate select ADK_KERNEL_SPI -config ADK_KERNEL_SPI_BCM2708 +config ADK_KERNEL_SPI_BCM2835 prompt "SPI driver for Raspberry PI" tristate select ADK_KERNEL_SPI |