Merge branch 'fixes' into next/fixes

CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91SAM9G45=y

CONFIG_MACH_AT91SAM9M10G45EK=y

CONFIG_AT91_PROGRAMMABLE_CLOCKS=y

CONFIG_AT91_SLOW_CLOCK=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="mem=128M console=ttyS0,115200 initrd=0x71100000,25165824 root=/dev/ram0 rw"

CONFIG_AUTO_ZRELADDR=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

CONFIG_IPV6=y

# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET6_XFRM_MODE_TUNNEL is not set

# CONFIG_INET6_XFRM_MODE_BEET is not set

CONFIG_IPV6_SIT_6RD=y

CONFIG_CFG80211=y

CONFIG_LIB80211=y

CONFIG_MAC80211=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=4

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_MISC_DEVICES=y

CONFIG_ATMEL_PWM=y

CONFIG_ATMEL_TCLIB=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_MULTI_LUN=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_MII=y

CONFIG_DAVICOM_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_MACB=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_LIBERTAS_THINFIRM=m

CONFIG_LIBERTAS_THINFIRM_USB=m

CONFIG_AT76C50X_USB=m

CONFIG_USB_ZD1201=m

CONFIG_RTL8187=m

CONFIG_ATH_COMMON=m

CONFIG_ATH9K=m

CONFIG_CARL9170=m

CONFIG_B43=m

CONFIG_B43_PHY_N=y

CONFIG_LIBERTAS=m

CONFIG_LIBERTAS_USB=m

CONFIG_LIBERTAS_SDIO=m

CONFIG_LIBERTAS_SPI=m

CONFIG_RT2X00=m

CONFIG_RT2500USB=m

CONFIG_RT73USB=m

CONFIG_RT2800USB=m

CONFIG_RT2800USB_RT53XX=y

CONFIG_RT2800USB_UNKNOWN=y

CONFIG_RTL8192CU=m

CONFIG_WL1251=m

CONFIG_WL1251_SDIO=m

CONFIG_WL12XX_MENU=m

CONFIG_WL12XX=m

CONFIG_WL12XX_SDIO=m

CONFIG_ZD1211RW=m

CONFIG_MWIFIEX=m

CONFIG_MWIFIEX_SDIO=m

CONFIG_INPUT_POLLDEV=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_MOUSEDEV_SCREEN_X=480

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272

CONFIG_INPUT_JOYDEV=y

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_QT1070=m

CONFIG_KEYBOARD_QT2160=m

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=m

CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y

# CONFIG_SERIO is not set

CONFIG_LEGACY_PTY_COUNT=4

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_GPIO=y

CONFIG_SPI=y

CONFIG_SPI_ATMEL=y

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

CONFIG_FB=y

CONFIG_FB_ATMEL=y

CONFIG_FB_UDL=m

CONFIG_BACKLIGHT_LCD_SUPPORT=y

# CONFIG_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_ATMEL_LCDC=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SEQUENCER=y

CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_VERBOSE_PROCFS is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_ARM is not set

CONFIG_SND_ATMEL_AC97C=y

# CONFIG_SND_SPI is not set

CONFIG_SND_USB_AUDIO=m

# CONFIG_USB_HID is not set

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_DEVICEFS=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_ACM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_GADGET=y

CONFIG_USB_ATMEL_USBA=m

CONFIG_USB_ZERO=m

CONFIG_USB_AUDIO=m

CONFIG_USB_ETH=m

CONFIG_USB_ETH_EEM=y

CONFIG_USB_MASS_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_USB_CDC_COMPOSITE=m

CONFIG_USB_G_MULTI=m

CONFIG_USB_G_MULTI_CDC=y

CONFIG_MMC=y

# CONFIG_MMC_BLOCK_BOUNCE is not set

CONFIG_SDIO_UART=m

CONFIG_MMC_ATMELMCI=y

CONFIG_MMC_ATMELMCI_DMA=y

CONFIG_LEDS_ATMEL_PWM=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AT91RM9200=y

CONFIG_DMADEVICES=y

CONFIG_AT_HDMAC=y

CONFIG_DMATEST=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_FANOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

CONFIG_SQUASHFS_EMBEDDED=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_STRIP_ASM_SYMS=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_DEBUG_MEMORY_INIT=y

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_ECB=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

# CONFIG_CRYPTO_HW is not set

{

	omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,

			ARRAY_SIZE(sdp2430_i2c1_boardinfo));

	omap2_pmic_init("twl4030", &sdp2430_twldata);

	omap_pmic_init(2, 100, "twl4030", INT_24XX_SYS_NIRQ,

			&sdp2430_twldata);

	return 0;

}

	KEY(7, 6, KEY_OK),

	KEY(7, 7, KEY_DOWN),

};

static struct omap_device_pad keypad_pads[] __initdata = {

static struct omap_device_pad keypad_pads[] = {

	{	.name   = "kpd_col1.kpd_col1",

		.enable = OMAP_WAKEUP_EN | OMAP_MUX_MODE1,

	},

	 */

	reg = omap4_ctrl_pad_readl(control_pbias_offset);

	reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |

		OMAP4_MMC1_PWRDNZ_MASK |

		OMAP4_USBC1_ICUSB_PWRDNZ_MASK);

		OMAP4_MMC1_PWRDNZ_MASK);

	omap4_ctrl_pad_writel(reg, control_pbias_offset);

}

		else

			reg |= OMAP4_MMC1_PBIASLITE_VMODE_MASK;

		reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |

			OMAP4_MMC1_PWRDNZ_MASK |

			OMAP4_USBC1_ICUSB_PWRDNZ_MASK);

			OMAP4_MMC1_PWRDNZ_MASK);

		omap4_ctrl_pad_writel(reg, control_pbias_offset);

		timeout = jiffies + msecs_to_jiffies(5);

		if (reg & OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK) {

			pr_err("Pbias Voltage is not same as LDO\n");

			/* Caution : On VMODE_ERROR Power Down MMC IO */

			reg &= ~(OMAP4_MMC1_PWRDNZ_MASK |

				OMAP4_USBC1_ICUSB_PWRDNZ_MASK);

			reg &= ~(OMAP4_MMC1_PWRDNZ_MASK);

			omap4_ctrl_pad_writel(reg, control_pbias_offset);

		}

	} else {

		reg = omap4_ctrl_pad_readl(control_pbias_offset);

		reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |

			OMAP4_MMC1_PWRDNZ_MASK |

			OMAP4_MMC1_PBIASLITE_VMODE_MASK |

			OMAP4_USBC1_ICUSB_PWRDNZ_MASK);

			OMAP4_MMC1_PBIASLITE_VMODE_MASK);

		omap4_ctrl_pad_writel(reg, control_pbias_offset);

	}

}

		omap_irq_bank_init_one(bank);

		for (i = 0, j = 0; i < bank->nr_irqs; i += 32, j += 0x20)

			omap_alloc_gc(bank->base_reg + j, i, 32);

		for (j = 0; j < bank->nr_irqs; j += 32)

			omap_alloc_gc(bank->base_reg + j, j, 32);

		nr_of_irqs += bank->nr_irqs;

		nr_banks++;