diff options
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 8 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 8a909944034..f6959ab91f3 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -205,8 +205,16 @@ 0x1aa 0x004 /* CONTROL_PADCONF_MCSPI2_SOMI, (IDIS | PI | M4 ) */ /* UART3 pins */ +#ifdef CONFIG_OLIO_H1_PRODUCTION + /* Production build, no console, safe mode */ + 0x16a 0x007 + 0x16c 0x007 + 0x16e 0x007 /* RX */ + 0x170 0x007 /* TX */ +#else /* regular build, working UART console */ 0x16e 0x100 /* RX, input, off wake up */ 0x170 0x000 /* TX, output */ +#endif /* GPIO146, aka UART2TX, aka Microphone enable */ 0x148 0x161C /* (204) OUTPUT | GPIO | OFF_ENABLE | OFF_PULL_LOW */ diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 2793feafaae..ea592541f0c 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -237,6 +237,7 @@ config MACH_OMAP3_H1_DVT2 config MACH_OMAP3_H1_PV bool "PV Build of the H1 board" depends on MACH_OMAP3_H1 + endchoice choice @@ -259,6 +260,13 @@ config MACH_OMAP3_H1_PV2 the kernel as well. endchoice +config OLIO_H1_PRODUCTION + bool "Olio H1 Production build" + depends on MACH_OMAP3_H1 + select MACH_OMAP3_H1_PV2 + help + Turns off UART3 pins. Don't forget to also turn off the console! (In device drivers -> character devices -> serial, and in kernel hacking as well). + config MACH_DEVKIT8000 bool "DEVKIT8000 board" depends on ARCH_OMAP3 |