aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.10/0119-BCM2708-Add-I2S-support-to-board-file.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2014-02-28 20:30:08 +0000
committerFlorian Fainelli <florian@openwrt.org>2014-02-28 20:30:08 +0000
commitbb39b8d99aae1f7eb13a97bd874838da91080de6 (patch)
tree3046f53937c0bc5dc13e2b2ab7b688a1932199bf /target/linux/brcm2708/patches-3.10/0119-BCM2708-Add-I2S-support-to-board-file.patch
parentc6c0d09f85c211560a1405441925681cfa25e8b1 (diff)
downloadupstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.tar.gz
upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.tar.bz2
upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.zip
brcm2708: update against latest rpi-3.10.y branch
Update our copies of the brcm2708 patches to the latest rpi-3.10-y rebased against linux-3.10.y stable (3.10.32). This should hopefully make it easier for us in the future to leverage the raspberry/rpi-* branches. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 39770
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0119-BCM2708-Add-I2S-support-to-board-file.patch')
-rw-r--r--target/linux/brcm2708/patches-3.10/0119-BCM2708-Add-I2S-support-to-board-file.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0119-BCM2708-Add-I2S-support-to-board-file.patch b/target/linux/brcm2708/patches-3.10/0119-BCM2708-Add-I2S-support-to-board-file.patch
new file mode 100644
index 0000000000..47eb6dd1f9
--- /dev/null
+++ b/target/linux/brcm2708/patches-3.10/0119-BCM2708-Add-I2S-support-to-board-file.patch
@@ -0,0 +1,55 @@
+From d873c79a7f4c512b41644d3f140d17e662ffde5e Mon Sep 17 00:00:00 2001
+From: Florian Meier <florian.meier@koalo.de>
+Date: Fri, 22 Nov 2013 19:04:54 +0100
+Subject: [PATCH 119/174] BCM2708: Add I2S support to board file
+
+Adds the required initializations for I2S
+to the board file of mach-bcm2708.
+
+Signed-off-by: Florian Meier <florian.meier@koalo.de>
+---
+ arch/arm/mach-bcm2708/bcm2708.c | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+--- a/arch/arm/mach-bcm2708/bcm2708.c
++++ b/arch/arm/mach-bcm2708/bcm2708.c
+@@ -617,6 +617,28 @@ static struct platform_device bcm2835_th
+ .name = "bcm2835_thermal",
+ };
+
++#ifdef CONFIG_SND_BCM2708_SOC_I2S_MODULE
++static struct resource bcm2708_i2s_resources[] = {
++ {
++ .start = I2S_BASE,
++ .end = I2S_BASE + 0x20,
++ .flags = IORESOURCE_MEM,
++ },
++ {
++ .start = PCM_CLOCK_BASE,
++ .end = PCM_CLOCK_BASE + 0x02,
++ .flags = IORESOURCE_MEM,
++ }
++};
++
++static struct platform_device bcm2708_i2s_device = {
++ .name = "bcm2708-i2s",
++ .id = 0,
++ .num_resources = ARRAY_SIZE(bcm2708_i2s_resources),
++ .resource = bcm2708_i2s_resources,
++};
++#endif
++
+ int __init bcm_register_device(struct platform_device *pdev)
+ {
+ int ret;
+@@ -743,6 +765,10 @@ void __init bcm2708_init(void)
+ bcm_register_device(&bcm2835_hwmon_device);
+ bcm_register_device(&bcm2835_thermal_device);
+
++#ifdef CONFIG_SND_BCM2708_SOC_I2S_MODULE
++ bcm_register_device(&bcm2708_i2s_device);
++#endif
++
+ for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
+ struct amba_device *d = amba_devs[i];
+ amba_device_register(d, &iomem_resource);