Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"A few more fixes who have trickled in:
- MMC bus width fixup for some Allwinner platforms
- Fix for NULL deref in ti-aemif when no platform data is passed in
- Fix div by 0 in SCMI code
- Add a missing module alias in a new RPi driver"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
memory: ti-aemif: fix a potential NULL-pointer dereference
firmware: arm_scmi: fix divide by zero when sustained_perf_level is zero
hwmon: rpi: add module alias to raspberrypi-hwmon
arm64: allwinner: dts: h6: fix Pine H64 MMC bus width
+11
-2
+2
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
+2
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
···
46
46
pinctrl-0 = <&mmc0_pins>;
47
47
vmmc-supply = <®_cldo1>;
48
48
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
49
+
bus-width = <4>;
49
50
status = "okay";
50
51
};
51
52
···
57
56
vqmmc-supply = <®_bldo2>;
58
57
non-removable;
59
58
cap-mmc-hw-reset;
59
+
bus-width = <8>;
60
60
status = "okay";
61
61
};
62
62
+7
-1
drivers/firmware/arm_scmi/perf.c
+7
-1
drivers/firmware/arm_scmi/perf.c
···
166
166
le32_to_cpu(attr->sustained_freq_khz);
167
167
dom_info->sustained_perf_level =
168
168
le32_to_cpu(attr->sustained_perf_level);
169
-
dom_info->mult_factor = (dom_info->sustained_freq_khz * 1000) /
169
+
if (!dom_info->sustained_freq_khz ||
170
+
!dom_info->sustained_perf_level)
171
+
/* CPUFreq converts to kHz, hence default 1000 */
172
+
dom_info->mult_factor = 1000;
173
+
else
174
+
dom_info->mult_factor =
175
+
(dom_info->sustained_freq_khz * 1000) /
170
176
dom_info->sustained_perf_level;
171
177
memcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE);
172
178
}
+1
drivers/hwmon/raspberrypi-hwmon.c
+1
drivers/hwmon/raspberrypi-hwmon.c