armv7-devel-r11: merge to: torvalds/linux@a38ecbb

Compare: torvalds/linux@4f671fe...a38ecbb
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

patch.sh

@@ -166,7 +166,7 @@ beaglebone () {
 
 	${git} "${DIR}/patches/beaglebone/dts/0001-am335x-boneblack-add-cpu0-opp-points.patch"
 	${git} "${DIR}/patches/beaglebone/dts/0002-dts-am335x-bone-common-fixup-leds-to-match-3.8.patch"
-	${git} "${DIR}/patches/beaglebone/dts/0003-bbb-force-usb0-to-perhiperal-mode-fixes-http-bugs.el.patch"
+#	${git} "${DIR}/patches/beaglebone/dts/0003-bbb-force-usb0-to-perhiperal-mode-fixes-http-bugs.el.patch"
 	${git} "${DIR}/patches/beaglebone/dts/0004-arm-dts-am335x-bone-common-add-collision-and-carrier.patch"
 
 	if [ "x${regenerate}" = "xenable" ] ; then

patches/defconfig

@@ -4970,7 +4970,6 @@ CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
 CONFIG_CLKSRC_VERSATILE=y
-# CONFIG_ASM9260_TIMER is not set
 CONFIG_MAILBOX=y
 CONFIG_PL320_MBOX=y
 CONFIG_OMAP2PLUS_MBOX=y

patches/defconfig-bone

@@ -4721,7 +4721,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
 CONFIG_CLKSRC_VERSATILE=y
-# CONFIG_ASM9260_TIMER is not set
 CONFIG_MAILBOX=y
 CONFIG_OMAP2PLUS_MBOX=y
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256

patches/defconfig-lpae

@@ -4834,7 +4834,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
 CONFIG_CLKSRC_VERSATILE=y
-# CONFIG_ASM9260_TIMER is not set
 CONFIG_MAILBOX=y
 CONFIG_PL320_MBOX=y
 CONFIG_OMAP2PLUS_MBOX=y

patches/example_imx_v6_v7_defconfig

@@ -3659,7 +3659,6 @@ CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
 # CONFIG_CLKSRC_VERSATILE is not set
-# CONFIG_ASM9260_TIMER is not set
 # CONFIG_MAILBOX is not set
 # CONFIG_IOMMU_SUPPORT is not set
 

patches/example_omap2plus_defconfig

@@ -1089,8 +1089,8 @@ CONFIG_MTD_NAND_ECC_BCH=y
 # CONFIG_MTD_NAND_DENALI is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_OMAP2=y
-# CONFIG_MTD_NAND_OMAP_BCH is not set
-# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
+CONFIG_MTD_NAND_OMAP_BCH=y
+CONFIG_MTD_NAND_OMAP_BCH_BUILD=y
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
@@ -2220,7 +2220,7 @@ CONFIG_REGULATOR_PBIAS=y
 # CONFIG_REGULATOR_PWM is not set
 CONFIG_REGULATOR_TI_ABB=y
 # CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
+CONFIG_REGULATOR_TPS62360=m
 CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
 CONFIG_REGULATOR_TPS65217=y
@@ -3075,7 +3075,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
 # CONFIG_CLKSRC_VERSATILE is not set
-# CONFIG_ASM9260_TIMER is not set
 # CONFIG_MAILBOX is not set
 # CONFIG_IOMMU_SUPPORT is not set
 
@@ -3127,9 +3126,9 @@ CONFIG_IRQ_CROSSBAR=y
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
-CONFIG_OMAP_CONTROL_PHY=m
+CONFIG_OMAP_CONTROL_PHY=y
 CONFIG_OMAP_USB2=m
-CONFIG_TI_PIPE3=m
+CONFIG_TI_PIPE3=y
 # CONFIG_TWL4030_USB is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_POWERCAP is not set

patches/example_sunxi_defconfig

@@ -2077,7 +2077,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
 # CONFIG_CLKSRC_VERSATILE is not set
-# CONFIG_ASM9260_TIMER is not set
 # CONFIG_MAILBOX is not set
 # CONFIG_IOMMU_SUPPORT is not set
 

patches/example_tegra_defconfig

@@ -3435,7 +3435,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
 # CONFIG_CLKSRC_VERSATILE is not set
-# CONFIG_ASM9260_TIMER is not set
 # CONFIG_MAILBOX is not set
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y