Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

config ARCH_U8500

	bool "ST-Ericsson U8500 Series"

	depends on MMU

	select CPU_V7

	select ARM_AMBA

	select GENERIC_CLOCKEVENTS

config ARCH_NR_GPIO

	int

	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA

	default 350 if ARCH_U8500

	default 355 if ARCH_U8500

	default 0

	help

	  Maximum number of GPIOs in the system.

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_GEOMETRY=y

# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set

CONFIG_MTD_MAP_BANK_WIDTH_4=y

# CONFIG_MTD_CFI_I2 is not set

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=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_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_LPC32XX=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyS0,115200n81 root=/dev/ram0"

CONFIG_CPU_IDLE=y

CONFIG_FPE_NWFPE=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=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_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_MUSEUM_IDS=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=1

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_MISC_DEVICES=y

CONFIG_EEPROM_AT25=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

CONFIG_MII=y

CONFIG_PHYLIB=y

CONFIG_SMSC_PHY=y

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_MOUSEDEV_SCREEN_X=240

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_LPC32XX=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_PNX=y

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_PNX4008_WATCHDOG=y

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 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_SEQUENCER_OSS=y

CONFIG_SND_DYNAMIC_MINORS=y

# CONFIG_SND_VERBOSE_PROCFS is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_ARM is not set

# CONFIG_SND_SPI is not set

CONFIG_SND_SOC=y

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

CONFIG_USB_STORAGE=y

CONFIG_USB_LIBUSUAL=y

CONFIG_MMC=y

# CONFIG_MMC_BLOCK_BOUNCE is not set

CONFIG_MMC_ARMMMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_RTC_DRV_LPC32XX=y

CONFIG_EXT2_FS=y

CONFIG_AUTOFS4_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS_WBUF_VERIFY=y

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_INFO=y

# CONFIG_FTRACE is not set

# CONFIG_ARM_UNWIND is not set

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_CRYPTO_ANSI_CPRNG=y

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC_CCITT=y

	if (freqs.old == freqs.new)

		return ret;

	dev_dbg(&cpufreq.dev, "transition: %u --> %u\n", freqs.old, freqs.new);

	dev_dbg(cpufreq.dev, "transition: %u --> %u\n", freqs.old, freqs.new);

	ret = cpufreq_frequency_table_target(policy, pdata->freq_table,

						freqs.new, relation, &idx);

}

#endif

int da850_register_pm(struct platform_device *pdev)

int __init da850_register_pm(struct platform_device *pdev)

{

	int ret;

	struct davinci_pm_config *pdata = pdev->dev.platform_data;