From: Olof Johansson <olof@lixom.net>
To: torvalds@linux-foundation.org
Cc: olof@lixom.net, arm@kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [GIT PULL] ARM: SoC fixes
Date: Sat, 8 Sep 2018 10:15:34 -0700 [thread overview]
Message-ID: <20180908171534.umap5fj6bkyvhki2@localhost> (raw)
Hi Linus,
The following changes since commit a72b44a871c218e2a0580e68affa1d3528c0587a:
Merge tag 'omap-for-v4.19/fixes-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes (2018-09-01 18:22:19 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-fixes
for you to fetch changes up to a132bb90414bfad4f8ee23cb45fe6946a89b167d:
Merge tag 'sunxi-fixes-for-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes (2018-09-08 10:04:37 -0700)
----------------------------------------------------------------
ARM: SoC fixes
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
----------------------------------------------------------------
Bartosz Golaszewski (1):
memory: ti-aemif: fix a potential NULL-pointer dereference
Icenowy Zheng (1):
arm64: allwinner: dts: h6: fix Pine H64 MMC bus width
Olof Johansson (2):
Merge tag 'arm-soc/for-4.19/drivers-fixes' of https://github.com/Broadcom/stblinux into fixes
Merge tag 'sunxi-fixes-for-4.19' of https://git.kernel.org/.../sunxi/linux into fixes
Peter Robinson (1):
hwmon: rpi: add module alias to raspberrypi-hwmon
Sudeep Holla (1):
firmware: arm_scmi: fix divide by zero when sustained_perf_level is zero
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 ++
drivers/firmware/arm_scmi/perf.c | 8 +++++++-
drivers/hwmon/raspberrypi-hwmon.c | 1 +
drivers/memory/ti-aemif.c | 2 +-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
index ceffc40810ee..48daec7f78ba 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
@@ -46,6 +46,7 @@
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_cldo1>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+ bus-width = <4>;
status = "okay";
};
@@ -56,6 +57,7 @@
vqmmc-supply = <®_bldo2>;
non-removable;
cap-mmc-hw-reset;
+ bus-width = <8>;
status = "okay";
};
diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c
index 721e6c57beae..64342944d917 100644
--- a/drivers/firmware/arm_scmi/perf.c
+++ b/drivers/firmware/arm_scmi/perf.c
@@ -166,7 +166,13 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain,
le32_to_cpu(attr->sustained_freq_khz);
dom_info->sustained_perf_level =
le32_to_cpu(attr->sustained_perf_level);
- dom_info->mult_factor = (dom_info->sustained_freq_khz * 1000) /
+ if (!dom_info->sustained_freq_khz ||
+ !dom_info->sustained_perf_level)
+ /* CPUFreq converts to kHz, hence default 1000 */
+ dom_info->mult_factor = 1000;
+ else
+ dom_info->mult_factor =
+ (dom_info->sustained_freq_khz * 1000) /
dom_info->sustained_perf_level;
memcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE);
}
diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c
index fb4e4a6bb1f6..be5ba4690895 100644
--- a/drivers/hwmon/raspberrypi-hwmon.c
+++ b/drivers/hwmon/raspberrypi-hwmon.c
@@ -164,3 +164,4 @@ module_platform_driver(rpi_hwmon_driver);
MODULE_AUTHOR("Stefan Wahren <stefan.wahren@i2se.com>");
MODULE_DESCRIPTION("Raspberry Pi voltage sensor driver");
MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:raspberrypi-hwmon");
diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c
index 31112f622b88..475e5b3790ed 100644
--- a/drivers/memory/ti-aemif.c
+++ b/drivers/memory/ti-aemif.c
@@ -411,7 +411,7 @@ static int aemif_probe(struct platform_device *pdev)
if (ret < 0)
goto error;
}
- } else {
+ } else if (pdata) {
for (i = 0; i < pdata->num_sub_devices; i++) {
pdata->sub_devices[i].dev.parent = dev;
ret = platform_device_register(&pdata->sub_devices[i]);
next reply other threads:[~2018-09-08 17:16 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-08 17:15 Olof Johansson [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-13 18:07 [GIT PULL] ARM: SoC fixes Olof Johansson
2020-04-23 15:17 [GIT PULL] ARM: soc fixes Arnd Bergmann
2020-03-08 23:58 [GIT PULL] ARM: SoC fixes Olof Johansson
2020-02-15 19:49 Olof Johansson
2020-02-15 21:25 ` pr-tracker-bot
2020-01-25 21:37 Olof Johansson
2020-01-25 22:15 ` pr-tracker-bot
2020-01-17 3:00 Olof Johansson
2020-01-17 3:50 ` pr-tracker-bot
2019-12-16 21:53 Olof Johansson
2019-12-17 0:55 ` pr-tracker-bot
2019-12-06 20:53 Olof Johansson
2019-12-06 22:25 ` pr-tracker-bot
2019-11-10 18:25 Olof Johansson
2019-11-10 21:45 ` pr-tracker-bot
2019-10-25 15:38 Olof Johansson
2019-10-25 21:35 ` pr-tracker-bot
2019-10-05 22:41 Olof Johansson
2019-10-06 0:40 ` pr-tracker-bot
2019-09-29 18:34 Olof Johansson
2019-09-30 17:30 ` pr-tracker-bot
2019-07-28 6:37 Olof Johansson
2019-07-28 17:30 ` pr-tracker-bot
2019-07-05 0:22 Olof Johansson
2019-07-05 2:55 ` pr-tracker-bot
2019-06-27 2:45 Olof Johansson
2019-06-28 0:45 ` pr-tracker-bot
2019-06-18 13:52 Olof Johansson
2019-06-18 18:05 ` pr-tracker-bot
2019-04-07 22:50 Olof Johansson
2019-04-07 22:54 ` Olof Johansson
2019-04-08 0:10 ` pr-tracker-bot
2019-01-13 18:48 Olof Johansson
2019-01-13 22:50 ` pr-tracker-bot
2018-12-10 1:23 Olof Johansson
2018-12-10 20:20 ` pr-tracker-bot
2018-12-02 19:23 Olof Johansson
2018-12-02 20:30 ` pr-tracker-bot
2018-11-07 17:10 Olof Johansson
2018-11-07 17:17 ` Linus Torvalds
2018-11-07 17:28 ` Olof Johansson
2018-11-08 15:49 ` Tony Lindgren
2018-11-10 18:09 ` Olof Johansson
2018-11-12 6:13 ` Corentin Labbe
2018-11-12 17:33 ` Tony Lindgren
2018-11-03 18:45 Olof Johansson
2018-11-03 19:15 ` Linus Torvalds
2018-09-30 19:23 Olof Johansson
2018-10-02 0:53 ` Greg KH
2018-09-02 2:36 Olof Johansson
2018-07-21 21:13 Olof Johansson
2018-07-15 6:00 Olof Johansson
2018-07-08 16:32 Olof Johansson
2018-06-30 19:32 Olof Johansson
2018-06-27 14:38 Olof Johansson
2018-05-26 21:01 Olof Johansson
2018-05-20 1:23 Olof Johansson
2017-12-10 5:11 Olof Johansson
2017-10-04 23:05 Olof Johansson
2017-06-19 6:40 Olof Johansson
2017-06-07 4:18 Olof Johansson
2017-04-16 19:00 Olof Johansson
2017-02-08 17:07 Arnd Bergmann
2017-01-20 0:35 Olof Johansson
2016-12-09 18:01 Olof Johansson
2016-11-20 2:37 Olof Johansson
2016-11-20 2:22 Olof Johansson
2016-11-20 2:26 ` Linus Torvalds
2016-11-20 2:36 ` Olof Johansson
2016-10-29 18:54 Olof Johansson
2016-09-08 4:57 Olof Johansson
2016-08-11 21:06 Arnd Bergmann
2016-07-17 4:56 Olof Johansson
2016-04-12 23:52 Olof Johansson
2015-08-02 7:29 Olof Johansson
2015-07-19 4:16 Olof Johansson
2015-03-29 21:12 Olof Johansson
2015-02-01 17:19 Olof Johansson
2015-01-24 23:19 Olof Johansson
2015-01-18 5:57 Olof Johansson
2014-08-10 5:14 Olof Johansson
2012-10-10 21:48 Olof Johansson
2012-07-27 1:56 Olof Johansson
2012-06-30 22:51 Olof Johansson
2012-06-23 23:40 Olof Johansson
2012-06-17 5:33 Olof Johansson
2012-04-06 4:46 Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180908171534.umap5fj6bkyvhki2@localhost \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).