Commit 98281842 authored Feb 27, 2023 by Linus Torvalds

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

parents 11c70529 9f79762e

MAINTAINERS

+3 −4

Original line number	Diff line number	Diff line
		@@ -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/

arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@
		};
		};

		iio-hwmon-battery {
		iio-hwmon {
		compatible = "iio-hwmon";
		io-channels = <&adc1 7>;
		};

arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@
		};
		};

		iio-hwmon-battery {
		iio-hwmon {
		compatible = "iio-hwmon";
		io-channels = <&adc1 7>;
		};

arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@
		};
		};

		iio-hwmon-battery {
		iio-hwmon {
		compatible = "iio-hwmon";
		io-channels = <&adc1 7>;
		};

arch/arm/boot/dts/exynos4-cpu-thermal.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {