← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c

  • Committer: Package Import Robot
  • Author(s): maximilian attems, maximilian attems, Ben Hutchings
  • Date: 2012-06-06 10:25:57 UTC
  • mfrom: (1.2.38)
  • Revision ID: package-import@ubuntu.com-20120606102557-b9j3506wcwrqrnx8
Tags: 3.4.1-1~experimental.1
* New upstream release: http://kernelnewbies.org/Linux_3.4
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.1

[ maximilian attems ]
* Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
  IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
  NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
  NET_TEAM, ATH6KL.

[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware
* aufs: Update to aufs3.4-20120521
* [rt] Update to 3.4-rt8 and reenable

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
38
38
#include <mach/hardware.h>
39
39
#include <mach/common.h>
40
40
#include <mach/iomux-mx35.h>
41
 
#include <mach/audmux.h>
42
41
 
43
42
#include "devices-imx35.h"
44
43
 
252
251
                        ARRAY_SIZE(eukrea_mbimxsd_pads)))
253
252
                printk(KERN_ERR "error setting mbimxsd pads !\n");
254
253
 
255
 
#if defined(CONFIG_SND_SOC_EUKREA_TLV320)
256
 
        /* SSI unit master I2S codec connected to SSI_AUD4 */
257
 
        mxc_audmux_v2_configure_port(0,
258
 
                        MXC_AUDMUX_V2_PTCR_SYN |
259
 
                        MXC_AUDMUX_V2_PTCR_TFSDIR |
260
 
                        MXC_AUDMUX_V2_PTCR_TFSEL(3) |
261
 
                        MXC_AUDMUX_V2_PTCR_TCLKDIR |
262
 
                        MXC_AUDMUX_V2_PTCR_TCSEL(3),
263
 
                        MXC_AUDMUX_V2_PDCR_RXDSEL(3)
264
 
        );
265
 
        mxc_audmux_v2_configure_port(3,
266
 
                        MXC_AUDMUX_V2_PTCR_SYN,
267
 
                        MXC_AUDMUX_V2_PDCR_RXDSEL(0)
268
 
        );
269
 
#endif
270
 
 
271
254
        imx35_add_imx_uart1(&uart_pdata);
272
255
        imx35_add_ipu_core(&mx3_ipu_data);
273
256
        imx35_add_mx3_sdc_fb(&mx3fb_pdata);