diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 14:50:30 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 14:50:30 -0800 |
commit | eaed435a7b870a38d89dbdb535c7842d618d3214 (patch) | |
tree | 75c2d90c7c1fa937fc83027699fad1455644df8e /arch/arm/mach-imx/efika.h | |
parent | a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99 (diff) | |
parent | 3f07f355704bc2ae26399f17c6d5d46c9a3d78d1 (diff) | |
download | op-kernel-dev-eaed435a7b870a38d89dbdb535c7842d618d3214.zip op-kernel-dev-eaed435a7b870a38d89dbdb535c7842d618d3214.tar.gz |
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.
* tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM i.MX: Update defconfig
ARM i.MX: Merge i.MX5 support into mach-imx
ARM i.MX5: remove unnecessary includes from board files
Fix up fairly trivial conflicts due to various changes nearby in
arch/arm/{mach,plat}-imx/{Kconfig,Makefile}
Pull request had been sent to the wrong email address, but happened
before the merge window closed. I'm merging the MX 5 consolidation,
since it apparently will help the next development window and will avoid
conflicts later as per Arnd.
Diffstat (limited to 'arch/arm/mach-imx/efika.h')
-rw-r--r-- | arch/arm/mach-imx/efika.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/efika.h b/arch/arm/mach-imx/efika.h new file mode 100644 index 0000000..014aa98 --- /dev/null +++ b/arch/arm/mach-imx/efika.h @@ -0,0 +1,10 @@ +#ifndef _EFIKA_H +#define _EFIKA_H + +#define EFIKA_WLAN_EN IMX_GPIO_NR(2, 16) +#define EFIKA_WLAN_RESET IMX_GPIO_NR(2, 10) +#define EFIKA_USB_PHY_RESET IMX_GPIO_NR(2, 9) + +void __init efika_board_common_init(void); + +#endif |