[PATCH v3 1/7] ARM: OMAP4: Remove un-used control module headers and defines.

Eduardo Valentin eduardo.valentin at ti.com
Thu Jun 28 00:45:25 EDT 2012


Why the authorship of these patches is changing?

For instance this patch, from Santosh, I believe it is the same...

On Wed, Jun 27, 2012 at 10:04:47PM +0400, Konstantin Baydarov wrote:
> Most of the OMAP4 control module register defines are not used and
> can be removed. Keep only needed defines and move them to common
> control module header just like other OMAP versions.
> 
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
> Signed-off-by: Eduardo Valentin <eduardo.valentin at ti.com>
> ---
>  arch/arm/mach-omap2/control.h                      |   45 +-
>  .../include/mach/ctrl_module_core_44xx.h           |  391 ------
>  .../include/mach/ctrl_module_pad_core_44xx.h       | 1409 --------------------
>  .../include/mach/ctrl_module_pad_wkup_44xx.h       |  236 ----
>  .../include/mach/ctrl_module_wkup_44xx.h           |   92 --
>  5 files changed, 40 insertions(+), 2133 deletions(-)
>  delete mode 100644 arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h
>  delete mode 100644 arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
>  delete mode 100644 arch/arm/mach-omap2/include/mach/ctrl_module_pad_wkup_44xx.h
>  delete mode 100644 arch/arm/mach-omap2/include/mach/ctrl_module_wkup_44xx.h
> 
> diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h
> index a406fd0..dad2903 100644
> --- a/arch/arm/mach-omap2/control.h
> +++ b/arch/arm/mach-omap2/control.h
> @@ -16,11 +16,6 @@
>  #ifndef __ARCH_ARM_MACH_OMAP2_CONTROL_H
>  #define __ARCH_ARM_MACH_OMAP2_CONTROL_H
>  
> -#include <mach/ctrl_module_core_44xx.h>
> -#include <mach/ctrl_module_wkup_44xx.h>
> -#include <mach/ctrl_module_pad_core_44xx.h>
> -#include <mach/ctrl_module_pad_wkup_44xx.h>
> -
>  #ifndef __ASSEMBLY__
>  #define OMAP242X_CTRL_REGADDR(reg)					\
>  		OMAP2_L4_IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
> @@ -183,6 +178,43 @@
>  #define OMAP3630_CONTROL_FUSE_OPP50_VDD2        (OMAP2_CONTROL_GENERAL + 0x0128)
>  #define OMAP3630_CONTROL_FUSE_OPP100_VDD2       (OMAP2_CONTROL_GENERAL + 0x012C)
>  
> +/* OMAP4 IDCODE CONTROL */
> +#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_PROD_ID_1		0x0218
> +#define OMAP4_CTRL_MODULE_CORE_STATUS				0x02c4
> +
> +/* CONTROL_I2C_1 */
> +#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_1		0x0624
> +#define OMAP4_HDMI_DDC_SDA_PULLUPRESX_MASK			(1 << 28)
> +#define OMAP4_HDMI_DDC_SCL_PULLUPRESX_MASK			(1 << 24)
> +
> +/* DSI CONTROL_DSIPHY */
> +#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY		0x0618
> +#define OMAP4_DSI2_LANEENABLE_SHIFT				29
> +#define OMAP4_DSI2_LANEENABLE_MASK				(0x7 << 29)
> +#define OMAP4_DSI1_LANEENABLE_SHIFT				24
> +#define OMAP4_DSI1_LANEENABLE_MASK				(0x1f << 24)
> +#define OMAP4_DSI1_PIPD_SHIFT					19
> +#define OMAP4_DSI1_PIPD_MASK					(0x1f << 19)
> +#define OMAP4_DSI2_PIPD_SHIFT					14
> +#define OMAP4_DSI2_PIPD_MASK					(0x1f << 14)
> +
> +/* CONTROL_PBIASLITE */
> +#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_PBIASLITE		0x0600
> +#define OMAP4_MMC1_PWRDNZ_MASK					(1 << 26)
> +#define OMAP4_MMC1_PBIASLITE_VMODE_MASK				(1 << 21)
> +#define OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK			(1 << 22)
> +#define OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK			(1 << 23)
> +
> +/* CONTROL_MMC1 */
> +#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MMC1			0x0628
> +#define OMAP4_SDMMC1_PUSTRENGTH_GRP0_MASK			(1 << 31)
> +#define OMAP4_SDMMC1_PUSTRENGTH_GRP1_MASK			(1 << 30)
> +#define OMAP4_SDMMC1_PUSTRENGTH_GRP2_MASK			(1 << 29)
> +#define OMAP4_SDMMC1_PUSTRENGTH_GRP3_MASK			(1 << 28)
> +#define OMAP4_SDMMC1_DR0_SPEEDCTRL_MASK				(1 << 27)
> +#define OMAP4_SDMMC1_DR1_SPEEDCTRL_MASK				(1 << 26)
> +#define OMAP4_SDMMC1_DR2_SPEEDCTRL_MASK				(1 << 25)
> +
>  /* OMAP44xx control efuse offsets */
>  #define OMAP44XX_CONTROL_FUSE_IVA_OPP50		0x22C
>  #define OMAP44XX_CONTROL_FUSE_IVA_OPP100	0x22F
> @@ -195,6 +227,9 @@
>  #define OMAP44XX_CONTROL_FUSE_CORE_OPP50	0x254
>  #define OMAP44XX_CONTROL_FUSE_CORE_OPP100	0x257
>  
> +/* OMAP44xx control McBSP padconf */
> +#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MCBSPLP	0x061c
> +
>  /* AM35XX only CONTROL_GENERAL register offsets */
>  #define AM35XX_CONTROL_MSUSPENDMUX_6    (OMAP2_CONTROL_GENERAL + 0x0038)
>  #define AM35XX_CONTROL_DEVCONF2         (OMAP2_CONTROL_GENERAL + 0x0310)
> diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h
> deleted file mode 100644
> index 2f7ac70..0000000
> --- a/arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h
> +++ /dev/null
> @@ -1,391 +0,0 @@
> -/*
> - * OMAP44xx CTRL_MODULE_CORE registers and bitfields
> - *
> - * Copyright (C) 2009-2010 Texas Instruments, Inc.
> - *
> - * Benoit Cousson (b-cousson at ti.com)
> - * Santosh Shilimkar (santosh.shilimkar at ti.com)
> - *
> - * This file is automatically generated from the OMAP hardware databases.
> - * We respectfully ask that any modifications to this file be coordinated
> - * with the public linux-omap at vger.kernel.org mailing list and the
> - * authors above to ensure that the autogeneration scripts are kept
> - * up-to-date with the file contents.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - */
> -
> -#ifndef __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_CORE_44XX_H
> -#define __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_CORE_44XX_H
> -
> -
> -/* Base address */
> -#define OMAP4_CTRL_MODULE_CORE					0x4a002000
> -
> -/* Registers offset */
> -#define OMAP4_CTRL_MODULE_CORE_IP_REVISION			0x0000
> -#define OMAP4_CTRL_MODULE_CORE_IP_HWINFO			0x0004
> -#define OMAP4_CTRL_MODULE_CORE_IP_SYSCONFIG			0x0010
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_DIE_ID_0		0x0200
> -#define OMAP4_CTRL_MODULE_CORE_ID_CODE				0x0204
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_DIE_ID_1		0x0208
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_DIE_ID_2		0x020c
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_DIE_ID_3		0x0210
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_PROD_ID_0		0x0214
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_PROD_ID_1		0x0218
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_USB_CONF		0x021c
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_OPP_VDD_WKUP		0x0228
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_OPP_BGAP		0x0260
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_OPP_DPLL_0		0x0264
> -#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_OPP_DPLL_1		0x0268
> -#define OMAP4_CTRL_MODULE_CORE_STATUS				0x02c4
> -#define OMAP4_CTRL_MODULE_CORE_DEV_CONF				0x0300
> -#define OMAP4_CTRL_MODULE_CORE_LDOVBB_IVA_VOLTAGE_CTRL		0x0314
> -#define OMAP4_CTRL_MODULE_CORE_LDOVBB_MPU_VOLTAGE_CTRL		0x0318
> -#define OMAP4_CTRL_MODULE_CORE_LDOSRAM_IVA_VOLTAGE_CTRL		0x0320
> -#define OMAP4_CTRL_MODULE_CORE_LDOSRAM_MPU_VOLTAGE_CTRL		0x0324
> -#define OMAP4_CTRL_MODULE_CORE_LDOSRAM_CORE_VOLTAGE_CTRL	0x0328
> -#define OMAP4_CTRL_MODULE_CORE_TEMP_SENSOR			0x032c
> -#define OMAP4_CTRL_MODULE_CORE_DPLL_NWELL_TRIM_0		0x0330
> -#define OMAP4_CTRL_MODULE_CORE_DPLL_NWELL_TRIM_1		0x0334
> -#define OMAP4_CTRL_MODULE_CORE_USBOTGHS_CONTROL			0x033c
> -#define OMAP4_CTRL_MODULE_CORE_DSS_CONTROL			0x0340
> -#define OMAP4_CTRL_MODULE_CORE_HWOBS_CONTROL			0x0350
> -#define OMAP4_CTRL_MODULE_CORE_DEBOBS_FINAL_MUX_SEL		0x0400
> -#define OMAP4_CTRL_MODULE_CORE_DEBOBS_MMR_MPU			0x0408
> -#define OMAP4_CTRL_MODULE_CORE_CONF_SDMA_REQ_SEL0		0x042c
> -#define OMAP4_CTRL_MODULE_CORE_CONF_SDMA_REQ_SEL1		0x0430
> -#define OMAP4_CTRL_MODULE_CORE_CONF_SDMA_REQ_SEL2		0x0434
> -#define OMAP4_CTRL_MODULE_CORE_CONF_SDMA_REQ_SEL3		0x0438
> -#define OMAP4_CTRL_MODULE_CORE_CONF_CLK_SEL0			0x0440
> -#define OMAP4_CTRL_MODULE_CORE_CONF_CLK_SEL1			0x0444
> -#define OMAP4_CTRL_MODULE_CORE_CONF_CLK_SEL2			0x0448
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DPLL_FREQLOCK_SEL		0x044c
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DPLL_TINITZ_SEL		0x0450
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DPLL_PHASELOCK_SEL		0x0454
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_0		0x0480
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_1		0x0484
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_2		0x0488
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_3		0x048c
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_4		0x0490
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_5		0x0494
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_6		0x0498
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_7		0x049c
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_8		0x04a0
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_9		0x04a4
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_10		0x04a8
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_11		0x04ac
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_12		0x04b0
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_13		0x04b4
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_14		0x04b8
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_15		0x04bc
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_16		0x04c0
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_17		0x04c4
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_18		0x04c8
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_19		0x04cc
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_20		0x04d0
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_21		0x04d4
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_22		0x04d8
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_23		0x04dc
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_24		0x04e0
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_25		0x04e4
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_26		0x04e8
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_27		0x04ec
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_28		0x04f0
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_29		0x04f4
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_30		0x04f8
> -#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_31		0x04fc
> -
> -/* Registers shifts and masks */
> -
> -/* IP_REVISION */
> -#define OMAP4_IP_REV_SCHEME_SHIFT			30
> -#define OMAP4_IP_REV_SCHEME_MASK			(0x3 << 30)
> -#define OMAP4_IP_REV_FUNC_SHIFT				16
> -#define OMAP4_IP_REV_FUNC_MASK				(0xfff << 16)
> -#define OMAP4_IP_REV_RTL_SHIFT				11
> -#define OMAP4_IP_REV_RTL_MASK				(0x1f << 11)
> -#define OMAP4_IP_REV_MAJOR_SHIFT			8
> -#define OMAP4_IP_REV_MAJOR_MASK				(0x7 << 8)
> -#define OMAP4_IP_REV_CUSTOM_SHIFT			6
> -#define OMAP4_IP_REV_CUSTOM_MASK			(0x3 << 6)
> -#define OMAP4_IP_REV_MINOR_SHIFT			0
> -#define OMAP4_IP_REV_MINOR_MASK				(0x3f << 0)
> -
> -/* IP_HWINFO */
> -#define OMAP4_IP_HWINFO_SHIFT				0
> -#define OMAP4_IP_HWINFO_MASK				(0xffffffff << 0)
> -
> -/* IP_SYSCONFIG */
> -#define OMAP4_IP_SYSCONFIG_IDLEMODE_SHIFT		2
> -#define OMAP4_IP_SYSCONFIG_IDLEMODE_MASK		(0x3 << 2)
> -
> -/* STD_FUSE_DIE_ID_0 */
> -#define OMAP4_STD_FUSE_DIE_ID_0_SHIFT			0
> -#define OMAP4_STD_FUSE_DIE_ID_0_MASK			(0xffffffff << 0)
> -
> -/* ID_CODE */
> -#define OMAP4_STD_FUSE_IDCODE_SHIFT			0
> -#define OMAP4_STD_FUSE_IDCODE_MASK			(0xffffffff << 0)
> -
> -/* STD_FUSE_DIE_ID_1 */
> -#define OMAP4_STD_FUSE_DIE_ID_1_SHIFT			0
> -#define OMAP4_STD_FUSE_DIE_ID_1_MASK			(0xffffffff << 0)
> -
> -/* STD_FUSE_DIE_ID_2 */
> -#define OMAP4_STD_FUSE_DIE_ID_2_SHIFT			0
> -#define OMAP4_STD_FUSE_DIE_ID_2_MASK			(0xffffffff << 0)
> -
> -/* STD_FUSE_DIE_ID_3 */
> -#define OMAP4_STD_FUSE_DIE_ID_3_SHIFT			0
> -#define OMAP4_STD_FUSE_DIE_ID_3_MASK			(0xffffffff << 0)
> -
> -/* STD_FUSE_PROD_ID_0 */
> -#define OMAP4_STD_FUSE_PROD_ID_0_SHIFT			0
> -#define OMAP4_STD_FUSE_PROD_ID_0_MASK			(0xffffffff << 0)
> -
> -/* STD_FUSE_PROD_ID_1 */
> -#define OMAP4_STD_FUSE_PROD_ID_1_SHIFT			0
> -#define OMAP4_STD_FUSE_PROD_ID_1_MASK			(0xffffffff << 0)
> -
> -/* STD_FUSE_USB_CONF */
> -#define OMAP4_USB_PROD_ID_SHIFT				16
> -#define OMAP4_USB_PROD_ID_MASK				(0xffff << 16)
> -#define OMAP4_USB_VENDOR_ID_SHIFT			0
> -#define OMAP4_USB_VENDOR_ID_MASK			(0xffff << 0)
> -
> -/* STD_FUSE_OPP_VDD_WKUP */
> -#define OMAP4_STD_FUSE_OPP_VDD_WKUP_SHIFT		0
> -#define OMAP4_STD_FUSE_OPP_VDD_WKUP_MASK		(0xffffffff << 0)
> -
> -/* STD_FUSE_OPP_BGAP */
> -#define OMAP4_STD_FUSE_OPP_BGAP_SHIFT			0
> -#define OMAP4_STD_FUSE_OPP_BGAP_MASK			(0xffffffff << 0)
> -
> -/* STD_FUSE_OPP_DPLL_0 */
> -#define OMAP4_STD_FUSE_OPP_DPLL_0_SHIFT			0
> -#define OMAP4_STD_FUSE_OPP_DPLL_0_MASK			(0xffffffff << 0)
> -
> -/* STD_FUSE_OPP_DPLL_1 */
> -#define OMAP4_STD_FUSE_OPP_DPLL_1_SHIFT			0
> -#define OMAP4_STD_FUSE_OPP_DPLL_1_MASK			(0xffffffff << 0)
> -
> -/* STATUS */
> -#define OMAP4_ATTILA_CONF_SHIFT				11
> -#define OMAP4_ATTILA_CONF_MASK				(0x3 << 11)
> -#define OMAP4_DEVICE_TYPE_SHIFT				8
> -#define OMAP4_DEVICE_TYPE_MASK				(0x7 << 8)
> -#define OMAP4_SYS_BOOT_SHIFT				0
> -#define OMAP4_SYS_BOOT_MASK				(0xff << 0)
> -
> -/* DEV_CONF */
> -#define OMAP4_DEV_CONF_SHIFT				1
> -#define OMAP4_DEV_CONF_MASK				(0x7fffffff << 1)
> -#define OMAP4_USBPHY_PD_SHIFT				0
> -#define OMAP4_USBPHY_PD_MASK				(1 << 0)
> -
> -/* LDOVBB_IVA_VOLTAGE_CTRL */
> -#define OMAP4_LDOVBBIVA_RBB_MUX_CTRL_SHIFT		26
> -#define OMAP4_LDOVBBIVA_RBB_MUX_CTRL_MASK		(1 << 26)
> -#define OMAP4_LDOVBBIVA_RBB_VSET_IN_SHIFT		21
> -#define OMAP4_LDOVBBIVA_RBB_VSET_IN_MASK		(0x1f << 21)
> -#define OMAP4_LDOVBBIVA_RBB_VSET_OUT_SHIFT		16
> -#define OMAP4_LDOVBBIVA_RBB_VSET_OUT_MASK		(0x1f << 16)
> -#define OMAP4_LDOVBBIVA_FBB_MUX_CTRL_SHIFT		10
> -#define OMAP4_LDOVBBIVA_FBB_MUX_CTRL_MASK		(1 << 10)
> -#define OMAP4_LDOVBBIVA_FBB_VSET_IN_SHIFT		5
> -#define OMAP4_LDOVBBIVA_FBB_VSET_IN_MASK		(0x1f << 5)
> -#define OMAP4_LDOVBBIVA_FBB_VSET_OUT_SHIFT		0
> -#define OMAP4_LDOVBBIVA_FBB_VSET_OUT_MASK		(0x1f << 0)
> -
> -/* LDOVBB_MPU_VOLTAGE_CTRL */
> -#define OMAP4_LDOVBBMPU_RBB_MUX_CTRL_SHIFT		26
> -#define OMAP4_LDOVBBMPU_RBB_MUX_CTRL_MASK		(1 << 26)
> -#define OMAP4_LDOVBBMPU_RBB_VSET_IN_SHIFT		21
> -#define OMAP4_LDOVBBMPU_RBB_VSET_IN_MASK		(0x1f << 21)
> -#define OMAP4_LDOVBBMPU_RBB_VSET_OUT_SHIFT		16
> -#define OMAP4_LDOVBBMPU_RBB_VSET_OUT_MASK		(0x1f << 16)
> -#define OMAP4_LDOVBBMPU_FBB_MUX_CTRL_SHIFT		10
> -#define OMAP4_LDOVBBMPU_FBB_MUX_CTRL_MASK		(1 << 10)
> -#define OMAP4_LDOVBBMPU_FBB_VSET_IN_SHIFT		5
> -#define OMAP4_LDOVBBMPU_FBB_VSET_IN_MASK		(0x1f << 5)
> -#define OMAP4_LDOVBBMPU_FBB_VSET_OUT_SHIFT		0
> -#define OMAP4_LDOVBBMPU_FBB_VSET_OUT_MASK		(0x1f << 0)
> -
> -/* LDOSRAM_IVA_VOLTAGE_CTRL */
> -#define OMAP4_LDOSRAMIVA_RETMODE_MUX_CTRL_SHIFT		26
> -#define OMAP4_LDOSRAMIVA_RETMODE_MUX_CTRL_MASK		(1 << 26)
> -#define OMAP4_LDOSRAMIVA_RETMODE_VSET_IN_SHIFT		21
> -#define OMAP4_LDOSRAMIVA_RETMODE_VSET_IN_MASK		(0x1f << 21)
> -#define OMAP4_LDOSRAMIVA_RETMODE_VSET_OUT_SHIFT		16
> -#define OMAP4_LDOSRAMIVA_RETMODE_VSET_OUT_MASK		(0x1f << 16)
> -#define OMAP4_LDOSRAMIVA_ACTMODE_MUX_CTRL_SHIFT		10
> -#define OMAP4_LDOSRAMIVA_ACTMODE_MUX_CTRL_MASK		(1 << 10)
> -#define OMAP4_LDOSRAMIVA_ACTMODE_VSET_IN_SHIFT		5
> -#define OMAP4_LDOSRAMIVA_ACTMODE_VSET_IN_MASK		(0x1f << 5)
> -#define OMAP4_LDOSRAMIVA_ACTMODE_VSET_OUT_SHIFT		0
> -#define OMAP4_LDOSRAMIVA_ACTMODE_VSET_OUT_MASK		(0x1f << 0)
> -
> -/* LDOSRAM_MPU_VOLTAGE_CTRL */
> -#define OMAP4_LDOSRAMMPU_RETMODE_MUX_CTRL_SHIFT		26
> -#define OMAP4_LDOSRAMMPU_RETMODE_MUX_CTRL_MASK		(1 << 26)
> -#define OMAP4_LDOSRAMMPU_RETMODE_VSET_IN_SHIFT		21
> -#define OMAP4_LDOSRAMMPU_RETMODE_VSET_IN_MASK		(0x1f << 21)
> -#define OMAP4_LDOSRAMMPU_RETMODE_VSET_OUT_SHIFT		16
> -#define OMAP4_LDOSRAMMPU_RETMODE_VSET_OUT_MASK		(0x1f << 16)
> -#define OMAP4_LDOSRAMMPU_ACTMODE_MUX_CTRL_SHIFT		10
> -#define OMAP4_LDOSRAMMPU_ACTMODE_MUX_CTRL_MASK		(1 << 10)
> -#define OMAP4_LDOSRAMMPU_ACTMODE_VSET_IN_SHIFT		5
> -#define OMAP4_LDOSRAMMPU_ACTMODE_VSET_IN_MASK		(0x1f << 5)
> -#define OMAP4_LDOSRAMMPU_ACTMODE_VSET_OUT_SHIFT		0
> -#define OMAP4_LDOSRAMMPU_ACTMODE_VSET_OUT_MASK		(0x1f << 0)
> -
> -/* LDOSRAM_CORE_VOLTAGE_CTRL */
> -#define OMAP4_LDOSRAMCORE_RETMODE_MUX_CTRL_SHIFT	26
> -#define OMAP4_LDOSRAMCORE_RETMODE_MUX_CTRL_MASK		(1 << 26)
> -#define OMAP4_LDOSRAMCORE_RETMODE_VSET_IN_SHIFT		21
> -#define OMAP4_LDOSRAMCORE_RETMODE_VSET_IN_MASK		(0x1f << 21)
> -#define OMAP4_LDOSRAMCORE_RETMODE_VSET_OUT_SHIFT	16
> -#define OMAP4_LDOSRAMCORE_RETMODE_VSET_OUT_MASK		(0x1f << 16)
> -#define OMAP4_LDOSRAMCORE_ACTMODE_MUX_CTRL_SHIFT	10
> -#define OMAP4_LDOSRAMCORE_ACTMODE_MUX_CTRL_MASK		(1 << 10)
> -#define OMAP4_LDOSRAMCORE_ACTMODE_VSET_IN_SHIFT		5
> -#define OMAP4_LDOSRAMCORE_ACTMODE_VSET_IN_MASK		(0x1f << 5)
> -#define OMAP4_LDOSRAMCORE_ACTMODE_VSET_OUT_SHIFT	0
> -#define OMAP4_LDOSRAMCORE_ACTMODE_VSET_OUT_MASK		(0x1f << 0)
> -
> -/* TEMP_SENSOR */
> -#define OMAP4_BGAP_TEMPSOFF_SHIFT			12
> -#define OMAP4_BGAP_TEMPSOFF_MASK			(1 << 12)
> -#define OMAP4_BGAP_TSHUT_SHIFT				11
> -#define OMAP4_BGAP_TSHUT_MASK				(1 << 11)
> -#define OMAP4_BGAP_TEMP_SENSOR_CONTCONV_SHIFT		10
> -#define OMAP4_BGAP_TEMP_SENSOR_CONTCONV_MASK		(1 << 10)
> -#define OMAP4_BGAP_TEMP_SENSOR_SOC_SHIFT		9
> -#define OMAP4_BGAP_TEMP_SENSOR_SOC_MASK			(1 << 9)
> -#define OMAP4_BGAP_TEMP_SENSOR_EOCZ_SHIFT		8
> -#define OMAP4_BGAP_TEMP_SENSOR_EOCZ_MASK		(1 << 8)
> -#define OMAP4_BGAP_TEMP_SENSOR_DTEMP_SHIFT		0
> -#define OMAP4_BGAP_TEMP_SENSOR_DTEMP_MASK		(0xff << 0)
> -
> -/* DPLL_NWELL_TRIM_0 */
> -#define OMAP4_DPLL_ABE_NWELL_TRIM_MUX_CTRL_SHIFT	29
> -#define OMAP4_DPLL_ABE_NWELL_TRIM_MUX_CTRL_MASK		(1 << 29)
> -#define OMAP4_DPLL_ABE_NWELL_TRIM_SHIFT			24
> -#define OMAP4_DPLL_ABE_NWELL_TRIM_MASK			(0x1f << 24)
> -#define OMAP4_DPLL_PER_NWELL_TRIM_MUX_CTRL_SHIFT	23
> -#define OMAP4_DPLL_PER_NWELL_TRIM_MUX_CTRL_MASK		(1 << 23)
> -#define OMAP4_DPLL_PER_NWELL_TRIM_SHIFT			18
> -#define OMAP4_DPLL_PER_NWELL_TRIM_MASK			(0x1f << 18)
> -#define OMAP4_DPLL_CORE_NWELL_TRIM_MUX_CTRL_SHIFT	17
> -#define OMAP4_DPLL_CORE_NWELL_TRIM_MUX_CTRL_MASK	(1 << 17)
> -#define OMAP4_DPLL_CORE_NWELL_TRIM_SHIFT		12
> -#define OMAP4_DPLL_CORE_NWELL_TRIM_MASK			(0x1f << 12)
> -#define OMAP4_DPLL_IVA_NWELL_TRIM_MUX_CTRL_SHIFT	11
> -#define OMAP4_DPLL_IVA_NWELL_TRIM_MUX_CTRL_MASK		(1 << 11)
> -#define OMAP4_DPLL_IVA_NWELL_TRIM_SHIFT			6
> -#define OMAP4_DPLL_IVA_NWELL_TRIM_MASK			(0x1f << 6)
> -#define OMAP4_DPLL_MPU_NWELL_TRIM_MUX_CTRL_SHIFT	5
> -#define OMAP4_DPLL_MPU_NWELL_TRIM_MUX_CTRL_MASK		(1 << 5)
> -#define OMAP4_DPLL_MPU_NWELL_TRIM_SHIFT			0
> -#define OMAP4_DPLL_MPU_NWELL_TRIM_MASK			(0x1f << 0)
> -
> -/* DPLL_NWELL_TRIM_1 */
> -#define OMAP4_DPLL_UNIPRO_NWELL_TRIM_MUX_CTRL_SHIFT	29
> -#define OMAP4_DPLL_UNIPRO_NWELL_TRIM_MUX_CTRL_MASK	(1 << 29)
> -#define OMAP4_DPLL_UNIPRO_NWELL_TRIM_SHIFT		24
> -#define OMAP4_DPLL_UNIPRO_NWELL_TRIM_MASK		(0x1f << 24)
> -#define OMAP4_DPLL_USB_NWELL_TRIM_MUX_CTRL_SHIFT	23
> -#define OMAP4_DPLL_USB_NWELL_TRIM_MUX_CTRL_MASK		(1 << 23)
> -#define OMAP4_DPLL_USB_NWELL_TRIM_SHIFT			18
> -#define OMAP4_DPLL_USB_NWELL_TRIM_MASK			(0x1f << 18)
> -#define OMAP4_DPLL_HDMI_NWELL_TRIM_MUX_CTRL_SHIFT	17
> -#define OMAP4_DPLL_HDMI_NWELL_TRIM_MUX_CTRL_MASK	(1 << 17)
> -#define OMAP4_DPLL_HDMI_NWELL_TRIM_SHIFT		12
> -#define OMAP4_DPLL_HDMI_NWELL_TRIM_MASK			(0x1f << 12)
> -#define OMAP4_DPLL_DSI2_NWELL_TRIM_MUX_CTRL_SHIFT	11
> -#define OMAP4_DPLL_DSI2_NWELL_TRIM_MUX_CTRL_MASK	(1 << 11)
> -#define OMAP4_DPLL_DSI2_NWELL_TRIM_SHIFT		6
> -#define OMAP4_DPLL_DSI2_NWELL_TRIM_MASK			(0x1f << 6)
> -#define OMAP4_DPLL_DSI1_NWELL_TRIM_MUX_CTRL_SHIFT	5
> -#define OMAP4_DPLL_DSI1_NWELL_TRIM_MUX_CTRL_MASK	(1 << 5)
> -#define OMAP4_DPLL_DSI1_NWELL_TRIM_SHIFT		0
> -#define OMAP4_DPLL_DSI1_NWELL_TRIM_MASK			(0x1f << 0)
> -
> -/* USBOTGHS_CONTROL */
> -#define OMAP4_DISCHRGVBUS_SHIFT				8
> -#define OMAP4_DISCHRGVBUS_MASK				(1 << 8)
> -#define OMAP4_CHRGVBUS_SHIFT				7
> -#define OMAP4_CHRGVBUS_MASK				(1 << 7)
> -#define OMAP4_DRVVBUS_SHIFT				6
> -#define OMAP4_DRVVBUS_MASK				(1 << 6)
> -#define OMAP4_IDPULLUP_SHIFT				5
> -#define OMAP4_IDPULLUP_MASK				(1 << 5)
> -#define OMAP4_IDDIG_SHIFT				4
> -#define OMAP4_IDDIG_MASK				(1 << 4)
> -#define OMAP4_SESSEND_SHIFT				3
> -#define OMAP4_SESSEND_MASK				(1 << 3)
> -#define OMAP4_VBUSVALID_SHIFT				2
> -#define OMAP4_VBUSVALID_MASK				(1 << 2)
> -#define OMAP4_BVALID_SHIFT				1
> -#define OMAP4_BVALID_MASK				(1 << 1)
> -#define OMAP4_AVALID_SHIFT				0
> -#define OMAP4_AVALID_MASK				(1 << 0)
> -
> -/* DSS_CONTROL */
> -#define OMAP4_DSS_MUX6_SELECT_SHIFT			0
> -#define OMAP4_DSS_MUX6_SELECT_MASK			(1 << 0)
> -
> -/* HWOBS_CONTROL */
> -#define OMAP4_HWOBS_CLKDIV_SEL_SHIFT			3
> -#define OMAP4_HWOBS_CLKDIV_SEL_MASK			(0x1f << 3)
> -#define OMAP4_HWOBS_ALL_ZERO_MODE_SHIFT			2
> -#define OMAP4_HWOBS_ALL_ZERO_MODE_MASK			(1 << 2)
> -#define OMAP4_HWOBS_ALL_ONE_MODE_SHIFT			1
> -#define OMAP4_HWOBS_ALL_ONE_MODE_MASK			(1 << 1)
> -#define OMAP4_HWOBS_MACRO_ENABLE_SHIFT			0
> -#define OMAP4_HWOBS_MACRO_ENABLE_MASK			(1 << 0)
> -
> -/* DEBOBS_FINAL_MUX_SEL */
> -#define OMAP4_SELECT_SHIFT				0
> -#define OMAP4_SELECT_MASK				(0xffffffff << 0)
> -
> -/* DEBOBS_MMR_MPU */
> -#define OMAP4_SELECT_DEBOBS_MMR_MPU_SHIFT		0
> -#define OMAP4_SELECT_DEBOBS_MMR_MPU_MASK		(0xf << 0)
> -
> -/* CONF_SDMA_REQ_SEL0 */
> -#define OMAP4_MULT_SHIFT				0
> -#define OMAP4_MULT_MASK					(0x7f << 0)
> -
> -/* CONF_CLK_SEL0 */
> -#define OMAP4_MULT_CONF_CLK_SEL0_SHIFT			0
> -#define OMAP4_MULT_CONF_CLK_SEL0_MASK			(0x7 << 0)
> -
> -/* CONF_CLK_SEL1 */
> -#define OMAP4_MULT_CONF_CLK_SEL1_SHIFT			0
> -#define OMAP4_MULT_CONF_CLK_SEL1_MASK			(0x7 << 0)
> -
> -/* CONF_CLK_SEL2 */
> -#define OMAP4_MULT_CONF_CLK_SEL2_SHIFT			0
> -#define OMAP4_MULT_CONF_CLK_SEL2_MASK			(0x7 << 0)
> -
> -/* CONF_DPLL_FREQLOCK_SEL */
> -#define OMAP4_MULT_CONF_DPLL_FREQLOCK_SEL_SHIFT		0
> -#define OMAP4_MULT_CONF_DPLL_FREQLOCK_SEL_MASK		(0x7 << 0)
> -
> -/* CONF_DPLL_TINITZ_SEL */
> -#define OMAP4_MULT_CONF_DPLL_TINITZ_SEL_SHIFT		0
> -#define OMAP4_MULT_CONF_DPLL_TINITZ_SEL_MASK		(0x7 << 0)
> -
> -/* CONF_DPLL_PHASELOCK_SEL */
> -#define OMAP4_MULT_CONF_DPLL_PHASELOCK_SEL_SHIFT	0
> -#define OMAP4_MULT_CONF_DPLL_PHASELOCK_SEL_MASK		(0x7 << 0)
> -
> -/* CONF_DEBUG_SEL_TST_0 */
> -#define OMAP4_MODE_SHIFT				0
> -#define OMAP4_MODE_MASK					(0xf << 0)
> -
> -#endif
> diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
> deleted file mode 100644
> index c88420d..0000000
> --- a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
> +++ /dev/null
> @@ -1,1409 +0,0 @@
> -/*
> - * OMAP44xx CTRL_MODULE_PAD_CORE registers and bitfields
> - *
> - * Copyright (C) 2009-2010 Texas Instruments, Inc.
> - *
> - * Benoit Cousson (b-cousson at ti.com)
> - * Santosh Shilimkar (santosh.shilimkar at ti.com)
> - *
> - * This file is automatically generated from the OMAP hardware databases.
> - * We respectfully ask that any modifications to this file be coordinated
> - * with the public linux-omap at vger.kernel.org mailing list and the
> - * authors above to ensure that the autogeneration scripts are kept
> - * up-to-date with the file contents.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - */
> -
> -#ifndef __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_PAD_CORE_44XX_H
> -#define __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_PAD_CORE_44XX_H
> -
> -
> -/* Base address */
> -#define OMAP4_CTRL_MODULE_PAD_CORE				0x4a100000
> -
> -/* Registers offset */
> -#define OMAP4_CTRL_MODULE_PAD_CORE_IP_REVISION			0x0000
> -#define OMAP4_CTRL_MODULE_PAD_CORE_IP_HWINFO			0x0004
> -#define OMAP4_CTRL_MODULE_PAD_CORE_IP_SYSCONFIG			0x0010
> -#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_0	0x01d8
> -#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_1	0x01dc
> -#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_2	0x01e0
> -#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_3	0x01e4
> -#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_4	0x01e8
> -#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_5	0x01ec
> -#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_6	0x01f0
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_PADCONF_GLOBAL	0x05a0
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_PADCONF_MODE		0x05a4
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART1IO_PADCONF_0	0x05a8
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART1IO_PADCONF_1	0x05ac
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART2IO_PADCONF_0	0x05b0
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART2IO_PADCONF_1	0x05b4
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART3IO_PADCONF_0	0x05b8
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART3IO_PADCONF_1	0x05bc
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART3IO_PADCONF_2	0x05c0
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_USBB_HSIC		0x05c4
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SLIMBUS		0x05c8
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_PBIASLITE		0x0600
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_0		0x0604
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_CAMERA_RX		0x0608
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_AVDAC		0x060c
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_HDMI_TX_PHY		0x0610
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MMC2			0x0614
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY		0x0618
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MCBSPLP		0x061c
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_USB2PHYCORE		0x0620
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_1		0x0624
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MMC1			0x0628
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_HSI			0x062c
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_USB			0x0630
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_HDQ			0x0634
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO1_0		0x0638
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO1_1		0x063c
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO1_2		0x0640
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO1_3		0x0644
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO2_0		0x0648
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO2_1		0x064c
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO2_2		0x0650
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO2_3		0x0654
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_BUS_HOLD		0x0658
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_C2C			0x065c
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CORE_CONTROL_SPARE_RW	0x0660
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CORE_CONTROL_SPARE_R		0x0664
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CORE_CONTROL_SPARE_R_C0	0x0668
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_1		0x0700
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_2		0x0704
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_3		0x0708
> -#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_4		0x070c
> -
> -/* Registers shifts and masks */
> -
> -/* IP_REVISION */
> -#define OMAP4_IP_REV_SCHEME_SHIFT				30
> -#define OMAP4_IP_REV_SCHEME_MASK				(0x3 << 30)
> -#define OMAP4_IP_REV_FUNC_SHIFT					16
> -#define OMAP4_IP_REV_FUNC_MASK					(0xfff << 16)
> -#define OMAP4_IP_REV_RTL_SHIFT					11
> -#define OMAP4_IP_REV_RTL_MASK					(0x1f << 11)
> -#define OMAP4_IP_REV_MAJOR_SHIFT				8
> -#define OMAP4_IP_REV_MAJOR_MASK					(0x7 << 8)
> -#define OMAP4_IP_REV_CUSTOM_SHIFT				6
> -#define OMAP4_IP_REV_CUSTOM_MASK				(0x3 << 6)
> -#define OMAP4_IP_REV_MINOR_SHIFT				0
> -#define OMAP4_IP_REV_MINOR_MASK					(0x3f << 0)
> -
> -/* IP_HWINFO */
> -#define OMAP4_IP_HWINFO_SHIFT					0
> -#define OMAP4_IP_HWINFO_MASK					(0xffffffff << 0)
> -
> -/* IP_SYSCONFIG */
> -#define OMAP4_IP_SYSCONFIG_IDLEMODE_SHIFT			2
> -#define OMAP4_IP_SYSCONFIG_IDLEMODE_MASK			(0x3 << 2)
> -
> -/* PADCONF_WAKEUPEVENT_0 */
> -#define OMAP4_GPMC_CLK_DUPLICATEWAKEUPEVENT_SHIFT		31
> -#define OMAP4_GPMC_CLK_DUPLICATEWAKEUPEVENT_MASK		(1 << 31)
> -#define OMAP4_GPMC_NWP_DUPLICATEWAKEUPEVENT_SHIFT		30
> -#define OMAP4_GPMC_NWP_DUPLICATEWAKEUPEVENT_MASK		(1 << 30)
> -#define OMAP4_GPMC_NCS3_DUPLICATEWAKEUPEVENT_SHIFT		29
> -#define OMAP4_GPMC_NCS3_DUPLICATEWAKEUPEVENT_MASK		(1 << 29)
> -#define OMAP4_GPMC_NCS2_DUPLICATEWAKEUPEVENT_SHIFT		28
> -#define OMAP4_GPMC_NCS2_DUPLICATEWAKEUPEVENT_MASK		(1 << 28)
> -#define OMAP4_GPMC_NCS1_DUPLICATEWAKEUPEVENT_SHIFT		27
> -#define OMAP4_GPMC_NCS1_DUPLICATEWAKEUPEVENT_MASK		(1 << 27)
> -#define OMAP4_GPMC_NCS0_DUPLICATEWAKEUPEVENT_SHIFT		26
> -#define OMAP4_GPMC_NCS0_DUPLICATEWAKEUPEVENT_MASK		(1 << 26)
> -#define OMAP4_GPMC_A25_DUPLICATEWAKEUPEVENT_SHIFT		25
> -#define OMAP4_GPMC_A25_DUPLICATEWAKEUPEVENT_MASK		(1 << 25)
> -#define OMAP4_GPMC_A24_DUPLICATEWAKEUPEVENT_SHIFT		24
> -#define OMAP4_GPMC_A24_DUPLICATEWAKEUPEVENT_MASK		(1 << 24)
> -#define OMAP4_GPMC_A23_DUPLICATEWAKEUPEVENT_SHIFT		23
> -#define OMAP4_GPMC_A23_DUPLICATEWAKEUPEVENT_MASK		(1 << 23)
> -#define OMAP4_GPMC_A22_DUPLICATEWAKEUPEVENT_SHIFT		22
> -#define OMAP4_GPMC_A22_DUPLICATEWAKEUPEVENT_MASK		(1 << 22)
> -#define OMAP4_GPMC_A21_DUPLICATEWAKEUPEVENT_SHIFT		21
> -#define OMAP4_GPMC_A21_DUPLICATEWAKEUPEVENT_MASK		(1 << 21)
> -#define OMAP4_GPMC_A20_DUPLICATEWAKEUPEVENT_SHIFT		20
> -#define OMAP4_GPMC_A20_DUPLICATEWAKEUPEVENT_MASK		(1 << 20)
> -#define OMAP4_GPMC_A19_DUPLICATEWAKEUPEVENT_SHIFT		19
> -#define OMAP4_GPMC_A19_DUPLICATEWAKEUPEVENT_MASK		(1 << 19)
> -#define OMAP4_GPMC_A18_DUPLICATEWAKEUPEVENT_SHIFT		18
> -#define OMAP4_GPMC_A18_DUPLICATEWAKEUPEVENT_MASK		(1 << 18)
> -#define OMAP4_GPMC_A17_DUPLICATEWAKEUPEVENT_SHIFT		17
> -#define OMAP4_GPMC_A17_DUPLICATEWAKEUPEVENT_MASK		(1 << 17)
> -#define OMAP4_GPMC_A16_DUPLICATEWAKEUPEVENT_SHIFT		16
> -#define OMAP4_GPMC_A16_DUPLICATEWAKEUPEVENT_MASK		(1 << 16)
> -#define OMAP4_GPMC_AD15_DUPLICATEWAKEUPEVENT_SHIFT		15
> -#define OMAP4_GPMC_AD15_DUPLICATEWAKEUPEVENT_MASK		(1 << 15)
> -#define OMAP4_GPMC_AD14_DUPLICATEWAKEUPEVENT_SHIFT		14
> -#define OMAP4_GPMC_AD14_DUPLICATEWAKEUPEVENT_MASK		(1 << 14)
> -#define OMAP4_GPMC_AD13_DUPLICATEWAKEUPEVENT_SHIFT		13
> -#define OMAP4_GPMC_AD13_DUPLICATEWAKEUPEVENT_MASK		(1 << 13)
> -#define OMAP4_GPMC_AD12_DUPLICATEWAKEUPEVENT_SHIFT		12
> -#define OMAP4_GPMC_AD12_DUPLICATEWAKEUPEVENT_MASK		(1 << 12)
> -#define OMAP4_GPMC_AD11_DUPLICATEWAKEUPEVENT_SHIFT		11
> -#define OMAP4_GPMC_AD11_DUPLICATEWAKEUPEVENT_MASK		(1 << 11)
> -#define OMAP4_GPMC_AD10_DUPLICATEWAKEUPEVENT_SHIFT		10
> -#define OMAP4_GPMC_AD10_DUPLICATEWAKEUPEVENT_MASK		(1 << 10)
> -#define OMAP4_GPMC_AD9_DUPLICATEWAKEUPEVENT_SHIFT		9
> -#define OMAP4_GPMC_AD9_DUPLICATEWAKEUPEVENT_MASK		(1 << 9)
> -#define OMAP4_GPMC_AD8_DUPLICATEWAKEUPEVENT_SHIFT		8
> -#define OMAP4_GPMC_AD8_DUPLICATEWAKEUPEVENT_MASK		(1 << 8)
> -#define OMAP4_GPMC_AD7_DUPLICATEWAKEUPEVENT_SHIFT		7
> -#define OMAP4_GPMC_AD7_DUPLICATEWAKEUPEVENT_MASK		(1 << 7)
> -#define OMAP4_GPMC_AD6_DUPLICATEWAKEUPEVENT_SHIFT		6
> -#define OMAP4_GPMC_AD6_DUPLICATEWAKEUPEVENT_MASK		(1 << 6)
> -#define OMAP4_GPMC_AD5_DUPLICATEWAKEUPEVENT_SHIFT		5
> -#define OMAP4_GPMC_AD5_DUPLICATEWAKEUPEVENT_MASK		(1 << 5)
> -#define OMAP4_GPMC_AD4_DUPLICATEWAKEUPEVENT_SHIFT		4
> -#define OMAP4_GPMC_AD4_DUPLICATEWAKEUPEVENT_MASK		(1 << 4)
> -#define OMAP4_GPMC_AD3_DUPLICATEWAKEUPEVENT_SHIFT		3
> -#define OMAP4_GPMC_AD3_DUPLICATEWAKEUPEVENT_MASK		(1 << 3)
> -#define OMAP4_GPMC_AD2_DUPLICATEWAKEUPEVENT_SHIFT		2
> -#define OMAP4_GPMC_AD2_DUPLICATEWAKEUPEVENT_MASK		(1 << 2)
> -#define OMAP4_GPMC_AD1_DUPLICATEWAKEUPEVENT_SHIFT		1
> -#define OMAP4_GPMC_AD1_DUPLICATEWAKEUPEVENT_MASK		(1 << 1)
> -#define OMAP4_GPMC_AD0_DUPLICATEWAKEUPEVENT_SHIFT		0
> -#define OMAP4_GPMC_AD0_DUPLICATEWAKEUPEVENT_MASK		(1 << 0)
> -
> -/* PADCONF_WAKEUPEVENT_1 */
> -#define OMAP4_CAM_STROBE_DUPLICATEWAKEUPEVENT_SHIFT		31
> -#define OMAP4_CAM_STROBE_DUPLICATEWAKEUPEVENT_MASK		(1 << 31)
> -#define OMAP4_CAM_SHUTTER_DUPLICATEWAKEUPEVENT_SHIFT		30
> -#define OMAP4_CAM_SHUTTER_DUPLICATEWAKEUPEVENT_MASK		(1 << 30)
> -#define OMAP4_CSI22_DY1_DUPLICATEWAKEUPEVENT_SHIFT		29
> -#define OMAP4_CSI22_DY1_DUPLICATEWAKEUPEVENT_MASK		(1 << 29)
> -#define OMAP4_CSI22_DX1_DUPLICATEWAKEUPEVENT_SHIFT		28
> -#define OMAP4_CSI22_DX1_DUPLICATEWAKEUPEVENT_MASK		(1 << 28)
> -#define OMAP4_CSI22_DY0_DUPLICATEWAKEUPEVENT_SHIFT		27
> -#define OMAP4_CSI22_DY0_DUPLICATEWAKEUPEVENT_MASK		(1 << 27)
> -#define OMAP4_CSI22_DX0_DUPLICATEWAKEUPEVENT_SHIFT		26
> -#define OMAP4_CSI22_DX0_DUPLICATEWAKEUPEVENT_MASK		(1 << 26)
> -#define OMAP4_CSI21_DY4_DUPLICATEWAKEUPEVENT_SHIFT		25
> -#define OMAP4_CSI21_DY4_DUPLICATEWAKEUPEVENT_MASK		(1 << 25)
> -#define OMAP4_CSI21_DX4_DUPLICATEWAKEUPEVENT_SHIFT		24
> -#define OMAP4_CSI21_DX4_DUPLICATEWAKEUPEVENT_MASK		(1 << 24)
> -#define OMAP4_CSI21_DY3_DUPLICATEWAKEUPEVENT_SHIFT		23
> -#define OMAP4_CSI21_DY3_DUPLICATEWAKEUPEVENT_MASK		(1 << 23)
> -#define OMAP4_CSI21_DX3_DUPLICATEWAKEUPEVENT_SHIFT		22
> -#define OMAP4_CSI21_DX3_DUPLICATEWAKEUPEVENT_MASK		(1 << 22)
> -#define OMAP4_CSI21_DY2_DUPLICATEWAKEUPEVENT_SHIFT		21
> -#define OMAP4_CSI21_DY2_DUPLICATEWAKEUPEVENT_MASK		(1 << 21)
> -#define OMAP4_CSI21_DX2_DUPLICATEWAKEUPEVENT_SHIFT		20
> -#define OMAP4_CSI21_DX2_DUPLICATEWAKEUPEVENT_MASK		(1 << 20)
> -#define OMAP4_CSI21_DY1_DUPLICATEWAKEUPEVENT_SHIFT		19
> -#define OMAP4_CSI21_DY1_DUPLICATEWAKEUPEVENT_MASK		(1 << 19)
> -#define OMAP4_CSI21_DX1_DUPLICATEWAKEUPEVENT_SHIFT		18
> -#define OMAP4_CSI21_DX1_DUPLICATEWAKEUPEVENT_MASK		(1 << 18)
> -#define OMAP4_CSI21_DY0_DUPLICATEWAKEUPEVENT_SHIFT		17
> -#define OMAP4_CSI21_DY0_DUPLICATEWAKEUPEVENT_MASK		(1 << 17)
> -#define OMAP4_CSI21_DX0_DUPLICATEWAKEUPEVENT_SHIFT		16
> -#define OMAP4_CSI21_DX0_DUPLICATEWAKEUPEVENT_MASK		(1 << 16)
> -#define OMAP4_HDMI_DDC_SDA_DUPLICATEWAKEUPEVENT_SHIFT		15
> -#define OMAP4_HDMI_DDC_SDA_DUPLICATEWAKEUPEVENT_MASK		(1 << 15)
> -#define OMAP4_HDMI_DDC_SCL_DUPLICATEWAKEUPEVENT_SHIFT		14
> -#define OMAP4_HDMI_DDC_SCL_DUPLICATEWAKEUPEVENT_MASK		(1 << 14)
> -#define OMAP4_HDMI_CEC_DUPLICATEWAKEUPEVENT_SHIFT		13
> -#define OMAP4_HDMI_CEC_DUPLICATEWAKEUPEVENT_MASK		(1 << 13)
> -#define OMAP4_HDMI_HPD_DUPLICATEWAKEUPEVENT_SHIFT		12
> -#define OMAP4_HDMI_HPD_DUPLICATEWAKEUPEVENT_MASK		(1 << 12)
> -#define OMAP4_C2C_DATA15_DUPLICATEWAKEUPEVENT_SHIFT		11
> -#define OMAP4_C2C_DATA15_DUPLICATEWAKEUPEVENT_MASK		(1 << 11)
> -#define OMAP4_C2C_DATA14_DUPLICATEWAKEUPEVENT_SHIFT		10
> -#define OMAP4_C2C_DATA14_DUPLICATEWAKEUPEVENT_MASK		(1 << 10)
> -#define OMAP4_C2C_DATA13_DUPLICATEWAKEUPEVENT_SHIFT		9
> -#define OMAP4_C2C_DATA13_DUPLICATEWAKEUPEVENT_MASK		(1 << 9)
> -#define OMAP4_C2C_DATA12_DUPLICATEWAKEUPEVENT_SHIFT		8
> -#define OMAP4_C2C_DATA12_DUPLICATEWAKEUPEVENT_MASK		(1 << 8)
> -#define OMAP4_C2C_DATA11_DUPLICATEWAKEUPEVENT_SHIFT		7
> -#define OMAP4_C2C_DATA11_DUPLICATEWAKEUPEVENT_MASK		(1 << 7)
> -#define OMAP4_GPMC_WAIT1_DUPLICATEWAKEUPEVENT_SHIFT		6
> -#define OMAP4_GPMC_WAIT1_DUPLICATEWAKEUPEVENT_MASK		(1 << 6)
> -#define OMAP4_GPMC_WAIT0_DUPLICATEWAKEUPEVENT_SHIFT		5
> -#define OMAP4_GPMC_WAIT0_DUPLICATEWAKEUPEVENT_MASK		(1 << 5)
> -#define OMAP4_GPMC_NBE1_DUPLICATEWAKEUPEVENT_SHIFT		4
> -#define OMAP4_GPMC_NBE1_DUPLICATEWAKEUPEVENT_MASK		(1 << 4)
> -#define OMAP4_GPMC_NBE0_CLE_DUPLICATEWAKEUPEVENT_SHIFT		3
> -#define OMAP4_GPMC_NBE0_CLE_DUPLICATEWAKEUPEVENT_MASK		(1 << 3)
> -#define OMAP4_GPMC_NWE_DUPLICATEWAKEUPEVENT_SHIFT		2
> -#define OMAP4_GPMC_NWE_DUPLICATEWAKEUPEVENT_MASK		(1 << 2)
> -#define OMAP4_GPMC_NOE_DUPLICATEWAKEUPEVENT_SHIFT		1
> -#define OMAP4_GPMC_NOE_DUPLICATEWAKEUPEVENT_MASK		(1 << 1)
> -#define OMAP4_GPMC_NADV_ALE_DUPLICATEWAKEUPEVENT_SHIFT		0
> -#define OMAP4_GPMC_NADV_ALE_DUPLICATEWAKEUPEVENT_MASK		(1 << 0)
> -
> -/* PADCONF_WAKEUPEVENT_2 */
> -#define OMAP4_ABE_MCBSP1_CLKX_DUPLICATEWAKEUPEVENT_SHIFT	31
> -#define OMAP4_ABE_MCBSP1_CLKX_DUPLICATEWAKEUPEVENT_MASK		(1 << 31)
> -#define OMAP4_ABE_MCBSP2_FSX_DUPLICATEWAKEUPEVENT_SHIFT		30
> -#define OMAP4_ABE_MCBSP2_FSX_DUPLICATEWAKEUPEVENT_MASK		(1 << 30)
> -#define OMAP4_ABE_MCBSP2_DX_DUPLICATEWAKEUPEVENT_SHIFT		29
> -#define OMAP4_ABE_MCBSP2_DX_DUPLICATEWAKEUPEVENT_MASK		(1 << 29)
> -#define OMAP4_ABE_MCBSP2_DR_DUPLICATEWAKEUPEVENT_SHIFT		28
> -#define OMAP4_ABE_MCBSP2_DR_DUPLICATEWAKEUPEVENT_MASK		(1 << 28)
> -#define OMAP4_ABE_MCBSP2_CLKX_DUPLICATEWAKEUPEVENT_SHIFT	27
> -#define OMAP4_ABE_MCBSP2_CLKX_DUPLICATEWAKEUPEVENT_MASK		(1 << 27)
> -#define OMAP4_SDMMC1_DAT7_DUPLICATEWAKEUPEVENT_SHIFT		26
> -#define OMAP4_SDMMC1_DAT7_DUPLICATEWAKEUPEVENT_MASK		(1 << 26)
> -#define OMAP4_SDMMC1_DAT6_DUPLICATEWAKEUPEVENT_SHIFT		25
> -#define OMAP4_SDMMC1_DAT6_DUPLICATEWAKEUPEVENT_MASK		(1 << 25)
> -#define OMAP4_SDMMC1_DAT5_DUPLICATEWAKEUPEVENT_SHIFT		24
> -#define OMAP4_SDMMC1_DAT5_DUPLICATEWAKEUPEVENT_MASK		(1 << 24)
> -#define OMAP4_SDMMC1_DAT4_DUPLICATEWAKEUPEVENT_SHIFT		23
> -#define OMAP4_SDMMC1_DAT4_DUPLICATEWAKEUPEVENT_MASK		(1 << 23)
> -#define OMAP4_SDMMC1_DAT3_DUPLICATEWAKEUPEVENT_SHIFT		22
> -#define OMAP4_SDMMC1_DAT3_DUPLICATEWAKEUPEVENT_MASK		(1 << 22)
> -#define OMAP4_SDMMC1_DAT2_DUPLICATEWAKEUPEVENT_SHIFT		21
> -#define OMAP4_SDMMC1_DAT2_DUPLICATEWAKEUPEVENT_MASK		(1 << 21)
> -#define OMAP4_SDMMC1_DAT1_DUPLICATEWAKEUPEVENT_SHIFT		20
> -#define OMAP4_SDMMC1_DAT1_DUPLICATEWAKEUPEVENT_MASK		(1 << 20)
> -#define OMAP4_SDMMC1_DAT0_DUPLICATEWAKEUPEVENT_SHIFT		19
> -#define OMAP4_SDMMC1_DAT0_DUPLICATEWAKEUPEVENT_MASK		(1 << 19)
> -#define OMAP4_SDMMC1_CMD_DUPLICATEWAKEUPEVENT_SHIFT		18
> -#define OMAP4_SDMMC1_CMD_DUPLICATEWAKEUPEVENT_MASK		(1 << 18)
> -#define OMAP4_SDMMC1_CLK_DUPLICATEWAKEUPEVENT_SHIFT		17
> -#define OMAP4_SDMMC1_CLK_DUPLICATEWAKEUPEVENT_MASK		(1 << 17)
> -#define OMAP4_USBC1_ICUSB_DM_DUPLICATEWAKEUPEVENT_SHIFT		16
> -#define OMAP4_USBC1_ICUSB_DM_DUPLICATEWAKEUPEVENT_MASK		(1 << 16)
> -#define OMAP4_USBC1_ICUSB_DP_DUPLICATEWAKEUPEVENT_SHIFT		15
> -#define OMAP4_USBC1_ICUSB_DP_DUPLICATEWAKEUPEVENT_MASK		(1 << 15)
> -#define OMAP4_USBB1_HSIC_STROBE_DUPLICATEWAKEUPEVENT_SHIFT	14
> -#define OMAP4_USBB1_HSIC_STROBE_DUPLICATEWAKEUPEVENT_MASK	(1 << 14)
> -#define OMAP4_USBB1_HSIC_DATA_DUPLICATEWAKEUPEVENT_SHIFT	13
> -#define OMAP4_USBB1_HSIC_DATA_DUPLICATEWAKEUPEVENT_MASK		(1 << 13)
> -#define OMAP4_USBB1_ULPITLL_DAT7_DUPLICATEWAKEUPEVENT_SHIFT	12
> -#define OMAP4_USBB1_ULPITLL_DAT7_DUPLICATEWAKEUPEVENT_MASK	(1 << 12)
> -#define OMAP4_USBB1_ULPITLL_DAT6_DUPLICATEWAKEUPEVENT_SHIFT	11
> -#define OMAP4_USBB1_ULPITLL_DAT6_DUPLICATEWAKEUPEVENT_MASK	(1 << 11)
> -#define OMAP4_USBB1_ULPITLL_DAT5_DUPLICATEWAKEUPEVENT_SHIFT	10
> -#define OMAP4_USBB1_ULPITLL_DAT5_DUPLICATEWAKEUPEVENT_MASK	(1 << 10)
> -#define OMAP4_USBB1_ULPITLL_DAT4_DUPLICATEWAKEUPEVENT_SHIFT	9
> -#define OMAP4_USBB1_ULPITLL_DAT4_DUPLICATEWAKEUPEVENT_MASK	(1 << 9)
> -#define OMAP4_USBB1_ULPITLL_DAT3_DUPLICATEWAKEUPEVENT_SHIFT	8
> -#define OMAP4_USBB1_ULPITLL_DAT3_DUPLICATEWAKEUPEVENT_MASK	(1 << 8)
> -#define OMAP4_USBB1_ULPITLL_DAT2_DUPLICATEWAKEUPEVENT_SHIFT	7
> -#define OMAP4_USBB1_ULPITLL_DAT2_DUPLICATEWAKEUPEVENT_MASK	(1 << 7)
> -#define OMAP4_USBB1_ULPITLL_DAT1_DUPLICATEWAKEUPEVENT_SHIFT	6
> -#define OMAP4_USBB1_ULPITLL_DAT1_DUPLICATEWAKEUPEVENT_MASK	(1 << 6)
> -#define OMAP4_USBB1_ULPITLL_DAT0_DUPLICATEWAKEUPEVENT_SHIFT	5
> -#define OMAP4_USBB1_ULPITLL_DAT0_DUPLICATEWAKEUPEVENT_MASK	(1 << 5)
> -#define OMAP4_USBB1_ULPITLL_NXT_DUPLICATEWAKEUPEVENT_SHIFT	4
> -#define OMAP4_USBB1_ULPITLL_NXT_DUPLICATEWAKEUPEVENT_MASK	(1 << 4)
> -#define OMAP4_USBB1_ULPITLL_DIR_DUPLICATEWAKEUPEVENT_SHIFT	3
> -#define OMAP4_USBB1_ULPITLL_DIR_DUPLICATEWAKEUPEVENT_MASK	(1 << 3)
> -#define OMAP4_USBB1_ULPITLL_STP_DUPLICATEWAKEUPEVENT_SHIFT	2
> -#define OMAP4_USBB1_ULPITLL_STP_DUPLICATEWAKEUPEVENT_MASK	(1 << 2)
> -#define OMAP4_USBB1_ULPITLL_CLK_DUPLICATEWAKEUPEVENT_SHIFT	1
> -#define OMAP4_USBB1_ULPITLL_CLK_DUPLICATEWAKEUPEVENT_MASK	(1 << 1)
> -#define OMAP4_CAM_GLOBALRESET_DUPLICATEWAKEUPEVENT_SHIFT	0
> -#define OMAP4_CAM_GLOBALRESET_DUPLICATEWAKEUPEVENT_MASK		(1 << 0)
> -
> -/* PADCONF_WAKEUPEVENT_3 */
> -#define OMAP4_MCSPI1_CS3_DUPLICATEWAKEUPEVENT_SHIFT		31
> -#define OMAP4_MCSPI1_CS3_DUPLICATEWAKEUPEVENT_MASK		(1 << 31)
> -#define OMAP4_MCSPI1_CS2_DUPLICATEWAKEUPEVENT_SHIFT		30
> -#define OMAP4_MCSPI1_CS2_DUPLICATEWAKEUPEVENT_MASK		(1 << 30)
> -#define OMAP4_MCSPI1_CS1_DUPLICATEWAKEUPEVENT_SHIFT		29
> -#define OMAP4_MCSPI1_CS1_DUPLICATEWAKEUPEVENT_MASK		(1 << 29)
> -#define OMAP4_MCSPI1_CS0_DUPLICATEWAKEUPEVENT_SHIFT		28
> -#define OMAP4_MCSPI1_CS0_DUPLICATEWAKEUPEVENT_MASK		(1 << 28)
> -#define OMAP4_MCSPI1_SIMO_DUPLICATEWAKEUPEVENT_SHIFT		27
> -#define OMAP4_MCSPI1_SIMO_DUPLICATEWAKEUPEVENT_MASK		(1 << 27)
> -#define OMAP4_MCSPI1_SOMI_DUPLICATEWAKEUPEVENT_SHIFT		26
> -#define OMAP4_MCSPI1_SOMI_DUPLICATEWAKEUPEVENT_MASK		(1 << 26)
> -#define OMAP4_MCSPI1_CLK_DUPLICATEWAKEUPEVENT_SHIFT		25
> -#define OMAP4_MCSPI1_CLK_DUPLICATEWAKEUPEVENT_MASK		(1 << 25)
> -#define OMAP4_I2C4_SDA_DUPLICATEWAKEUPEVENT_SHIFT		24
> -#define OMAP4_I2C4_SDA_DUPLICATEWAKEUPEVENT_MASK		(1 << 24)
> -#define OMAP4_I2C4_SCL_DUPLICATEWAKEUPEVENT_SHIFT		23
> -#define OMAP4_I2C4_SCL_DUPLICATEWAKEUPEVENT_MASK		(1 << 23)
> -#define OMAP4_I2C3_SDA_DUPLICATEWAKEUPEVENT_SHIFT		22
> -#define OMAP4_I2C3_SDA_DUPLICATEWAKEUPEVENT_MASK		(1 << 22)
> -#define OMAP4_I2C3_SCL_DUPLICATEWAKEUPEVENT_SHIFT		21
> -#define OMAP4_I2C3_SCL_DUPLICATEWAKEUPEVENT_MASK		(1 << 21)
> -#define OMAP4_I2C2_SDA_DUPLICATEWAKEUPEVENT_SHIFT		20
> -#define OMAP4_I2C2_SDA_DUPLICATEWAKEUPEVENT_MASK		(1 << 20)
> -#define OMAP4_I2C2_SCL_DUPLICATEWAKEUPEVENT_SHIFT		19
> -#define OMAP4_I2C2_SCL_DUPLICATEWAKEUPEVENT_MASK		(1 << 19)
> -#define OMAP4_I2C1_SDA_DUPLICATEWAKEUPEVENT_SHIFT		18
> -#define OMAP4_I2C1_SDA_DUPLICATEWAKEUPEVENT_MASK		(1 << 18)
> -#define OMAP4_I2C1_SCL_DUPLICATEWAKEUPEVENT_SHIFT		17
> -#define OMAP4_I2C1_SCL_DUPLICATEWAKEUPEVENT_MASK		(1 << 17)
> -#define OMAP4_HDQ_SIO_DUPLICATEWAKEUPEVENT_SHIFT		16
> -#define OMAP4_HDQ_SIO_DUPLICATEWAKEUPEVENT_MASK			(1 << 16)
> -#define OMAP4_UART2_TX_DUPLICATEWAKEUPEVENT_SHIFT		15
> -#define OMAP4_UART2_TX_DUPLICATEWAKEUPEVENT_MASK		(1 << 15)
> -#define OMAP4_UART2_RX_DUPLICATEWAKEUPEVENT_SHIFT		14
> -#define OMAP4_UART2_RX_DUPLICATEWAKEUPEVENT_MASK		(1 << 14)
> -#define OMAP4_UART2_RTS_DUPLICATEWAKEUPEVENT_SHIFT		13
> -#define OMAP4_UART2_RTS_DUPLICATEWAKEUPEVENT_MASK		(1 << 13)
> -#define OMAP4_UART2_CTS_DUPLICATEWAKEUPEVENT_SHIFT		12
> -#define OMAP4_UART2_CTS_DUPLICATEWAKEUPEVENT_MASK		(1 << 12)
> -#define OMAP4_ABE_DMIC_DIN3_DUPLICATEWAKEUPEVENT_SHIFT		11
> -#define OMAP4_ABE_DMIC_DIN3_DUPLICATEWAKEUPEVENT_MASK		(1 << 11)
> -#define OMAP4_ABE_DMIC_DIN2_DUPLICATEWAKEUPEVENT_SHIFT		10
> -#define OMAP4_ABE_DMIC_DIN2_DUPLICATEWAKEUPEVENT_MASK		(1 << 10)
> -#define OMAP4_ABE_DMIC_DIN1_DUPLICATEWAKEUPEVENT_SHIFT		9
> -#define OMAP4_ABE_DMIC_DIN1_DUPLICATEWAKEUPEVENT_MASK		(1 << 9)
> -#define OMAP4_ABE_DMIC_CLK1_DUPLICATEWAKEUPEVENT_SHIFT		8
> -#define OMAP4_ABE_DMIC_CLK1_DUPLICATEWAKEUPEVENT_MASK		(1 << 8)
> -#define OMAP4_ABE_CLKS_DUPLICATEWAKEUPEVENT_SHIFT		7
> -#define OMAP4_ABE_CLKS_DUPLICATEWAKEUPEVENT_MASK		(1 << 7)
> -#define OMAP4_ABE_PDM_LB_CLK_DUPLICATEWAKEUPEVENT_SHIFT		6
> -#define OMAP4_ABE_PDM_LB_CLK_DUPLICATEWAKEUPEVENT_MASK		(1 << 6)
> -#define OMAP4_ABE_PDM_FRAME_DUPLICATEWAKEUPEVENT_SHIFT		5
> -#define OMAP4_ABE_PDM_FRAME_DUPLICATEWAKEUPEVENT_MASK		(1 << 5)
> -#define OMAP4_ABE_PDM_DL_DATA_DUPLICATEWAKEUPEVENT_SHIFT	4
> -#define OMAP4_ABE_PDM_DL_DATA_DUPLICATEWAKEUPEVENT_MASK		(1 << 4)
> -#define OMAP4_ABE_PDM_UL_DATA_DUPLICATEWAKEUPEVENT_SHIFT	3
> -#define OMAP4_ABE_PDM_UL_DATA_DUPLICATEWAKEUPEVENT_MASK		(1 << 3)
> -#define OMAP4_ABE_MCBSP1_FSX_DUPLICATEWAKEUPEVENT_SHIFT		2
> -#define OMAP4_ABE_MCBSP1_FSX_DUPLICATEWAKEUPEVENT_MASK		(1 << 2)
> -#define OMAP4_ABE_MCBSP1_DX_DUPLICATEWAKEUPEVENT_SHIFT		1
> -#define OMAP4_ABE_MCBSP1_DX_DUPLICATEWAKEUPEVENT_MASK		(1 << 1)
> -#define OMAP4_ABE_MCBSP1_DR_DUPLICATEWAKEUPEVENT_SHIFT		0
> -#define OMAP4_ABE_MCBSP1_DR_DUPLICATEWAKEUPEVENT_MASK		(1 << 0)
> -
> -/* PADCONF_WAKEUPEVENT_4 */
> -#define OMAP4_UNIPRO_TY0_DUPLICATEWAKEUPEVENT_SHIFT		31
> -#define OMAP4_UNIPRO_TY0_DUPLICATEWAKEUPEVENT_MASK		(1 << 31)
> -#define OMAP4_UNIPRO_TX0_DUPLICATEWAKEUPEVENT_SHIFT		30
> -#define OMAP4_UNIPRO_TX0_DUPLICATEWAKEUPEVENT_MASK		(1 << 30)
> -#define OMAP4_USBB2_HSIC_STROBE_DUPLICATEWAKEUPEVENT_SHIFT	29
> -#define OMAP4_USBB2_HSIC_STROBE_DUPLICATEWAKEUPEVENT_MASK	(1 << 29)
> -#define OMAP4_USBB2_HSIC_DATA_DUPLICATEWAKEUPEVENT_SHIFT	28
> -#define OMAP4_USBB2_HSIC_DATA_DUPLICATEWAKEUPEVENT_MASK		(1 << 28)
> -#define OMAP4_USBB2_ULPITLL_DAT7_DUPLICATEWAKEUPEVENT_SHIFT	27
> -#define OMAP4_USBB2_ULPITLL_DAT7_DUPLICATEWAKEUPEVENT_MASK	(1 << 27)
> -#define OMAP4_USBB2_ULPITLL_DAT6_DUPLICATEWAKEUPEVENT_SHIFT	26
> -#define OMAP4_USBB2_ULPITLL_DAT6_DUPLICATEWAKEUPEVENT_MASK	(1 << 26)
> -#define OMAP4_USBB2_ULPITLL_DAT5_DUPLICATEWAKEUPEVENT_SHIFT	25
> -#define OMAP4_USBB2_ULPITLL_DAT5_DUPLICATEWAKEUPEVENT_MASK	(1 << 25)
> -#define OMAP4_USBB2_ULPITLL_DAT4_DUPLICATEWAKEUPEVENT_SHIFT	24
> -#define OMAP4_USBB2_ULPITLL_DAT4_DUPLICATEWAKEUPEVENT_MASK	(1 << 24)
> -#define OMAP4_USBB2_ULPITLL_DAT3_DUPLICATEWAKEUPEVENT_SHIFT	23
> -#define OMAP4_USBB2_ULPITLL_DAT3_DUPLICATEWAKEUPEVENT_MASK	(1 << 23)
> -#define OMAP4_USBB2_ULPITLL_DAT2_DUPLICATEWAKEUPEVENT_SHIFT	22
> -#define OMAP4_USBB2_ULPITLL_DAT2_DUPLICATEWAKEUPEVENT_MASK	(1 << 22)
> -#define OMAP4_USBB2_ULPITLL_DAT1_DUPLICATEWAKEUPEVENT_SHIFT	21
> -#define OMAP4_USBB2_ULPITLL_DAT1_DUPLICATEWAKEUPEVENT_MASK	(1 << 21)
> -#define OMAP4_USBB2_ULPITLL_DAT0_DUPLICATEWAKEUPEVENT_SHIFT	20
> -#define OMAP4_USBB2_ULPITLL_DAT0_DUPLICATEWAKEUPEVENT_MASK	(1 << 20)
> -#define OMAP4_USBB2_ULPITLL_NXT_DUPLICATEWAKEUPEVENT_SHIFT	19
> -#define OMAP4_USBB2_ULPITLL_NXT_DUPLICATEWAKEUPEVENT_MASK	(1 << 19)
> -#define OMAP4_USBB2_ULPITLL_DIR_DUPLICATEWAKEUPEVENT_SHIFT	18
> -#define OMAP4_USBB2_ULPITLL_DIR_DUPLICATEWAKEUPEVENT_MASK	(1 << 18)
> -#define OMAP4_USBB2_ULPITLL_STP_DUPLICATEWAKEUPEVENT_SHIFT	17
> -#define OMAP4_USBB2_ULPITLL_STP_DUPLICATEWAKEUPEVENT_MASK	(1 << 17)
> -#define OMAP4_USBB2_ULPITLL_CLK_DUPLICATEWAKEUPEVENT_SHIFT	16
> -#define OMAP4_USBB2_ULPITLL_CLK_DUPLICATEWAKEUPEVENT_MASK	(1 << 16)
> -#define OMAP4_UART4_TX_DUPLICATEWAKEUPEVENT_SHIFT		15
> -#define OMAP4_UART4_TX_DUPLICATEWAKEUPEVENT_MASK		(1 << 15)
> -#define OMAP4_UART4_RX_DUPLICATEWAKEUPEVENT_SHIFT		14
> -#define OMAP4_UART4_RX_DUPLICATEWAKEUPEVENT_MASK		(1 << 14)
> -#define OMAP4_MCSPI4_CS0_DUPLICATEWAKEUPEVENT_SHIFT		13
> -#define OMAP4_MCSPI4_CS0_DUPLICATEWAKEUPEVENT_MASK		(1 << 13)
> -#define OMAP4_MCSPI4_SOMI_DUPLICATEWAKEUPEVENT_SHIFT		12
> -#define OMAP4_MCSPI4_SOMI_DUPLICATEWAKEUPEVENT_MASK		(1 << 12)
> -#define OMAP4_MCSPI4_SIMO_DUPLICATEWAKEUPEVENT_SHIFT		11
> -#define OMAP4_MCSPI4_SIMO_DUPLICATEWAKEUPEVENT_MASK		(1 << 11)
> -#define OMAP4_MCSPI4_CLK_DUPLICATEWAKEUPEVENT_SHIFT		10
> -#define OMAP4_MCSPI4_CLK_DUPLICATEWAKEUPEVENT_MASK		(1 << 10)
> -#define OMAP4_SDMMC5_DAT3_DUPLICATEWAKEUPEVENT_SHIFT		9
> -#define OMAP4_SDMMC5_DAT3_DUPLICATEWAKEUPEVENT_MASK		(1 << 9)
> -#define OMAP4_SDMMC5_DAT2_DUPLICATEWAKEUPEVENT_SHIFT		8
> -#define OMAP4_SDMMC5_DAT2_DUPLICATEWAKEUPEVENT_MASK		(1 << 8)
> -#define OMAP4_SDMMC5_DAT1_DUPLICATEWAKEUPEVENT_SHIFT		7
> -#define OMAP4_SDMMC5_DAT1_DUPLICATEWAKEUPEVENT_MASK		(1 << 7)
> -#define OMAP4_SDMMC5_DAT0_DUPLICATEWAKEUPEVENT_SHIFT		6
> -#define OMAP4_SDMMC5_DAT0_DUPLICATEWAKEUPEVENT_MASK		(1 << 6)
> -#define OMAP4_SDMMC5_CMD_DUPLICATEWAKEUPEVENT_SHIFT		5
> -#define OMAP4_SDMMC5_CMD_DUPLICATEWAKEUPEVENT_MASK		(1 << 5)
> -#define OMAP4_SDMMC5_CLK_DUPLICATEWAKEUPEVENT_SHIFT		4
> -#define OMAP4_SDMMC5_CLK_DUPLICATEWAKEUPEVENT_MASK		(1 << 4)
> -#define OMAP4_UART3_TX_IRTX_DUPLICATEWAKEUPEVENT_SHIFT		3
> -#define OMAP4_UART3_TX_IRTX_DUPLICATEWAKEUPEVENT_MASK		(1 << 3)
> -#define OMAP4_UART3_RX_IRRX_DUPLICATEWAKEUPEVENT_SHIFT		2
> -#define OMAP4_UART3_RX_IRRX_DUPLICATEWAKEUPEVENT_MASK		(1 << 2)
> -#define OMAP4_UART3_RTS_SD_DUPLICATEWAKEUPEVENT_SHIFT		1
> -#define OMAP4_UART3_RTS_SD_DUPLICATEWAKEUPEVENT_MASK		(1 << 1)
> -#define OMAP4_UART3_CTS_RCTX_DUPLICATEWAKEUPEVENT_SHIFT		0
> -#define OMAP4_UART3_CTS_RCTX_DUPLICATEWAKEUPEVENT_MASK		(1 << 0)
> -
> -/* PADCONF_WAKEUPEVENT_5 */
> -#define OMAP4_DPM_EMU11_DUPLICATEWAKEUPEVENT_SHIFT		31
> -#define OMAP4_DPM_EMU11_DUPLICATEWAKEUPEVENT_MASK		(1 << 31)
> -#define OMAP4_DPM_EMU10_DUPLICATEWAKEUPEVENT_SHIFT		30
> -#define OMAP4_DPM_EMU10_DUPLICATEWAKEUPEVENT_MASK		(1 << 30)
> -#define OMAP4_DPM_EMU9_DUPLICATEWAKEUPEVENT_SHIFT		29
> -#define OMAP4_DPM_EMU9_DUPLICATEWAKEUPEVENT_MASK		(1 << 29)
> -#define OMAP4_DPM_EMU8_DUPLICATEWAKEUPEVENT_SHIFT		28
> -#define OMAP4_DPM_EMU8_DUPLICATEWAKEUPEVENT_MASK		(1 << 28)
> -#define OMAP4_DPM_EMU7_DUPLICATEWAKEUPEVENT_SHIFT		27
> -#define OMAP4_DPM_EMU7_DUPLICATEWAKEUPEVENT_MASK		(1 << 27)
> -#define OMAP4_DPM_EMU6_DUPLICATEWAKEUPEVENT_SHIFT		26
> -#define OMAP4_DPM_EMU6_DUPLICATEWAKEUPEVENT_MASK		(1 << 26)
> -#define OMAP4_DPM_EMU5_DUPLICATEWAKEUPEVENT_SHIFT		25
> -#define OMAP4_DPM_EMU5_DUPLICATEWAKEUPEVENT_MASK		(1 << 25)
> -#define OMAP4_DPM_EMU4_DUPLICATEWAKEUPEVENT_SHIFT		24
> -#define OMAP4_DPM_EMU4_DUPLICATEWAKEUPEVENT_MASK		(1 << 24)
> -#define OMAP4_DPM_EMU3_DUPLICATEWAKEUPEVENT_SHIFT		23
> -#define OMAP4_DPM_EMU3_DUPLICATEWAKEUPEVENT_MASK		(1 << 23)
> -#define OMAP4_DPM_EMU2_DUPLICATEWAKEUPEVENT_SHIFT		22
> -#define OMAP4_DPM_EMU2_DUPLICATEWAKEUPEVENT_MASK		(1 << 22)
> -#define OMAP4_DPM_EMU1_DUPLICATEWAKEUPEVENT_SHIFT		21
> -#define OMAP4_DPM_EMU1_DUPLICATEWAKEUPEVENT_MASK		(1 << 21)
> -#define OMAP4_DPM_EMU0_DUPLICATEWAKEUPEVENT_SHIFT		20
> -#define OMAP4_DPM_EMU0_DUPLICATEWAKEUPEVENT_MASK		(1 << 20)
> -#define OMAP4_SYS_BOOT5_DUPLICATEWAKEUPEVENT_SHIFT		19
> -#define OMAP4_SYS_BOOT5_DUPLICATEWAKEUPEVENT_MASK		(1 << 19)
> -#define OMAP4_SYS_BOOT4_DUPLICATEWAKEUPEVENT_SHIFT		18
> -#define OMAP4_SYS_BOOT4_DUPLICATEWAKEUPEVENT_MASK		(1 << 18)
> -#define OMAP4_SYS_BOOT3_DUPLICATEWAKEUPEVENT_SHIFT		17
> -#define OMAP4_SYS_BOOT3_DUPLICATEWAKEUPEVENT_MASK		(1 << 17)
> -#define OMAP4_SYS_BOOT2_DUPLICATEWAKEUPEVENT_SHIFT		16
> -#define OMAP4_SYS_BOOT2_DUPLICATEWAKEUPEVENT_MASK		(1 << 16)
> -#define OMAP4_SYS_BOOT1_DUPLICATEWAKEUPEVENT_SHIFT		15
> -#define OMAP4_SYS_BOOT1_DUPLICATEWAKEUPEVENT_MASK		(1 << 15)
> -#define OMAP4_SYS_BOOT0_DUPLICATEWAKEUPEVENT_SHIFT		14
> -#define OMAP4_SYS_BOOT0_DUPLICATEWAKEUPEVENT_MASK		(1 << 14)
> -#define OMAP4_SYS_NIRQ2_DUPLICATEWAKEUPEVENT_SHIFT		13
> -#define OMAP4_SYS_NIRQ2_DUPLICATEWAKEUPEVENT_MASK		(1 << 13)
> -#define OMAP4_SYS_NIRQ1_DUPLICATEWAKEUPEVENT_SHIFT		12
> -#define OMAP4_SYS_NIRQ1_DUPLICATEWAKEUPEVENT_MASK		(1 << 12)
> -#define OMAP4_FREF_CLK2_OUT_DUPLICATEWAKEUPEVENT_SHIFT		11
> -#define OMAP4_FREF_CLK2_OUT_DUPLICATEWAKEUPEVENT_MASK		(1 << 11)
> -#define OMAP4_FREF_CLK1_OUT_DUPLICATEWAKEUPEVENT_SHIFT		10
> -#define OMAP4_FREF_CLK1_OUT_DUPLICATEWAKEUPEVENT_MASK		(1 << 10)
> -#define OMAP4_UNIPRO_RY2_DUPLICATEWAKEUPEVENT_SHIFT		9
> -#define OMAP4_UNIPRO_RY2_DUPLICATEWAKEUPEVENT_MASK		(1 << 9)
> -#define OMAP4_UNIPRO_RX2_DUPLICATEWAKEUPEVENT_SHIFT		8
> -#define OMAP4_UNIPRO_RX2_DUPLICATEWAKEUPEVENT_MASK		(1 << 8)
> -#define OMAP4_UNIPRO_RY1_DUPLICATEWAKEUPEVENT_SHIFT		7
> -#define OMAP4_UNIPRO_RY1_DUPLICATEWAKEUPEVENT_MASK		(1 << 7)
> -#define OMAP4_UNIPRO_RX1_DUPLICATEWAKEUPEVENT_SHIFT		6
> -#define OMAP4_UNIPRO_RX1_DUPLICATEWAKEUPEVENT_MASK		(1 << 6)
> -#define OMAP4_UNIPRO_RY0_DUPLICATEWAKEUPEVENT_SHIFT		5
> -#define OMAP4_UNIPRO_RY0_DUPLICATEWAKEUPEVENT_MASK		(1 << 5)
> -#define OMAP4_UNIPRO_RX0_DUPLICATEWAKEUPEVENT_SHIFT		4
> -#define OMAP4_UNIPRO_RX0_DUPLICATEWAKEUPEVENT_MASK		(1 << 4)
> -#define OMAP4_UNIPRO_TY2_DUPLICATEWAKEUPEVENT_SHIFT		3
> -#define OMAP4_UNIPRO_TY2_DUPLICATEWAKEUPEVENT_MASK		(1 << 3)
> -#define OMAP4_UNIPRO_TX2_DUPLICATEWAKEUPEVENT_SHIFT		2
> -#define OMAP4_UNIPRO_TX2_DUPLICATEWAKEUPEVENT_MASK		(1 << 2)
> -#define OMAP4_UNIPRO_TY1_DUPLICATEWAKEUPEVENT_SHIFT		1
> -#define OMAP4_UNIPRO_TY1_DUPLICATEWAKEUPEVENT_MASK		(1 << 1)
> -#define OMAP4_UNIPRO_TX1_DUPLICATEWAKEUPEVENT_SHIFT		0
> -#define OMAP4_UNIPRO_TX1_DUPLICATEWAKEUPEVENT_MASK		(1 << 0)
> -
> -/* PADCONF_WAKEUPEVENT_6 */
> -#define OMAP4_DPM_EMU19_DUPLICATEWAKEUPEVENT_SHIFT		7
> -#define OMAP4_DPM_EMU19_DUPLICATEWAKEUPEVENT_MASK		(1 << 7)
> -#define OMAP4_DPM_EMU18_DUPLICATEWAKEUPEVENT_SHIFT		6
> -#define OMAP4_DPM_EMU18_DUPLICATEWAKEUPEVENT_MASK		(1 << 6)
> -#define OMAP4_DPM_EMU17_DUPLICATEWAKEUPEVENT_SHIFT		5
> -#define OMAP4_DPM_EMU17_DUPLICATEWAKEUPEVENT_MASK		(1 << 5)
> -#define OMAP4_DPM_EMU16_DUPLICATEWAKEUPEVENT_SHIFT		4
> -#define OMAP4_DPM_EMU16_DUPLICATEWAKEUPEVENT_MASK		(1 << 4)
> -#define OMAP4_DPM_EMU15_DUPLICATEWAKEUPEVENT_SHIFT		3
> -#define OMAP4_DPM_EMU15_DUPLICATEWAKEUPEVENT_MASK		(1 << 3)
> -#define OMAP4_DPM_EMU14_DUPLICATEWAKEUPEVENT_SHIFT		2
> -#define OMAP4_DPM_EMU14_DUPLICATEWAKEUPEVENT_MASK		(1 << 2)
> -#define OMAP4_DPM_EMU13_DUPLICATEWAKEUPEVENT_SHIFT		1
> -#define OMAP4_DPM_EMU13_DUPLICATEWAKEUPEVENT_MASK		(1 << 1)
> -#define OMAP4_DPM_EMU12_DUPLICATEWAKEUPEVENT_SHIFT		0
> -#define OMAP4_DPM_EMU12_DUPLICATEWAKEUPEVENT_MASK		(1 << 0)
> -
> -/* CONTROL_PADCONF_GLOBAL */
> -#define OMAP4_FORCE_OFFMODE_EN_SHIFT				31
> -#define OMAP4_FORCE_OFFMODE_EN_MASK				(1 << 31)
> -
> -/* CONTROL_PADCONF_MODE */
> -#define OMAP4_VDDS_DV_BANK0_SHIFT				31
> -#define OMAP4_VDDS_DV_BANK0_MASK				(1 << 31)
> -#define OMAP4_VDDS_DV_BANK1_SHIFT				30
> -#define OMAP4_VDDS_DV_BANK1_MASK				(1 << 30)
> -#define OMAP4_VDDS_DV_BANK3_SHIFT				29
> -#define OMAP4_VDDS_DV_BANK3_MASK				(1 << 29)
> -#define OMAP4_VDDS_DV_BANK4_SHIFT				28
> -#define OMAP4_VDDS_DV_BANK4_MASK				(1 << 28)
> -#define OMAP4_VDDS_DV_BANK5_SHIFT				27
> -#define OMAP4_VDDS_DV_BANK5_MASK				(1 << 27)
> -#define OMAP4_VDDS_DV_BANK6_SHIFT				26
> -#define OMAP4_VDDS_DV_BANK6_MASK				(1 << 26)
> -#define OMAP4_VDDS_DV_C2C_SHIFT					25
> -#define OMAP4_VDDS_DV_C2C_MASK					(1 << 25)
> -#define OMAP4_VDDS_DV_CAM_SHIFT					24
> -#define OMAP4_VDDS_DV_CAM_MASK					(1 << 24)
> -#define OMAP4_VDDS_DV_GPMC_SHIFT				23
> -#define OMAP4_VDDS_DV_GPMC_MASK					(1 << 23)
> -#define OMAP4_VDDS_DV_SDMMC2_SHIFT				22
> -#define OMAP4_VDDS_DV_SDMMC2_MASK				(1 << 22)
> -
> -/* CONTROL_SMART1IO_PADCONF_0 */
> -#define OMAP4_ABE_DR0_SC_SHIFT					30
> -#define OMAP4_ABE_DR0_SC_MASK					(0x3 << 30)
> -#define OMAP4_CAM_DR0_SC_SHIFT					28
> -#define OMAP4_CAM_DR0_SC_MASK					(0x3 << 28)
> -#define OMAP4_FREF_DR2_SC_SHIFT					26
> -#define OMAP4_FREF_DR2_SC_MASK					(0x3 << 26)
> -#define OMAP4_FREF_DR3_SC_SHIFT					24
> -#define OMAP4_FREF_DR3_SC_MASK					(0x3 << 24)
> -#define OMAP4_GPIO_DR8_SC_SHIFT					22
> -#define OMAP4_GPIO_DR8_SC_MASK					(0x3 << 22)
> -#define OMAP4_GPIO_DR9_SC_SHIFT					20
> -#define OMAP4_GPIO_DR9_SC_MASK					(0x3 << 20)
> -#define OMAP4_GPMC_DR2_SC_SHIFT					18
> -#define OMAP4_GPMC_DR2_SC_MASK					(0x3 << 18)
> -#define OMAP4_GPMC_DR3_SC_SHIFT					16
> -#define OMAP4_GPMC_DR3_SC_MASK					(0x3 << 16)
> -#define OMAP4_GPMC_DR6_SC_SHIFT					14
> -#define OMAP4_GPMC_DR6_SC_MASK					(0x3 << 14)
> -#define OMAP4_HDMI_DR0_SC_SHIFT					12
> -#define OMAP4_HDMI_DR0_SC_MASK					(0x3 << 12)
> -#define OMAP4_MCSPI1_DR0_SC_SHIFT				10
> -#define OMAP4_MCSPI1_DR0_SC_MASK				(0x3 << 10)
> -#define OMAP4_UART1_DR0_SC_SHIFT				8
> -#define OMAP4_UART1_DR0_SC_MASK					(0x3 << 8)
> -#define OMAP4_UART3_DR0_SC_SHIFT				6
> -#define OMAP4_UART3_DR0_SC_MASK					(0x3 << 6)
> -#define OMAP4_UART3_DR1_SC_SHIFT				4
> -#define OMAP4_UART3_DR1_SC_MASK					(0x3 << 4)
> -#define OMAP4_UNIPRO_DR0_SC_SHIFT				2
> -#define OMAP4_UNIPRO_DR0_SC_MASK				(0x3 << 2)
> -#define OMAP4_UNIPRO_DR1_SC_SHIFT				0
> -#define OMAP4_UNIPRO_DR1_SC_MASK				(0x3 << 0)
> -
> -/* CONTROL_SMART1IO_PADCONF_1 */
> -#define OMAP4_ABE_DR0_LB_SHIFT					30
> -#define OMAP4_ABE_DR0_LB_MASK					(0x3 << 30)
> -#define OMAP4_CAM_DR0_LB_SHIFT					28
> -#define OMAP4_CAM_DR0_LB_MASK					(0x3 << 28)
> -#define OMAP4_FREF_DR2_LB_SHIFT					26
> -#define OMAP4_FREF_DR2_LB_MASK					(0x3 << 26)
> -#define OMAP4_FREF_DR3_LB_SHIFT					24
> -#define OMAP4_FREF_DR3_LB_MASK					(0x3 << 24)
> -#define OMAP4_GPIO_DR8_LB_SHIFT					22
> -#define OMAP4_GPIO_DR8_LB_MASK					(0x3 << 22)
> -#define OMAP4_GPIO_DR9_LB_SHIFT					20
> -#define OMAP4_GPIO_DR9_LB_MASK					(0x3 << 20)
> -#define OMAP4_GPMC_DR2_LB_SHIFT					18
> -#define OMAP4_GPMC_DR2_LB_MASK					(0x3 << 18)
> -#define OMAP4_GPMC_DR3_LB_SHIFT					16
> -#define OMAP4_GPMC_DR3_LB_MASK					(0x3 << 16)
> -#define OMAP4_GPMC_DR6_LB_SHIFT					14
> -#define OMAP4_GPMC_DR6_LB_MASK					(0x3 << 14)
> -#define OMAP4_HDMI_DR0_LB_SHIFT					12
> -#define OMAP4_HDMI_DR0_LB_MASK					(0x3 << 12)
> -#define OMAP4_MCSPI1_DR0_LB_SHIFT				10
> -#define OMAP4_MCSPI1_DR0_LB_MASK				(0x3 << 10)
> -#define OMAP4_UART1_DR0_LB_SHIFT				8
> -#define OMAP4_UART1_DR0_LB_MASK					(0x3 << 8)
> -#define OMAP4_UART3_DR0_LB_SHIFT				6
> -#define OMAP4_UART3_DR0_LB_MASK					(0x3 << 6)
> -#define OMAP4_UART3_DR1_LB_SHIFT				4
> -#define OMAP4_UART3_DR1_LB_MASK					(0x3 << 4)
> -#define OMAP4_UNIPRO_DR0_LB_SHIFT				2
> -#define OMAP4_UNIPRO_DR0_LB_MASK				(0x3 << 2)
> -#define OMAP4_UNIPRO_DR1_LB_SHIFT				0
> -#define OMAP4_UNIPRO_DR1_LB_MASK				(0x3 << 0)
> -
> -/* CONTROL_SMART2IO_PADCONF_0 */
> -#define OMAP4_C2C_DR0_LB_SHIFT					31
> -#define OMAP4_C2C_DR0_LB_MASK					(1 << 31)
> -#define OMAP4_DPM_DR1_LB_SHIFT					30
> -#define OMAP4_DPM_DR1_LB_MASK					(1 << 30)
> -#define OMAP4_DPM_DR2_LB_SHIFT					29
> -#define OMAP4_DPM_DR2_LB_MASK					(1 << 29)
> -#define OMAP4_DPM_DR3_LB_SHIFT					28
> -#define OMAP4_DPM_DR3_LB_MASK					(1 << 28)
> -#define OMAP4_GPIO_DR0_LB_SHIFT					27
> -#define OMAP4_GPIO_DR0_LB_MASK					(1 << 27)
> -#define OMAP4_GPIO_DR1_LB_SHIFT					26
> -#define OMAP4_GPIO_DR1_LB_MASK					(1 << 26)
> -#define OMAP4_GPIO_DR10_LB_SHIFT				25
> -#define OMAP4_GPIO_DR10_LB_MASK					(1 << 25)
> -#define OMAP4_GPIO_DR2_LB_SHIFT					24
> -#define OMAP4_GPIO_DR2_LB_MASK					(1 << 24)
> -#define OMAP4_GPMC_DR0_LB_SHIFT					23
> -#define OMAP4_GPMC_DR0_LB_MASK					(1 << 23)
> -#define OMAP4_GPMC_DR1_LB_SHIFT					22
> -#define OMAP4_GPMC_DR1_LB_MASK					(1 << 22)
> -#define OMAP4_GPMC_DR4_LB_SHIFT					21
> -#define OMAP4_GPMC_DR4_LB_MASK					(1 << 21)
> -#define OMAP4_GPMC_DR5_LB_SHIFT					20
> -#define OMAP4_GPMC_DR5_LB_MASK					(1 << 20)
> -#define OMAP4_GPMC_DR7_LB_SHIFT					19
> -#define OMAP4_GPMC_DR7_LB_MASK					(1 << 19)
> -#define OMAP4_HSI2_DR0_LB_SHIFT					18
> -#define OMAP4_HSI2_DR0_LB_MASK					(1 << 18)
> -#define OMAP4_HSI2_DR1_LB_SHIFT					17
> -#define OMAP4_HSI2_DR1_LB_MASK					(1 << 17)
> -#define OMAP4_HSI2_DR2_LB_SHIFT					16
> -#define OMAP4_HSI2_DR2_LB_MASK					(1 << 16)
> -#define OMAP4_KPD_DR0_LB_SHIFT					15
> -#define OMAP4_KPD_DR0_LB_MASK					(1 << 15)
> -#define OMAP4_KPD_DR1_LB_SHIFT					14
> -#define OMAP4_KPD_DR1_LB_MASK					(1 << 14)
> -#define OMAP4_PDM_DR0_LB_SHIFT					13
> -#define OMAP4_PDM_DR0_LB_MASK					(1 << 13)
> -#define OMAP4_SDMMC2_DR0_LB_SHIFT				12
> -#define OMAP4_SDMMC2_DR0_LB_MASK				(1 << 12)
> -#define OMAP4_SDMMC3_DR0_LB_SHIFT				11
> -#define OMAP4_SDMMC3_DR0_LB_MASK				(1 << 11)
> -#define OMAP4_SDMMC4_DR0_LB_SHIFT				10
> -#define OMAP4_SDMMC4_DR0_LB_MASK				(1 << 10)
> -#define OMAP4_SDMMC4_DR1_LB_SHIFT				9
> -#define OMAP4_SDMMC4_DR1_LB_MASK				(1 << 9)
> -#define OMAP4_SPI3_DR0_LB_SHIFT					8
> -#define OMAP4_SPI3_DR0_LB_MASK					(1 << 8)
> -#define OMAP4_SPI3_DR1_LB_SHIFT					7
> -#define OMAP4_SPI3_DR1_LB_MASK					(1 << 7)
> -#define OMAP4_UART3_DR2_LB_SHIFT				6
> -#define OMAP4_UART3_DR2_LB_MASK					(1 << 6)
> -#define OMAP4_UART3_DR3_LB_SHIFT				5
> -#define OMAP4_UART3_DR3_LB_MASK					(1 << 5)
> -#define OMAP4_UART3_DR4_LB_SHIFT				4
> -#define OMAP4_UART3_DR4_LB_MASK					(1 << 4)
> -#define OMAP4_UART3_DR5_LB_SHIFT				3
> -#define OMAP4_UART3_DR5_LB_MASK					(1 << 3)
> -#define OMAP4_USBA0_DR1_LB_SHIFT				2
> -#define OMAP4_USBA0_DR1_LB_MASK					(1 << 2)
> -#define OMAP4_USBA_DR2_LB_SHIFT					1
> -#define OMAP4_USBA_DR2_LB_MASK					(1 << 1)
> -
> -/* CONTROL_SMART2IO_PADCONF_1 */
> -#define OMAP4_USBB1_DR0_LB_SHIFT				31
> -#define OMAP4_USBB1_DR0_LB_MASK					(1 << 31)
> -#define OMAP4_USBB2_DR0_LB_SHIFT				30
> -#define OMAP4_USBB2_DR0_LB_MASK					(1 << 30)
> -#define OMAP4_USBA0_DR0_LB_SHIFT				29
> -#define OMAP4_USBA0_DR0_LB_MASK					(1 << 29)
> -
> -/* CONTROL_SMART3IO_PADCONF_0 */
> -#define OMAP4_DMIC_DR0_MB_SHIFT					30
> -#define OMAP4_DMIC_DR0_MB_MASK					(0x3 << 30)
> -#define OMAP4_GPIO_DR3_MB_SHIFT					28
> -#define OMAP4_GPIO_DR3_MB_MASK					(0x3 << 28)
> -#define OMAP4_GPIO_DR4_MB_SHIFT					26
> -#define OMAP4_GPIO_DR4_MB_MASK					(0x3 << 26)
> -#define OMAP4_GPIO_DR5_MB_SHIFT					24
> -#define OMAP4_GPIO_DR5_MB_MASK					(0x3 << 24)
> -#define OMAP4_GPIO_DR6_MB_SHIFT					22
> -#define OMAP4_GPIO_DR6_MB_MASK					(0x3 << 22)
> -#define OMAP4_HSI_DR1_MB_SHIFT					20
> -#define OMAP4_HSI_DR1_MB_MASK					(0x3 << 20)
> -#define OMAP4_HSI_DR2_MB_SHIFT					18
> -#define OMAP4_HSI_DR2_MB_MASK					(0x3 << 18)
> -#define OMAP4_HSI_DR3_MB_SHIFT					16
> -#define OMAP4_HSI_DR3_MB_MASK					(0x3 << 16)
> -#define OMAP4_MCBSP2_DR0_MB_SHIFT				14
> -#define OMAP4_MCBSP2_DR0_MB_MASK				(0x3 << 14)
> -#define OMAP4_MCSPI4_DR0_MB_SHIFT				12
> -#define OMAP4_MCSPI4_DR0_MB_MASK				(0x3 << 12)
> -#define OMAP4_MCSPI4_DR1_MB_SHIFT				10
> -#define OMAP4_MCSPI4_DR1_MB_MASK				(0x3 << 10)
> -#define OMAP4_SDMMC3_DR0_MB_SHIFT				8
> -#define OMAP4_SDMMC3_DR0_MB_MASK				(0x3 << 8)
> -#define OMAP4_SPI2_DR0_MB_SHIFT					0
> -#define OMAP4_SPI2_DR0_MB_MASK					(0x3 << 0)
> -
> -/* CONTROL_SMART3IO_PADCONF_1 */
> -#define OMAP4_SPI2_DR1_MB_SHIFT					30
> -#define OMAP4_SPI2_DR1_MB_MASK					(0x3 << 30)
> -#define OMAP4_SPI2_DR2_MB_SHIFT					28
> -#define OMAP4_SPI2_DR2_MB_MASK					(0x3 << 28)
> -#define OMAP4_UART2_DR0_MB_SHIFT				26
> -#define OMAP4_UART2_DR0_MB_MASK					(0x3 << 26)
> -#define OMAP4_UART2_DR1_MB_SHIFT				24
> -#define OMAP4_UART2_DR1_MB_MASK					(0x3 << 24)
> -#define OMAP4_UART4_DR0_MB_SHIFT				22
> -#define OMAP4_UART4_DR0_MB_MASK					(0x3 << 22)
> -#define OMAP4_HSI_DR0_MB_SHIFT					20
> -#define OMAP4_HSI_DR0_MB_MASK					(0x3 << 20)
> -
> -/* CONTROL_SMART3IO_PADCONF_2 */
> -#define OMAP4_DMIC_DR0_LB_SHIFT					31
> -#define OMAP4_DMIC_DR0_LB_MASK					(1 << 31)
> -#define OMAP4_GPIO_DR3_LB_SHIFT					30
> -#define OMAP4_GPIO_DR3_LB_MASK					(1 << 30)
> -#define OMAP4_GPIO_DR4_LB_SHIFT					29
> -#define OMAP4_GPIO_DR4_LB_MASK					(1 << 29)
> -#define OMAP4_GPIO_DR5_LB_SHIFT					28
> -#define OMAP4_GPIO_DR5_LB_MASK					(1 << 28)
> -#define OMAP4_GPIO_DR6_LB_SHIFT					27
> -#define OMAP4_GPIO_DR6_LB_MASK					(1 << 27)
> -#define OMAP4_HSI_DR1_LB_SHIFT					26
> -#define OMAP4_HSI_DR1_LB_MASK					(1 << 26)
> -#define OMAP4_HSI_DR2_LB_SHIFT					25
> -#define OMAP4_HSI_DR2_LB_MASK					(1 << 25)
> -#define OMAP4_HSI_DR3_LB_SHIFT					24
> -#define OMAP4_HSI_DR3_LB_MASK					(1 << 24)
> -#define OMAP4_MCBSP2_DR0_LB_SHIFT				23
> -#define OMAP4_MCBSP2_DR0_LB_MASK				(1 << 23)
> -#define OMAP4_MCSPI4_DR0_LB_SHIFT				22
> -#define OMAP4_MCSPI4_DR0_LB_MASK				(1 << 22)
> -#define OMAP4_MCSPI4_DR1_LB_SHIFT				21
> -#define OMAP4_MCSPI4_DR1_LB_MASK				(1 << 21)
> -#define OMAP4_SLIMBUS2_DR0_LB_SHIFT				18
> -#define OMAP4_SLIMBUS2_DR0_LB_MASK				(1 << 18)
> -#define OMAP4_SPI2_DR0_LB_SHIFT					16
> -#define OMAP4_SPI2_DR0_LB_MASK					(1 << 16)
> -#define OMAP4_SPI2_DR1_LB_SHIFT					15
> -#define OMAP4_SPI2_DR1_LB_MASK					(1 << 15)
> -#define OMAP4_SPI2_DR2_LB_SHIFT					14
> -#define OMAP4_SPI2_DR2_LB_MASK					(1 << 14)
> -#define OMAP4_UART2_DR0_LB_SHIFT				13
> -#define OMAP4_UART2_DR0_LB_MASK					(1 << 13)
> -#define OMAP4_UART2_DR1_LB_SHIFT				12
> -#define OMAP4_UART2_DR1_LB_MASK					(1 << 12)
> -#define OMAP4_UART4_DR0_LB_SHIFT				11
> -#define OMAP4_UART4_DR0_LB_MASK					(1 << 11)
> -#define OMAP4_HSI_DR0_LB_SHIFT					10
> -#define OMAP4_HSI_DR0_LB_MASK					(1 << 10)
> -
> -/* CONTROL_USBB_HSIC */
> -#define OMAP4_USBB2_DR1_SR_SHIFT				30
> -#define OMAP4_USBB2_DR1_SR_MASK					(0x3 << 30)
> -#define OMAP4_USBB2_DR1_I_SHIFT					27
> -#define OMAP4_USBB2_DR1_I_MASK					(0x7 << 27)
> -#define OMAP4_USBB1_DR1_SR_SHIFT				25
> -#define OMAP4_USBB1_DR1_SR_MASK					(0x3 << 25)
> -#define OMAP4_USBB1_DR1_I_SHIFT					22
> -#define OMAP4_USBB1_DR1_I_MASK					(0x7 << 22)
> -#define OMAP4_USBB1_HSIC_DATA_WD_SHIFT				20
> -#define OMAP4_USBB1_HSIC_DATA_WD_MASK				(0x3 << 20)
> -#define OMAP4_USBB1_HSIC_STROBE_WD_SHIFT			18
> -#define OMAP4_USBB1_HSIC_STROBE_WD_MASK				(0x3 << 18)
> -#define OMAP4_USBB2_HSIC_DATA_WD_SHIFT				16
> -#define OMAP4_USBB2_HSIC_DATA_WD_MASK				(0x3 << 16)
> -#define OMAP4_USBB2_HSIC_STROBE_WD_SHIFT			14
> -#define OMAP4_USBB2_HSIC_STROBE_WD_MASK				(0x3 << 14)
> -#define OMAP4_USBB1_HSIC_DATA_OFFMODE_WD_ENABLE_SHIFT		13
> -#define OMAP4_USBB1_HSIC_DATA_OFFMODE_WD_ENABLE_MASK		(1 << 13)
> -#define OMAP4_USBB1_HSIC_DATA_OFFMODE_WD_SHIFT			11
> -#define OMAP4_USBB1_HSIC_DATA_OFFMODE_WD_MASK			(0x3 << 11)
> -#define OMAP4_USBB1_HSIC_STROBE_OFFMODE_WD_ENABLE_SHIFT		10
> -#define OMAP4_USBB1_HSIC_STROBE_OFFMODE_WD_ENABLE_MASK		(1 << 10)
> -#define OMAP4_USBB1_HSIC_STROBE_OFFMODE_WD_SHIFT		8
> -#define OMAP4_USBB1_HSIC_STROBE_OFFMODE_WD_MASK			(0x3 << 8)
> -#define OMAP4_USBB2_HSIC_DATA_OFFMODE_WD_ENABLE_SHIFT		7
> -#define OMAP4_USBB2_HSIC_DATA_OFFMODE_WD_ENABLE_MASK		(1 << 7)
> -#define OMAP4_USBB2_HSIC_DATA_OFFMODE_WD_SHIFT			5
> -#define OMAP4_USBB2_HSIC_DATA_OFFMODE_WD_MASK			(0x3 << 5)
> -#define OMAP4_USBB2_HSIC_STROBE_OFFMODE_WD_ENABLE_SHIFT		4
> -#define OMAP4_USBB2_HSIC_STROBE_OFFMODE_WD_ENABLE_MASK		(1 << 4)
> -#define OMAP4_USBB2_HSIC_STROBE_OFFMODE_WD_SHIFT		2
> -#define OMAP4_USBB2_HSIC_STROBE_OFFMODE_WD_MASK			(0x3 << 2)
> -
> -/* CONTROL_SLIMBUS */
> -#define OMAP4_SLIMBUS1_DR0_MB_SHIFT				30
> -#define OMAP4_SLIMBUS1_DR0_MB_MASK				(0x3 << 30)
> -#define OMAP4_SLIMBUS1_DR1_MB_SHIFT				28
> -#define OMAP4_SLIMBUS1_DR1_MB_MASK				(0x3 << 28)
> -#define OMAP4_SLIMBUS2_DR0_MB_SHIFT				26
> -#define OMAP4_SLIMBUS2_DR0_MB_MASK				(0x3 << 26)
> -#define OMAP4_SLIMBUS2_DR1_MB_SHIFT				24
> -#define OMAP4_SLIMBUS2_DR1_MB_MASK				(0x3 << 24)
> -#define OMAP4_SLIMBUS2_DR2_MB_SHIFT				22
> -#define OMAP4_SLIMBUS2_DR2_MB_MASK				(0x3 << 22)
> -#define OMAP4_SLIMBUS2_DR3_MB_SHIFT				20
> -#define OMAP4_SLIMBUS2_DR3_MB_MASK				(0x3 << 20)
> -#define OMAP4_SLIMBUS1_DR0_LB_SHIFT				19
> -#define OMAP4_SLIMBUS1_DR0_LB_MASK				(1 << 19)
> -#define OMAP4_SLIMBUS2_DR1_LB_SHIFT				18
> -#define OMAP4_SLIMBUS2_DR1_LB_MASK				(1 << 18)
> -
> -/* CONTROL_PBIASLITE */
> -#define OMAP4_USIM_PBIASLITE_HIZ_MODE_SHIFT			31
> -#define OMAP4_USIM_PBIASLITE_HIZ_MODE_MASK			(1 << 31)
> -#define OMAP4_USIM_PBIASLITE_SUPPLY_HI_OUT_SHIFT		30
> -#define OMAP4_USIM_PBIASLITE_SUPPLY_HI_OUT_MASK			(1 << 30)
> -#define OMAP4_USIM_PBIASLITE_VMODE_ERROR_SHIFT			29
> -#define OMAP4_USIM_PBIASLITE_VMODE_ERROR_MASK			(1 << 29)
> -#define OMAP4_USIM_PBIASLITE_PWRDNZ_SHIFT			28
> -#define OMAP4_USIM_PBIASLITE_PWRDNZ_MASK			(1 << 28)
> -#define OMAP4_USIM_PBIASLITE_VMODE_SHIFT			27
> -#define OMAP4_USIM_PBIASLITE_VMODE_MASK				(1 << 27)
> -#define OMAP4_MMC1_PWRDNZ_SHIFT					26
> -#define OMAP4_MMC1_PWRDNZ_MASK					(1 << 26)
> -#define OMAP4_MMC1_PBIASLITE_HIZ_MODE_SHIFT			25
> -#define OMAP4_MMC1_PBIASLITE_HIZ_MODE_MASK			(1 << 25)
> -#define OMAP4_MMC1_PBIASLITE_SUPPLY_HI_OUT_SHIFT		24
> -#define OMAP4_MMC1_PBIASLITE_SUPPLY_HI_OUT_MASK			(1 << 24)
> -#define OMAP4_MMC1_PBIASLITE_VMODE_ERROR_SHIFT			23
> -#define OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK			(1 << 23)
> -#define OMAP4_MMC1_PBIASLITE_PWRDNZ_SHIFT			22
> -#define OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK			(1 << 22)
> -#define OMAP4_MMC1_PBIASLITE_VMODE_SHIFT			21
> -#define OMAP4_MMC1_PBIASLITE_VMODE_MASK				(1 << 21)
> -#define OMAP4_USBC1_ICUSB_PWRDNZ_SHIFT				20
> -#define OMAP4_USBC1_ICUSB_PWRDNZ_MASK				(1 << 20)
> -
> -/* CONTROL_I2C_0 */
> -#define OMAP4_I2C4_SDA_GLFENB_SHIFT				31
> -#define OMAP4_I2C4_SDA_GLFENB_MASK				(1 << 31)
> -#define OMAP4_I2C4_SDA_LOAD_BITS_SHIFT				29
> -#define OMAP4_I2C4_SDA_LOAD_BITS_MASK				(0x3 << 29)
> -#define OMAP4_I2C4_SDA_PULLUPRESX_SHIFT				28
> -#define OMAP4_I2C4_SDA_PULLUPRESX_MASK				(1 << 28)
> -#define OMAP4_I2C3_SDA_GLFENB_SHIFT				27
> -#define OMAP4_I2C3_SDA_GLFENB_MASK				(1 << 27)
> -#define OMAP4_I2C3_SDA_LOAD_BITS_SHIFT				25
> -#define OMAP4_I2C3_SDA_LOAD_BITS_MASK				(0x3 << 25)
> -#define OMAP4_I2C3_SDA_PULLUPRESX_SHIFT				24
> -#define OMAP4_I2C3_SDA_PULLUPRESX_MASK				(1 << 24)
> -#define OMAP4_I2C2_SDA_GLFENB_SHIFT				23
> -#define OMAP4_I2C2_SDA_GLFENB_MASK				(1 << 23)
> -#define OMAP4_I2C2_SDA_LOAD_BITS_SHIFT				21
> -#define OMAP4_I2C2_SDA_LOAD_BITS_MASK				(0x3 << 21)
> -#define OMAP4_I2C2_SDA_PULLUPRESX_SHIFT				20
> -#define OMAP4_I2C2_SDA_PULLUPRESX_MASK				(1 << 20)
> -#define OMAP4_I2C1_SDA_GLFENB_SHIFT				19
> -#define OMAP4_I2C1_SDA_GLFENB_MASK				(1 << 19)
> -#define OMAP4_I2C1_SDA_LOAD_BITS_SHIFT				17
> -#define OMAP4_I2C1_SDA_LOAD_BITS_MASK				(0x3 << 17)
> -#define OMAP4_I2C1_SDA_PULLUPRESX_SHIFT				16
> -#define OMAP4_I2C1_SDA_PULLUPRESX_MASK				(1 << 16)
> -#define OMAP4_I2C4_SCL_GLFENB_SHIFT				15
> -#define OMAP4_I2C4_SCL_GLFENB_MASK				(1 << 15)
> -#define OMAP4_I2C4_SCL_LOAD_BITS_SHIFT				13
> -#define OMAP4_I2C4_SCL_LOAD_BITS_MASK				(0x3 << 13)
> -#define OMAP4_I2C4_SCL_PULLUPRESX_SHIFT				12
> -#define OMAP4_I2C4_SCL_PULLUPRESX_MASK				(1 << 12)
> -#define OMAP4_I2C3_SCL_GLFENB_SHIFT				11
> -#define OMAP4_I2C3_SCL_GLFENB_MASK				(1 << 11)
> -#define OMAP4_I2C3_SCL_LOAD_BITS_SHIFT				9
> -#define OMAP4_I2C3_SCL_LOAD_BITS_MASK				(0x3 << 9)
> -#define OMAP4_I2C3_SCL_PULLUPRESX_SHIFT				8
> -#define OMAP4_I2C3_SCL_PULLUPRESX_MASK				(1 << 8)
> -#define OMAP4_I2C2_SCL_GLFENB_SHIFT				7
> -#define OMAP4_I2C2_SCL_GLFENB_MASK				(1 << 7)
> -#define OMAP4_I2C2_SCL_LOAD_BITS_SHIFT				5
> -#define OMAP4_I2C2_SCL_LOAD_BITS_MASK				(0x3 << 5)
> -#define OMAP4_I2C2_SCL_PULLUPRESX_SHIFT				4
> -#define OMAP4_I2C2_SCL_PULLUPRESX_MASK				(1 << 4)
> -#define OMAP4_I2C1_SCL_GLFENB_SHIFT				3
> -#define OMAP4_I2C1_SCL_GLFENB_MASK				(1 << 3)
> -#define OMAP4_I2C1_SCL_LOAD_BITS_SHIFT				1
> -#define OMAP4_I2C1_SCL_LOAD_BITS_MASK				(0x3 << 1)
> -#define OMAP4_I2C1_SCL_PULLUPRESX_SHIFT				0
> -#define OMAP4_I2C1_SCL_PULLUPRESX_MASK				(1 << 0)
> -
> -/* CONTROL_CAMERA_RX */
> -#define OMAP4_CAMERARX_UNIPRO_CTRLCLKEN_SHIFT			31
> -#define OMAP4_CAMERARX_UNIPRO_CTRLCLKEN_MASK			(1 << 31)
> -#define OMAP4_CAMERARX_CSI22_LANEENABLE_SHIFT			29
> -#define OMAP4_CAMERARX_CSI22_LANEENABLE_MASK			(0x3 << 29)
> -#define OMAP4_CAMERARX_CSI21_LANEENABLE_SHIFT			24
> -#define OMAP4_CAMERARX_CSI21_LANEENABLE_MASK			(0x1f << 24)
> -#define OMAP4_CAMERARX_UNIPRO_CAMMODE_SHIFT			22
> -#define OMAP4_CAMERARX_UNIPRO_CAMMODE_MASK			(0x3 << 22)
> -#define OMAP4_CAMERARX_CSI22_CTRLCLKEN_SHIFT			21
> -#define OMAP4_CAMERARX_CSI22_CTRLCLKEN_MASK			(1 << 21)
> -#define OMAP4_CAMERARX_CSI22_CAMMODE_SHIFT			19
> -#define OMAP4_CAMERARX_CSI22_CAMMODE_MASK			(0x3 << 19)
> -#define OMAP4_CAMERARX_CSI21_CTRLCLKEN_SHIFT			18
> -#define OMAP4_CAMERARX_CSI21_CTRLCLKEN_MASK			(1 << 18)
> -#define OMAP4_CAMERARX_CSI21_CAMMODE_SHIFT			16
> -#define OMAP4_CAMERARX_CSI21_CAMMODE_MASK			(0x3 << 16)
> -
> -/* CONTROL_AVDAC */
> -#define OMAP4_AVDAC_ACEN_SHIFT					31
> -#define OMAP4_AVDAC_ACEN_MASK					(1 << 31)
> -#define OMAP4_AVDAC_TVOUTBYPASS_SHIFT				30
> -#define OMAP4_AVDAC_TVOUTBYPASS_MASK				(1 << 30)
> -#define OMAP4_AVDAC_INPUTINV_SHIFT				29
> -#define OMAP4_AVDAC_INPUTINV_MASK				(1 << 29)
> -#define OMAP4_AVDAC_CTL_SHIFT					13
> -#define OMAP4_AVDAC_CTL_MASK					(0xffff << 13)
> -#define OMAP4_AVDAC_CTL_WR_ACK_SHIFT				12
> -#define OMAP4_AVDAC_CTL_WR_ACK_MASK				(1 << 12)
> -
> -/* CONTROL_HDMI_TX_PHY */
> -#define OMAP4_HDMITXPHY_PADORDER_SHIFT				31
> -#define OMAP4_HDMITXPHY_PADORDER_MASK				(1 << 31)
> -#define OMAP4_HDMITXPHY_TXVALID_SHIFT				30
> -#define OMAP4_HDMITXPHY_TXVALID_MASK				(1 << 30)
> -#define OMAP4_HDMITXPHY_ENBYPASSCLK_SHIFT			29
> -#define OMAP4_HDMITXPHY_ENBYPASSCLK_MASK			(1 << 29)
> -#define OMAP4_HDMITXPHY_PD_PULLUPDET_SHIFT			28
> -#define OMAP4_HDMITXPHY_PD_PULLUPDET_MASK			(1 << 28)
> -
> -/* CONTROL_MMC2 */
> -#define OMAP4_MMC2_FEEDBACK_CLK_SEL_SHIFT			31
> -#define OMAP4_MMC2_FEEDBACK_CLK_SEL_MASK			(1 << 31)
> -
> -/* CONTROL_DSIPHY */
> -#define OMAP4_DSI2_LANEENABLE_SHIFT				29
> -#define OMAP4_DSI2_LANEENABLE_MASK				(0x7 << 29)
> -#define OMAP4_DSI1_LANEENABLE_SHIFT				24
> -#define OMAP4_DSI1_LANEENABLE_MASK				(0x1f << 24)
> -#define OMAP4_DSI1_PIPD_SHIFT					19
> -#define OMAP4_DSI1_PIPD_MASK					(0x1f << 19)
> -#define OMAP4_DSI2_PIPD_SHIFT					14
> -#define OMAP4_DSI2_PIPD_MASK					(0x1f << 14)
> -
> -/* CONTROL_MCBSPLP */
> -#define OMAP4_ALBCTRLRX_FSX_SHIFT				31
> -#define OMAP4_ALBCTRLRX_FSX_MASK				(1 << 31)
> -#define OMAP4_ALBCTRLRX_CLKX_SHIFT				30
> -#define OMAP4_ALBCTRLRX_CLKX_MASK				(1 << 30)
> -#define OMAP4_ABE_MCBSP1_DR_EN_SHIFT				29
> -#define OMAP4_ABE_MCBSP1_DR_EN_MASK				(1 << 29)
> -
> -/* CONTROL_USB2PHYCORE */
> -#define OMAP4_USB2PHY_AUTORESUME_EN_SHIFT			31
> -#define OMAP4_USB2PHY_AUTORESUME_EN_MASK			(1 << 31)
> -#define OMAP4_USB2PHY_DISCHGDET_SHIFT				30
> -#define OMAP4_USB2PHY_DISCHGDET_MASK				(1 << 30)
> -#define OMAP4_USB2PHY_GPIOMODE_SHIFT				29
> -#define OMAP4_USB2PHY_GPIOMODE_MASK				(1 << 29)
> -#define OMAP4_USB2PHY_CHG_DET_EXT_CTL_SHIFT			28
> -#define OMAP4_USB2PHY_CHG_DET_EXT_CTL_MASK			(1 << 28)
> -#define OMAP4_USB2PHY_RDM_PD_CHGDET_EN_SHIFT			27
> -#define OMAP4_USB2PHY_RDM_PD_CHGDET_EN_MASK			(1 << 27)
> -#define OMAP4_USB2PHY_RDP_PU_CHGDET_EN_SHIFT			26
> -#define OMAP4_USB2PHY_RDP_PU_CHGDET_EN_MASK			(1 << 26)
> -#define OMAP4_USB2PHY_CHG_VSRC_EN_SHIFT				25
> -#define OMAP4_USB2PHY_CHG_VSRC_EN_MASK				(1 << 25)
> -#define OMAP4_USB2PHY_CHG_ISINK_EN_SHIFT			24
> -#define OMAP4_USB2PHY_CHG_ISINK_EN_MASK				(1 << 24)
> -#define OMAP4_USB2PHY_CHG_DET_STATUS_SHIFT			21
> -#define OMAP4_USB2PHY_CHG_DET_STATUS_MASK			(0x7 << 21)
> -#define OMAP4_USB2PHY_CHG_DET_DM_COMP_SHIFT			20
> -#define OMAP4_USB2PHY_CHG_DET_DM_COMP_MASK			(1 << 20)
> -#define OMAP4_USB2PHY_CHG_DET_DP_COMP_SHIFT			19
> -#define OMAP4_USB2PHY_CHG_DET_DP_COMP_MASK			(1 << 19)
> -#define OMAP4_USB2PHY_DATADET_SHIFT				18
> -#define OMAP4_USB2PHY_DATADET_MASK				(1 << 18)
> -#define OMAP4_USB2PHY_SINKONDP_SHIFT				17
> -#define OMAP4_USB2PHY_SINKONDP_MASK				(1 << 17)
> -#define OMAP4_USB2PHY_SRCONDM_SHIFT				16
> -#define OMAP4_USB2PHY_SRCONDM_MASK				(1 << 16)
> -#define OMAP4_USB2PHY_RESTARTCHGDET_SHIFT			15
> -#define OMAP4_USB2PHY_RESTARTCHGDET_MASK			(1 << 15)
> -#define OMAP4_USB2PHY_CHGDETDONE_SHIFT				14
> -#define OMAP4_USB2PHY_CHGDETDONE_MASK				(1 << 14)
> -#define OMAP4_USB2PHY_CHGDETECTED_SHIFT				13
> -#define OMAP4_USB2PHY_CHGDETECTED_MASK				(1 << 13)
> -#define OMAP4_USB2PHY_MCPCPUEN_SHIFT				12
> -#define OMAP4_USB2PHY_MCPCPUEN_MASK				(1 << 12)
> -#define OMAP4_USB2PHY_MCPCMODEEN_SHIFT				11
> -#define OMAP4_USB2PHY_MCPCMODEEN_MASK				(1 << 11)
> -#define OMAP4_USB2PHY_RESETDONEMCLK_SHIFT			10
> -#define OMAP4_USB2PHY_RESETDONEMCLK_MASK			(1 << 10)
> -#define OMAP4_USB2PHY_UTMIRESETDONE_SHIFT			9
> -#define OMAP4_USB2PHY_UTMIRESETDONE_MASK			(1 << 9)
> -#define OMAP4_USB2PHY_TXBITSTUFFENABLE_SHIFT			8
> -#define OMAP4_USB2PHY_TXBITSTUFFENABLE_MASK			(1 << 8)
> -#define OMAP4_USB2PHY_DATAPOLARITYN_SHIFT			7
> -#define OMAP4_USB2PHY_DATAPOLARITYN_MASK			(1 << 7)
> -#define OMAP4_USBDPLL_FREQLOCK_SHIFT				6
> -#define OMAP4_USBDPLL_FREQLOCK_MASK				(1 << 6)
> -#define OMAP4_USB2PHY_RESETDONETCLK_SHIFT			5
> -#define OMAP4_USB2PHY_RESETDONETCLK_MASK			(1 << 5)
> -
> -/* CONTROL_I2C_1 */
> -#define OMAP4_HDMI_DDC_SDA_GLFENB_SHIFT				31
> -#define OMAP4_HDMI_DDC_SDA_GLFENB_MASK				(1 << 31)
> -#define OMAP4_HDMI_DDC_SDA_LOAD_BITS_SHIFT			29
> -#define OMAP4_HDMI_DDC_SDA_LOAD_BITS_MASK			(0x3 << 29)
> -#define OMAP4_HDMI_DDC_SDA_PULLUPRESX_SHIFT			28
> -#define OMAP4_HDMI_DDC_SDA_PULLUPRESX_MASK			(1 << 28)
> -#define OMAP4_HDMI_DDC_SCL_GLFENB_SHIFT				27
> -#define OMAP4_HDMI_DDC_SCL_GLFENB_MASK				(1 << 27)
> -#define OMAP4_HDMI_DDC_SCL_LOAD_BITS_SHIFT			25
> -#define OMAP4_HDMI_DDC_SCL_LOAD_BITS_MASK			(0x3 << 25)
> -#define OMAP4_HDMI_DDC_SCL_PULLUPRESX_SHIFT			24
> -#define OMAP4_HDMI_DDC_SCL_PULLUPRESX_MASK			(1 << 24)
> -#define OMAP4_HDMI_DDC_SDA_HSMODE_SHIFT				23
> -#define OMAP4_HDMI_DDC_SDA_HSMODE_MASK				(1 << 23)
> -#define OMAP4_HDMI_DDC_SDA_NMODE_SHIFT				22
> -#define OMAP4_HDMI_DDC_SDA_NMODE_MASK				(1 << 22)
> -#define OMAP4_HDMI_DDC_SCL_HSMODE_SHIFT				21
> -#define OMAP4_HDMI_DDC_SCL_HSMODE_MASK				(1 << 21)
> -#define OMAP4_HDMI_DDC_SCL_NMODE_SHIFT				20
> -#define OMAP4_HDMI_DDC_SCL_NMODE_MASK				(1 << 20)
> -
> -/* CONTROL_MMC1 */
> -#define OMAP4_SDMMC1_PUSTRENGTH_GRP0_SHIFT			31
> -#define OMAP4_SDMMC1_PUSTRENGTH_GRP0_MASK			(1 << 31)
> -#define OMAP4_SDMMC1_PUSTRENGTH_GRP1_SHIFT			30
> -#define OMAP4_SDMMC1_PUSTRENGTH_GRP1_MASK			(1 << 30)
> -#define OMAP4_SDMMC1_PUSTRENGTH_GRP2_SHIFT			29
> -#define OMAP4_SDMMC1_PUSTRENGTH_GRP2_MASK			(1 << 29)
> -#define OMAP4_SDMMC1_PUSTRENGTH_GRP3_SHIFT			28
> -#define OMAP4_SDMMC1_PUSTRENGTH_GRP3_MASK			(1 << 28)
> -#define OMAP4_SDMMC1_DR0_SPEEDCTRL_SHIFT			27
> -#define OMAP4_SDMMC1_DR0_SPEEDCTRL_MASK				(1 << 27)
> -#define OMAP4_SDMMC1_DR1_SPEEDCTRL_SHIFT			26
> -#define OMAP4_SDMMC1_DR1_SPEEDCTRL_MASK				(1 << 26)
> -#define OMAP4_SDMMC1_DR2_SPEEDCTRL_SHIFT			25
> -#define OMAP4_SDMMC1_DR2_SPEEDCTRL_MASK				(1 << 25)
> -#define OMAP4_USBC1_DR0_SPEEDCTRL_SHIFT				24
> -#define OMAP4_USBC1_DR0_SPEEDCTRL_MASK				(1 << 24)
> -#define OMAP4_USB_FD_CDEN_SHIFT					23
> -#define OMAP4_USB_FD_CDEN_MASK					(1 << 23)
> -#define OMAP4_USBC1_ICUSB_DP_PDDIS_SHIFT			22
> -#define OMAP4_USBC1_ICUSB_DP_PDDIS_MASK				(1 << 22)
> -#define OMAP4_USBC1_ICUSB_DM_PDDIS_SHIFT			21
> -#define OMAP4_USBC1_ICUSB_DM_PDDIS_MASK				(1 << 21)
> -
> -/* CONTROL_HSI */
> -#define OMAP4_HSI1_CALLOOP_SEL_SHIFT				31
> -#define OMAP4_HSI1_CALLOOP_SEL_MASK				(1 << 31)
> -#define OMAP4_HSI1_CALMUX_SEL_SHIFT				30
> -#define OMAP4_HSI1_CALMUX_SEL_MASK				(1 << 30)
> -#define OMAP4_HSI2_CALLOOP_SEL_SHIFT				29
> -#define OMAP4_HSI2_CALLOOP_SEL_MASK				(1 << 29)
> -#define OMAP4_HSI2_CALMUX_SEL_SHIFT				28
> -#define OMAP4_HSI2_CALMUX_SEL_MASK				(1 << 28)
> -
> -/* CONTROL_USB */
> -#define OMAP4_CARKIT_USBA0_ULPIPHY_DAT0_AUTO_EN_SHIFT		31
> -#define OMAP4_CARKIT_USBA0_ULPIPHY_DAT0_AUTO_EN_MASK		(1 << 31)
> -#define OMAP4_CARKIT_USBA0_ULPIPHY_DAT1_AUTO_EN_SHIFT		30
> -#define OMAP4_CARKIT_USBA0_ULPIPHY_DAT1_AUTO_EN_MASK		(1 << 30)
> -
> -/* CONTROL_HDQ */
> -#define OMAP4_HDQ_SIO_PWRDNZ_SHIFT				31
> -#define OMAP4_HDQ_SIO_PWRDNZ_MASK				(1 << 31)
> -
> -/* CONTROL_LPDDR2IO1_0 */
> -#define OMAP4_LPDDR2IO1_GR4_SR_SHIFT				30
> -#define OMAP4_LPDDR2IO1_GR4_SR_MASK				(0x3 << 30)
> -#define OMAP4_LPDDR2IO1_GR4_I_SHIFT				27
> -#define OMAP4_LPDDR2IO1_GR4_I_MASK				(0x7 << 27)
> -#define OMAP4_LPDDR2IO1_GR4_WD_SHIFT				25
> -#define OMAP4_LPDDR2IO1_GR4_WD_MASK				(0x3 << 25)
> -#define OMAP4_LPDDR2IO1_GR3_SR_SHIFT				22
> -#define OMAP4_LPDDR2IO1_GR3_SR_MASK				(0x3 << 22)
> -#define OMAP4_LPDDR2IO1_GR3_I_SHIFT				19
> -#define OMAP4_LPDDR2IO1_GR3_I_MASK				(0x7 << 19)
> -#define OMAP4_LPDDR2IO1_GR3_WD_SHIFT				17
> -#define OMAP4_LPDDR2IO1_GR3_WD_MASK				(0x3 << 17)
> -#define OMAP4_LPDDR2IO1_GR2_SR_SHIFT				14
> -#define OMAP4_LPDDR2IO1_GR2_SR_MASK				(0x3 << 14)
> -#define OMAP4_LPDDR2IO1_GR2_I_SHIFT				11
> -#define OMAP4_LPDDR2IO1_GR2_I_MASK				(0x7 << 11)
> -#define OMAP4_LPDDR2IO1_GR2_WD_SHIFT				9
> -#define OMAP4_LPDDR2IO1_GR2_WD_MASK				(0x3 << 9)
> -#define OMAP4_LPDDR2IO1_GR1_SR_SHIFT				6
> -#define OMAP4_LPDDR2IO1_GR1_SR_MASK				(0x3 << 6)
> -#define OMAP4_LPDDR2IO1_GR1_I_SHIFT				3
> -#define OMAP4_LPDDR2IO1_GR1_I_MASK				(0x7 << 3)
> -#define OMAP4_LPDDR2IO1_GR1_WD_SHIFT				1
> -#define OMAP4_LPDDR2IO1_GR1_WD_MASK				(0x3 << 1)
> -
> -/* CONTROL_LPDDR2IO1_1 */
> -#define OMAP4_LPDDR2IO1_GR8_SR_SHIFT				30
> -#define OMAP4_LPDDR2IO1_GR8_SR_MASK				(0x3 << 30)
> -#define OMAP4_LPDDR2IO1_GR8_I_SHIFT				27
> -#define OMAP4_LPDDR2IO1_GR8_I_MASK				(0x7 << 27)
> -#define OMAP4_LPDDR2IO1_GR8_WD_SHIFT				25
> -#define OMAP4_LPDDR2IO1_GR8_WD_MASK				(0x3 << 25)
> -#define OMAP4_LPDDR2IO1_GR7_SR_SHIFT				22
> -#define OMAP4_LPDDR2IO1_GR7_SR_MASK				(0x3 << 22)
> -#define OMAP4_LPDDR2IO1_GR7_I_SHIFT				19
> -#define OMAP4_LPDDR2IO1_GR7_I_MASK				(0x7 << 19)
> -#define OMAP4_LPDDR2IO1_GR7_WD_SHIFT				17
> -#define OMAP4_LPDDR2IO1_GR7_WD_MASK				(0x3 << 17)
> -#define OMAP4_LPDDR2IO1_GR6_SR_SHIFT				14
> -#define OMAP4_LPDDR2IO1_GR6_SR_MASK				(0x3 << 14)
> -#define OMAP4_LPDDR2IO1_GR6_I_SHIFT				11
> -#define OMAP4_LPDDR2IO1_GR6_I_MASK				(0x7 << 11)
> -#define OMAP4_LPDDR2IO1_GR6_WD_SHIFT				9
> -#define OMAP4_LPDDR2IO1_GR6_WD_MASK				(0x3 << 9)
> -#define OMAP4_LPDDR2IO1_GR5_SR_SHIFT				6
> -#define OMAP4_LPDDR2IO1_GR5_SR_MASK				(0x3 << 6)
> -#define OMAP4_LPDDR2IO1_GR5_I_SHIFT				3
> -#define OMAP4_LPDDR2IO1_GR5_I_MASK				(0x7 << 3)
> -#define OMAP4_LPDDR2IO1_GR5_WD_SHIFT				1
> -#define OMAP4_LPDDR2IO1_GR5_WD_MASK				(0x3 << 1)
> -
> -/* CONTROL_LPDDR2IO1_2 */
> -#define OMAP4_LPDDR2IO1_GR11_SR_SHIFT				30
> -#define OMAP4_LPDDR2IO1_GR11_SR_MASK				(0x3 << 30)
> -#define OMAP4_LPDDR2IO1_GR11_I_SHIFT				27
> -#define OMAP4_LPDDR2IO1_GR11_I_MASK				(0x7 << 27)
> -#define OMAP4_LPDDR2IO1_GR11_WD_SHIFT				25
> -#define OMAP4_LPDDR2IO1_GR11_WD_MASK				(0x3 << 25)
> -#define OMAP4_LPDDR2IO1_GR10_SR_SHIFT				22
> -#define OMAP4_LPDDR2IO1_GR10_SR_MASK				(0x3 << 22)
> -#define OMAP4_LPDDR2IO1_GR10_I_SHIFT				19
> -#define OMAP4_LPDDR2IO1_GR10_I_MASK				(0x7 << 19)
> -#define OMAP4_LPDDR2IO1_GR10_WD_SHIFT				17
> -#define OMAP4_LPDDR2IO1_GR10_WD_MASK				(0x3 << 17)
> -#define OMAP4_LPDDR2IO1_GR9_SR_SHIFT				14
> -#define OMAP4_LPDDR2IO1_GR9_SR_MASK				(0x3 << 14)
> -#define OMAP4_LPDDR2IO1_GR9_I_SHIFT				11
> -#define OMAP4_LPDDR2IO1_GR9_I_MASK				(0x7 << 11)
> -#define OMAP4_LPDDR2IO1_GR9_WD_SHIFT				9
> -#define OMAP4_LPDDR2IO1_GR9_WD_MASK				(0x3 << 9)
> -
> -/* CONTROL_LPDDR2IO1_3 */
> -#define OMAP4_LPDDR21_VREF_CA_CCAP0_SHIFT			31
> -#define OMAP4_LPDDR21_VREF_CA_CCAP0_MASK			(1 << 31)
> -#define OMAP4_LPDDR21_VREF_CA_CCAP1_SHIFT			30
> -#define OMAP4_LPDDR21_VREF_CA_CCAP1_MASK			(1 << 30)
> -#define OMAP4_LPDDR21_VREF_CA_INT_CCAP0_SHIFT			29
> -#define OMAP4_LPDDR21_VREF_CA_INT_CCAP0_MASK			(1 << 29)
> -#define OMAP4_LPDDR21_VREF_CA_INT_CCAP1_SHIFT			28
> -#define OMAP4_LPDDR21_VREF_CA_INT_CCAP1_MASK			(1 << 28)
> -#define OMAP4_LPDDR21_VREF_CA_INT_TAP0_SHIFT			27
> -#define OMAP4_LPDDR21_VREF_CA_INT_TAP0_MASK			(1 << 27)
> -#define OMAP4_LPDDR21_VREF_CA_INT_TAP1_SHIFT			26
> -#define OMAP4_LPDDR21_VREF_CA_INT_TAP1_MASK			(1 << 26)
> -#define OMAP4_LPDDR21_VREF_CA_TAP0_SHIFT			25
> -#define OMAP4_LPDDR21_VREF_CA_TAP0_MASK				(1 << 25)
> -#define OMAP4_LPDDR21_VREF_CA_TAP1_SHIFT			24
> -#define OMAP4_LPDDR21_VREF_CA_TAP1_MASK				(1 << 24)
> -#define OMAP4_LPDDR21_VREF_DQ0_INT_CCAP0_SHIFT			23
> -#define OMAP4_LPDDR21_VREF_DQ0_INT_CCAP0_MASK			(1 << 23)
> -#define OMAP4_LPDDR21_VREF_DQ0_INT_CCAP1_SHIFT			22
> -#define OMAP4_LPDDR21_VREF_DQ0_INT_CCAP1_MASK			(1 << 22)
> -#define OMAP4_LPDDR21_VREF_DQ0_INT_TAP0_SHIFT			21
> -#define OMAP4_LPDDR21_VREF_DQ0_INT_TAP0_MASK			(1 << 21)
> -#define OMAP4_LPDDR21_VREF_DQ0_INT_TAP1_SHIFT			20
> -#define OMAP4_LPDDR21_VREF_DQ0_INT_TAP1_MASK			(1 << 20)
> -#define OMAP4_LPDDR21_VREF_DQ1_INT_CCAP0_SHIFT			19
> -#define OMAP4_LPDDR21_VREF_DQ1_INT_CCAP0_MASK			(1 << 19)
> -#define OMAP4_LPDDR21_VREF_DQ1_INT_CCAP1_SHIFT			18
> -#define OMAP4_LPDDR21_VREF_DQ1_INT_CCAP1_MASK			(1 << 18)
> -#define OMAP4_LPDDR21_VREF_DQ1_INT_TAP0_SHIFT			17
> -#define OMAP4_LPDDR21_VREF_DQ1_INT_TAP0_MASK			(1 << 17)
> -#define OMAP4_LPDDR21_VREF_DQ1_INT_TAP1_SHIFT			16
> -#define OMAP4_LPDDR21_VREF_DQ1_INT_TAP1_MASK			(1 << 16)
> -#define OMAP4_LPDDR21_VREF_DQ_CCAP0_SHIFT			15
> -#define OMAP4_LPDDR21_VREF_DQ_CCAP0_MASK			(1 << 15)
> -#define OMAP4_LPDDR21_VREF_DQ_CCAP1_SHIFT			14
> -#define OMAP4_LPDDR21_VREF_DQ_CCAP1_MASK			(1 << 14)
> -#define OMAP4_LPDDR21_VREF_DQ_TAP0_SHIFT			13
> -#define OMAP4_LPDDR21_VREF_DQ_TAP0_MASK				(1 << 13)
> -#define OMAP4_LPDDR21_VREF_DQ_TAP1_SHIFT			12
> -#define OMAP4_LPDDR21_VREF_DQ_TAP1_MASK				(1 << 12)
> -
> -/* CONTROL_LPDDR2IO2_0 */
> -#define OMAP4_LPDDR2IO2_GR4_SR_SHIFT				30
> -#define OMAP4_LPDDR2IO2_GR4_SR_MASK				(0x3 << 30)
> -#define OMAP4_LPDDR2IO2_GR4_I_SHIFT				27
> -#define OMAP4_LPDDR2IO2_GR4_I_MASK				(0x7 << 27)
> -#define OMAP4_LPDDR2IO2_GR4_WD_SHIFT				25
> -#define OMAP4_LPDDR2IO2_GR4_WD_MASK				(0x3 << 25)
> -#define OMAP4_LPDDR2IO2_GR3_SR_SHIFT				22
> -#define OMAP4_LPDDR2IO2_GR3_SR_MASK				(0x3 << 22)
> -#define OMAP4_LPDDR2IO2_GR3_I_SHIFT				19
> -#define OMAP4_LPDDR2IO2_GR3_I_MASK				(0x7 << 19)
> -#define OMAP4_LPDDR2IO2_GR3_WD_SHIFT				17
> -#define OMAP4_LPDDR2IO2_GR3_WD_MASK				(0x3 << 17)
> -#define OMAP4_LPDDR2IO2_GR2_SR_SHIFT				14
> -#define OMAP4_LPDDR2IO2_GR2_SR_MASK				(0x3 << 14)
> -#define OMAP4_LPDDR2IO2_GR2_I_SHIFT				11
> -#define OMAP4_LPDDR2IO2_GR2_I_MASK				(0x7 << 11)
> -#define OMAP4_LPDDR2IO2_GR2_WD_SHIFT				9
> -#define OMAP4_LPDDR2IO2_GR2_WD_MASK				(0x3 << 9)
> -#define OMAP4_LPDDR2IO2_GR1_SR_SHIFT				6
> -#define OMAP4_LPDDR2IO2_GR1_SR_MASK				(0x3 << 6)
> -#define OMAP4_LPDDR2IO2_GR1_I_SHIFT				3
> -#define OMAP4_LPDDR2IO2_GR1_I_MASK				(0x7 << 3)
> -#define OMAP4_LPDDR2IO2_GR1_WD_SHIFT				1
> -#define OMAP4_LPDDR2IO2_GR1_WD_MASK				(0x3 << 1)
> -
> -/* CONTROL_LPDDR2IO2_1 */
> -#define OMAP4_LPDDR2IO2_GR8_SR_SHIFT				30
> -#define OMAP4_LPDDR2IO2_GR8_SR_MASK				(0x3 << 30)
> -#define OMAP4_LPDDR2IO2_GR8_I_SHIFT				27
> -#define OMAP4_LPDDR2IO2_GR8_I_MASK				(0x7 << 27)
> -#define OMAP4_LPDDR2IO2_GR8_WD_SHIFT				25
> -#define OMAP4_LPDDR2IO2_GR8_WD_MASK				(0x3 << 25)
> -#define OMAP4_LPDDR2IO2_GR7_SR_SHIFT				22
> -#define OMAP4_LPDDR2IO2_GR7_SR_MASK				(0x3 << 22)
> -#define OMAP4_LPDDR2IO2_GR7_I_SHIFT				19
> -#define OMAP4_LPDDR2IO2_GR7_I_MASK				(0x7 << 19)
> -#define OMAP4_LPDDR2IO2_GR7_WD_SHIFT				17
> -#define OMAP4_LPDDR2IO2_GR7_WD_MASK				(0x3 << 17)
> -#define OMAP4_LPDDR2IO2_GR6_SR_SHIFT				14
> -#define OMAP4_LPDDR2IO2_GR6_SR_MASK				(0x3 << 14)
> -#define OMAP4_LPDDR2IO2_GR6_I_SHIFT				11
> -#define OMAP4_LPDDR2IO2_GR6_I_MASK				(0x7 << 11)
> -#define OMAP4_LPDDR2IO2_GR6_WD_SHIFT				9
> -#define OMAP4_LPDDR2IO2_GR6_WD_MASK				(0x3 << 9)
> -#define OMAP4_LPDDR2IO2_GR5_SR_SHIFT				6
> -#define OMAP4_LPDDR2IO2_GR5_SR_MASK				(0x3 << 6)
> -#define OMAP4_LPDDR2IO2_GR5_I_SHIFT				3
> -#define OMAP4_LPDDR2IO2_GR5_I_MASK				(0x7 << 3)
> -#define OMAP4_LPDDR2IO2_GR5_WD_SHIFT				1
> -#define OMAP4_LPDDR2IO2_GR5_WD_MASK				(0x3 << 1)
> -
> -/* CONTROL_LPDDR2IO2_2 */
> -#define OMAP4_LPDDR2IO2_GR11_SR_SHIFT				30
> -#define OMAP4_LPDDR2IO2_GR11_SR_MASK				(0x3 << 30)
> -#define OMAP4_LPDDR2IO2_GR11_I_SHIFT				27
> -#define OMAP4_LPDDR2IO2_GR11_I_MASK				(0x7 << 27)
> -#define OMAP4_LPDDR2IO2_GR11_WD_SHIFT				25
> -#define OMAP4_LPDDR2IO2_GR11_WD_MASK				(0x3 << 25)
> -#define OMAP4_LPDDR2IO2_GR10_SR_SHIFT				22
> -#define OMAP4_LPDDR2IO2_GR10_SR_MASK				(0x3 << 22)
> -#define OMAP4_LPDDR2IO2_GR10_I_SHIFT				19
> -#define OMAP4_LPDDR2IO2_GR10_I_MASK				(0x7 << 19)
> -#define OMAP4_LPDDR2IO2_GR10_WD_SHIFT				17
> -#define OMAP4_LPDDR2IO2_GR10_WD_MASK				(0x3 << 17)
> -#define OMAP4_LPDDR2IO2_GR9_SR_SHIFT				14
> -#define OMAP4_LPDDR2IO2_GR9_SR_MASK				(0x3 << 14)
> -#define OMAP4_LPDDR2IO2_GR9_I_SHIFT				11
> -#define OMAP4_LPDDR2IO2_GR9_I_MASK				(0x7 << 11)
> -#define OMAP4_LPDDR2IO2_GR9_WD_SHIFT				9
> -#define OMAP4_LPDDR2IO2_GR9_WD_MASK				(0x3 << 9)
> -
> -/* CONTROL_LPDDR2IO2_3 */
> -#define OMAP4_LPDDR22_VREF_CA_CCAP0_SHIFT			31
> -#define OMAP4_LPDDR22_VREF_CA_CCAP0_MASK			(1 << 31)
> -#define OMAP4_LPDDR22_VREF_CA_CCAP1_SHIFT			30
> -#define OMAP4_LPDDR22_VREF_CA_CCAP1_MASK			(1 << 30)
> -#define OMAP4_LPDDR22_VREF_CA_INT_CCAP0_SHIFT			29
> -#define OMAP4_LPDDR22_VREF_CA_INT_CCAP0_MASK			(1 << 29)
> -#define OMAP4_LPDDR22_VREF_CA_INT_CCAP1_SHIFT			28
> -#define OMAP4_LPDDR22_VREF_CA_INT_CCAP1_MASK			(1 << 28)
> -#define OMAP4_LPDDR22_VREF_CA_INT_TAP0_SHIFT			27
> -#define OMAP4_LPDDR22_VREF_CA_INT_TAP0_MASK			(1 << 27)
> -#define OMAP4_LPDDR22_VREF_CA_INT_TAP1_SHIFT			26
> -#define OMAP4_LPDDR22_VREF_CA_INT_TAP1_MASK			(1 << 26)
> -#define OMAP4_LPDDR22_VREF_CA_TAP0_SHIFT			25
> -#define OMAP4_LPDDR22_VREF_CA_TAP0_MASK				(1 << 25)
> -#define OMAP4_LPDDR22_VREF_CA_TAP1_SHIFT			24
> -#define OMAP4_LPDDR22_VREF_CA_TAP1_MASK				(1 << 24)
> -#define OMAP4_LPDDR22_VREF_DQ0_INT_CCAP0_SHIFT			23
> -#define OMAP4_LPDDR22_VREF_DQ0_INT_CCAP0_MASK			(1 << 23)
> -#define OMAP4_LPDDR22_VREF_DQ0_INT_CCAP1_SHIFT			22
> -#define OMAP4_LPDDR22_VREF_DQ0_INT_CCAP1_MASK			(1 << 22)
> -#define OMAP4_LPDDR22_VREF_DQ0_INT_TAP0_SHIFT			21
> -#define OMAP4_LPDDR22_VREF_DQ0_INT_TAP0_MASK			(1 << 21)
> -#define OMAP4_LPDDR22_VREF_DQ0_INT_TAP1_SHIFT			20
> -#define OMAP4_LPDDR22_VREF_DQ0_INT_TAP1_MASK			(1 << 20)
> -#define OMAP4_LPDDR22_VREF_DQ1_INT_CCAP0_SHIFT			19
> -#define OMAP4_LPDDR22_VREF_DQ1_INT_CCAP0_MASK			(1 << 19)
> -#define OMAP4_LPDDR22_VREF_DQ1_INT_CCAP1_SHIFT			18
> -#define OMAP4_LPDDR22_VREF_DQ1_INT_CCAP1_MASK			(1 << 18)
> -#define OMAP4_LPDDR22_VREF_DQ1_INT_TAP0_SHIFT			17
> -#define OMAP4_LPDDR22_VREF_DQ1_INT_TAP0_MASK			(1 << 17)
> -#define OMAP4_LPDDR22_VREF_DQ1_INT_TAP1_SHIFT			16
> -#define OMAP4_LPDDR22_VREF_DQ1_INT_TAP1_MASK			(1 << 16)
> -#define OMAP4_LPDDR22_VREF_DQ_CCAP0_SHIFT			15
> -#define OMAP4_LPDDR22_VREF_DQ_CCAP0_MASK			(1 << 15)
> -#define OMAP4_LPDDR22_VREF_DQ_CCAP1_SHIFT			14
> -#define OMAP4_LPDDR22_VREF_DQ_CCAP1_MASK			(1 << 14)
> -#define OMAP4_LPDDR22_VREF_DQ_TAP0_SHIFT			13
> -#define OMAP4_LPDDR22_VREF_DQ_TAP0_MASK				(1 << 13)
> -#define OMAP4_LPDDR22_VREF_DQ_TAP1_SHIFT			12
> -#define OMAP4_LPDDR22_VREF_DQ_TAP1_MASK				(1 << 12)
> -
> -/* CONTROL_BUS_HOLD */
> -#define OMAP4_ABE_DMIC_DIN3_EN_SHIFT				31
> -#define OMAP4_ABE_DMIC_DIN3_EN_MASK				(1 << 31)
> -#define OMAP4_MCSPI1_CS3_EN_SHIFT				30
> -#define OMAP4_MCSPI1_CS3_EN_MASK				(1 << 30)
> -
> -/* CONTROL_C2C */
> -#define OMAP4_MIRROR_MODE_EN_SHIFT				31
> -#define OMAP4_MIRROR_MODE_EN_MASK				(1 << 31)
> -#define OMAP4_C2C_SPARE_SHIFT					24
> -#define OMAP4_C2C_SPARE_MASK					(0x7f << 24)
> -
> -/* CORE_CONTROL_SPARE_RW */
> -#define OMAP4_CORE_CONTROL_SPARE_RW_SHIFT			0
> -#define OMAP4_CORE_CONTROL_SPARE_RW_MASK			(0xffffffff << 0)
> -
> -/* CORE_CONTROL_SPARE_R */
> -#define OMAP4_CORE_CONTROL_SPARE_R_SHIFT			0
> -#define OMAP4_CORE_CONTROL_SPARE_R_MASK				(0xffffffff << 0)
> -
> -/* CORE_CONTROL_SPARE_R_C0 */
> -#define OMAP4_CORE_CONTROL_SPARE_R_C0_SHIFT			31
> -#define OMAP4_CORE_CONTROL_SPARE_R_C0_MASK			(1 << 31)
> -#define OMAP4_CORE_CONTROL_SPARE_R_C1_SHIFT			30
> -#define OMAP4_CORE_CONTROL_SPARE_R_C1_MASK			(1 << 30)
> -#define OMAP4_CORE_CONTROL_SPARE_R_C2_SHIFT			29
> -#define OMAP4_CORE_CONTROL_SPARE_R_C2_MASK			(1 << 29)
> -#define OMAP4_CORE_CONTROL_SPARE_R_C3_SHIFT			28
> -#define OMAP4_CORE_CONTROL_SPARE_R_C3_MASK			(1 << 28)
> -#define OMAP4_CORE_CONTROL_SPARE_R_C4_SHIFT			27
> -#define OMAP4_CORE_CONTROL_SPARE_R_C4_MASK			(1 << 27)
> -#define OMAP4_CORE_CONTROL_SPARE_R_C5_SHIFT			26
> -#define OMAP4_CORE_CONTROL_SPARE_R_C5_MASK			(1 << 26)
> -#define OMAP4_CORE_CONTROL_SPARE_R_C6_SHIFT			25
> -#define OMAP4_CORE_CONTROL_SPARE_R_C6_MASK			(1 << 25)
> -#define OMAP4_CORE_CONTROL_SPARE_R_C7_SHIFT			24
> -#define OMAP4_CORE_CONTROL_SPARE_R_C7_MASK			(1 << 24)
> -
> -/* CONTROL_EFUSE_1 */
> -#define OMAP4_AVDAC_TRIM_BYTE3_SHIFT				24
> -#define OMAP4_AVDAC_TRIM_BYTE3_MASK				(0x7f << 24)
> -#define OMAP4_AVDAC_TRIM_BYTE2_SHIFT				16
> -#define OMAP4_AVDAC_TRIM_BYTE2_MASK				(0xff << 16)
> -#define OMAP4_AVDAC_TRIM_BYTE1_SHIFT				8
> -#define OMAP4_AVDAC_TRIM_BYTE1_MASK				(0xff << 8)
> -#define OMAP4_AVDAC_TRIM_BYTE0_SHIFT				0
> -#define OMAP4_AVDAC_TRIM_BYTE0_MASK				(0xff << 0)
> -
> -/* CONTROL_EFUSE_2 */
> -#define OMAP4_EFUSE_SMART2TEST_P0_SHIFT				31
> -#define OMAP4_EFUSE_SMART2TEST_P0_MASK				(1 << 31)
> -#define OMAP4_EFUSE_SMART2TEST_P1_SHIFT				30
> -#define OMAP4_EFUSE_SMART2TEST_P1_MASK				(1 << 30)
> -#define OMAP4_EFUSE_SMART2TEST_P2_SHIFT				29
> -#define OMAP4_EFUSE_SMART2TEST_P2_MASK				(1 << 29)
> -#define OMAP4_EFUSE_SMART2TEST_P3_SHIFT				28
> -#define OMAP4_EFUSE_SMART2TEST_P3_MASK				(1 << 28)
> -#define OMAP4_EFUSE_SMART2TEST_N0_SHIFT				27
> -#define OMAP4_EFUSE_SMART2TEST_N0_MASK				(1 << 27)
> -#define OMAP4_EFUSE_SMART2TEST_N1_SHIFT				26
> -#define OMAP4_EFUSE_SMART2TEST_N1_MASK				(1 << 26)
> -#define OMAP4_EFUSE_SMART2TEST_N2_SHIFT				25
> -#define OMAP4_EFUSE_SMART2TEST_N2_MASK				(1 << 25)
> -#define OMAP4_EFUSE_SMART2TEST_N3_SHIFT				24
> -#define OMAP4_EFUSE_SMART2TEST_N3_MASK				(1 << 24)
> -#define OMAP4_LPDDR2_PTV_N1_SHIFT				23
> -#define OMAP4_LPDDR2_PTV_N1_MASK				(1 << 23)
> -#define OMAP4_LPDDR2_PTV_N2_SHIFT				22
> -#define OMAP4_LPDDR2_PTV_N2_MASK				(1 << 22)
> -#define OMAP4_LPDDR2_PTV_N3_SHIFT				21
> -#define OMAP4_LPDDR2_PTV_N3_MASK				(1 << 21)
> -#define OMAP4_LPDDR2_PTV_N4_SHIFT				20
> -#define OMAP4_LPDDR2_PTV_N4_MASK				(1 << 20)
> -#define OMAP4_LPDDR2_PTV_N5_SHIFT				19
> -#define OMAP4_LPDDR2_PTV_N5_MASK				(1 << 19)
> -#define OMAP4_LPDDR2_PTV_P1_SHIFT				18
> -#define OMAP4_LPDDR2_PTV_P1_MASK				(1 << 18)
> -#define OMAP4_LPDDR2_PTV_P2_SHIFT				17
> -#define OMAP4_LPDDR2_PTV_P2_MASK				(1 << 17)
> -#define OMAP4_LPDDR2_PTV_P3_SHIFT				16
> -#define OMAP4_LPDDR2_PTV_P3_MASK				(1 << 16)
> -#define OMAP4_LPDDR2_PTV_P4_SHIFT				15
> -#define OMAP4_LPDDR2_PTV_P4_MASK				(1 << 15)
> -#define OMAP4_LPDDR2_PTV_P5_SHIFT				14
> -#define OMAP4_LPDDR2_PTV_P5_MASK				(1 << 14)
> -
> -/* CONTROL_EFUSE_3 */
> -#define OMAP4_STD_FUSE_SPARE_1_SHIFT				24
> -#define OMAP4_STD_FUSE_SPARE_1_MASK				(0xff << 24)
> -#define OMAP4_STD_FUSE_SPARE_2_SHIFT				16
> -#define OMAP4_STD_FUSE_SPARE_2_MASK				(0xff << 16)
> -#define OMAP4_STD_FUSE_SPARE_3_SHIFT				8
> -#define OMAP4_STD_FUSE_SPARE_3_MASK				(0xff << 8)
> -#define OMAP4_STD_FUSE_SPARE_4_SHIFT				0
> -#define OMAP4_STD_FUSE_SPARE_4_MASK				(0xff << 0)
> -
> -/* CONTROL_EFUSE_4 */
> -#define OMAP4_STD_FUSE_SPARE_5_SHIFT				24
> -#define OMAP4_STD_FUSE_SPARE_5_MASK				(0xff << 24)
> -#define OMAP4_STD_FUSE_SPARE_6_SHIFT				16
> -#define OMAP4_STD_FUSE_SPARE_6_MASK				(0xff << 16)
> -#define OMAP4_STD_FUSE_SPARE_7_SHIFT				8
> -#define OMAP4_STD_FUSE_SPARE_7_MASK				(0xff << 8)
> -#define OMAP4_STD_FUSE_SPARE_8_SHIFT				0
> -#define OMAP4_STD_FUSE_SPARE_8_MASK				(0xff << 0)
> -
> -#endif
> diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_wkup_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_wkup_44xx.h
> deleted file mode 100644
> index 17c9b37..0000000
> --- a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_wkup_44xx.h
> +++ /dev/null
> @@ -1,236 +0,0 @@
> -/*
> - * OMAP44xx CTRL_MODULE_PAD_WKUP registers and bitfields
> - *
> - * Copyright (C) 2009-2010 Texas Instruments, Inc.
> - *
> - * Benoit Cousson (b-cousson at ti.com)
> - * Santosh Shilimkar (santosh.shilimkar at ti.com)
> - *
> - * This file is automatically generated from the OMAP hardware databases.
> - * We respectfully ask that any modifications to this file be coordinated
> - * with the public linux-omap at vger.kernel.org mailing list and the
> - * authors above to ensure that the autogeneration scripts are kept
> - * up-to-date with the file contents.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - */
> -
> -#ifndef __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_PAD_WKUP_44XX_H
> -#define __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_PAD_WKUP_44XX_H
> -
> -
> -/* Base address */
> -#define OMAP4_CTRL_MODULE_PAD_WKUP					0x4a31e000
> -
> -/* Registers offset */
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_IP_REVISION				0x0000
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_IP_HWINFO				0x0004
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_IP_SYSCONFIG				0x0010
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_PADCONF_WAKEUPEVENT_0		0x007c
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_SMART1NOPMIO_PADCONF_0	0x05a0
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_SMART1NOPMIO_PADCONF_1	0x05a4
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_PADCONF_MODE			0x05a8
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_XTAL_OSCILLATOR		0x05ac
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_USIMIO			0x0600
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_I2C_2			0x0604
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_JTAG				0x0608
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_SYS				0x060c
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_WKUP_CONTROL_SPARE_RW		0x0614
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_WKUP_CONTROL_SPARE_R			0x0618
> -#define OMAP4_CTRL_MODULE_PAD_WKUP_WKUP_CONTROL_SPARE_R_C0		0x061c
> -
> -/* Registers shifts and masks */
> -
> -/* IP_REVISION */
> -#define OMAP4_IP_REV_SCHEME_SHIFT				30
> -#define OMAP4_IP_REV_SCHEME_MASK				(0x3 << 30)
> -#define OMAP4_IP_REV_FUNC_SHIFT					16
> -#define OMAP4_IP_REV_FUNC_MASK					(0xfff << 16)
> -#define OMAP4_IP_REV_RTL_SHIFT					11
> -#define OMAP4_IP_REV_RTL_MASK					(0x1f << 11)
> -#define OMAP4_IP_REV_MAJOR_SHIFT				8
> -#define OMAP4_IP_REV_MAJOR_MASK					(0x7 << 8)
> -#define OMAP4_IP_REV_CUSTOM_SHIFT				6
> -#define OMAP4_IP_REV_CUSTOM_MASK				(0x3 << 6)
> -#define OMAP4_IP_REV_MINOR_SHIFT				0
> -#define OMAP4_IP_REV_MINOR_MASK					(0x3f << 0)
> -
> -/* IP_HWINFO */
> -#define OMAP4_IP_HWINFO_SHIFT					0
> -#define OMAP4_IP_HWINFO_MASK					(0xffffffff << 0)
> -
> -/* IP_SYSCONFIG */
> -#define OMAP4_IP_SYSCONFIG_IDLEMODE_SHIFT			2
> -#define OMAP4_IP_SYSCONFIG_IDLEMODE_MASK			(0x3 << 2)
> -
> -/* PADCONF_WAKEUPEVENT_0 */
> -#define OMAP4_JTAG_TDO_DUPLICATEWAKEUPEVENT_SHIFT		24
> -#define OMAP4_JTAG_TDO_DUPLICATEWAKEUPEVENT_MASK		(1 << 24)
> -#define OMAP4_JTAG_TDI_DUPLICATEWAKEUPEVENT_SHIFT		23
> -#define OMAP4_JTAG_TDI_DUPLICATEWAKEUPEVENT_MASK		(1 << 23)
> -#define OMAP4_JTAG_TMS_TMSC_DUPLICATEWAKEUPEVENT_SHIFT		22
> -#define OMAP4_JTAG_TMS_TMSC_DUPLICATEWAKEUPEVENT_MASK		(1 << 22)
> -#define OMAP4_JTAG_RTCK_DUPLICATEWAKEUPEVENT_SHIFT		21
> -#define OMAP4_JTAG_RTCK_DUPLICATEWAKEUPEVENT_MASK		(1 << 21)
> -#define OMAP4_JTAG_TCK_DUPLICATEWAKEUPEVENT_SHIFT		20
> -#define OMAP4_JTAG_TCK_DUPLICATEWAKEUPEVENT_MASK		(1 << 20)
> -#define OMAP4_JTAG_NTRST_DUPLICATEWAKEUPEVENT_SHIFT		19
> -#define OMAP4_JTAG_NTRST_DUPLICATEWAKEUPEVENT_MASK		(1 << 19)
> -#define OMAP4_SYS_BOOT7_DUPLICATEWAKEUPEVENT_SHIFT		18
> -#define OMAP4_SYS_BOOT7_DUPLICATEWAKEUPEVENT_MASK		(1 << 18)
> -#define OMAP4_SYS_BOOT6_DUPLICATEWAKEUPEVENT_SHIFT		17
> -#define OMAP4_SYS_BOOT6_DUPLICATEWAKEUPEVENT_MASK		(1 << 17)
> -#define OMAP4_SYS_PWRON_RESET_OUT_DUPLICATEWAKEUPEVENT_SHIFT	16
> -#define OMAP4_SYS_PWRON_RESET_OUT_DUPLICATEWAKEUPEVENT_MASK	(1 << 16)
> -#define OMAP4_SYS_PWR_REQ_DUPLICATEWAKEUPEVENT_SHIFT		15
> -#define OMAP4_SYS_PWR_REQ_DUPLICATEWAKEUPEVENT_MASK		(1 << 15)
> -#define OMAP4_SYS_NRESWARM_DUPLICATEWAKEUPEVENT_SHIFT		14
> -#define OMAP4_SYS_NRESWARM_DUPLICATEWAKEUPEVENT_MASK		(1 << 14)
> -#define OMAP4_SYS_32K_DUPLICATEWAKEUPEVENT_SHIFT		13
> -#define OMAP4_SYS_32K_DUPLICATEWAKEUPEVENT_MASK			(1 << 13)
> -#define OMAP4_FREF_CLK4_OUT_DUPLICATEWAKEUPEVENT_SHIFT		12
> -#define OMAP4_FREF_CLK4_OUT_DUPLICATEWAKEUPEVENT_MASK		(1 << 12)
> -#define OMAP4_FREF_CLK4_REQ_DUPLICATEWAKEUPEVENT_SHIFT		11
> -#define OMAP4_FREF_CLK4_REQ_DUPLICATEWAKEUPEVENT_MASK		(1 << 11)
> -#define OMAP4_FREF_CLK3_OUT_DUPLICATEWAKEUPEVENT_SHIFT		10
> -#define OMAP4_FREF_CLK3_OUT_DUPLICATEWAKEUPEVENT_MASK		(1 << 10)
> -#define OMAP4_FREF_CLK3_REQ_DUPLICATEWAKEUPEVENT_SHIFT		9
> -#define OMAP4_FREF_CLK3_REQ_DUPLICATEWAKEUPEVENT_MASK		(1 << 9)
> -#define OMAP4_FREF_CLK0_OUT_DUPLICATEWAKEUPEVENT_SHIFT		8
> -#define OMAP4_FREF_CLK0_OUT_DUPLICATEWAKEUPEVENT_MASK		(1 << 8)
> -#define OMAP4_FREF_CLK_IOREQ_DUPLICATEWAKEUPEVENT_SHIFT		7
> -#define OMAP4_FREF_CLK_IOREQ_DUPLICATEWAKEUPEVENT_MASK		(1 << 7)
> -#define OMAP4_SR_SDA_DUPLICATEWAKEUPEVENT_SHIFT			6
> -#define OMAP4_SR_SDA_DUPLICATEWAKEUPEVENT_MASK			(1 << 6)
> -#define OMAP4_SR_SCL_DUPLICATEWAKEUPEVENT_SHIFT			5
> -#define OMAP4_SR_SCL_DUPLICATEWAKEUPEVENT_MASK			(1 << 5)
> -#define OMAP4_SIM_PWRCTRL_DUPLICATEWAKEUPEVENT_SHIFT		4
> -#define OMAP4_SIM_PWRCTRL_DUPLICATEWAKEUPEVENT_MASK		(1 << 4)
> -#define OMAP4_SIM_CD_DUPLICATEWAKEUPEVENT_SHIFT			3
> -#define OMAP4_SIM_CD_DUPLICATEWAKEUPEVENT_MASK			(1 << 3)
> -#define OMAP4_SIM_RESET_DUPLICATEWAKEUPEVENT_SHIFT		2
> -#define OMAP4_SIM_RESET_DUPLICATEWAKEUPEVENT_MASK		(1 << 2)
> -#define OMAP4_SIM_CLK_DUPLICATEWAKEUPEVENT_SHIFT		1
> -#define OMAP4_SIM_CLK_DUPLICATEWAKEUPEVENT_MASK			(1 << 1)
> -#define OMAP4_SIM_IO_DUPLICATEWAKEUPEVENT_SHIFT			0
> -#define OMAP4_SIM_IO_DUPLICATEWAKEUPEVENT_MASK			(1 << 0)
> -
> -/* CONTROL_SMART1NOPMIO_PADCONF_0 */
> -#define OMAP4_FREF_DR0_SC_SHIFT					30
> -#define OMAP4_FREF_DR0_SC_MASK					(0x3 << 30)
> -#define OMAP4_FREF_DR1_SC_SHIFT					28
> -#define OMAP4_FREF_DR1_SC_MASK					(0x3 << 28)
> -#define OMAP4_FREF_DR4_SC_SHIFT					26
> -#define OMAP4_FREF_DR4_SC_MASK					(0x3 << 26)
> -#define OMAP4_FREF_DR5_SC_SHIFT					24
> -#define OMAP4_FREF_DR5_SC_MASK					(0x3 << 24)
> -#define OMAP4_FREF_DR6_SC_SHIFT					22
> -#define OMAP4_FREF_DR6_SC_MASK					(0x3 << 22)
> -#define OMAP4_FREF_DR7_SC_SHIFT					20
> -#define OMAP4_FREF_DR7_SC_MASK					(0x3 << 20)
> -#define OMAP4_GPIO_DR7_SC_SHIFT					18
> -#define OMAP4_GPIO_DR7_SC_MASK					(0x3 << 18)
> -#define OMAP4_DPM_DR0_SC_SHIFT					14
> -#define OMAP4_DPM_DR0_SC_MASK					(0x3 << 14)
> -#define OMAP4_SIM_DR0_SC_SHIFT					12
> -#define OMAP4_SIM_DR0_SC_MASK					(0x3 << 12)
> -
> -/* CONTROL_SMART1NOPMIO_PADCONF_1 */
> -#define OMAP4_FREF_DR0_LB_SHIFT					30
> -#define OMAP4_FREF_DR0_LB_MASK					(0x3 << 30)
> -#define OMAP4_FREF_DR1_LB_SHIFT					28
> -#define OMAP4_FREF_DR1_LB_MASK					(0x3 << 28)
> -#define OMAP4_FREF_DR4_LB_SHIFT					26
> -#define OMAP4_FREF_DR4_LB_MASK					(0x3 << 26)
> -#define OMAP4_FREF_DR5_LB_SHIFT					24
> -#define OMAP4_FREF_DR5_LB_MASK					(0x3 << 24)
> -#define OMAP4_FREF_DR6_LB_SHIFT					22
> -#define OMAP4_FREF_DR6_LB_MASK					(0x3 << 22)
> -#define OMAP4_FREF_DR7_LB_SHIFT					20
> -#define OMAP4_FREF_DR7_LB_MASK					(0x3 << 20)
> -#define OMAP4_GPIO_DR7_LB_SHIFT					18
> -#define OMAP4_GPIO_DR7_LB_MASK					(0x3 << 18)
> -#define OMAP4_DPM_DR0_LB_SHIFT					14
> -#define OMAP4_DPM_DR0_LB_MASK					(0x3 << 14)
> -#define OMAP4_SIM_DR0_LB_SHIFT					12
> -#define OMAP4_SIM_DR0_LB_MASK					(0x3 << 12)
> -
> -/* CONTROL_PADCONF_MODE */
> -#define OMAP4_VDDS_DV_FREF_SHIFT				31
> -#define OMAP4_VDDS_DV_FREF_MASK					(1 << 31)
> -#define OMAP4_VDDS_DV_BANK2_SHIFT				30
> -#define OMAP4_VDDS_DV_BANK2_MASK				(1 << 30)
> -
> -/* CONTROL_XTAL_OSCILLATOR */
> -#define OMAP4_OSCILLATOR_BOOST_SHIFT				31
> -#define OMAP4_OSCILLATOR_BOOST_MASK				(1 << 31)
> -#define OMAP4_OSCILLATOR_OS_OUT_SHIFT				30
> -#define OMAP4_OSCILLATOR_OS_OUT_MASK				(1 << 30)
> -
> -/* CONTROL_USIMIO */
> -#define OMAP4_PAD_USIM_CLK_LOW_SHIFT				31
> -#define OMAP4_PAD_USIM_CLK_LOW_MASK				(1 << 31)
> -#define OMAP4_PAD_USIM_RST_LOW_SHIFT				29
> -#define OMAP4_PAD_USIM_RST_LOW_MASK				(1 << 29)
> -#define OMAP4_USIM_PWRDNZ_SHIFT					28
> -#define OMAP4_USIM_PWRDNZ_MASK					(1 << 28)
> -
> -/* CONTROL_I2C_2 */
> -#define OMAP4_SR_SDA_GLFENB_SHIFT				31
> -#define OMAP4_SR_SDA_GLFENB_MASK				(1 << 31)
> -#define OMAP4_SR_SDA_LOAD_BITS_SHIFT				29
> -#define OMAP4_SR_SDA_LOAD_BITS_MASK				(0x3 << 29)
> -#define OMAP4_SR_SDA_PULLUPRESX_SHIFT				28
> -#define OMAP4_SR_SDA_PULLUPRESX_MASK				(1 << 28)
> -#define OMAP4_SR_SCL_GLFENB_SHIFT				27
> -#define OMAP4_SR_SCL_GLFENB_MASK				(1 << 27)
> -#define OMAP4_SR_SCL_LOAD_BITS_SHIFT				25
> -#define OMAP4_SR_SCL_LOAD_BITS_MASK				(0x3 << 25)
> -#define OMAP4_SR_SCL_PULLUPRESX_SHIFT				24
> -#define OMAP4_SR_SCL_PULLUPRESX_MASK				(1 << 24)
> -
> -/* CONTROL_JTAG */
> -#define OMAP4_JTAG_NTRST_EN_SHIFT				31
> -#define OMAP4_JTAG_NTRST_EN_MASK				(1 << 31)
> -#define OMAP4_JTAG_TCK_EN_SHIFT					30
> -#define OMAP4_JTAG_TCK_EN_MASK					(1 << 30)
> -#define OMAP4_JTAG_RTCK_EN_SHIFT				29
> -#define OMAP4_JTAG_RTCK_EN_MASK					(1 << 29)
> -#define OMAP4_JTAG_TDI_EN_SHIFT					28
> -#define OMAP4_JTAG_TDI_EN_MASK					(1 << 28)
> -#define OMAP4_JTAG_TDO_EN_SHIFT					27
> -#define OMAP4_JTAG_TDO_EN_MASK					(1 << 27)
> -
> -/* CONTROL_SYS */
> -#define OMAP4_SYS_NRESWARM_PIPU_SHIFT				31
> -#define OMAP4_SYS_NRESWARM_PIPU_MASK				(1 << 31)
> -
> -/* WKUP_CONTROL_SPARE_RW */
> -#define OMAP4_WKUP_CONTROL_SPARE_RW_SHIFT			0
> -#define OMAP4_WKUP_CONTROL_SPARE_RW_MASK			(0xffffffff << 0)
> -
> -/* WKUP_CONTROL_SPARE_R */
> -#define OMAP4_WKUP_CONTROL_SPARE_R_SHIFT			0
> -#define OMAP4_WKUP_CONTROL_SPARE_R_MASK				(0xffffffff << 0)
> -
> -/* WKUP_CONTROL_SPARE_R_C0 */
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C0_SHIFT			31
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C0_MASK			(1 << 31)
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C1_SHIFT			30
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C1_MASK			(1 << 30)
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C2_SHIFT			29
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C2_MASK			(1 << 29)
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C3_SHIFT			28
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C3_MASK			(1 << 28)
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C4_SHIFT			27
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C4_MASK			(1 << 27)
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C5_SHIFT			26
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C5_MASK			(1 << 26)
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C6_SHIFT			25
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C6_MASK			(1 << 25)
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C7_SHIFT			24
> -#define OMAP4_WKUP_CONTROL_SPARE_R_C7_MASK			(1 << 24)
> -
> -#endif
> diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_wkup_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_wkup_44xx.h
> deleted file mode 100644
> index a0af9ba..0000000
> --- a/arch/arm/mach-omap2/include/mach/ctrl_module_wkup_44xx.h
> +++ /dev/null
> @@ -1,92 +0,0 @@
> -/*
> - * OMAP44xx CTRL_MODULE_WKUP registers and bitfields
> - *
> - * Copyright (C) 2009-2010 Texas Instruments, Inc.
> - *
> - * Benoit Cousson (b-cousson at ti.com)
> - * Santosh Shilimkar (santosh.shilimkar at ti.com)
> - *
> - * This file is automatically generated from the OMAP hardware databases.
> - * We respectfully ask that any modifications to this file be coordinated
> - * with the public linux-omap at vger.kernel.org mailing list and the
> - * authors above to ensure that the autogeneration scripts are kept
> - * up-to-date with the file contents.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - */
> -
> -#ifndef __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_WKUP_44XX_H
> -#define __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_WKUP_44XX_H
> -
> -
> -/* Base address */
> -#define OMAP4_CTRL_MODULE_WKUP				0x4a30c000
> -
> -/* Registers offset */
> -#define OMAP4_CTRL_MODULE_WKUP_IP_REVISION		0x0000
> -#define OMAP4_CTRL_MODULE_WKUP_IP_HWINFO		0x0004
> -#define OMAP4_CTRL_MODULE_WKUP_IP_SYSCONFIG		0x0010
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_0	0x0460
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_1	0x0464
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_2	0x0468
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_3	0x046c
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_4	0x0470
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_5	0x0474
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_6	0x0478
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_7	0x047c
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_8	0x0480
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_9	0x0484
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_10	0x0488
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_11	0x048c
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_12	0x0490
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_13	0x0494
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_14	0x0498
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_15	0x049c
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_16	0x04a0
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_17	0x04a4
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_18	0x04a8
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_19	0x04ac
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_20	0x04b0
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_21	0x04b4
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_22	0x04b8
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_23	0x04bc
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_24	0x04c0
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_25	0x04c4
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_26	0x04c8
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_27	0x04cc
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_28	0x04d0
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_29	0x04d4
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_30	0x04d8
> -#define OMAP4_CTRL_MODULE_WKUP_CONF_DEBUG_SEL_TST_31	0x04dc
> -
> -/* Registers shifts and masks */
> -
> -/* IP_REVISION */
> -#define OMAP4_IP_REV_SCHEME_SHIFT		30
> -#define OMAP4_IP_REV_SCHEME_MASK		(0x3 << 30)
> -#define OMAP4_IP_REV_FUNC_SHIFT			16
> -#define OMAP4_IP_REV_FUNC_MASK			(0xfff << 16)
> -#define OMAP4_IP_REV_RTL_SHIFT			11
> -#define OMAP4_IP_REV_RTL_MASK			(0x1f << 11)
> -#define OMAP4_IP_REV_MAJOR_SHIFT		8
> -#define OMAP4_IP_REV_MAJOR_MASK			(0x7 << 8)
> -#define OMAP4_IP_REV_CUSTOM_SHIFT		6
> -#define OMAP4_IP_REV_CUSTOM_MASK		(0x3 << 6)
> -#define OMAP4_IP_REV_MINOR_SHIFT		0
> -#define OMAP4_IP_REV_MINOR_MASK			(0x3f << 0)
> -
> -/* IP_HWINFO */
> -#define OMAP4_IP_HWINFO_SHIFT			0
> -#define OMAP4_IP_HWINFO_MASK			(0xffffffff << 0)
> -
> -/* IP_SYSCONFIG */
> -#define OMAP4_IP_SYSCONFIG_IDLEMODE_SHIFT	2
> -#define OMAP4_IP_SYSCONFIG_IDLEMODE_MASK	(0x3 << 2)
> -
> -/* CONF_DEBUG_SEL_TST_0 */
> -#define OMAP4_WKUP_MODE_SHIFT			0
> -#define OMAP4_WKUP_MODE_MASK				(1 << 0)
> -
> -#endif
> -- 
> 1.7.7.6
> 
> 



More information about the linux-arm-kernel mailing list