Merge tag 'omap-for-v3.19/fixes-for-merge-window' of git://git.kernel.org/pub/scm...

From: Tony Lindgren <tony@atomide.com>
Subject: [GIT PULL] few fixes for the v3.19 merge window

Fixes for a few issues found that would be good to get
into -rc1:

- Update SoC revision detection for am43x es1.2

- Fix regression with GPMC timings on 2430sdp for some versions
  of u-boot

- Fix dra7 watchdog compatible property

- Fix am437x-sk-evm LCD timings

- Fix dra7 DSS clock muxing

- Fix dra7-evm voltages

- Remove a unused function prototype for am33xx_clk_init

- Enable AHCI in the omap2plus_defconfig

* tag 'omap-for-v3.19/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (1601 commits)
  ARM: omap2plus_defconfig: Enable AHCI_PLATFORM driver
  ARM: dts: am437x-sk-evm.dts: fix LCD timings
  ARM: dts: dra7-evm: Update SMPS7 (VDD_CORE) max voltage to match DM
  ARM: dts: dra7-evm: Fix typo in SMPS6 (VDD_GPU) max voltage
  ARM: OMAP2+: AM43x: Add ID for ES1.2
  ARM: dts: am437x-sk: fix lcd enable pin mux data
  ARM: dts: Fix gpmc regression for omap 2430sdp smc91x
  hwmon: (tmp401) Detect TMP435 on all addresses it supports
  mfd: rtsx: Add func to split u32 into register
  mmc: sdhci-msm: Convert to mmc_send_tuning()
  mmc: sdhci-esdhc-imx: Convert to mmc_send_tuning()
  mmc: core: Let mmc_send_tuning() to take struct mmc_host* as parameter
  nios2: Make NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOL
  nios2: Add missing NR_CPUS to Kconfig
  nios2: asm-offsets: Remove unused definition TI_TASK
  nios2: Remove write-only struct member from nios2_timer
  nios2: Remove unused extern declaration of shm_align_mask
  nios2: include linux/type.h in io.h
  nios2: move include asm-generic/io.h to end of file
  nios2: remove include asm-generic/iomap.h from io.h
  ...

diff --combined arch/arm/configs/multi_v7_defconfig
index f86cb86,d789658..2328fe7
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -3,12 -3,14 +3,14 @@@ CONFIG_FHANDLE=
  CONFIG_IRQ_DOMAIN_DEBUG=y
  CONFIG_NO_HZ=y
  CONFIG_HIGH_RES_TIMERS=y
+ CONFIG_CGROUPS=y
  CONFIG_BLK_DEV_INITRD=y
  CONFIG_EMBEDDED=y
  CONFIG_PERF_EVENTS=y
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
  CONFIG_PARTITION_ADVANCED=y
+ CONFIG_CMDLINE_PARTITION=y
  CONFIG_ARCH_VIRT=y
  CONFIG_ARCH_MVEBU=y
  CONFIG_MACH_ARMADA_370=y
@@@ -17,7 -19,9 +19,9 @@@ CONFIG_MACH_ARMADA_38X=
  CONFIG_MACH_ARMADA_XP=y
  CONFIG_MACH_DOVE=y
  CONFIG_ARCH_BCM=y
- CONFIG_ARCH_BCM_MOBILE=y
+ CONFIG_ARCH_BCM_CYGNUS=y
+ CONFIG_ARCH_BCM_21664=y
+ CONFIG_ARCH_BCM_281XX=y
  CONFIG_ARCH_BCM_5301X=y
  CONFIG_ARCH_BRCMSTB=y
  CONFIG_ARCH_BERLIN=y
@@@ -124,8 -128,12 +128,12 @@@ CONFIG_DMA_CMA=
  CONFIG_CMA_SIZE_MBYTES=64
  CONFIG_OMAP_OCP2SCP=y
  CONFIG_MTD=y
+ CONFIG_MTD_CMDLINE_PARTS=y
+ CONFIG_MTD_BLOCK=y
  CONFIG_MTD_M25P80=y
+ CONFIG_MTD_NAND=y
  CONFIG_MTD_SPI_NOR=y
+ CONFIG_MTD_UBI=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_AD525X_DPOT=y
  CONFIG_AD525X_DPOT_I2C=y
@@@ -146,6 -154,7 +154,7 @@@ CONFIG_AHCI_TEGRA=
  CONFIG_SATA_HIGHBANK=y
  CONFIG_SATA_MV=y
  CONFIG_NETDEVICES=y
