From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Nov 2020 16:24:21 +0000 (+0100)
Subject: Merge tag 'aspeed-5.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/joel... 
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/00c543f6f3f46ce02e300d76e22bb21a8a75e872?hp=-c

Merge tag 'aspeed-5.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/drivers

ASPEED soc driver updates for 5.11

New drivers:

 - SoC info driver to expose revision information

New features:

 - AST2600 support for the LPC control driver. This includes
   setting the LPC2AHB bridge up in a backwards compatible manner.

Cleanups:

 - LPC control
 - Kconfig
 - Bindings updates for AST2600 strings

* tag 'aspeed-5.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  soc: aspeed: Enable drivers with ARCH_ASPEED
  soc: aspeed: Fix a reference leak in aspeed_socinfo_init()
  soc: aspeed: remove unneeded semicolon
  soc: aspeed-lpc-ctrl: Fix driver name
  soc: aspeed-lpc-ctrl: Fix whitespace
  soc: aspeed-lpc-ctrl: LPC to AHB mapping on ast2600
  soc: aspeed-lpc-ctrl: Fail probe of lpc-ctrl if reserved memory is not aligned
  soc: aspeed: lpc: Add AST2600 compatible strings
  dt-bindings: aspeed-lpc: Add AST2600 compatible strings
  ARM: dts: aspeed: Add silicon id node
  soc: aspeed: Add soc info driver
  dt-bindings: aspeed: Add silicon id node to SCU
  soc: aspeed: Improve kconfig

Link: https://lore.kernel.org/r/CACPK8Xe=9ezhyWRMqVOEQr7SU1YoYfVBGGdGzjmE4SiBr--vJQ@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

00c543f6f3f46ce02e300d76e22bb21a8a75e872
diff --combined arch/arm/boot/dts/aspeed-g5.dtsi
index a93009aa2f04,c6862182313a..5bc0de0f3365
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@@ -239,6 -239,11 +239,11 @@@
  					status = "disabled";
  				};
  
+ 				silicon-id@7c {
+ 					compatible = "aspeed,ast2500-silicon-id", "aspeed,silicon-id";
+ 					reg = <0x7c 0x4 0x150 0x8>;
+ 				};
+ 
  				pinctrl: pinctrl@80 {
  					compatible = "aspeed,ast2500-pinctrl";
  					reg = <0x80 0x18>, <0xa0 0x10>;
@@@ -425,6 -430,7 +430,6 @@@
  				interrupts = <8>;
  				clocks = <&syscon ASPEED_CLK_APB>;
  				no-loopback-test;
 -				aspeed,sirq-polarity-sense = <&syscon 0x70 25>;
  				status = "disabled";
  			};