diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-03-06 15:07:12 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-03-06 15:07:12 +0800 |
| commit | 4becc339ef23d54b39139a85bb6e33b7f27d67d1 (patch) | |
| tree | 583571dd15b19d2e0592e15ff5ffee6e9c24ab6c /arch/arm/plat-mxc/include | |
| parent | f072008f5a29068baa0bc1febad8aaf2840e2568 (diff) | |
| parent | 180c995fa9dfd1912e199d908ae55b2b8c479d13 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Conflicts:
drivers/video/mxc/ldb.c
Diffstat (limited to 'arch/arm/plat-mxc/include')
| -rwxr-xr-x | arch/arm/plat-mxc/include/mach/mxc.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h index ee763a829bf2..ea60442a236f 100755 --- a/arch/arm/plat-mxc/include/mach/mxc.h +++ b/arch/arm/plat-mxc/include/mach/mxc.h @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007, 2011-2012 Freescale Semiconductor, Inc. + * Copyright 2004-2007, 2011-2013 Freescale Semiconductor, Inc. * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de) * * This program is free software; you can redistribute it and/or @@ -278,6 +278,28 @@ int tzic_enable_wake(int is_idle); extern void mxc_cpu_lp_set(enum mxc_cpu_pwr_mode mode); extern int tzic_enable_wake(int is_idle); + +/* available disableable devices in fuse */ +enum mxc_dev_type { + MXC_DEV_PXP, + MXC_DEV_OVG, + MXC_DEV_DSI_CSI2, + MXC_DEV_ENET, + MXC_DEV_MLB, + MXC_DEV_EPDC, + MXC_DEV_HDMI, + MXC_DEV_PCIE, + MXC_DEV_SATA, + MXC_DEV_DTCP, + MXC_DEV_2D, + MXC_DEV_3D, + MXC_DEV_VPU, + MXC_DEV_DIVX3, + MXC_DEV_RV, + MXC_DEV_SORENSEN, +}; +extern int fuse_dev_is_available(enum mxc_dev_type dev); + #endif #if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX2) |