From patchwork Sat Sep 8 17:15:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 10593133 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 21788112B for ; Sat, 8 Sep 2018 17:16:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB19D2A3FF for ; Sat, 8 Sep 2018 17:16:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCACD2A406; Sat, 8 Sep 2018 17:16:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 655D92A3FF for ; Sat, 8 Sep 2018 17:16:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=qrYp/kyk6RMdxlKxOkaQbe6dAXnUFUxpvrDP9TcgHD0=; b=fRCj6YKq9dc85X Hy7+GbV2aNy6rr+uKkQJk49u9x7upFhmu+tmyiLe4g4KsjonKVM4hwd5Lr2KG45nBlcOqpm1u2FoP UpznLrQ8kBOj3emZtXyvW5+O3tUGaomVmawxZL+TI9eIenFVx4+X/IAaifoArkFJod8pa4TPTZ0gy hU1WY2wUx9hE2HzOEj3IPia58JXmmnsQfmBn4M31fqcwCco3X1oadnnP4SQ3Gr8jgbvKYp0BbQUfb zSAxqSY/kmnl5vxEwhuWfx5lChL6PKehdI85/jhKC4hN8zJRHALaqmm9tBJNd+Cm/VZGMQu2maJ8t fyRriSeS4/ZQuv57HaqA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fygqI-0001iO-U4; Sat, 08 Sep 2018 17:16:18 +0000 Received: from mail-lf1-x142.google.com ([2a00:1450:4864:20::142]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fygqF-0001hc-JT for linux-arm-kernel@lists.infradead.org; Sat, 08 Sep 2018 17:16:17 +0000 Received: by mail-lf1-x142.google.com with SMTP id e23-v6so14357020lfc.13 for ; Sat, 08 Sep 2018 10:16:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lixom-net.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=UgFx6b1cyqtQKKk3ZujClaN1xmtcqYYggEGFpn2jICU=; b=nISu7xuPaf7nF/F3QwJgEdLPgAuM9bTX3/TGbVGbgHdWMNtXBdWu7tLhihTxIupeGY nkKLQmKytw/vLMcyTkg1rtIAvcMkS/Qo5DVjYRPKXaC1bmjNEVrIdQ/i3XrjZTLPZ7sn o31NnVT/FszVdv7NO38b3LntZZGJ5YvyDFtspvoqbieEaLEaT7zy8w1wEd3FZa+O/rzi KOM/xO79ImIKQ9mARMD26Rj9QhFa6mV3rSzlqbubq/00iZt3iNOM7xSTc+Knxp7QFFwD 5+uWdFfftddhnsDmX2riGQ7E4Bu1APxsUpLz6KDuNDQCrSkMFOBas1HnyKARrykwrFrw CVKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=UgFx6b1cyqtQKKk3ZujClaN1xmtcqYYggEGFpn2jICU=; b=oKEnxnOnCoJF0sjVD3sEELyvbXuX23Wqsy3/QI6hZB9HmsL/FZyJHbDbdgs6sD4AVh 0x+7zYIqiz2ASGDhVy5mYybdD7FVZqE2L48xC0ZM3Or6juxWALqS177/l1MOWrMi2NfL 9pKlVRPbv9f74GSVt6NLGwLbQ4R9xrXR4uu0zC1wn7U0lsYb7FGe90ICTO+zTn3vXic+ 5awu4VaPIy6mu+SnUnTmohQOJ+sfVSdnVS/d7x3yEUKv2hdpt7mf75KOwtL9UIQQ84iY ckZWyqIdvZJF9tQ7CSlpCTIsdf8Myv1Gq+TXs+VTNuImKzuiJXfczhHITp1eOU2QlOlh wKzg== X-Gm-Message-State: APzg51Azfeu4INPe7GPwFuuddNaJsuf50y3A4buvVtwhG35Cagl5EkkH UpsFkBS1h31fQQZtYMpkfcZ6/ybaHZPyKw== X-Google-Smtp-Source: ANB0VdY8f8FETkUI/GvuHLnFs7Lxpb/ae/PlN3PhxjF+2raTEMS38sKDWcfHR8JlJF/yV6wvrjy9sw== X-Received: by 2002:a19:c94a:: with SMTP id z71-v6mr8010923lff.34.1536426962711; Sat, 08 Sep 2018 10:16:02 -0700 (PDT) Received: from localhost (h85-30-9-151.cust.se.alltele.net. [85.30.9.151]) by smtp.gmail.com with ESMTPSA id m20-v6sm1830992lfb.27.2018.09.08.10.16.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Sep 2018 10:16:00 -0700 (PDT) Date: Sat, 8 Sep 2018 10:15:34 -0700 From: Olof Johansson To: torvalds@linux-foundation.org Subject: [GIT PULL] ARM: SoC fixes Message-ID: <20180908171534.umap5fj6bkyvhki2@localhost> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170113 (1.7.2) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180908_101615_644902_AD7CA31B X-CRM114-Status: GOOD ( 17.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: olof@lixom.net, arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 "); 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]);