From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Sep 2019 17:04:28 +0000 (-0700)
Subject: Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v5.4-rc1~3
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=cef0aa0ce8592f68fb093b2be0d341a568ff9890;p=sfrench%2Fcifs-2.6.git

Merge tag 'armsoc-fixes' of git://git./linux/kernel/git/soc/soc

Pull ARM SoC fixes from Olof Johansson:
 "A few fixes that have trickled in through the merge window:

   - Video fixes for OMAP due to panel-dpi driver removal

   - Clock fixes for OMAP that broke no-idle quirks + nfsroot on DRA7

   - Fixing arch version on ASpeed ast2500

   - Two fixes for reset handling on ARM SCMI"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: aspeed: ast2500 is ARMv6K
  reset: reset-scmi: add missing handle initialisation
  firmware: arm_scmi: reset: fix reset_state assignment in scmi_domain_reset
  bus: ti-sysc: Remove unpaired sysc_clkdm_deny_idle()
  ARM: dts: logicpd-som-lv: Fix i2c2 and i2c3 Pin mux
  ARM: dts: am3517-evm: Fix missing video
  ARM: dts: logicpd-torpedo-baseboard: Fix missing video
  ARM: omap2plus_defconfig: Fix missing video
  bus: ti-sysc: Fix handling of invalid clocks
  bus: ti-sysc: Fix clock handling for no-idle quirks
---

cef0aa0ce8592f68fb093b2be0d341a568ff9890
diff --cc arch/arm/mach-aspeed/Kconfig
index 56007b0b6120,44ee6bac255e..e8d6e9957d65
--- a/arch/arm/mach-aspeed/Kconfig
+++ b/arch/arm/mach-aspeed/Kconfig
@@@ -26,9 -26,7 +26,8 @@@ config MACH_ASPEED_G
  config MACH_ASPEED_G5
  	bool "Aspeed SoC 5th Generation"
  	depends on ARCH_MULTI_V6
- 	select CPU_V6
  	select PINCTRL_ASPEED_G5
 +	select FTTMR010_TIMER
  	help
  	 Say yes if you intend to run on an Aspeed ast2500 or similar
  	 fifth generation Aspeed BMCs.