Merge pull request #536 from wigyori/cc-sec
[15.05/openwrt.git] / target / linux / brcm2708 / patches-3.18 / 0032-BCM2708-Add-I2S-support-to-board-file.patch
1 From 92f48ad219db73d6fb34f909965622ca4067da4f Mon Sep 17 00:00:00 2001
2 From: Florian Meier <florian.meier@koalo.de>
3 Date: Fri, 22 Nov 2013 19:04:54 +0100
4 Subject: [PATCH 032/114] BCM2708: Add I2S support to board file
5
6 Adds the required initializations for I2S
7 to the board file of mach-bcm2708.
8
9 Signed-off-by: Florian Meier <florian.meier@koalo.de>
10 ---
11  arch/arm/mach-bcm2708/bcm2708.c | 26 ++++++++++++++++++++++++++
12  1 file changed, 26 insertions(+)
13
14 --- a/arch/arm/mach-bcm2708/bcm2708.c
15 +++ b/arch/arm/mach-bcm2708/bcm2708.c
16 @@ -587,6 +587,28 @@ static struct platform_device bcm2835_th
17         .name = "bcm2835_thermal",
18  };
19  
20 +#ifdef CONFIG_SND_BCM2708_SOC_I2S_MODULE
21 +static struct resource bcm2708_i2s_resources[] = {
22 +       {
23 +               .start = I2S_BASE,
24 +               .end = I2S_BASE + 0x20,
25 +               .flags = IORESOURCE_MEM,
26 +       },
27 +        {
28 +               .start = PCM_CLOCK_BASE,
29 +               .end = PCM_CLOCK_BASE + 0x02,
30 +               .flags = IORESOURCE_MEM,
31 +       }
32 +};
33 +
34 +static struct platform_device bcm2708_i2s_device = {
35 +       .name = "bcm2708-i2s",
36 +       .id = 0,
37 +       .num_resources = ARRAY_SIZE(bcm2708_i2s_resources),
38 +       .resource = bcm2708_i2s_resources,
39 +};
40 +#endif
41 +
42  int __init bcm_register_device(struct platform_device *pdev)
43  {
44         int ret;
45 @@ -707,6 +729,10 @@ void __init bcm2708_init(void)
46         bcm_register_device(&bcm2835_hwmon_device);
47         bcm_register_device(&bcm2835_thermal_device);
48  
49 +#ifdef CONFIG_SND_BCM2708_SOC_I2S_MODULE
50 +       bcm_register_device(&bcm2708_i2s_device);
51 +#endif
52 +
53         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
54                 struct amba_device *d = amba_devs[i];
55                 amba_device_register(d, &iomem_resource);