Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux...

# Conflicts:
#	MAINTAINERS

diff --cc MAINTAINERS
index 7a46a9567b71f264d8a2ee8e3254a55cce376267,dcb10e7175b825f8c7dea8fc965437701e95b651..63384068f71bdf8d93caff5282e1d9463dfd416d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3468,8 -3427,8 +3468,9 @@@ M:      Alexey Charkov <alchark@gmail.com
  M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Odd Fixes
 -F:    Documentation/devicetree/bindings/i2c/i2c-wmt.txt
+ F:    Documentation/devicetree/bindings/hwinfo/via,vt8500-scc-id.yaml
 +F:    Documentation/devicetree/bindings/i2c/wm,wm8505-i2c.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/via,vt8500-intc.yaml
  F:    arch/arm/boot/dts/vt8500/
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/timer-vt8500.c

diff --cc arch/arm/boot/dts/vt8500/vt8500.dtsi
index 09f5ed3e6821b72fc440f9de3df0ad484d2c4e17,3db1340b130dd454ed677e8f0e5f6e8dea1fafb5..d1dd37220d41becece5d24fbb19aa71b01723e35
--- 1/arch/arm/boot/dts/vt8500/vt8500.dtsi
--- 2/arch/arm/boot/dts/vt8500/vt8500.dtsi
+++ b/arch/arm/boot/dts/vt8500/vt8500.dtsi
@@@ -106,10 -111,10 +111,10 @@@
                timer@d8130100 {
                        compatible = "via,vt8500-timer";
                        reg = <0xd8130100 0x28>;
-                       interrupts = <36>;
+                       interrupts = <36>, <37>, <38>, <39>;
                };
  
 -              ehci@d8007900 {
 +              usb@d8007900 {
                        compatible = "via,vt8500-ehci";
                        reg = <0xd8007900 0x200>;
                        interrupts = <43>;

diff --cc arch/arm/boot/dts/vt8500/wm8505.dtsi
index c81810b967bb349419a5ac7db4e788faec3695fb,fd4aca7e33f6c5e7ce95456e3a5ce2ff70bdace3..2b1819f0c5412648a83cd3eeb495f68d2e4100ef
--- 1/arch/arm/boot/dts/vt8500/wm8505.dtsi
--- 2/arch/arm/boot/dts/vt8500/wm8505.dtsi
+++ b/arch/arm/boot/dts/vt8500/wm8505.dtsi
@@@ -204,10 -209,10 +209,10 @@@
                timer@d8130100 {
                        compatible = "via,vt8500-timer";
                        reg = <0xd8130100 0x28>;
-                       interrupts = <36>;
+                       interrupts = <36>, <37>, <38>, <39>;
                };
  
 -              ehci@d8007100 {
 +              usb@d8007100 {
                        compatible = "via,vt8500-ehci";
                        reg = <0xd8007100 0x200>;
                        interrupts = <1>;

diff --cc arch/arm/boot/dts/vt8500/wm8650.dtsi
index 555008120a3e315591d2ca49a39d354925d570fd,e8c92215ae0bbfa6a2257125e695a3af5ff01997..042eec78c085d19fc97d7f0f9721399c0716ff74
--- 1/arch/arm/boot/dts/vt8500/wm8650.dtsi
--- 2/arch/arm/boot/dts/vt8500/wm8650.dtsi
+++ b/arch/arm/boot/dts/vt8500/wm8650.dtsi
@@@ -176,10 -181,10 +181,10 @@@
                timer@d8130100 {
                        compatible = "via,vt8500-timer";
                        reg = <0xd8130100 0x28>;
-                       interrupts = <36>;
+                       interrupts = <36>, <37>, <38>, <39>;
                };
  
 -              ehci@d8007900 {
 +              usb@d8007900 {
                        compatible = "via,vt8500-ehci";
                        reg = <0xd8007900 0x200>;
                        interrupts = <43>;

diff --cc arch/arm/boot/dts/vt8500/wm8750.dtsi
index 309f6e5129fb817d343cd58a8d90340afd8d6eb9,0124e215e47f53cef08a36eb86935506597d3c1c..56342aa1d993a43e7ee766f93151c6d456496262
--- 1/arch/arm/boot/dts/vt8500/wm8750.dtsi
--- 2/arch/arm/boot/dts/vt8500/wm8750.dtsi
+++ b/arch/arm/boot/dts/vt8500/wm8750.dtsi
@@@ -248,10 -253,10 +253,10 @@@
                timer@d8130100 {
                        compatible = "via,vt8500-timer";
                        reg = <0xd8130100 0x28>;
-                       interrupts = <36>;
+                       interrupts = <36>, <37>, <38>, <39>;
                };
  
 -              ehci@d8007900 {
 +              usb@d8007900 {
                        compatible = "via,vt8500-ehci";
                        reg = <0xd8007900 0x200>;
                        interrupts = <26>;

diff --cc arch/arm/boot/dts/vt8500/wm8850.dtsi
index 3f4a514d65e2ac7658b73cc9c4f3cae1407265bc,9a936a1484aab27982243cd4fff8725219b5f20b..03e72f28d31b1cfdcfa71ede93b8943971bae4e3
--- 1/arch/arm/boot/dts/vt8500/wm8850.dtsi
--- 2/arch/arm/boot/dts/vt8500/wm8850.dtsi
+++ b/arch/arm/boot/dts/vt8500/wm8850.dtsi
@@@ -235,10 -240,10 +240,10 @@@
                timer@d8130100 {
                        compatible = "via,vt8500-timer";
                        reg = <0xd8130100 0x28>;
-                       interrupts = <36>;
+                       interrupts = <36>, <37>, <38>, <39>;
                };
  
 -              ehci@d8007900 {
 +              usb@d8007900 {
                        compatible = "via,vt8500-ehci";
                        reg = <0xd8007900 0x200>;
                        interrupts = <26>;

diff --cc drivers/soc/Kconfig
Simple merge

diff --cc drivers/soc/Makefile
Simple merge