From patchwork Tue Nov 19 05:13:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179631 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp147297ilf; Mon, 18 Nov 2019 21:24:31 -0800 (PST) X-Google-Smtp-Source: APXvYqwaUexPYmyGBX0deg/dCpshhpOHFAxKhrRXas99uCQCyGtmAsJQGxyCzYJJhYbGe4vuyLKR X-Received: by 2002:a17:906:8305:: with SMTP id j5mr20907337ejx.48.1574141071479; Mon, 18 Nov 2019 21:24:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141071; cv=none; d=google.com; s=arc-20160816; b=RMH9fN4AYJcspmqn6E56SSCKM+gkwccpR/VNd7O4MH2TaIcJ6AmbbBKMfgTCU16pue kjcBsposXwgBFVQPzwlVUX4SMIJNEHs0NQomoUBPT2PxsffDRsaEgIXakKicXEiAc5E7 ZiTBWSfTw86eEw4lzAP5yE723D6Q0QSHWxKeJ9CaxtmDTZZ9XR/64UF52yWbRUiw6Y5v 2AhW9eBce2Q+yaboBDOIxEq46CnanF4G9jzw3sVtJpYU/R9nRmpGjtEH5I79aYQZnaQS fiIyhcYUiJJTLuahCWAO0dk10HKlbzsNRdHOpu1+C2tCaJyoZ+Z94bphid7Qvl0royOf iftQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fOA//JKXRH3JH3aVh9qwlNxS5eieQf8bEI6ZSdeQ7FI=; b=u2fMd24vhYeqrNoLXPAPtYJ3/FowKowuwz+8EHjq25rxS2/Ya9dIhvwFZjuM7NK6z+ LfCGxr9Z83bQffshLSuHRHIr8/yRppyT1gMjAOdL83SQ+1D/hMDHZP4cpsRDq6kPHiMq 2P2PEFZlEAq5tZOQWdHCoMHmNoxPSjRKrHZgmeHl09+82L3mol8WrTqDjogjaEYjU1/B di5DEVUV3P57c9zne7zIIlylHLok1WodMOaBSmJCPoR3Zw+ACTPSWMLIYXV4zWDk5KCE IJ24jqtbh+uC2g2O4Js2bY15SREYzj6JaQjtC+RFv65EfwQEWCuZvqyx9yDeNtE4WG+a eCFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ljLjFQMW; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a26si4920896eje.383.2019.11.18.21.24.31; Mon, 18 Nov 2019 21:24:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ljLjFQMW; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728201AbfKSFYa (ORCPT + 15 others); Tue, 19 Nov 2019 00:24:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:40656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727452AbfKSFY3 (ORCPT ); Tue, 19 Nov 2019 00:24:29 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 83A5221783; Tue, 19 Nov 2019 05:24:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141069; bh=3pZtjJxg82RJ4bLROtW2plxaPpzpKc7U4x+pscgL8z4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ljLjFQMWMVPxJQZnrHhbXy6/rdYzzr6AY10IY58sMRDbEJ+xYPkP1zMI8cnNn9Tzi MiKD9fTYmPh/MYHDYuQipZUowUDtxzorF3FNhfKObsuxfpcrYzCtBqLWaTWf6OfFna sexJYcIxT0U3u8Vq7rtmmgX5fcR9h0k0Hto2eaGQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ard Biesheuvel , Jens Wiklander , Sasha Levin Subject: [PATCH 4.19 034/422] tee: optee: take DT status property into account Date: Tue, 19 Nov 2019 06:13:51 +0100 Message-Id: <20191119051402.211777274@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ard Biesheuvel [ Upstream commit db878f76b9ff7487da9bb0f686153f81829f1230 ] DT nodes may have a 'status' property which, if set to anything other than 'ok' or 'okay', indicates to the OS that the DT node should be treated as if it was not present. So add that missing logic to the OP-TEE driver. Signed-off-by: Ard Biesheuvel Signed-off-by: Jens Wiklander Signed-off-by: Sasha Levin --- drivers/tee/optee/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index e1aafe842d660..34dce850067b9 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -696,7 +696,7 @@ static int __init optee_driver_init(void) return -ENODEV; np = of_find_matching_node(fw_np, optee_match); - if (!np) + if (!np || !of_device_is_available(np)) return -ENODEV; optee = optee_probe(np); From patchwork Tue Nov 19 05:13:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179632 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp147529ilf; Mon, 18 Nov 2019 21:24:50 -0800 (PST) X-Google-Smtp-Source: APXvYqx60CPn0fhjz4PVP2aWrc5MtE2M78kXdOfgcLKS8x6TbD5k/20pZt9iBhpWr807OjQcVEF5 X-Received: by 2002:a17:906:f108:: with SMTP id gv8mr33157660ejb.180.1574141089902; Mon, 18 Nov 2019 21:24:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141089; cv=none; d=google.com; s=arc-20160816; b=fGMaimg6qO++cvf1F+AaUYBNWfIwxeoYuuLX/oKkgXv0uwwYXKHJKF8iYW4r6cxpYE GC9BSd0FOt0yO6wa0EkA6d5XCTYZx8K7bKfrqhSEKb/537YY24jdge5TBG4XOjy3RoDH 5ADHQdYDxjMeWjjABDpSS9c+LkYGDIfF9tkjr7R9GrQsnno9sZSdaC3AXW4Fq3YPJE+E dEyfnWaW9Hyj3TQvCmPeYrhpDvu941mHPTaWzQS9mCUQf9m/QPDMrTxXqWRte9t9/n/O INGHTEHa1si9cPmOwojFREAdIWkfRWEa3+Ju4Y+DWmYeyJB5qWatdGpJYyVzOjNMNU+t m1kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Qzlm3O00gTMY7lIsp7L5uneza3a5NLlK20KUBf3H4oQ=; b=S4toguCGftWFcDqcVIZ4GwsVT/PsU80SwzRpgcmfTHda+5D1jpik8ZQSwRPdhZviFp c31LbkjcRDZOKKaLRPpy8oltQGreQHwH/OWQjvQlUA0BwTOv68I+7i3+e1ZuI6ojEotu LE7DHvk6Amo2NGstwHNZWH9hEbiW9U6GGpIcPK++MFipvXPwZDgIW+IwWzXeZ3ItMS7z UptghoUhkM3etl5Tppi4Yl7Y+APv259IrUeRX6HohHJpG9OTlFGY+bLrBMJwexIXkuYS +WXvxTjXW9QFedhKWwjoV72XXBEDLo2AiiJ8uiLPVMRiBeES53vRangDKAjkkkjxEAS0 1+zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rMKSqgfh; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q30si15938192edb.372.2019.11.18.21.24.49; Mon, 18 Nov 2019 21:24:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rMKSqgfh; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728270AbfKSFYr (ORCPT + 15 others); Tue, 19 Nov 2019 00:24:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:41172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728254AbfKSFYr (ORCPT ); Tue, 19 Nov 2019 00:24:47 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0FC9C21783; Tue, 19 Nov 2019 05:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141086; bh=nL257+5kU0ZhATbuvvRos00sxXWABvhtjW0o5lB36dE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rMKSqgfh2ZOf0emicRaB4DK2+hnNoTYzHYoN90wSZqy8hw0YQMHP8Lw6xMD8Ydccn qryn5I98IGYwukZKsK+aW4YXrA9YRuJgpjJ4IpEEW7QD0HZQkKWJ85RbUvyy3nVVGh jeqpuMgkFo7kDRRgncG0LEZLkhc4a1KejPaAVvmI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Pierre-Louis Bossart , Vinod Koul , Sasha Levin Subject: [PATCH 4.19 039/422] soundwire: intel: Fix uninitialized adev deref Date: Tue, 19 Nov 2019 06:13:56 +0100 Message-Id: <20191119051402.493920522@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vinod Koul [ Upstream commit e1c815f4b24a305e5bc9eceb541674bf4d02b709 ] In case of error, we can dereference uninitialized 'adev' drivers/soundwire/intel_init.c:154 sdw_intel_acpi_cb() error: uninitialized symbol 'adev'. Fix that by not using adev for warn print and make it pr_err. Reported-by: Dan Carpenter Acked-by: Pierre-Louis Bossart Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/soundwire/intel_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/soundwire/intel_init.c b/drivers/soundwire/intel_init.c index d1ea6b4d0ad30..5c8a20d998786 100644 --- a/drivers/soundwire/intel_init.c +++ b/drivers/soundwire/intel_init.c @@ -151,7 +151,7 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, struct acpi_device *adev; if (acpi_bus_get_device(handle, &adev)) { - dev_err(&adev->dev, "Couldn't find ACPI handle\n"); + pr_err("%s: Couldn't find ACPI handle\n", __func__); return AE_NOT_FOUND; } From patchwork Tue Nov 19 05:14:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179635 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp148514ilf; Mon, 18 Nov 2019 21:26:08 -0800 (PST) X-Google-Smtp-Source: APXvYqzNT8BGgAjKxrfmUJz6gVPzx+MktCjC7b8dYZRtZqhsqpV/fIF/9EsL0m+g6Acbs/ywbCzw X-Received: by 2002:a17:906:4d93:: with SMTP id s19mr3886782eju.285.1574141168511; Mon, 18 Nov 2019 21:26:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141168; cv=none; d=google.com; s=arc-20160816; b=lgbUWULUMywQqYgez6mBGw0EBkL8enz9A+HJSV91ntHHpIpVU5psaI+Wp5QYkxp4Yo 2EGPtrZVnO8DyO8zmPD1iKKAM93N2h+48O/W+c+ePYcxAudqhHIlGh5YrLbjlWZUNCI3 F5VTOqRl2LniraCLu22K+OA9rpQ5SYVLxO8AAAvwguWJgsOfQ6jfI+ZeFtHTVEWGMQ0L tNqp+admQl4LQynq1YDDe/2NxGdWyohCkKcNpR7iKWpopSKoy2LcEJ+0fNL4sZdtDEMO zcLM/w4eTyIvEYBx3EHY14SZ/ztgcAGdG0hYetbNzvH/CTF5Od5W+WGnpDiGqTOpDbrN bDhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PqIzis6grXkMKbKmk6lvdK0uUpspysnflgy+ztfeEr4=; b=YVUVsP6UfbRqdDM4vA9FipC8Ct4PJSwY2h3Dw4Pbg5WA03D3ZOIIywoe8eVt0C6Wfy HjCJSf/4FxImc6Z+j4qjbLFL/64MYiyZNJ1Q4lzSxMzyUhtwwvAsATMYdEOvl2w+0I1s U8ZLHVpC5grfOCaZY446Dz+muhn86lHe9ClvTlklQbL6Kpdt0Zd9MppUnGniuvfkg3v8 l2nj6bxL7Wa+Lv5kPehDKRH6VHqZ8zA2kDAbdGBMT3T0GJU4tuG/8u44TX+N/8XVpm2E mf6iDY2kkfsQ6itpE2u8Ly5+jkVtBrYBpMUqNEIlm7DtwGoR4naSO2YHpP4+xq+EHqM4 UETA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=J2JSjJSQ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id be23si13607058edb.103.2019.11.18.21.26.08; Mon, 18 Nov 2019 21:26:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=J2JSjJSQ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728497AbfKSF0H (ORCPT + 15 others); Tue, 19 Nov 2019 00:26:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:44074 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727849AbfKSF0G (ORCPT ); Tue, 19 Nov 2019 00:26:06 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C1BC4222A2; Tue, 19 Nov 2019 05:26:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141166; bh=GFSVBNLPJtFDTvTDouENezti5bv31KmrpDsn995p2Sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J2JSjJSQYYiFaFgJ7AJztaa/30yiJiMY1w+2Ycci5OS+k5lUNIW68r8seruIc5mTl uRQmWz4nHao/qGkQEO1GNEPMa8/tt44MmxrIyeqUimaomcix3sVv8gZWppJxHU2b5c q2oMwBi4YK7UhJVWNzL/ond8iUl4opsYAMelyR/c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerome Brunet , Mark Brown , Sasha Levin Subject: [PATCH 4.19 068/422] ASoC: meson: axg-fifo: report interrupt request failure Date: Tue, 19 Nov 2019 06:14:25 +0100 Message-Id: <20191119051404.060509734@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jerome Brunet [ Upstream commit dadfab7272b13ca441efdb9aa9117bc669680b05 ] Return value of request_irq() was irgnored. Fix this and report the failure if any Fixes: 6dc4fa179fb8 ("ASoC: meson: add axg fifo base driver") Signed-off-by: Jerome Brunet Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/meson/axg-fifo.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.1 diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c index 30262550e37b1..0e4f65e654c4b 100644 --- a/sound/soc/meson/axg-fifo.c +++ b/sound/soc/meson/axg-fifo.c @@ -203,6 +203,8 @@ static int axg_fifo_pcm_open(struct snd_pcm_substream *ss) ret = request_irq(fifo->irq, axg_fifo_pcm_irq_block, 0, dev_name(dev), ss); + if (ret) + return ret; /* Enable pclk to access registers and clock the fifo ip */ ret = clk_prepare_enable(fifo->pclk); From patchwork Tue Nov 19 05:14:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179729 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp188538ilf; Mon, 18 Nov 2019 22:10:34 -0800 (PST) X-Google-Smtp-Source: APXvYqxc4QPribEimTZJIZm3L+pYp0hobHhE2TNoAjHzhQx0x3AHBbrrl44xvNDHj4UQQMNNfeMn X-Received: by 2002:a17:906:301a:: with SMTP id 26mr32333330ejz.201.1574143834348; Mon, 18 Nov 2019 22:10:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143834; cv=none; d=google.com; s=arc-20160816; b=k06TvckLqWuD/A+iz+Q4ujtoKa30qmJph+bsAqkrz0+TsA8K19lVCBKTFzymc7K/19 Rb5RXAH5HmANB0cjc8ZVMtBCchO+r+3PcdeGDK1DSxRA69MMi5jGcGfwJvpJnvjP08Et Q+rDIA1VGLv3HRsMtMlKRutLIS29DqWW1fUeILzOs6l5WXgjtgpSayDcuJtu5NYrzaxk hVZ19YW4BhpDCbV5fJRp8OaoNK1nuN4/l/FOf98ZUjCM8Qxc6H9jLLXSBXsbMAdzQ1u6 vkyTofC18CDVX/oOloygrWXRKW6xQlEhwJYNs03nt0Ip5nMX5ph20ZlsBJhz4fibsD+K liFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GPf99G38m8kkp1B7SRwB0ALuhpAshjescN7iMZ+nNls=; b=It1cfqxnyTUJjBgD+CWKRq+OIQUkN/zNvcWaSZrujZwcbmV1derQ8P8C32ieIIrwHV 3Yl6H5RgUEUaHiXbIBWUZ1h/orNvltaPjd0ayCAeBlheveaeq11Gi4nqjqz3i6InUHX8 r/Vm8mV/2jmQBy3xM++rXQ+5C9C6wXCYwfd5IIN8jTMRArAUObBfaTcWa6p/PoT/q2/2 G02+JglthOCckuWbN4FDy/6jYOJSqUbBYiYfcp9NTBLXlwaV/1B8MCbH1gOmHpaxwcZ6 sANtIvwGzMDTTlyCI2IsF4S1doh2R2IdLuK6XrWdAnwHsJla6JV5ZIjFq4a1YpMEaaN0 EHYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SHqgLKP9; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bt28si13551090edb.270.2019.11.18.22.10.34; Mon, 18 Nov 2019 22:10:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SHqgLKP9; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727733AbfKSGK2 (ORCPT + 15 others); Tue, 19 Nov 2019 01:10:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:44510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727718AbfKSF01 (ORCPT ); Tue, 19 Nov 2019 00:26:27 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 96A7721939; Tue, 19 Nov 2019 05:26:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141187; bh=DCGoM8RFU/85m16B7mGU3/4vxVxz030aYpVZQqpMOeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SHqgLKP9KWJyB7pw9afdrVKJyX+kkXOIGCbWlBHzkaBYAXe3k44i+REB8kBUhbKBi 3i2Yx/58Yff07gxRbrK2nZr5k/FNRxLGJWdolrCKmIa+GDBuGmo1oDqLbawi8mlhHx NrTEJSwlMleSmWT73S1nhXTSXYvcQyctY7qZp0hk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 4.19 074/422] ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook Date: Tue, 19 Nov 2019 06:14:31 +0100 Message-Id: <20191119051404.368327480@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit 64858773d78e820003a94e5a7179d368213655d6 ] This patch adds missing properties to the CODEC and sound nodes, so the audio will work also on Snow rev5 Chromebook. This patch is an extension to the commit e9eefc3f8ce0 ("ARM: dts: exynos: Add missing clock and DAI properties to the max98095 node in Snow Chromebook") and commit 6ab569936d60 ("ARM: dts: exynos: Enable HDMI audio on Snow Chromebook"). It has been reported that such changes work fine on the rev5 board too. Signed-off-by: Marek Szyprowski [krzk: Fixed typo in phandle to &max98090] Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- arch/arm/boot/dts/exynos5250-snow-rev5.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.20.1 diff --git a/arch/arm/boot/dts/exynos5250-snow-rev5.dts b/arch/arm/boot/dts/exynos5250-snow-rev5.dts index 0348b1c49a691..7cbfc6f1f4b8f 100644 --- a/arch/arm/boot/dts/exynos5250-snow-rev5.dts +++ b/arch/arm/boot/dts/exynos5250-snow-rev5.dts @@ -20,6 +20,14 @@ samsung,model = "Snow-I2S-MAX98090"; samsung,audio-codec = <&max98090>; + + cpu { + sound-dai = <&i2s0 0>; + }; + + codec { + sound-dai = <&max98090 0>, <&hdmi>; + }; }; }; @@ -31,6 +39,9 @@ interrupt-parent = <&gpx0>; pinctrl-names = "default"; pinctrl-0 = <&max98090_irq>; + clocks = <&pmu_system_controller 0>; + clock-names = "mclk"; + #sound-dai-cells = <1>; }; }; From patchwork Tue Nov 19 05:15:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179640 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp151687ilf; Mon, 18 Nov 2019 21:30:12 -0800 (PST) X-Google-Smtp-Source: APXvYqwRQhUqTnDRS+mjn24gMkEPHPlt3Z8ruXdQ5qZ9LFKZveTyKpEOs4x5U6N1oNgheO6ZhSiE X-Received: by 2002:a17:907:216e:: with SMTP id rl14mr32405227ejb.291.1574141412269; Mon, 18 Nov 2019 21:30:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141412; cv=none; d=google.com; s=arc-20160816; b=PjySGrD3W4ad/fumG1QgUYAj4FTuPmFuoXstuE77cRoluY8Nl6el/hVn/WjjRFm/Fx 71FO2gT7bhzlm8NlGOHqCN50UyX1XyjomD5msA00Iy3oQUkCIA0e+woJKyFQjsDzJvYJ Kkw4+UKQI7w4j8BPT5ed2nXTOoQYa0TMkv4XTuGOmCLPUWG3k0kFQjh1Y16Lqw5c+kwT oD+ot+/SzFNiDLdxvnWi91txiVMyLBHMkS5UOEFhGMSqwthUF3aqMXhbq3ZJVR6NbPCv qRGAOi2zNcSKdn9gGX1xKrZifRi/2Ifd4tH3XUFfuG9kbQsA9ulgUZDQWUx9CKSdCNqJ haxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RMhOKPM7lFwm5vTNbniECwKSl16FphHvQHAGV82kAS0=; b=HSPh3KE0D0wDDpx8zUJL2sHsIRzXh4OFSeFJUZID27mOPXtiuakan+NfNGMlkSsWWs Z4sJ4fGPrWNTAij9Xy3jVkweEAYWAhuIv1ynlBffHRS8cLHunPwoxPDfoFbnHht9MQ3o 3cJS/ct0COrFkpTBWY5UnOzB0z/mWSmeMk4w7XjM2/JkAO4qvBcNm9m3SuLxeU6Qzk7M b+C6xzqerqNbWS/egMjEL7nUNAiNfRsTwhSdQTZL9my04fcpkHZ1tT0wg34XLdXlIv9g M1hZF/kERkMTR9J28KNsTzvCdw0AlFIF9yyhftfn4SxeDU5zZoliHkaiBf91RkxnhuUF DmgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YiRMRLXq; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l27si16006539edc.358.2019.11.18.21.30.11; Mon, 18 Nov 2019 21:30:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YiRMRLXq; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727998AbfKSFaJ (ORCPT + 15 others); Tue, 19 Nov 2019 00:30:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:48832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729082AbfKSFaH (ORCPT ); Tue, 19 Nov 2019 00:30:07 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 81F2921939; Tue, 19 Nov 2019 05:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141407; bh=m5SAiEhmgoM419e11DWoaWJ3r5SwTf19vYa1RbB7u0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YiRMRLXqUywlAHfG46JZxNU/CgIkwEghc/RaAisT17eRUZEADgpirQjRZrma4UpGG jAElKXrfisD2aKpNvi6YMpqeKdOwJRAzd923klOmz5Fo0AlSFoW+MmJQL4VvrJZUdD o+E/ilhBgs7JO+z8kdIiZCBtdWTkBhSGPUbStGcA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 4.19 151/422] ARM: dts: exynos: Disable pull control for PMIC IRQ line on Artik5 board Date: Tue, 19 Nov 2019 06:15:48 +0100 Message-Id: <20191119051408.412047428@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit 62623718fd31d08b26ebea6c8b40f24924153ab7 ] S2MPS14 PMIC interrupt line on Exynos3250-based Artik5 evaluation board has external pull-up resistors, so disable any pull control for it in controller node. This fixes support for S2MPS14 PMIC interrupts and enables operation of wakeup from S2MPS14 RTC alarm. Signed-off-by: Marek Szyprowski Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- arch/arm/boot/dts/exynos3250-artik5.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.20.1 diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi index 620b50c19ead9..7c22cbf6f3d41 100644 --- a/arch/arm/boot/dts/exynos3250-artik5.dtsi +++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi @@ -69,6 +69,8 @@ compatible = "samsung,s2mps14-pmic"; interrupt-parent = <&gpx3>; interrupts = <5 IRQ_TYPE_NONE>; + pinctrl-names = "default"; + pinctrl-0 = <&s2mps14_irq>; reg = <0x66>; s2mps14_osc: clocks { @@ -350,6 +352,11 @@ samsung,pin-drv = ; samsung,pin-val = <1>; }; + + s2mps14_irq: s2mps14-irq { + samsung,pins = "gpx3-5"; + samsung,pin-pud = ; + }; }; &rtc { From patchwork Tue Nov 19 05:16:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179642 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp153782ilf; Mon, 18 Nov 2019 21:32:20 -0800 (PST) X-Google-Smtp-Source: APXvYqxLh2WuJcbbc0ObU8HB273jcleqI4OHuNwoj+hH8oSYPseVcSU8lVPARxYEpUXV2fbUWUxn X-Received: by 2002:a17:906:278a:: with SMTP id j10mr32664690ejc.125.1574141539627; Mon, 18 Nov 2019 21:32:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141539; cv=none; d=google.com; s=arc-20160816; b=hL03hbaTBkWrh9ClRpJSX3LXAVwbC47uB74wMr1w3X5NilnN/XLw0aQEQqwxMHX9DS bYHqqdLIFe9baimOrai76xwBGY5SIkvaf+aApZcGQ2mAYT0jHNLkkrZUbPvDwlRIL5UL sipFa9Y5ehf3aK8NF2uE8T3Hn/THoyZigdFr9HI9UV6VQdf55NFCRJgU2o9I50tzThUe JidQ6M0snCurGk/+sf5R4gP1V3cwOLievkekl01OhOakXR64e4S6WnDvBGzAIsbXDtVr aTKl4i/NQ5PznkfVdGX/K200rbJGUWn7QJiFmBuQh1NwL+qTXnMQoLolMKXL0vq27s2t dZcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qjQW6psIUDpPd5buRQD+ekWKUgCErzPcP5JrZoKWplY=; b=QgCiiDCV7AXgz0F57vVk6gSwxiYPK9w/+z4OlHqDKGqHpnhAtEiavBXENZEq0NNbEb 88sCjobSfxCf7DluidZOinetrmeM/0TKoS2ihKN5nJ2mUzB0LdzOWiSuMC4J976LOk6c 6ZqoFdZm8cvoqd6BRbxiRIvCyRQOgyZWxZmzKXYLIZZCPqXxi4ZgE28c3wl1OJ+iSgb+ O+1yLRQkurNu5JtOzJeBsCoxrYHV3GADbeFpAULV8X2VApYnzhXo1VmXeAM8mgWyk7cj AjO8R6la8/7/25eokCbMtbQ2o9+Y2HaEX+40mlAt981YmPnop185UgSWvDqrnrKyejif l06Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DKsG1EqW; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i18si5882386edt.319.2019.11.18.21.32.19; Mon, 18 Nov 2019 21:32:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DKsG1EqW; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728143AbfKSFcP (ORCPT + 15 others); Tue, 19 Nov 2019 00:32:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:52470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728595AbfKSFcO (ORCPT ); Tue, 19 Nov 2019 00:32:14 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2BCCB208C3; Tue, 19 Nov 2019 05:32:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141533; bh=ypa3wOs131kORiY+6JAWO3HBW3gIyp6YubYc/0p5glQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DKsG1EqWjVGNWeeELkKLSWByQxoKTZjJ9OuyQkQ4gRMTBcz/GZLFyg8mONBlPi07Z l3QdVXMrxzzBO+Gk5sCkugJWclbjibCrjBIvJb0nVU7rNrft9HqJhBgahFTvi6QBZH 8nZ/nCwQSdLZ3PodhUc5mZTb7LeSI96d4HTS+Zt0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Da Xue , Jerome Brunet , Kevin Hilman , Sasha Levin Subject: [PATCH 4.19 194/422] arm64: dts: meson: libretech: update board model Date: Tue, 19 Nov 2019 06:16:31 +0100 Message-Id: <20191119051411.123239778@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jerome Brunet [ Upstream commit b7eb0e26cc4a212fde09144cd49d4103170d2b9e ] There is actually several different libretech board with the CC suffix so the model name is not appropriate here. Update to something more specific Reported-by: Da Xue Signed-off-by: Jerome Brunet Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts index f63bceb88caaf..90a56af967a7f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts @@ -13,7 +13,7 @@ / { compatible = "libretech,cc", "amlogic,s905x", "amlogic,meson-gxl"; - model = "Libre Technology CC"; + model = "Libre Computer Board AML-S905X-CC"; aliases { serial0 = &uart_AO; From patchwork Tue Nov 19 05:16:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179643 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp154298ilf; Mon, 18 Nov 2019 21:32:53 -0800 (PST) X-Google-Smtp-Source: APXvYqzABSK2KiJtaRiBAzvQFq+BU7tGnTSor4Cf7Na6+BQePBAn9PoWdy5eDuUrz98l6jhgtUtx X-Received: by 2002:a17:906:7e41:: with SMTP id z1mr31912830ejr.63.1574141573647; Mon, 18 Nov 2019 21:32:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141573; cv=none; d=google.com; s=arc-20160816; b=DgBbcHmHEYDgso34j1PG9qfRYYXVcO5k3iYjEftu1FVPybV1+uJsHuCEegpr6JN/vi xKadzOFKIdtMS/HiOVWXxU/aL6/5Pim4gkSToslO9vDyjns82mMXSYearGtCeSs7/Nwt QXLkednfVmNwbC3AcP0QMyjAem3FKyyTAHoJXNfLqSX6nShRoYzXOwQwaJRAp0nUAB/r J8ougUwALZLQx/xHhglqFtjuK5QEjwKNeTfoxXV6Y/nLCBfhXKS0rKbfnCznjaJGEYgr e/qyemSnymhIbE/RM7ajVJCyozjpzkh8RtXpB1xtjWfUY6VyfQeXkYnH5QK/Cpbqcy0Q 37pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4SfYdpMAZA5tF67MBl8gD3vnW3UrMxqN6p0evxCoDm8=; b=OpzdGP9wiGqpRuC8iaNDZQAAn/uxZEGBipirOcUuYI0SESVlfSNvMvRodjqBwIBUrK jg7Kx8WBSV9nSCn7PLDEtgKaeCWu6Sx9YpNGj/6nPSJ//4NTlvJ1AXbVFR5hnIbGLuR9 8NeuKBIpvwol8yPyi3MOC/X6UJcULOfXmyLM+OFfjENvpt8XYreYnobmy7TLEAJ8sPYm bOScl7jsJL9naCudH34tWFPaXpe40QW2XAb/H6eEwadqBpkBrTtceCB7kp440LSahXaR 0SPLmiGvjG5G8IiOjGsLeiW3LQg6D2rtiNS2A53D7B6tiyhVdwp0PF4iKCZZdt2LiA3+ KThg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MpkXx4AG; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p7si13104325edq.227.2019.11.18.21.32.53; Mon, 18 Nov 2019 21:32:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MpkXx4AG; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729458AbfKSFcw (ORCPT + 15 others); Tue, 19 Nov 2019 00:32:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:53262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729456AbfKSFcw (ORCPT ); Tue, 19 Nov 2019 00:32:52 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 05F8D21783; Tue, 19 Nov 2019 05:32:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141571; bh=fTe/6jv6vp2P2ZrGxFtNky6NeEAfIueFoy7sJP/UR2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MpkXx4AG63W3WHap3Q+BEeQT71MEoljTR5P8b6FgTE3+QtUQEFg+1EkOdYpDOeVe5 UVyyVA4yOnyDaBM5iEZ4V4bMe/Z3mof55ng+p94AILNXJorLMrQgrVGZL+jRpN8mrp mIJQnt47cfm/jhmiEBxHt+s5ExS98pUSyC/GT3vo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Niklas Cassel , Bjorn Andersson , Andy Gross , Sasha Levin Subject: [PATCH 4.19 206/422] soc: qcom: wcnss_ctrl: Avoid string overflow Date: Tue, 19 Nov 2019 06:16:43 +0100 Message-Id: <20191119051411.937179384@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Niklas Cassel [ Upstream commit 4c96ed170d658d8826d94edec8ac93ee777981a2 ] 'chinfo.name' is used as a NUL-terminated string, but using strncpy() with the length equal to the buffer size may result in lack of the termination: drivers//soc/qcom/wcnss_ctrl.c: In function 'qcom_wcnss_open_channel': drivers//soc/qcom/wcnss_ctrl.c:284:2: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation] strncpy(chinfo.name, name, sizeof(chinfo.name)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This changes it to use the safer strscpy() instead. Signed-off-by: Niklas Cassel Reviewed-by: Bjorn Andersson Signed-off-by: Andy Gross Signed-off-by: Sasha Levin --- drivers/soc/qcom/wcnss_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/soc/qcom/wcnss_ctrl.c b/drivers/soc/qcom/wcnss_ctrl.c index df3ccb30bc2dd..373400dd816d6 100644 --- a/drivers/soc/qcom/wcnss_ctrl.c +++ b/drivers/soc/qcom/wcnss_ctrl.c @@ -281,7 +281,7 @@ struct rpmsg_endpoint *qcom_wcnss_open_channel(void *wcnss, const char *name, rp struct rpmsg_channel_info chinfo; struct wcnss_ctrl *_wcnss = wcnss; - strncpy(chinfo.name, name, sizeof(chinfo.name)); + strscpy(chinfo.name, name, sizeof(chinfo.name)); chinfo.src = RPMSG_ADDR_ANY; chinfo.dst = RPMSG_ADDR_ANY; From patchwork Tue Nov 19 05:16:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179645 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp154456ilf; Mon, 18 Nov 2019 21:33:04 -0800 (PST) X-Google-Smtp-Source: APXvYqxdv5vicZbnwfvfcBkbj9Z6yTxNlTXnnKGEfV/CGwpOk5rfdruRuTjPDivzkEl+V2oIxwX+ X-Received: by 2002:a17:906:fcdb:: with SMTP id qx27mr32169325ejb.255.1574141584348; Mon, 18 Nov 2019 21:33:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141584; cv=none; d=google.com; s=arc-20160816; b=HzO9OdesqZ8FZBD+34HErGbV4z71556n82BGjeueUjO18dU4Ch3dbuYQ9H8c2pnACH kHteznqJ/5mfYSdMJVlLXAKhXPKUGEaNMwhcToeudlxvGAWB0rWtf5gMYlKRzQBdSBV3 kNC/XsIbpP9iQNMFi3hcJy9yfXm7E/rW/PYqfOm0CK8vaxzdSIAK+PzNIiN/R7s2nFHO JtKDRen+/dW26Iy+7fF6yIei8EeOuMR2W/gWFwJ0/nThkO29tlKWCzeHwCBzNqCzMive dZTsrlRoflJBRXuh8XdUXK1JIQi5rdRr8BykbTLoYlO2Nh9fNPSX+sTGSIN8Z9OKyyOR 8WmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ON3SRD1uapF+htTOHpEkx7KbleQ3b4fzL2IVEFfvZkk=; b=mzlcrlqk7ofLkkrlK4jcEkVuvZriZoOFLrmAk78aGD3RFyjCQtHgSyzeJ09bzVxkAt P24WIrQYY4xMwhYdDuZ1QivBQNZ0yci+ZEvRbBz8oQDUNHu17hu+C3WkQSMQjHH7QVP3 3w1cIuQlAuDZyWFFR3kbBUoW4CIKeqVR8mktkEl133JTnqJOpIaD3dyO/YS5WijOIUPO 6arRKT+snHPHwH8ARp+gg5f9dhQ41tCE1L3gh6yXf4FVFDH/3chRSA0jJ4RBDZw7eDcb eDI/tINbSO9D2YJ6pwi65CnyiusEGkmWxHWTeszDtoIn31AEO6UsdOPDMGMWbuAb50nz vJ0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="OjFnvUr/"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g3si13041915ejf.345.2019.11.18.21.33.04; Mon, 18 Nov 2019 21:33:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="OjFnvUr/"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728955AbfKSFdD (ORCPT + 15 others); Tue, 19 Nov 2019 00:33:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:53442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729471AbfKSFdC (ORCPT ); Tue, 19 Nov 2019 00:33:02 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5546421783; Tue, 19 Nov 2019 05:33:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141580; bh=NflRRV0uqucVxYoCTUuHIRCHF+FW37oV9OaJflefziU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OjFnvUr/WtrQ99NmsfsmPwbth+Stp83stQ8xVGe8qAc/aJCwHrzdSfzr47Lcvd80C gisOUkCBrJVP5gqLObQwaO7YgrZPeKxO+UULmt2u+BcOhr+FkhN7OccA1NWBRxYZAD HZg79rSlXPPX0E61+Wd6zo0GZgeuxdsbtWQl0UxY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ray Jui , Scott Branden , Jon Mason , bcm-kernel-feedback-list@broadcom.com, Rob Herring , Florian Fainelli , Sasha Levin Subject: [PATCH 4.19 209/422] arm64: dts: broadcom: Fix I2C and SPI bus warnings Date: Tue, 19 Nov 2019 06:16:46 +0100 Message-Id: <20191119051412.136267401@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 7cdbe45da1a189e744e6801aebb462ee47235580 ] dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses. arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (i2c_bus_reg): /hsls/i2c@e0000/pcf8574@20: I2C bus unit address format error, expected "27" arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dtb: Warning (i2c_bus_reg): /hsls/i2c@e0000/pcf8574@20: I2C bus unit address format error, expected "27" arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (spi_bus_bridge): /hsls/ssp@180000: node name for SPI buses should be 'spi' arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (spi_bus_bridge): /hsls/ssp@190000: node name for SPI buses should be 'spi' Cc: Ray Jui Cc: Scott Branden Cc: Jon Mason Cc: bcm-kernel-feedback-list@broadcom.com Signed-off-by: Rob Herring Acked-by: Scott Branden Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 4 ++-- arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi | 2 +- arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi index 1a406a76c86a2..ea854f689fda8 100644 --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi @@ -639,7 +639,7 @@ status = "disabled"; }; - ssp0: ssp@66180000 { + ssp0: spi@66180000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x66180000 0x1000>; interrupts = ; @@ -650,7 +650,7 @@ status = "disabled"; }; - ssp1: ssp@66190000 { + ssp1: spi@66190000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x66190000 0x1000>; interrupts = ; diff --git a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi index bc299c3d90683..a9b92e52d50e8 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi @@ -138,7 +138,7 @@ &i2c1 { status = "okay"; - pcf8574: pcf8574@20 { + pcf8574: pcf8574@27 { compatible = "nxp,pcf8574a"; gpio-controller; #gpio-cells = <2>; diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi index 84101ea1fd2cb..ff714fcbac68d 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi @@ -520,7 +520,7 @@ status = "disabled"; }; - ssp0: ssp@180000 { + ssp0: spi@180000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x00180000 0x1000>; interrupts = ; @@ -532,7 +532,7 @@ status = "disabled"; }; - ssp1: ssp@190000 { + ssp1: spi@190000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x00190000 0x1000>; interrupts = ; From patchwork Tue Nov 19 05:16:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179727 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp185517ilf; Mon, 18 Nov 2019 22:07:31 -0800 (PST) X-Google-Smtp-Source: APXvYqyyJ1HClnvoOZxmBrkqFlxfjwimeZtyDzZmkl23fzJSjmuRW3CJqw5AXEIPN59KJc9ivscL X-Received: by 2002:a17:906:b2c7:: with SMTP id cf7mr31630218ejb.218.1574143651420; Mon, 18 Nov 2019 22:07:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143651; cv=none; d=google.com; s=arc-20160816; b=Hw+3jCgCJ9d4f5SdUEnZzdoI1XX3YREWubQ935HgbxnDIKveeNrEV91gEJtcQdamqa UNh6rNI1XHo0pqd+onArM5L5sTgDMKzaxlPRAqSdfEwUgDqb9bxAXFFVRfF77GW+MLb4 NnQRrZJdoZ9wgp+aD35vHhLAkTuu43Fbg/I74disw/V65onN/9GR65IdpRGvB+iFJPBe lAUWgsUqUuRrCfa49NK6GqJcnG9lafJVWdqehXEz8TeZ145EToRFK2aXJhYJ3qhNiop/ jyx2ZhGLNsRZolJLA6/KkdQNMS/drs3pWG670Gos5WssZ+vUMjJJU9LOxFT6AJfIGdmK Helg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LWdmV+Cg9TS4VuFNYU0fDH9YWudxzDjuCgPMnIubl+8=; b=TlnsWNi6QRY5Zcnxxspj3s1BEu06w1Mxq2LAbBOmpYs9Nm2gZEkeo1KVG/o+Y5wb69 FrBC5zKlxFu/6mcS2QHU8Xxx7OPl5PLgzV7SJls0kmZCfxJonlA0HFHJdWOVshW44+bp 92pITIn4CJ12C17FTGUmoMv1aNDnNPS98nSiK0rDHSrjTc0mpDmdFIpgJQshZ6H8NFLg gXAuDhthzO3tK05Oc/j2U97HaA2itQ4lMb5lQj+1bxIwBMMh2mqX1WwdI7wfWJmro/mK iZQgJ+h5RT2VqdNMR+/ukz+lS3Crxi0fFhBcWOAoYyYgQm7bDB7psMtGLF/rN4B3jzZx rFyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HOYmxRHE; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 9si407609eju.352.2019.11.18.22.07.31; Mon, 18 Nov 2019 22:07:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HOYmxRHE; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727736AbfKSGHa (ORCPT + 15 others); Tue, 19 Nov 2019 01:07:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:53608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729502AbfKSFdK (ORCPT ); Tue, 19 Nov 2019 00:33:10 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C383221783; Tue, 19 Nov 2019 05:33:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141589; bh=AnQeayZI8Q5t0IuDvtp0ycef/61y+WT5LaZc9K/UZ0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HOYmxRHE78vqrtjnHX+g5qo4hrWGXA/7jMAxT49hk1Q0B+dR+G0AdMv7xi8QSzcu/ TdcPGc1mjdk+cc7z2HXZx/EqBpQlC7o/rFXWUDcdS1D5omIW6A5SZu1jYVYGlWi79x f/rINGpY7WUhH7PQYyLuryE5M+eUbM7+G4lKwhx8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joel Stanley , Andrew Jeffery , linux-aspeed@lists.ozlabs.org, Rob Herring , Sasha Levin Subject: [PATCH 4.19 211/422] ARM: dts: aspeed: Fix I2C bus warnings Date: Tue, 19 Nov 2019 06:16:48 +0100 Message-Id: <20191119051412.266011758@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 1426d40e11f730e0c0fd3700a7048082f87b0e6e ] dtc has new checks for I2C buses. The ASpeed dts files have a node named 'i2c' which causes a false positive warning. As the node is a 'simple-bus', correct the node name to be 'bus' to fix the warnings. arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c@1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-romulus.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c@1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-ast2500-evb.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c@1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c@1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c@1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c@1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c@1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-zaius.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c@1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c@1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c@1e78a000: incorrect #size-cells for I2C bus Cc: Joel Stanley Cc: Andrew Jeffery Cc: linux-aspeed@lists.ozlabs.org Signed-off-by: Rob Herring Signed-off-by: Joel Stanley Signed-off-by: Sasha Levin --- arch/arm/boot/dts/aspeed-g4.dtsi | 2 +- arch/arm/boot/dts/aspeed-g5.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index b23a983f95a53..69f6b9d2e7e7d 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -350,7 +350,7 @@ status = "disabled"; }; - i2c: i2c@1e78a000 { + i2c: bus@1e78a000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 87fdc146ff525..d107459fc0f89 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -410,7 +410,7 @@ status = "disabled"; }; - i2c: i2c@1e78a000 { + i2c: bus@1e78a000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; From patchwork Tue Nov 19 05:16:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179646 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp154820ilf; Mon, 18 Nov 2019 21:33:23 -0800 (PST) X-Google-Smtp-Source: APXvYqz9/zZ4yHwuB4heCTj0A5Lr6OFqA9qZUnHTKHE35cxGcR+dXUjGWivy8R4/LyhPrANl0EG8 X-Received: by 2002:a17:906:f0c9:: with SMTP id dk9mr32597131ejb.56.1574141603547; Mon, 18 Nov 2019 21:33:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141603; cv=none; d=google.com; s=arc-20160816; b=cIuOU7LRutdGesnSIYjhFjTGZSvRr65vm0Y6sobPw9PBEk6+cl0o3r9asew06Rco7Y eHx9GcFWdetl4WxonK7ypLuVGf4skunxGm6pbljDUoRh6FZXf2MH+h6C0Bpc5pU0qRV9 veBlv+OjxwMS4Qq/LEQ9z8BG4ZBmDHdr7gEEoWP9L62G68QXND1+fS+UAu5pHTk92hxA D/RF0hMGuc3Sk1OP0ksJVWs4NBdvh5deMN4GYv+U7fKeWjfYY0hFF9w457YsF5D4g8iG RjQ74aqDdl5kFDU+rAcGQr7RfQsX5u8F3G2X7YNlvk/IYWg8YszKl+49/5zowISFAnUv uyGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xzCr07NCiZqgF5druQV41t5uT40WxbxuphEV7+Z1dqw=; b=fIcP2C2qpfk182GwnG0z1Xj251MM0UqI1X6FuNTPZdoKfK8TWJCywDfJYZBSnH87/c obyWOXOXJ/VSHYdPMvBH0+sZPN165YAIDDnhYVYWQJcrwPMlonvGB8yvXOw8WyBtDr/1 yuRcbESDCzdAYtL0XW1yRUd4gu9HMCg87ODpsfR2yXgjF6W2w8C6GFDa55gq2XzH9zsR wlL3wiLD2o+2gITqUMN9eRpR7s0PnXOzw5xEN0cZ3WTMFzSkui/0M5ux0PaLI+c+yqS5 9bAZQdyjuZijDoF2zQBDOUt6IXZSPf8lJso+6StmTOCTrY+oUQck9sISEVMvy9i7sNRb azXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PvhJq7Vl; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x28si17974575edl.21.2019.11.18.21.33.23; Mon, 18 Nov 2019 21:33:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PvhJq7Vl; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727865AbfKSFdU (ORCPT + 15 others); Tue, 19 Nov 2019 00:33:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:53846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729517AbfKSFdT (ORCPT ); Tue, 19 Nov 2019 00:33:19 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BADE621783; Tue, 19 Nov 2019 05:33:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141598; bh=3R1O+2sefDUBuO2KrxNRutCSxBn0BF/KyQKfUA/8QQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PvhJq7VlBpE8sHTfD0QtUSv3L09zK5QyOHSG6pGyZAFLUkyqwx1i2xcBZJYNPlWZP /3+Y0HjVS2XreuGQ1Ot5SpLBQMDQOawLlXrsHZEKHTC6hDu4/l111bR9u6yUkssrN4 N243hpGmiRAer2W8eSfIX17PhTruoJusuVAbK/Sc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxime Ripard , Chen-Yu Tsai , Rob Herring , Sasha Levin Subject: [PATCH 4.19 214/422] ARM: dts: sunxi: Fix I2C bus warnings Date: Tue, 19 Nov 2019 06:16:51 +0100 Message-Id: <20191119051412.467259994@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 0729b4af5753b65aa031f58c435da53dbbf56d19 ] dtc has new checks for I2C buses. Fix the warnings in unit-addresses. arch/arm/boot/dts/sun8i-a23-gt90h-v4.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a23-inet86dz.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property arch/arm/boot/dts/sun8i-a33-q8-tablet.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property arch/arm/boot/dts/sun5i-a13-utoo-p66.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property arch/arm/boot/dts/sun5i-a13-q8-tablet.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property Cc: Maxime Ripard Cc: Chen-Yu Tsai Signed-off-by: Rob Herring Signed-off-by: Chen-Yu Tsai Signed-off-by: Sasha Levin --- arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 3 ++- arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 3 ++- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi index 8acbaab14fe51..d2a2eb8b3f262 100644 --- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi +++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi @@ -92,7 +92,8 @@ */ clock-frequency = <400000>; - touchscreen: touchscreen { + touchscreen: touchscreen@40 { + reg = <0x40>; interrupt-parent = <&pio>; interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>; /* EINT11 (PG11) */ pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi index 880096c7e2523..5e8a95af89b8c 100644 --- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi +++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi @@ -69,7 +69,8 @@ */ clock-frequency = <400000>; - touchscreen: touchscreen@0 { + touchscreen: touchscreen@40 { + reg = <0x40>; interrupt-parent = <&pio>; interrupts = <1 5 IRQ_TYPE_EDGE_FALLING>; /* PB5 */ pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts index 35859d8f3267f..bf97f6244c233 100644 --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts @@ -95,7 +95,7 @@ &i2c0 { status = "okay"; - axp22x: pmic@68 { + axp22x: pmic@34 { compatible = "x-powers,axp221"; reg = <0x34>; interrupt-parent = <&nmi_intc>; From patchwork Tue Nov 19 05:17:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179654 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp157217ilf; Mon, 18 Nov 2019 21:36:02 -0800 (PST) X-Google-Smtp-Source: APXvYqxY/KPtLc4e2MHXyFMIMSvDWHP6BtTJ9wOXwdXznKxv3I1JpDS0xBikdx4QSRiK3AjPKAjt X-Received: by 2002:a17:906:5959:: with SMTP id g25mr31794301ejr.248.1574141762412; Mon, 18 Nov 2019 21:36:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141762; cv=none; d=google.com; s=arc-20160816; b=h3X0TP2Tk3Pv5/IxvMJQmd/ZajS1awiv/V5IscoFmVGyZkQv0E0bxI1sJcNP938IIs lqdFwve7TGxY/3Ab7YE0bxUAWQIMw8DF1CFzmX+fBHbI73FzGPt6R2wb5QJx5cgeOWPL 8UmVD4ow1p/xidoVFYX2knScT2JDjUhcKOwAxUL6emWyRxh4c9UOKgYt6h7I1uBYE5LU 6zu3pokGgTq5IRpvBnTkn69/8DSqZcgFy+FAcnnaWaICTvx0kcEHMqBdR5827vg5o4jV yWJm6cc3igu+u8CSyYnpVJJPvSMJb8gR8M4YYEuIkr16BNfNstAJosM8cvjtq2byfg5J gkdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZLA/TUPhOF/ze/RY0vB7fASoG5o8d+EOBRcvJWk41Ds=; b=M5HXAn8nmla4YNdJtEV9WJU1gIT5RW6WoqM1IBWWZpn7jmWgioYK0z4hLKTnngcai9 d7+vkpRLReSgZy/LKYCthNfmLVM1BGLx3ly+EXo4AXJLDwf7ozNrWuh3ClNh/QZsgX/p eRJX3whs+4Yv1UuhwQRAKn3aF4ZcwUBjnIbMsCmAR9LNWuvhpi83HwSH5Hss3SD+6cdO BFFMnH0AeDWiCkNFfZnq/aUgnZpI/bn23iS+Ss6I39t1Z1v/Jhr8wg6l1q+FAB2TTZtZ CJHiy3m2guvk8fAw3rytY7X9bcROYkEaZyrZgZTEQvYgLpSk3G13M+TBsXmI18MxFpE+ NBOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kYKRtrb9; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e20si2793152eda.164.2019.11.18.21.36.02; Mon, 18 Nov 2019 21:36:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kYKRtrb9; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729428AbfKSFgA (ORCPT + 15 others); Tue, 19 Nov 2019 00:36:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:57022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729106AbfKSFf5 (ORCPT ); Tue, 19 Nov 2019 00:35:57 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9320B20862; Tue, 19 Nov 2019 05:35:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141757; bh=jSGFsiKCQFZBLSEAsjsqgfDUw/IFfM12cjJ2KDf7CbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kYKRtrb9rJ4Jb5JpkFUZNJ2ge+CTywiWjFLXNm8wMOLmAdCcfSFx2X8t8FmhGwrPN QNs2Cs+yKnVJqJNYtN979hAB2U7LN9Oo0zWhuxXo2Ym6iDU/Kydt1MGOaTxVIZ++xE eoqaXXk8MxchB/S9hP6bIjglQW8A+AOu1xklU6eo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heiko Stuebner , linux-rockchip@lists.infradead.org, Rob Herring , Sasha Levin Subject: [PATCH 4.19 230/422] ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 Date: Tue, 19 Nov 2019 06:17:07 +0100 Message-Id: <20191119051413.780821671@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 131c3eb428ccd5f0c784b9edb4f72ec296a045d2 ] dtc has new checks for SPI buses. The rk3036 dts file has a node named spi' which causes false positive warnings. As the node is a pinctrl child node, change the node name to be 'spi-pins' to fix the warnings. arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus Cc: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org Signed-off-by: Rob Herring Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm/boot/dts/rk3036.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 67f57200d9a06..d560fc4051c5f 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -733,7 +733,7 @@ /* no rts / cts for uart2 */ }; - spi { + spi-pins { spi_txd:spi-txd { rockchip,pins = <1 29 RK_FUNC_3 &pcfg_pull_default>; }; From patchwork Tue Nov 19 05:17:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179652 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp156142ilf; Mon, 18 Nov 2019 21:34:47 -0800 (PST) X-Google-Smtp-Source: APXvYqwFHgIUuLzp+IGxgp9jMmf4mcO0BydxoALcC8mTTYYWDg2kAr5aCAZKfLa0jPzvTdqc0kPM X-Received: by 2002:a17:906:6c95:: with SMTP id s21mr33072263ejr.205.1574141687181; Mon, 18 Nov 2019 21:34:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141687; cv=none; d=google.com; s=arc-20160816; b=AU0NJ/hjtwQ9nA/dIe1OwiAiVDeN9Jnj7XAzfSnC51R3D8qWsyVK3LcngaKCtXEKkt IquJERgiuay+2lEOfeWlHPeLl3d8RNrvax080K5wbyKWJuQjQ1DR+hx9uuvWKY+2awl0 JJlvNC7lEi4NGdusSNiUQRDjd/GW/V/vGKGzKqzYmx3eRdBhgiGWujG51GGpy0a7who7 tRH33sVk0NFO/TYy2DtvO+Mp47P3H1evOCD6SLDQsw1daeMHkh5ct+37gJF/PwQtF0QL uYmjXawXI4sCg8gzLwcsTDj3b6UeAAL8aP5P1YFzPlbRbohJ03BxVpBTz0zhpcSFYakW vjNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nqNYNzpPvoz2RJ++p5tmlq3m5cXtLZxNIkOBZwSM6W8=; b=eD5Qm0pSK5FZFOvoxSCje9+6LYkr1AvKjnuDJ7nD1lnBaJi963Y/ImdL0eeLqnJ9II cs8D+S2amFzPRuQo6tQgSEGZCY+K0FneJychhs70vhNJcCSkMUYzQTxHSCvDIFKNS02n 8FKFRaac+iAx/bv+5TcHfI6x68Umf07aY/s0XafhMoBPjSwIyw9/ar5t1u+WGpqgtP2O +3Kv2xdWmYyQhrPuHuQC5F9n7HtnH3QSd0vu3puMf1ydR8wDCsn88V1bt239Bhv9PETE 88IHSClNV6NBrFwCZr7fXUhbpMQqLSZ2TmS6i29waAgVw5Akc8DlXuDsJS4o/r4dXASO Zhig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0PoXAs+6; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b26si12093324edc.25.2019.11.18.21.34.46; Mon, 18 Nov 2019 21:34:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0PoXAs+6; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729246AbfKSFeo (ORCPT + 15 others); Tue, 19 Nov 2019 00:34:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:55508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729722AbfKSFeo (ORCPT ); Tue, 19 Nov 2019 00:34:44 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D7A7C214DE; Tue, 19 Nov 2019 05:34:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141683; bh=oO0gUUG/vj63i5VoHzt41VVsBO2NgniuaSJlilhfdaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0PoXAs+6jyDCwAkO9+zggvdR25rvOyiABy0FSGdeJiBNYE9LwZcM1iaQ7+BvTjwbc XaOrOqffcxPhgUaSpEnICNCyyG2FznQEHOAvUsoKzYRn9P1JZ/kvIrwU4FuOeI4v6Y AFAZ7IdXRuiwvB0rHH0Lz5z0O5vurvjG7JFUVeTA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 4.19 245/422] serial: samsung: Enable baud clock for UART reset procedure in resume Date: Tue, 19 Nov 2019 06:17:22 +0100 Message-Id: <20191119051414.877369929@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit 1ff3652bc7111df26b5807037f624be294cf69d5 ] Ensure that the baud clock is also enabled for UART register writes in driver resume. On Exynos5433 SoC this is needed to avoid external abort issue. Signed-off-by: Marek Szyprowski Reviewed-by: Krzysztof Kozlowski Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/samsung.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.20.1 diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index c6058b52d5d59..2a49b6d876b87 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1944,7 +1944,11 @@ static int s3c24xx_serial_resume(struct device *dev) if (port) { clk_prepare_enable(ourport->clk); + if (!IS_ERR(ourport->baudclk)) + clk_prepare_enable(ourport->baudclk); s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port)); + if (!IS_ERR(ourport->baudclk)) + clk_disable_unprepare(ourport->baudclk); clk_disable_unprepare(ourport->clk); uart_resume_port(&s3c24xx_uart_drv, port); @@ -1967,7 +1971,11 @@ static int s3c24xx_serial_resume_noirq(struct device *dev) if (rx_enabled(port)) uintm &= ~S3C64XX_UINTM_RXD_MSK; clk_prepare_enable(ourport->clk); + if (!IS_ERR(ourport->baudclk)) + clk_prepare_enable(ourport->baudclk); wr_regl(port, S3C64XX_UINTM, uintm); + if (!IS_ERR(ourport->baudclk)) + clk_disable_unprepare(ourport->baudclk); clk_disable_unprepare(ourport->clk); } } From patchwork Tue Nov 19 05:17:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179653 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp156270ilf; Mon, 18 Nov 2019 21:34:56 -0800 (PST) X-Google-Smtp-Source: APXvYqyD0ujZgJpuuOeJ/oKroB4NEKGsD7ilQgZ9PB5w0ivJT59CrHk428KNV7z0omrvXtvSUGUZ X-Received: by 2002:a17:906:4899:: with SMTP id v25mr6901096ejq.235.1574141696327; Mon, 18 Nov 2019 21:34:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141696; cv=none; d=google.com; s=arc-20160816; b=VTHHx/u59xVgAbVge+2YET/5gme0G+1B3hVVdiIRnQicP3lxFNM5DD0f9Dh/8KyBmi Ol75nJhH86ffFboSF+qx9HX5QebhDi3QGElknYZ4dSKWFrRJJB0rKteaDaMJMJtbNI7t Iipo1cCHXUU496bn4BQEuUHvdNJEHdSl3Dms+RFtV1rUNQfnU+eNJXhPmunXi994yMU8 lUf1t2p6nUL2p7YH66wdyHT7ouGwZrolSlEGmk2qhwwnKjHOloazmfjT2gkOfswc1KnW 8lBm1IH63+Q2/zBdVmxgrkZE1AXynwZYN6ovjZSe+Y4RK+0GxPGvy1fwUjzaB+EUbg+s qTBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LXzy2/Ja9HHv1MQp8hMVDk333P0Vk+zhvumXpwYgpyM=; b=msJhdawxPvlJAi9nvY/L+IK05FHUNSfcgoeVvgZSITUwF3akqcTLgJMsOk4UvJ4oEs wfDb072I+gDIS8BT4/d4d8a2V5G3y4AuLSZ0koHGxQqq2wGYlHCKCTYmRk76Ua4ZDbxW 4a/1/Ps82fq1+xqNA0H8OBkrNm6LrSumJTPhGkuax63dCjVeEh6O+flXgB1QwQmYouY3 o3seF/z3o8MJJRoZhYs3vR+qvqvgUJgcHgrT2pAC+2uHrLi4uDUlqBR31GgN2mVZ/2tC kF+JtoU7IBf4BEwbYh0kxKiW6YLKS6Pgr2BxSBxlsU9roBeRPYyKzwhhzlp85VPfdOyu yBlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ciixoxfp; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w57si15603008eda.78.2019.11.18.21.34.56; Mon, 18 Nov 2019 21:34:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ciixoxfp; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729752AbfKSFez (ORCPT + 15 others); Tue, 19 Nov 2019 00:34:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:55696 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729746AbfKSFex (ORCPT ); Tue, 19 Nov 2019 00:34:53 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D0CEC214DE; Tue, 19 Nov 2019 05:34:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141692; bh=82lJAAxP/eZNSrg3BjEPvcX/JauuazJcBNZc/mKlh5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ciixoxfpBGzUY/CiA5Xxdcpsx3qEPqiR2hA7cgrogevdmKzR4Hg6v6/IsIgJM8KSj K5rI8jxKaBlSepUtW6/IxIoBl72Nojop51584cUgSTRuPQm3x5FWPuw5iTfkh0SrWh w24d2s2q/+ZRr2Dt1mu6tDw5Z3672Cp8+BZFqO9o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kishon Vijay Abraham I , Tony Lindgren , Vignesh R , Nishanth Menon , Tero Kristo , Sasha Levin Subject: [PATCH 4.19 248/422] arm64: dts: ti: k3-am65: Change #address-cells and #size-cells of interconnect to 2 Date: Tue, 19 Nov 2019 06:17:25 +0100 Message-Id: <20191119051415.062654734@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kishon Vijay Abraham I [ Upstream commit 3bc1572068e3896b60d86f9c0fb56d1cef28201c ] AM65 has two PCIe controllers and each PCIe controller has '2' address spaces one within the 4GB address space of the SoC and the other above the 4GB address space of the SoC (cbass_main) in addition to the register space. The size of the address space above the 4GB SoC address space is 4GB. These address ranges will be used by CPU/DMA to access the PCIe address space. In order to represent the address space above the 4GB SoC address space and to represent the size of this address space as 4GB, change address-cells and size-cells of interconnect to 2. Since OSPI has similar need in MCU Domain Memory Map, change address-cells and size-cells of cbass_mcu interconnect also to 2. Fixes: ea47eed33a3fe3d919 ("arm64: dts: ti: Add Support for AM654 SoC") Signed-off-by: Kishon Vijay Abraham I Acked-by: Tony Lindgren Acked-by: Vignesh R Acked-by: Nishanth Menon Signed-off-by: Tero Kristo Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 10 +++--- arch/arm64/boot/dts/ti/k3-am65.dtsi | 44 ++++++++++++------------ 2 files changed, 27 insertions(+), 27 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi index e23c5762355d0..2e3917171b17f 100644 --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi @@ -8,13 +8,13 @@ &cbass_main { gic500: interrupt-controller@1800000 { compatible = "arm,gic-v3"; - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <2>; + #size-cells = <2>; ranges; #interrupt-cells = <3>; interrupt-controller; - reg = <0x01800000 0x10000>, /* GICD */ - <0x01880000 0x90000>; /* GICR */ + reg = <0x00 0x01800000 0x00 0x10000>, /* GICD */ + <0x00 0x01880000 0x00 0x90000>; /* GICR */ /* * vcpumntirq: * virtual CPU interface maintenance interrupt @@ -23,7 +23,7 @@ gic_its: gic-its@1820000 { compatible = "arm,gic-v3-its"; - reg = <0x01820000 0x10000>; + reg = <0x00 0x01820000 0x00 0x10000>; msi-controller; #msi-cells = <1>; }; diff --git a/arch/arm64/boot/dts/ti/k3-am65.dtsi b/arch/arm64/boot/dts/ti/k3-am65.dtsi index cede1fa0983c9..ded364d208351 100644 --- a/arch/arm64/boot/dts/ti/k3-am65.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am65.dtsi @@ -46,38 +46,38 @@ cbass_main: interconnect@100000 { compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0x00100000 0x00 0x00100000 0x00020000>, /* ctrl mmr */ - <0x00600000 0x00 0x00600000 0x00001100>, /* GPIO */ - <0x00900000 0x00 0x00900000 0x00012000>, /* serdes */ - <0x01000000 0x00 0x01000000 0x0af02400>, /* Most peripherals */ - <0x30800000 0x00 0x30800000 0x0bc00000>, /* MAIN NAVSS */ + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x00 0x00100000 0x00 0x00100000 0x00 0x00020000>, /* ctrl mmr */ + <0x00 0x00600000 0x00 0x00600000 0x00 0x00001100>, /* GPIO */ + <0x00 0x00900000 0x00 0x00900000 0x00 0x00012000>, /* serdes */ + <0x00 0x01000000 0x00 0x01000000 0x00 0x0af02400>, /* Most peripherals */ + <0x00 0x30800000 0x00 0x30800000 0x00 0x0bc00000>, /* MAIN NAVSS */ /* MCUSS Range */ - <0x28380000 0x00 0x28380000 0x03880000>, - <0x40200000 0x00 0x40200000 0x00900100>, - <0x42040000 0x00 0x42040000 0x03ac2400>, - <0x45100000 0x00 0x45100000 0x00c24000>, - <0x46000000 0x00 0x46000000 0x00200000>, - <0x47000000 0x00 0x47000000 0x00068400>; + <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>, + <0x00 0x40200000 0x00 0x40200000 0x00 0x00900100>, + <0x00 0x42040000 0x00 0x42040000 0x00 0x03ac2400>, + <0x00 0x45100000 0x00 0x45100000 0x00 0x00c24000>, + <0x00 0x46000000 0x00 0x46000000 0x00 0x00200000>, + <0x00 0x47000000 0x00 0x47000000 0x00 0x00068400>; cbass_mcu: interconnect@28380000 { compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0x28380000 0x28380000 0x03880000>, /* MCU NAVSS*/ - <0x40200000 0x40200000 0x00900100>, /* First peripheral window */ - <0x42040000 0x42040000 0x03ac2400>, /* WKUP */ - <0x45100000 0x45100000 0x00c24000>, /* MMRs, remaining NAVSS */ - <0x46000000 0x46000000 0x00200000>, /* CPSW */ - <0x47000000 0x47000000 0x00068400>; /* OSPI space 1 */ + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>, /* MCU NAVSS*/ + <0x00 0x40200000 0x00 0x40200000 0x00 0x00900100>, /* First peripheral window */ + <0x00 0x42040000 0x00 0x42040000 0x00 0x03ac2400>, /* WKUP */ + <0x00 0x45100000 0x00 0x45100000 0x00 0x00c24000>, /* MMRs, remaining NAVSS */ + <0x00 0x46000000 0x00 0x46000000 0x00 0x00200000>, /* CPSW */ + <0x00 0x47000000 0x00 0x47000000 0x00 0x00068400>; /* OSPI space 1 */ cbass_wakeup: interconnect@42040000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; /* WKUP Basic peripherals */ - ranges = <0x42040000 0x42040000 0x03ac2400>; + ranges = <0x42040000 0x00 0x42040000 0x03ac2400>; }; }; }; From patchwork Tue Nov 19 05:18:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179661 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp158824ilf; Mon, 18 Nov 2019 21:37:56 -0800 (PST) X-Google-Smtp-Source: APXvYqytr7y+4mdROjhus1mCLd1jGjEW21euDZJ3nG/7OJNXo4aYyB3Q38Eqz0rB/0TR9SKpwvNI X-Received: by 2002:a17:906:8697:: with SMTP id g23mr33081486ejx.177.1574141876197; Mon, 18 Nov 2019 21:37:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141876; cv=none; d=google.com; s=arc-20160816; b=KYCjYAFRLtYUIbYsQjyO2HHb8m5hjaCXpI52y/8emCGf7G/Q3XS7Pi6IFZQdTYXyNb iYQOEhGN4/63wqNOoqVhOiui6BhMqImC147w5fuCvJO9GX4dhIyH34+KDWZIaqLjc28/ hjQKbL1zBp3b4OWdrKjScC7F6QJIjSLUHs9YkmeK8AkQIPRvcii1lTo5oAhQMo2Rh6B+ 8DBwG4PF4dPwyDDbGBXCj7IIA7Nm8SASiW8iL9JcDU/exGlaeHi1iS4GC8w9AVD8jPs+ fDCLM+YLHEW0p6PhNR0PF7qv3T+XHCf313LQwOtF3Wk76jBbrTkhjG/Kt8qkZEEfV3s9 3nwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6/u8AE4Nj8hYdZVwvjud+V0Nq02QcGBkubSNJyq56Zg=; b=CPK3OTRyuL7BJX19zqztshD44a6dq9klt1kboiO0SJHwcy3onoUw95ZHIsby3DUJ+y Vo6NN16exJxKC/03hL7r6MqAaXZg9o/3rG6vWcvkJWsfVHZ29oypOZjEw5BSwnzX0D/k /ftr/NWsscFkAltukYc+ZJAdNc8dhqKLUcbE4BpJbopaXzBupI3Wkdw//MFEkedgTZsG wvTVLjyT//nTC/G2D8Jj3Mua8sl4IdyZT07Xt/9Nd/D34O36KL9P/5t/YXosoUqkHYRh R05JHTvWDVPTTSkUQQZ3q0RID98K9TTNCSnTp7GtFmwTMF/98NmK9vfPVqfmrd9jto40 aLng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IazIhixq; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i7si14964466eda.375.2019.11.18.21.37.55; Mon, 18 Nov 2019 21:37:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IazIhixq; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727974AbfKSFhx (ORCPT + 15 others); Tue, 19 Nov 2019 00:37:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:59750 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727786AbfKSFhw (ORCPT ); Tue, 19 Nov 2019 00:37:52 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D40A3208C3; Tue, 19 Nov 2019 05:37:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141871; bh=5DAZedxoVa4+OSqq5Zg5edci9gymplLuAcUiPZbpNHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IazIhixqvAs19IC7LJE981idaw+k5GHu0eLdFxZIaksm3AVHHVvxZufDOvwzn6T+Z hIo7uiN7JCjtotd6rLkDqsDS9ywfjFcIzGBG7I35kubIYZ5hwDZNhRpzPhBA3ZF8z/ W1xhMbLvpArxGcZjDyKUvbG1MIrbEkHbPBRC3l0U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Rob Herring , Sasha Levin Subject: [PATCH 4.19 307/422] ARM: dts: marvell: Fix SPI and I2C bus warnings Date: Tue, 19 Nov 2019 06:18:24 +0100 Message-Id: <20191119051418.893490425@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit cf680cc5251487b9a39919c3cda31a108af19cf8 ] dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses. arch/arm/boot/dts/dove-cubox.dtb: Warning (i2c_bus_reg): /i2c-mux/i2c@0/clock-generator: I2C bus unit address format error, expected "60" arch/arm/boot/dts/dove-cubox-es.dtb: Warning (i2c_bus_reg): /i2c-mux/i2c@0/clock-generator: I2C bus unit address format error, expected "60" arch/arm/boot/dts/dove-cubox.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-cubox-es.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-dove-db.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-sbc-a510.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-sbc-a510.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@14600: node name for SPI buses should be 'spi' arch/arm/boot/dts/orion5x-kuroboxpro.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" arch/arm/boot/dts/orion5x-linkstation-lschl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" arch/arm/boot/dts/orion5x-linkstation-lsgl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" arch/arm/boot/dts/orion5x-linkstation-lswtgl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" Cc: Jason Cooper Cc: Andrew Lunn Cc: Sebastian Hesselbarth Cc: Gregory Clement Signed-off-by: Rob Herring Signed-off-by: Gregory CLEMENT Signed-off-by: Sasha Levin --- arch/arm/boot/dts/dove-cubox.dts | 2 +- arch/arm/boot/dts/dove.dtsi | 6 +++--- arch/arm/boot/dts/orion5x-linkstation.dtsi | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index 580e3cbcfbf7c..3e1584e787aec 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts @@ -87,7 +87,7 @@ status = "okay"; clock-frequency = <100000>; - si5351: clock-generator { + si5351: clock-generator@60 { compatible = "silabs,si5351a-msop"; reg = <0x60>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 4a0a5115b2984..250ad0535e8cc 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -155,7 +155,7 @@ 0xffffe000 MBUS_ID(0x03, 0x01) 0 0x0000800 /* CESA SRAM 2k */ 0xfffff000 MBUS_ID(0x0d, 0x00) 0 0x0000800>; /* PMU SRAM 2k */ - spi0: spi-ctrl@10600 { + spi0: spi@10600 { compatible = "marvell,orion-spi"; #address-cells = <1>; #size-cells = <0>; @@ -168,7 +168,7 @@ status = "disabled"; }; - i2c: i2c-ctrl@11000 { + i2c: i2c@11000 { compatible = "marvell,mv64xxx-i2c"; reg = <0x11000 0x20>; #address-cells = <1>; @@ -218,7 +218,7 @@ status = "disabled"; }; - spi1: spi-ctrl@14600 { + spi1: spi@14600 { compatible = "marvell,orion-spi"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/orion5x-linkstation.dtsi b/arch/arm/boot/dts/orion5x-linkstation.dtsi index ebd93df5d07a8..b6c9b85951ea6 100644 --- a/arch/arm/boot/dts/orion5x-linkstation.dtsi +++ b/arch/arm/boot/dts/orion5x-linkstation.dtsi @@ -156,7 +156,7 @@ &i2c { status = "okay"; - rtc { + rtc@32 { compatible = "ricoh,rs5c372a"; reg = <0x32>; }; From patchwork Tue Nov 19 05:18:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179663 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp159238ilf; Mon, 18 Nov 2019 21:38:23 -0800 (PST) X-Google-Smtp-Source: APXvYqxnqahyPy0EEXxejkvymbrq/ibDVA0FnN8GLRlhFoWIsrj1tB2I5dxwOcsh8Yd6mewRoPX9 X-Received: by 2002:a17:906:a28d:: with SMTP id i13mr31665320ejz.288.1574141903538; Mon, 18 Nov 2019 21:38:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141903; cv=none; d=google.com; s=arc-20160816; b=szVDmaxzRqfZnGNBnPiRLFz+VYGM5uxHYQL9TXZIrcAC4B9IT3SAEvbani+7REMBqt UXiHNhh1Gyyh4DeZfKuoB2yH3E2WEopFTKjRIQqa5OWqPsoxCnwq6QkAdRTaLcovF++w b8CuI7B5YL8oOVM/hVncF97pN5yZVk/W94Nhpljc14aWXN04gsMr2hA+z8qSxBeXxLq/ mtvOTqtgr2DjMKwsOHLffuQW2RI6TWDlIuzxBfznnyDiIcCo0UUQ0L8doS8mtoja2muQ 2JW00vnWZUC4Uaq/Sn4GTVcGZEkzuojDhxnp172shFV9MRfCT7Ou7iEkQwsPALCUEIx+ qRCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8nge+0EnuVwuITE+fp0+amOZ2ieYAbSKXmRAVeJvm7c=; b=yPbPZ4IjDGaTEbM2H9afC7rXaXcaLUr3BhBxtskt2S6qt3zOeQL1NiKV2fHYoBUKSe zMf6hDrkxnIj/xPNsP7nSZx5RvXUz2nZFmQReWGKzxLqua+lFD2Bhra99GQPqetn3Sdy +3lCrY86Js+mxtnZgZHG0g/yTfcmmQb0LlTwWwR5uyR0bvgS9GgdOe1jrp4Ilb3VpyCA G11nEU8oIT0TdNJoD+zuYrrrEzIb6REMNh+nfaqw0xPtHbWGTcu87DcAeUFo+IHwSw3d 4ykh3QaebqQB6COxs8o5K4v2PUFyjQyYxty2asdOJensN5hsWFzTiirLAYVSHOii2+DJ fXDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Bm1sH2uP; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b10si13946663eds.63.2019.11.18.21.38.23; Mon, 18 Nov 2019 21:38:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Bm1sH2uP; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730179AbfKSFiU (ORCPT + 15 others); Tue, 19 Nov 2019 00:38:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:60266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730173AbfKSFiS (ORCPT ); Tue, 19 Nov 2019 00:38:18 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7606E206EC; Tue, 19 Nov 2019 05:38:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141898; bh=kYX34TqtCC3SM/hdhNIA6q1CTQZWCDNDaa35a4w3VJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bm1sH2uPE63AZkLytEkePlQHAjr8mGVeXZpYSTKpaz/vgLEWBG/CVZRvsO8hOXdxL kFJAqwDo015OFsO9h5JC8ofTQlf+BmyxN/mYXNjeYNr76ctGlpgmPisjjDttKTh8s+ AAWbLaw4ehwT9S0pRWQXb8DGROKQA2CZIiNPo+qQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxime Coquelin , Alexandre Torgue , Rob Herring , Sasha Levin Subject: [PATCH 4.19 311/422] ARM: dts: stm32: Fix SPI controller node names Date: Tue, 19 Nov 2019 06:18:28 +0100 Message-Id: <20191119051419.149965549@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 1ba23b1df0bb6eec430408614c3a11280941e112 ] SPI controller nodes should be named 'spi' rather than 'qspi'. Fixing the name enables dtc SPI bus checks. Cc: Maxime Coquelin Cc: Alexandre Torgue Signed-off-by: Rob Herring Signed-off-by: Alexandre Torgue Signed-off-by: Sasha Levin --- arch/arm/boot/dts/stm32mp157c.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi index 185541a5b69fb..c50c36baba758 100644 --- a/arch/arm/boot/dts/stm32mp157c.dtsi +++ b/arch/arm/boot/dts/stm32mp157c.dtsi @@ -947,7 +947,7 @@ dma-requests = <48>; }; - qspi: qspi@58003000 { + qspi: spi@58003000 { compatible = "st,stm32f469-qspi"; reg = <0x58003000 0x1000>, <0x70000000 0x10000000>; reg-names = "qspi", "qspi_mm"; From patchwork Tue Nov 19 05:18:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179669 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp159548ilf; Mon, 18 Nov 2019 21:38:44 -0800 (PST) X-Google-Smtp-Source: APXvYqzfaudLKJr/JBWDAJHahLkQ07so8pSMSB9M4b9BSlT90fvy8sJIA+vRQxnabnglCmA1v8z2 X-Received: by 2002:a17:906:bfe3:: with SMTP id vr3mr31984414ejb.273.1574141924389; Mon, 18 Nov 2019 21:38:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141924; cv=none; d=google.com; s=arc-20160816; b=cT5nyyR9rjO7ZyYEDHqVfdDbdutEfvhyeYRL3W2gaGku/njwwPzRn8fRnN6ewbd19H 8hBgMP5P0qhqad2qc3lTTjwvsIhcEOGXnqb57zpS0lBqLjKadQui+4768z4sP1tELsDM snIQM173O4vR83MAuPOkxz+R/qu5QSZoczM0ezNbmVE5BWlHxLLj8zoSubCZeFkdlUnF +a+2gsLX2eb1pF4cO+b/rXFf4NbcpCeMWfzmSsTeTfltFifW40BKv8btQnNQkaY0kbbG 1Dw3ckeBACMmeKBZ+3b5EylrrGdwybym+oiK7V4STo+/45tZtRw2yMUmLKfvLZlTALLW Kx+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=To1s4uB6jy65ogLirdh5wFHDHLuD9h4K09YupexMECI=; b=f1g1O1gitlYo0SGS+wR96Kiqs5SfqbN7j1Lj/Ulhmn+kfbT8sem1nNpamcUicbQKg4 XlMj7WRrJxLcq+J6rHlSMfis0d34KdD+ezplnm+9TTh/OfQQKIAlvTHtYaDr1kO66iR9 47TovgDJLg0/vhNxBa2CLH6jUzDvg1oTRU2raeMltYURORBm5LEAxiDSCqQxE57VF9+u ooIK173MMGiJ1jzl2aDPSc5cHmv+Q6NXeggKIMcmhhzw62EVeWWaGoppQ/qXYx0sMOXo FrfQlxsFJBDnaa5f1D9YhAxcIihNY0/uCZuH+eBUHcG+lyRP72OgqgvVrLXL1pGKm6za JghQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xHX+StIM; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w19si4402249eje.290.2019.11.18.21.38.44; Mon, 18 Nov 2019 21:38:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xHX+StIM; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729061AbfKSFil (ORCPT + 15 others); Tue, 19 Nov 2019 00:38:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:60716 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729621AbfKSFik (ORCPT ); Tue, 19 Nov 2019 00:38:40 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CA180208C3; Tue, 19 Nov 2019 05:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141918; bh=tlbUosy2fq8Q/oWAJId8gRxFvS+jxOmsLcfyNhEtnSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xHX+StIMKIHms4csQztj0Qg2r4e2YpE5gBm3GLTGhr3Zqi2y2c03gZ+KqCKKooOak 6bZDE9TICfIpgrmOZO1YBRx1TQEksb7lx5q/okCs8ycwnB/TsfhPEV8+jnah1cmUEx 73NMCJtpOc7noWWATai6OFjMnEa3j8aSitvdizVQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 326/422] media: imx: work around false-positive warning, again Date: Tue, 19 Nov 2019 06:18:43 +0100 Message-Id: <20191119051420.140254143@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 8d1a4817cce1b15b4909f0e324a4f5af5952da67 ] A warning that I thought to be solved by a previous patch of mine has resurfaced with gcc-8: media/imx/imx-media-csi.c: In function 'csi_link_validate': media/imx/imx-media-csi.c:1025:20: error: 'upstream_ep' may be used uninitialized in this function [-Werror=maybe-uninitialized] media/imx/imx-media-csi.c:1026:24: error: 'upstream_ep.bus_type' may be used uninitialized in this function [-Werror=maybe-uninitialized] media/imx/imx-media-csi.c:127:19: error: 'upstream_ep.bus.parallel.bus_width' may be used uninitialized in this function [-Werror=maybe-uninitialized] media/imx/imx-media-csi.c: In function 'csi_enum_mbus_code': media/imx/imx-media-csi.c:132:9: error: '*((void *)&upstream_ep+12)' may be used uninitialized in this function [-Werror=maybe-uninitialized] media/imx/imx-media-csi.c:132:48: error: 'upstream_ep.bus.parallel.bus_width' may be used uninitialized in this function [-Werror=maybe-uninitialized] I spent some more time digging in this time, and think I have a better fix, bailing out of the function that either initializes or errors out here, which simplifies the code enough for gcc to figure out what is going on. The earlier partial workaround can be removed now, as the new workaround is better. Fixes: 890f27693f2a ("media: imx: work around false-positive warning") Signed-off-by: Arnd Bergmann Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/imx/imx-media-csi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index d17ce1fb4ef51..0f8fdc347091b 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -166,6 +166,9 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv, struct v4l2_subdev *sd; struct media_pad *pad; + if (!IS_ENABLED(CONFIG_OF)) + return -ENXIO; + if (!priv->src_sd) return -EPIPE; @@ -1072,7 +1075,7 @@ static int csi_link_validate(struct v4l2_subdev *sd, struct v4l2_subdev_format *sink_fmt) { struct csi_priv *priv = v4l2_get_subdevdata(sd); - struct v4l2_fwnode_endpoint upstream_ep = {}; + struct v4l2_fwnode_endpoint upstream_ep; bool is_csi2; int ret; From patchwork Tue Nov 19 05:19:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179672 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp160409ilf; Mon, 18 Nov 2019 21:39:52 -0800 (PST) X-Google-Smtp-Source: APXvYqwHGNRjrnJXppXat5uTYidB3ON7kwUkrgZ4Lz8GteRmZ+ifa5JX2l3seZtVS+bUkb11YQ4L X-Received: by 2002:a17:906:2505:: with SMTP id i5mr11748004ejb.18.1574141992272; Mon, 18 Nov 2019 21:39:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141992; cv=none; d=google.com; s=arc-20160816; b=nxKphqK4msbhL1/qPvmwrlmPcxNo2nKdVSJ+8+3pFr2k2WRtwVJHS52ssptuaEyEC/ sYGaa4AxSP4pA66SuUt8NhNrGpheRCo1X51sHGN4eqEnciIvqXal34rQqzFaRFJuPyKJ uFWuXf+TXgV0P/ut3dnJt4lFD4Po25pGmr9URBF0bkwLzHHLh52eArx/BPwyk6iHsDzZ CHm7/MHaFuISCqCsx3vf+RLB/gPZIJsPTAWPCjba5v8ZMlgQvcpAZ3bmbGQWn5e3rd6F XbBQnMXGb75aopueUUUushBx8nIG+MhdMfUq0Qu1x19wpLbDTp9XcHs3Nok31ULzGTmp k0Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dG7XjRUj5fMlPwOfsl2Wo0lM7TWwD2fq2tsxf4nsW3Y=; b=R8sqAoo6UQTEdz5ncuJ4YW7pnB6t4CBhPsjNvP0Fs9GKKWtx3S9M9P/aWdR2xxj2Er t9BlPqPNBqpbAH1ugK2TWLuFDV8lWr/0uPPppG7jQB8M9tufutBccGrUmr0gf70eEU9k YEVtUdFunwhK7jWNt3mwrjP6VzGGITlvQrsbQZTJUnsDtKSN9RXatTeukpMUXcOWTGhR 3WrZv1/giKqH6leAkp4PKDoJ/2ikvdIw7vWEv6bqsbO01Lo2RuQvaiCvpWF/eZbeHAzX B4zT+6mY8QusuovlBlj+ox7h9hhkprDUqnybvsvz71PmK/NgWhOKpiVq8zWSk3rtEmIo VeAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yVOXeVXc; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1si12773053ejn.250.2019.11.18.21.39.52; Mon, 18 Nov 2019 21:39:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yVOXeVXc; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727519AbfKSFju (ORCPT + 15 others); Tue, 19 Nov 2019 00:39:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:33876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729029AbfKSFju (ORCPT ); Tue, 19 Nov 2019 00:39:50 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 442AC208C3; Tue, 19 Nov 2019 05:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141988; bh=6gzoZfx52S5asSThLZ4H9TrQfRFPQlE5mcur+nGG4gA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yVOXeVXcqAQmrwsUeTnT2lS/hzmwR3h9lsZk/vwfUB9i2beE3NBiHMZHb+GGraM3J OuMGx12BDfhOr167tQurqjWHo4grJNupMone739IeKeqJs3mzi81VVYJ5NOEhNxRVP XTIkq/VTXRL5BoWUQc9vPF8qecKnIu/GaTPfN7Wc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Suzuki K Poulose , Sasha Levin Subject: [PATCH 4.19 348/422] coresight: tmc-etr: Handle driver mode specific ETR buffers Date: Tue, 19 Nov 2019 06:19:05 +0100 Message-Id: <20191119051421.561782393@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suzuki K Poulose [ Upstream commit 96a7f644006ecc05eaaa1a5d09373d0ee63beb0a ] Since the ETR could be driven either by SYSFS or by perf, it becomes complicated how we deal with the buffers used for each of these modes. The ETR driver cannot simply free the current attached buffer without knowing the provider (i.e, sysfs vs perf). To solve this issue, we provide: 1) the driver-mode specific etr buffer to be retained in the drvdata 2) the etr_buf for a session should be passed on when enabling the hardware, which will be stored in drvdata->etr_buf. This will be replaced (not free'd) as soon as the hardware is disabled, after necessary sync operation. The advantages of this are : 1) The common code path doesn't need to worry about how to dispose an existing buffer, if it is about to start a new session with a different buffer, possibly in a different mode. 2) The driver mode can control its buffers and can get access to the saved session even when the hardware is operating in a different mode. (e.g, we can still access a trace buffer from a sysfs mode even if the etr is now used in perf mode, without disrupting the current session.) Towards this, we introduce a sysfs specific data which will hold the etr_buf used for sysfs mode of operation, controlled solely by the sysfs mode handling code. Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- .../hwtracing/coresight/coresight-tmc-etr.c | 58 ++++++++++++------- drivers/hwtracing/coresight/coresight-tmc.h | 2 + 2 files changed, 40 insertions(+), 20 deletions(-) -- 2.20.1 diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c index 11963647e19ae..2d6f428176ff8 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -895,10 +895,15 @@ static void tmc_sync_etr_buf(struct tmc_drvdata *drvdata) tmc_etr_buf_insert_barrier_packet(etr_buf, etr_buf->offset); } -static void tmc_etr_enable_hw(struct tmc_drvdata *drvdata) +static void tmc_etr_enable_hw(struct tmc_drvdata *drvdata, + struct etr_buf *etr_buf) { u32 axictl, sts; - struct etr_buf *etr_buf = drvdata->etr_buf; + + /* Callers should provide an appropriate buffer for use */ + if (WARN_ON(!etr_buf || drvdata->etr_buf)) + return; + drvdata->etr_buf = etr_buf; /* * If this ETR is connected to a CATU, enable it before we turn @@ -960,13 +965,16 @@ static void tmc_etr_enable_hw(struct tmc_drvdata *drvdata) * also updating the @bufpp on where to find it. Since the trace data * starts at anywhere in the buffer, depending on the RRP, we adjust the * @len returned to handle buffer wrapping around. + * + * We are protected here by drvdata->reading != 0, which ensures the + * sysfs_buf stays alive. */ ssize_t tmc_etr_get_sysfs_trace(struct tmc_drvdata *drvdata, loff_t pos, size_t len, char **bufpp) { s64 offset; ssize_t actual = len; - struct etr_buf *etr_buf = drvdata->etr_buf; + struct etr_buf *etr_buf = drvdata->sysfs_buf; if (pos + actual > etr_buf->len) actual = etr_buf->len - pos; @@ -996,7 +1004,14 @@ tmc_etr_free_sysfs_buf(struct etr_buf *buf) static void tmc_etr_sync_sysfs_buf(struct tmc_drvdata *drvdata) { - tmc_sync_etr_buf(drvdata); + struct etr_buf *etr_buf = drvdata->etr_buf; + + if (WARN_ON(drvdata->sysfs_buf != etr_buf)) { + tmc_etr_free_sysfs_buf(drvdata->sysfs_buf); + drvdata->sysfs_buf = NULL; + } else { + tmc_sync_etr_buf(drvdata); + } } static void tmc_etr_disable_hw(struct tmc_drvdata *drvdata) @@ -1017,6 +1032,8 @@ static void tmc_etr_disable_hw(struct tmc_drvdata *drvdata) /* Disable CATU device if this ETR is connected to one */ tmc_etr_disable_catu(drvdata); + /* Reset the ETR buf used by hardware */ + drvdata->etr_buf = NULL; } static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev) @@ -1024,7 +1041,7 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev) int ret = 0; unsigned long flags; struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); - struct etr_buf *new_buf = NULL, *free_buf = NULL; + struct etr_buf *sysfs_buf = NULL, *new_buf = NULL, *free_buf = NULL; /* * If we are enabling the ETR from disabled state, we need to make @@ -1035,7 +1052,8 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev) * with the lock released. */ spin_lock_irqsave(&drvdata->spinlock, flags); - if (!drvdata->etr_buf || (drvdata->etr_buf->size != drvdata->size)) { + sysfs_buf = READ_ONCE(drvdata->sysfs_buf); + if (!sysfs_buf || (sysfs_buf->size != drvdata->size)) { spin_unlock_irqrestore(&drvdata->spinlock, flags); /* Allocate memory with the locks released */ @@ -1064,14 +1082,14 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev) * If we don't have a buffer or it doesn't match the requested size, * use the buffer allocated above. Otherwise reuse the existing buffer. */ - if (!drvdata->etr_buf || - (new_buf && drvdata->etr_buf->size != new_buf->size)) { - free_buf = drvdata->etr_buf; - drvdata->etr_buf = new_buf; + sysfs_buf = READ_ONCE(drvdata->sysfs_buf); + if (!sysfs_buf || (new_buf && sysfs_buf->size != new_buf->size)) { + free_buf = sysfs_buf; + drvdata->sysfs_buf = new_buf; } drvdata->mode = CS_MODE_SYSFS; - tmc_etr_enable_hw(drvdata); + tmc_etr_enable_hw(drvdata, drvdata->sysfs_buf); out: spin_unlock_irqrestore(&drvdata->spinlock, flags); @@ -1156,13 +1174,13 @@ int tmc_read_prepare_etr(struct tmc_drvdata *drvdata) goto out; } - /* If drvdata::etr_buf is NULL the trace data has been read already */ - if (drvdata->etr_buf == NULL) { + /* If sysfs_buf is NULL the trace data has been read already */ + if (!drvdata->sysfs_buf) { ret = -EINVAL; goto out; } - /* Disable the TMC if need be */ + /* Disable the TMC if we are trying to read from a running session */ if (drvdata->mode == CS_MODE_SYSFS) tmc_etr_disable_hw(drvdata); @@ -1176,7 +1194,7 @@ out: int tmc_read_unprepare_etr(struct tmc_drvdata *drvdata) { unsigned long flags; - struct etr_buf *etr_buf = NULL; + struct etr_buf *sysfs_buf = NULL; /* config types are set a boot time and never change */ if (WARN_ON_ONCE(drvdata->config_type != TMC_CONFIG_TYPE_ETR)) @@ -1191,22 +1209,22 @@ int tmc_read_unprepare_etr(struct tmc_drvdata *drvdata) * buffer. Since the tracer is still enabled drvdata::buf can't * be NULL. */ - tmc_etr_enable_hw(drvdata); + tmc_etr_enable_hw(drvdata, drvdata->sysfs_buf); } else { /* * The ETR is not tracing and the buffer was just read. * As such prepare to free the trace buffer. */ - etr_buf = drvdata->etr_buf; - drvdata->etr_buf = NULL; + sysfs_buf = drvdata->sysfs_buf; + drvdata->sysfs_buf = NULL; } drvdata->reading = false; spin_unlock_irqrestore(&drvdata->spinlock, flags); /* Free allocated memory out side of the spinlock */ - if (etr_buf) - tmc_free_etr_buf(etr_buf); + if (sysfs_buf) + tmc_etr_free_sysfs_buf(sysfs_buf); return 0; } diff --git a/drivers/hwtracing/coresight/coresight-tmc.h b/drivers/hwtracing/coresight/coresight-tmc.h index 7027bd60c4cc8..872f63e3651ba 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.h +++ b/drivers/hwtracing/coresight/coresight-tmc.h @@ -170,6 +170,7 @@ struct etr_buf { * @trigger_cntr: amount of words to store after a trigger. * @etr_caps: Bitmask of capabilities of the TMC ETR, inferred from the * device configuration register (DEVID) + * @sysfs_data: SYSFS buffer for ETR. */ struct tmc_drvdata { void __iomem *base; @@ -189,6 +190,7 @@ struct tmc_drvdata { enum tmc_mem_intf_width memwidth; u32 trigger_cntr; u32 etr_caps; + struct etr_buf *sysfs_buf; }; struct etr_buf_operations { From patchwork Tue Nov 19 05:19:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179676 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp160597ilf; Mon, 18 Nov 2019 21:40:07 -0800 (PST) X-Google-Smtp-Source: APXvYqxyc7uQRTmdHPDZAnnxIo/Ye8bL5hMSUrJvuYPAOEn0Paf8ZdAG0RAdA2Win3N8z8jLCv1C X-Received: by 2002:a17:907:20b8:: with SMTP id pw24mr31507504ejb.28.1574142006910; Mon, 18 Nov 2019 21:40:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142006; cv=none; d=google.com; s=arc-20160816; b=FanvoTZKlGp8OHQJZyAupQOGf8A4bw/1I31Utq9ct2nMWWotAS3dQ0KVUSSK75vV7y gxaRdlOlnxl6iTUqvSKo2I/AneLvRDK7qRXONVhr87rAf23hnOsMbHFYYYJCxq2uZwlR Fd0YF0mLZp1Y6CAOf7MGSLat9wnvheigZLwA/6f4+99dq5Fa9p4pNCz0JFquE2KDErxZ 5pljU9AIXifAR0limWJCTPi6/hZ84jO+aqlSlHQURDXratFBjcy3uPRgqkRQOn9+OKL6 WCvoMcbiZngFwENNFAAqBjhAFnDQWafGgMMC0HlPGoUTX1gIOJ9o0Jlix+b1rIZVbIHa M+cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=M03kP257WJe8rMG2G9zOxl3Te6gT/pcO2zjXzJRthaQ=; b=hLKix4g0xYqi5SFyE1EyvjpiE+/VGTXLHcXMBxO6gh5do0tBXkwfubmq4Gi/JNG2RL yTa8ZRnUJQr2HpKldS4e+rs0gMIzEdhHmu0p/rM9GjLpvlWGmEfdo4701cHUY4vx4Bpl hrCJYvkreEfNeAmthjbJqdPIS/anM/rpHYIQDbX92fabx4mafVFIbfTG97paXpcjbJoV I0KZCbgHFh4LnipZ36bRwiFWGFiBL8M5CG+kDOBUHCz7KKniE5qcPvsg36xKS0eri8fd uohby0QQw8cL/8IhpPRAu9xIuZKPh2lM8BPJ0zwI567YNAHdwl611HhdlbELxUYR2Sw1 6ioA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=E6NHtA9E; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b28si16247177edn.230.2019.11.18.21.40.06; Mon, 18 Nov 2019 21:40:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=E6NHtA9E; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728239AbfKSFkF (ORCPT + 15 others); Tue, 19 Nov 2019 00:40:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:34150 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728541AbfKSFkE (ORCPT ); Tue, 19 Nov 2019 00:40:04 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E336B21783; Tue, 19 Nov 2019 05:40:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142003; bh=yJZQW5BnUSHbWHbhWh0m2DBiRAjsbY+dArtTZdzFv70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E6NHtA9EM6Tq1Kd9H3j5dBq9JpDk9F3eBNat9aKJ4CeKTS9pLD7M12RRLQJ3Trp4Q fDOYgaQlkE60wxNOdaxs7WYUhCnmNh8sMTTK+U/72y8gk14R4wAGjzw70LCpdffm5p uWmmJlH5BDahkjCUQg4W8J3mswTjo3HE/tIDcjmw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Sasha Levin Subject: [PATCH 4.19 352/422] slimbus: ngd: register ngd driver only once. Date: Tue, 19 Nov 2019 06:19:09 +0100 Message-Id: <20191119051421.826714842@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit 1830dad34c070161fda2ff1db77b39ffa78aa380 ] Move ngd platform driver out of loop so that it registers only once. Signed-off-by: Srinivas Kandagatla Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/slimbus/qcom-ngd-ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index f63d1b8a09335..a9abde2f4088b 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1346,7 +1346,6 @@ static int of_qcom_slim_ngd_register(struct device *parent, ngd->base = ctrl->base + ngd->id * data->offset + (ngd->id - 1) * data->size; ctrl->ngd = ngd; - platform_driver_register(&qcom_slim_ngd_driver); return 0; } @@ -1445,6 +1444,7 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) init_completion(&ctrl->reconf); init_completion(&ctrl->qmi.qmi_comp); + platform_driver_register(&qcom_slim_ngd_driver); return of_qcom_slim_ngd_register(dev, ctrl); }