+ CONFIG_HIX5HD2_GMAC=y
  CONFIG_SUN4I_EMAC=y
  CONFIG_MACB=y
  CONFIG_NET_CALXEDA_XGMAC=y
@@@ -160,6 -169,7 +169,7 @@@ CONFIG_TI_CPSW=
  CONFIG_XILINX_EMACLITE=y
  CONFIG_AT803X_PHY=y
  CONFIG_MARVELL_PHY=y
+ CONFIG_BROADCOM_PHY=y
  CONFIG_ICPLUS_PHY=y
  CONFIG_USB_PEGASUS=y
  CONFIG_USB_USBNET=y
@@@ -234,6 -244,7 +244,7 @@@ CONFIG_SPI_TEGRA114=
  CONFIG_SPI_TEGRA20_SFLASH=y
  CONFIG_SPI_TEGRA20_SLINK=y
  CONFIG_SPI_XILINX=y
+ CONFIG_SPI_SPIDEV=y
  CONFIG_PINCTRL_AS3722=y
  CONFIG_PINCTRL_PALMAS=y
  CONFIG_PINCTRL_APQ8084=y
@@@ -261,6 -272,7 +272,7 @@@ CONFIG_ST_THERMAL_SYSCFG=
  CONFIG_ST_THERMAL_MEMMAP=y
  CONFIG_WATCHDOG=y
  CONFIG_XILINX_WATCHDOG=y
+ CONFIG_ARM_SP805_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
  CONFIG_MESON_WATCHDOG=y
@@@ -268,6 -280,7 +280,7 @@@ CONFIG_MFD_AS3722=
  CONFIG_MFD_BCM590XX=y
  CONFIG_MFD_CROS_EC=y
  CONFIG_MFD_CROS_EC_SPI=y
+ CONFIG_MFD_MAX77686=y
  CONFIG_MFD_MAX8907=y
  CONFIG_MFD_SEC_CORE=y
  CONFIG_MFD_STMPE=y
@@@ -279,7 -292,10 +292,10 @@@ CONFIG_REGULATOR_AB8500=
  CONFIG_REGULATOR_AS3722=y
  CONFIG_REGULATOR_BCM590XX=y
  CONFIG_REGULATOR_GPIO=y
+ CONFIG_MFD_SYSCON=y
+ CONFIG_POWER_RESET_SYSCON=y
  CONFIG_REGULATOR_MAX8907=y
+ CONFIG_REGULATOR_MAX77686=y
  CONFIG_REGULATOR_PALMAS=y
  CONFIG_REGULATOR_S2MPS11=y
  CONFIG_REGULATOR_S5M8767=y
@@@ -308,6 -324,8 +324,8 @@@ CONFIG_FRAMEBUFFER_CONSOLE=
  CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
  CONFIG_SOUND=y
  CONFIG_SND=y
+ CONFIG_SND_DYNAMIC_MINORS=y
+ CONFIG_SND_USB_AUDIO=y
  CONFIG_SND_SOC=y
  CONFIG_SND_SOC_TEGRA=y
  CONFIG_SND_SOC_TEGRA_RT5640=y
@@@ -321,9 -339,11 +339,11 @@@ CONFIG_USB_XHCI_HCD=
  CONFIG_USB_XHCI_MVEBU=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_TEGRA=y
+ CONFIG_USB_EHCI_HCD_STI=y
  CONFIG_USB_EHCI_HCD_PLATFORM=y
  CONFIG_USB_ISP1760_HCD=y
  CONFIG_USB_OHCI_HCD=y
+ CONFIG_USB_OHCI_HCD_STI=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y
  CONFIG_USB_STORAGE=y
  CONFIG_USB_CHIPIDEA=y
@@@ -355,6 -375,8 +375,8 @@@ CONFIG_MMC_OMAP_HS=
  CONFIG_MMC_MVSDIO=y
  CONFIG_MMC_SUNXI=y
  CONFIG_MMC_DW=y
+ CONFIG_MMC_DW_IDMAC=y
+ CONFIG_MMC_DW_PLTFM=y
  CONFIG_MMC_DW_EXYNOS=y
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_NEW_LEDS=y
@@@ -379,6 -401,7 +401,7 @@@ CONFIG_RTC_CLASS=
  CONFIG_RTC_DRV_AS3722=y
  CONFIG_RTC_DRV_DS1307=y
  CONFIG_RTC_DRV_MAX8907=y
+ CONFIG_RTC_DRV_MAX77686=y
  CONFIG_RTC_DRV_PALMAS=y
  CONFIG_RTC_DRV_TWL4030=y
  CONFIG_RTC_DRV_TPS6586X=y
@@@ -413,6 -436,7 +436,7 @@@ CONFIG_NVEC_POWER=
  CONFIG_NVEC_PAZ00=y
  CONFIG_QCOM_GSBI=y
  CONFIG_COMMON_CLK_QCOM=y
+ CONFIG_COMMON_CLK_MAX77686=y
  CONFIG_APQ_MMCC_8084=y
  CONFIG_MSM_GCC_8660=y
  CONFIG_MSM_MMCC_8960=y
@@@ -426,12 -450,19 +450,19 @@@ CONFIG_AK8975=
  CONFIG_PWM=y
  CONFIG_PWM_TEGRA=y
  CONFIG_PWM_VT8500=y
+ CONFIG_PHY_HIX5HD2_SATA=y
  CONFIG_OMAP_USB2=y
  CONFIG_TI_PIPE3=y
  CONFIG_PHY_MIPHY365X=y
+ CONFIG_PHY_STIH41X_USB=y
  CONFIG_PHY_SUN4I_USB=y
  CONFIG_EXT4_FS=y
+ CONFIG_AUTOFS4_FS=y
+ CONFIG_MSDOS_FS=y
  CONFIG_VFAT_FS=y
+ CONFIG_NTFS_FS=y
+ CONFIG_TMPFS_POSIX_ACL=y
+ CONFIG_UBIFS_FS=y
  CONFIG_TMPFS=y
  CONFIG_SQUASHFS=y
  CONFIG_SQUASHFS_LZO=y
@@@ -440,9 -471,12 +471,12 @@@ CONFIG_NFS_FS=
  CONFIG_NFS_V3_ACL=y
  CONFIG_NFS_V4=y
  CONFIG_ROOT_NFS=y
+ CONFIG_NLS_CODEPAGE_437=y
+ CONFIG_NLS_ISO8859_1=y
+ CONFIG_NLS_UTF8=y
  CONFIG_PRINTK_TIME=y
  CONFIG_DEBUG_FS=y
  CONFIG_MAGIC_SYSRQ=y
  CONFIG_LOCKUP_DETECTOR=y
  CONFIG_CRYPTO_DEV_TEGRA_AES=y
 -CONFIG_GENERIC_CPUFREQ_CPU0=y
 +CONFIG_CPUFREQ_DT=y

diff --combined arch/arm/configs/shmobile_defconfig
index bfe79d5,63fb531..49f5515
--- 1/arch/arm/configs/shmobile_defconfig
--- 2/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@@ -17,7 -17,6 +17,6 @@@ CONFIG_ARCH_R8A7779=
  CONFIG_ARCH_R8A7790=y
  CONFIG_ARCH_R8A7791=y
  CONFIG_ARCH_R8A7794=y
- CONFIG_MACH_KOELSCH=y
  CONFIG_MACH_LAGER=y
  CONFIG_MACH_MARZEN=y
  # CONFIG_SWP_EMULATE is not set
@@@ -126,6 -125,7 +125,7 @@@ CONFIG_SND=
  CONFIG_SND_SOC=y
  CONFIG_SND_SOC_SH4_FSI=y
  CONFIG_SND_SOC_RCAR=y
+ CONFIG_SND_SOC_AK4642=y
  CONFIG_SND_SOC_WM8978=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
@@@ -146,6 -146,8 +146,8 @@@ CONFIG_RTC_CLASS=
  CONFIG_RTC_DRV_S35390A=y
  CONFIG_DMADEVICES=y
  CONFIG_SH_DMAE=y
+ CONFIG_RCAR_AUDMAC_PP=y
+ CONFIG_RCAR_DMAC=y
  # CONFIG_IOMMU_SUPPORT is not set
  CONFIG_PWM=y
  CONFIG_PWM_RENESAS_TPU=y
@@@ -176,5 -178,5 +178,5 @@@ CONFIG_CPU_FREQ_GOV_USERSPACE=
  CONFIG_CPU_FREQ_GOV_ONDEMAND=y
  CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
  CONFIG_CPU_THERMAL=y
 -CONFIG_GENERIC_CPUFREQ_CPU0=y
 +CONFIG_CPUFREQ_DT=y
  CONFIG_REGULATOR_DA9210=y