tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 98281842 11c70529

+21 -23
+3 -4
MAINTAINERS
··· 20880 20880 F: include/linux/clk/ti.h 20881 20881 20882 20882 TI DAVINCI MACHINE SUPPORT 20883 - M: Sekhar Nori <nsekhar@ti.com> 20884 - R: Bartosz Golaszewski <brgl@bgdev.pl> 20883 + M: Bartosz Golaszewski <brgl@bgdev.pl> 20885 20884 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 20886 - S: Supported 20887 - T: git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git 20885 + S: Maintained 20886 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git 20888 20887 F: Documentation/devicetree/bindings/i2c/i2c-davinci.txt 20889 20888 F: arch/arm/boot/dts/da850* 20890 20889 F: arch/arm/mach-davinci/
+1 -1
arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts
··· 124 124 }; 125 125 }; 126 126 127 - iio-hwmon-battery { 127 + iio-hwmon { 128 128 compatible = "iio-hwmon"; 129 129 io-channels = <&adc1 7>; 130 130 };
+1 -1
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
··· 244 244 }; 245 245 }; 246 246 247 - iio-hwmon-battery { 247 + iio-hwmon { 248 248 compatible = "iio-hwmon"; 249 249 io-channels = <&adc1 7>; 250 250 };
+1 -1
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
··· 220 220 }; 221 221 }; 222 222 223 - iio-hwmon-battery { 223 + iio-hwmon { 224 224 compatible = "iio-hwmon"; 225 225 io-channels = <&adc1 7>; 226 226 };
+1 -1
arch/arm/boot/dts/exynos4-cpu-thermal.dtsi
··· 10 10 / { 11 11 thermal-zones { 12 12 cpu_thermal: cpu-thermal { 13 - thermal-sensors = <&tmu 0>; 13 + thermal-sensors = <&tmu>; 14 14 polling-delay-passive = <0>; 15 15 polling-delay = <0>; 16 16 trips {
-1
arch/arm/boot/dts/exynos4210.dtsi
··· 393 393 &cpu_thermal { 394 394 polling-delay-passive = <0>; 395 395 polling-delay = <0>; 396 - thermal-sensors = <&tmu 0>; 397 396 }; 398 397 399 398 &gic {
+1 -1
arch/arm/boot/dts/exynos5250.dtsi
··· 1107 1107 &cpu_thermal { 1108 1108 polling-delay-passive = <0>; 1109 1109 polling-delay = <0>; 1110 - thermal-sensors = <&tmu 0>; 1110 + thermal-sensors = <&tmu>; 1111 1111 1112 1112 cooling-maps { 1113 1113 map0 {
-1
arch/arm/boot/dts/exynos5410-odroidxu.dts
··· 120 120 }; 121 121 122 122 &cpu0_thermal { 123 - thermal-sensors = <&tmu_cpu0 0>; 124 123 polling-delay-passive = <0>; 125 124 polling-delay = <0>; 126 125
+5 -5
arch/arm/boot/dts/exynos5422-odroidhc1.dts
··· 31 31 32 32 thermal-zones { 33 33 cpu0_thermal: cpu0-thermal { 34 - thermal-sensors = <&tmu_cpu0 0>; 34 + thermal-sensors = <&tmu_cpu0>; 35 35 trips { 36 36 cpu0_alert0: cpu-alert-0 { 37 37 temperature = <70000>; /* millicelsius */ ··· 86 86 }; 87 87 }; 88 88 cpu1_thermal: cpu1-thermal { 89 - thermal-sensors = <&tmu_cpu1 0>; 89 + thermal-sensors = <&tmu_cpu1>; 90 90 trips { 91 91 cpu1_alert0: cpu-alert-0 { 92 92 temperature = <70000>; ··· 130 130 }; 131 131 }; 132 132 cpu2_thermal: cpu2-thermal { 133 - thermal-sensors = <&tmu_cpu2 0>; 133 + thermal-sensors = <&tmu_cpu2>; 134 134 trips { 135 135 cpu2_alert0: cpu-alert-0 { 136 136 temperature = <70000>; ··· 174 174 }; 175 175 }; 176 176 cpu3_thermal: cpu3-thermal { 177 - thermal-sensors = <&tmu_cpu3 0>; 177 + thermal-sensors = <&tmu_cpu3>; 178 178 trips { 179 179 cpu3_alert0: cpu-alert-0 { 180 180 temperature = <70000>; ··· 218 218 }; 219 219 }; 220 220 gpu_thermal: gpu-thermal { 221 - thermal-sensors = <&tmu_gpu 0>; 221 + thermal-sensors = <&tmu_gpu>; 222 222 trips { 223 223 gpu_alert0: gpu-alert-0 { 224 224 temperature = <70000>;
+5 -5
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
··· 50 50 51 51 thermal-zones { 52 52 cpu0_thermal: cpu0-thermal { 53 - thermal-sensors = <&tmu_cpu0 0>; 53 + thermal-sensors = <&tmu_cpu0>; 54 54 polling-delay-passive = <250>; 55 55 polling-delay = <0>; 56 56 trips { ··· 139 139 }; 140 140 }; 141 141 cpu1_thermal: cpu1-thermal { 142 - thermal-sensors = <&tmu_cpu1 0>; 142 + thermal-sensors = <&tmu_cpu1>; 143 143 polling-delay-passive = <250>; 144 144 polling-delay = <0>; 145 145 trips { ··· 212 212 }; 213 213 }; 214 214 cpu2_thermal: cpu2-thermal { 215 - thermal-sensors = <&tmu_cpu2 0>; 215 + thermal-sensors = <&tmu_cpu2>; 216 216 polling-delay-passive = <250>; 217 217 polling-delay = <0>; 218 218 trips { ··· 285 285 }; 286 286 }; 287 287 cpu3_thermal: cpu3-thermal { 288 - thermal-sensors = <&tmu_cpu3 0>; 288 + thermal-sensors = <&tmu_cpu3>; 289 289 polling-delay-passive = <250>; 290 290 polling-delay = <0>; 291 291 trips { ··· 358 358 }; 359 359 }; 360 360 gpu_thermal: gpu-thermal { 361 - thermal-sensors = <&tmu_gpu 0>; 361 + thermal-sensors = <&tmu_gpu>; 362 362 polling-delay-passive = <250>; 363 363 polling-delay = <0>; 364 364 trips {
+1 -1
arch/arm/boot/dts/spear320-hmi.dts
··· 241 241 irq-trigger = <0x1>; 242 242 243 243 stmpegpio: stmpe-gpio { 244 - compatible = "stmpe,gpio"; 244 + compatible = "st,stmpe-gpio"; 245 245 reg = <0>; 246 246 gpio-controller; 247 247 #gpio-cells = <2>;
+2 -1
arch/arm64/configs/defconfig
··· 115 115 CONFIG_JUMP_LABEL=y 116 116 CONFIG_MODULES=y 117 117 CONFIG_MODULE_UNLOAD=y 118 + CONFIG_IOSCHED_BFQ=y 118 119 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 119 120 # CONFIG_COMPAT_BRK is not set 120 121 CONFIG_MEMORY_HOTPLUG=y ··· 220 219 CONFIG_PCIE_ROCKCHIP_HOST=m 221 220 CONFIG_PCIE_MEDIATEK_GEN3=m 222 221 CONFIG_PCIE_BRCMSTB=m 223 - CONFIG_PCI_IMX6=y 222 + CONFIG_PCI_IMX6_HOST=y 224 223 CONFIG_PCI_LAYERSCAPE=y 225 224 CONFIG_PCI_HISI=y 226 225 CONFIG_PCIE_QCOM=y