Skip to content

Commit

Permalink
Merge tag 'arm-fixes-6.3-1' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history 
…nel/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
  • Loading branch information
Linus Torvalds committed Feb 27, 2023
2 parents 11c7052 + 9f79762 commit 9828184
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 23 deletions.
7 changes: 3 additions & 4 deletions MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
};
};

iio-hwmon-battery {
iio-hwmon {
compatible = "iio-hwmon";
io-channels = <&adc1 7>;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
};
};

iio-hwmon-battery {
iio-hwmon {
compatible = "iio-hwmon";
io-channels = <&adc1 7>;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
};
};

iio-hwmon-battery {
iio-hwmon {
compatible = "iio-hwmon";
io-channels = <&adc1 7>;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos4-cpu-thermal.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/exynos4210.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@
&cpu_thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tmu 0>;
};

&gic {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5250.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,7 @@
&cpu_thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tmu 0>;
thermal-sensors = <&tmu>;

cooling-maps {
map0 {
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/exynos5410-odroidxu.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
};

&cpu0_thermal {
thermal-sensors = <&tmu_cpu0 0>;
polling-delay-passive = <0>;
polling-delay = <0>;

Expand Down
10 changes: 5 additions & 5 deletions arch/arm/boot/dts/exynos5422-odroidhc1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down
10 changes: 5 additions & 5 deletions arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/spear320-hmi.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
irq-trigger = <0x1>;

stmpegpio: stmpe-gpio {
compatible = "stmpe,gpio";
compatible = "st,stmpe-gpio";
reg = <0>;
gpio-controller;
#gpio-cells = <2>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm64/configs/defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9828184

Please sign in to comment.