From: Olof Johansson Date: Wed, 22 Apr 2015 04:45:15 +0000 (-0700) Subject: Merge tag 'omap-for-v4.1/prcm-dts-mfd-syscon-fix' of git://git.kernel.org/pub/scm... X-Git-Tag: firefly_0821_release~176^2~1891^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=48c1078509b47b38802329028ccfd77783bcff99;p=firefly-linux-kernel-4.4.55.git Merge tag 'omap-for-v4.1/prcm-dts-mfd-syscon-fix' of git://git./linux/kernel/git/tmlind/linux-omap into next/late Merge "urgent omap boot fix for v4.1 if MFD_SYSCON is not set" from Tony Lindgren: Urgent pull request for v4.1 to booting for custom kernel .config files that do not have MFD_SYSCON set. Omaps now have a dependency to MFD_SYSCON for system control module generic register area and some clocks with the changes done in omap-for-v4.1/prcm-dts branch. This can be pulled on top of omap-for-v4.1/prcm-dts, or into fixes for v4.1. We already do have a slight MFD_SYSCON dependency for REGULATOR_PBIAS for dual voltage MMC cards on the first MMC bus for many devices, so from that point of view this can also be merged separately from omap-for-v4.1/prcm-dts. * tag 'omap-for-v4.1/prcm-dts-mfd-syscon-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON Signed-off-by: Olof Johansson --- 48c1078509b47b38802329028ccfd77783bcff99