Merge tag 'arm-fixes-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
 "A few bugfixes already came up during the merge window. Samsung,
  ASpeed, Spear have minor DT changes, in case of Samsung this fixes a
  regression compared to earlier versions.

  Bartosz takes over as the primary maintainer for the TI DaVinci
  platform, and we get a few last minute defconfig changes"

* tag 'arm-fixes-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: dts: spear320-hmi: correct STMPE GPIO compatible
  ARM: dts: aspeed: p10bmc: Update battery node name
  arm64: defconfig: Add IOSCHED_BFQ to the default configs
  arm64: defconfig: Fix unintentional disablement of PCI on i.MX
  ARM: dts: exynos: correct TMU phandle in Odroid XU3 family
  ARM: dts: exynos: correct TMU phandle in Odroid HC1
  ARM: dts: exynos: correct TMU phandle in Odroid XU
  ARM: dts: exynos: correct TMU phandle in Exynos5250
  ARM: dts: exynos: correct TMU phandle in Exynos4210
  ARM: dts: exynos: correct TMU phandle in Exynos4
  MAINTAINERS: make me the maintainer of DaVinci platforms

diff --git a/MAINTAINERS b/MAINTAINERS
index 0b4edb98289b47c7ad35eb9075006e6cca4d0017..edd3d562beeeb5bee8f5225727f53031343807a7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20880,11 +20880,10 @@ F:    drivers/clk/ti/
 F:     include/linux/clk/ti.h
 
 TI DAVINCI MACHINE SUPPORT
-M:     Sekhar Nori <nsekhar@ti.com>
-R:     Bartosz Golaszewski <brgl@bgdev.pl>
+M:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
 F:     Documentation/devicetree/bindings/i2c/i2c-davinci.txt
 F:     arch/arm/boot/dts/da850*
 F:     arch/arm/mach-davinci/

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts
index 0f9a4f0a5571dd664f2c10ac250d208d1d57b1b9..a5be0ee048ec2333ed6c82fc2486faef7a902ecb 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts
@@ -124,7 +124,7 @@
                };
        };
 
-       iio-hwmon-battery {
+       iio-hwmon {
                compatible = "iio-hwmon";
                io-channels = <&adc1 7>;
        };

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
index 456ca2830a31b92c49b1696faad57766eaae0a6b..c3b0cd61ac85efd66dabed3dc31e1971e724ffeb 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
@@ -244,7 +244,7 @@
                };
        };
 
-       iio-hwmon-battery {
+       iio-hwmon {
                compatible = "iio-hwmon";
                io-channels = <&adc1 7>;
        };

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index e1b5d44308fe7008e22cd1d43625593c1dffb211..7162e65b811566cda33daf0a7915de5ce92d9bae 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -220,7 +220,7 @@
                };
        };
 
-       iio-hwmon-battery {
+       iio-hwmon {
                compatible = "iio-hwmon";
                io-channels = <&adc1 7>;
        };

diff --git a/arch/arm/boot/dts/exynos4-cpu-thermal.dtsi b/arch/arm/boot/dts/exynos4-cpu-thermal.dtsi
index 021d9fc1b49235c75342ba8d1d949f5f77fc4f25..27a1a895266559190e4708321d9c896cf89f9aee 100644 (file)
--- a/arch/arm/boot/dts/exynos4-cpu-thermal.dtsi
+++ b/arch/arm/boot/dts/exynos4-cpu-thermal.dtsi
@@ -10,7 +10,7 @@
 / {
 thermal-zones {
        cpu_thermal: cpu-thermal {
-               thermal-sensors = <&tmu 0>;
+               thermal-sensors = <&tmu>;
                polling-delay-passive = <0>;
                polling-delay = <0>;
                trips {

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 5a1ec714c612e96c3bd344b3f6a86544bcbf7301..0e27c3375e2e9b097e9cab3770597e8ff06ad94c 100644 (file)
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -393,7 +393,6 @@
 &cpu_thermal {
        polling-delay-passive = <0>;
        polling-delay = <0>;
-       thermal-sensors = <&tmu 0>;
 };
 
 &gic {

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index a5db4ac213d59c1b8fba78e0cbc0872e254eb23a..60a623e3a200352e954e8fb5a28d466d9dfaa23b 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -1107,7 +1107,7 @@
 &cpu_thermal {
        polling-delay-passive = <0>;
        polling-delay = <0>;
-       thermal-sensors = <&tmu 0>;
+       thermal-sensors = <&tmu>;
 
        cooling-maps {
                map0 {

diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts
index 232561620da2a003aabff3b1d9984600c37c75eb..6ddd1dd2fb0bbc55e09e0ef0ad186dd981e16c9a 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts
+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -120,7 +120,6 @@
 };
 
 &cpu0_thermal {
-       thermal-sensors = <&tmu_cpu0 0>;
        polling-delay-passive = <0>;
        polling-delay = <0>;
 

diff --git a/arch/arm/boot/dts/exynos5422-odroidhc1.dts b/arch/arm/boot/dts/exynos5422-odroidhc1.dts
index 3de7019572a20397265356e0e3b63f08f36e2225..5e428039370677271953c6ecedd65d0950b8f5c8 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidhc1.dts
+++ b/arch/arm/boot/dts/exynos5422-odroidhc1.dts
@@ -31,7 +31,7 @@
 
        thermal-zones {
                cpu0_thermal: cpu0-thermal {
-                       thermal-sensors = <&tmu_cpu0 0>;
+                       thermal-sensors = <&tmu_cpu0>;
                        trips {
                                cpu0_alert0: cpu-alert-0 {
                                        temperature = <70000>; /* millicelsius */
@@ -86,7 +86,7 @@
                        };
                };
                cpu1_thermal: cpu1-thermal {
-                       thermal-sensors = <&tmu_cpu1 0>;
+                       thermal-sensors = <&tmu_cpu1>;
                        trips {
                                cpu1_alert0: cpu-alert-0 {
                                        temperature = <70000>;
@@ -130,7 +130,7 @@
                        };
                };
                cpu2_thermal: cpu2-thermal {
-                       thermal-sensors = <&tmu_cpu2 0>;
+                       thermal-sensors = <&tmu_cpu2>;
                        trips {
                                cpu2_alert0: cpu-alert-0 {
                                        temperature = <70000>;
@@ -174,7 +174,7 @@
                        };
                };
                cpu3_thermal: cpu3-thermal {
-                       thermal-sensors = <&tmu_cpu3 0>;
+                       thermal-sensors = <&tmu_cpu3>;
                        trips {
                                cpu3_alert0: cpu-alert-0 {
                                        temperature = <70000>;
@@ -218,7 +218,7 @@
                        };
                };
                gpu_thermal: gpu-thermal {
-                       thermal-sensors = <&tmu_gpu 0>;
+                       thermal-sensors = <&tmu_gpu>;
                        trips {
                                gpu_alert0: gpu-alert-0 {
                                        temperature = <70000>;

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index a6961ff24030431706575fbf9699f148c90970d5..e6e7e2ff2a261f067f72bac09a33e72d7c06cbec 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -50,7 +50,7 @@
 
        thermal-zones {
                cpu0_thermal: cpu0-thermal {
-                       thermal-sensors = <&tmu_cpu0 0>;
+                       thermal-sensors = <&tmu_cpu0>;
                        polling-delay-passive = <250>;
                        polling-delay = <0>;
                        trips {
@@ -139,7 +139,7 @@
                        };
                };
                cpu1_thermal: cpu1-thermal {
-                       thermal-sensors = <&tmu_cpu1 0>;
+                       thermal-sensors = <&tmu_cpu1>;
                        polling-delay-passive = <250>;
                        polling-delay = <0>;
                        trips {
@@ -212,7 +212,7 @@
                        };
                };
                cpu2_thermal: cpu2-thermal {
-                       thermal-sensors = <&tmu_cpu2 0>;
+                       thermal-sensors = <&tmu_cpu2>;
                        polling-delay-passive = <250>;
                        polling-delay = <0>;
                        trips {
@@ -285,7 +285,7 @@
                        };
                };
                cpu3_thermal: cpu3-thermal {
-                       thermal-sensors = <&tmu_cpu3 0>;
+                       thermal-sensors = <&tmu_cpu3>;
                        polling-delay-passive = <250>;
                        polling-delay = <0>;
                        trips {
@@ -358,7 +358,7 @@
                        };
                };
                gpu_thermal: gpu-thermal {
-                       thermal-sensors = <&tmu_gpu 0>;
+                       thermal-sensors = <&tmu_gpu>;
                        polling-delay-passive = <250>;
                        polling-delay = <0>;
                        trips {

diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts
index 34503ac9c51c24abf6e2d903618a2090a2185a52..721e5ee7b6803e6d306a8a1c94cc52944e336edf 100644 (file)
--- a/arch/arm/boot/dts/spear320-hmi.dts
+++ b/arch/arm/boot/dts/spear320-hmi.dts
@@ -241,7 +241,7 @@
                                        irq-trigger = <0x1>;
 
                                        stmpegpio: stmpe-gpio {
-                                               compatible = "stmpe,gpio";
+                                               compatible = "st,stmpe-gpio";
                                                reg = <0>;
                                                gpio-controller;
                                                #gpio-cells = <2>;

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 7e0487bbdaa048987ba6cd6faf7dc88f2651ba45..7790ee42c68a88d7620c02f9dda25e5bc70d0a08 100644 (file)
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -115,6 +115,7 @@ CONFIG_KVM=y
 CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
+CONFIG_IOSCHED_BFQ=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_MEMORY_HOTPLUG=y
@@ -219,7 +220,7 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCIE_ROCKCHIP_HOST=m
 CONFIG_PCIE_MEDIATEK_GEN3=m
 CONFIG_PCIE_BRCMSTB=m
-CONFIG_PCI_IMX6=y
+CONFIG_PCI_IMX6_HOST=y
 CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCI_HISI=y
 CONFIG_PCIE_QCOM=y