From patchwork Fri Nov 22 10:26:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179958 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp12273ilf; Fri, 22 Nov 2019 02:31:39 -0800 (PST) X-Google-Smtp-Source: APXvYqzRPg+87RO9VSX4RMvtzaUsaFgWTN1DAhZn3fDIkE7uzUQLtKN+VrJAbHjFdVrYxeiwbX+V X-Received: by 2002:aa7:dc0c:: with SMTP id b12mr171954edu.186.1574418699306; Fri, 22 Nov 2019 02:31:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574418699; cv=none; d=google.com; s=arc-20160816; b=wHuuf7sAZMeAfhsMcW6diGbmm4yAG2BpxHJMfp2nF3UeS0ngipC+jLntBi2qk31dM7 2WjMU/NvWJw9XtZv/cMfLB5Ks1rI5+jJGFL1o/fdp/Jo2NNgFZ1fni/BCjr6J2fzkLRW N1jcHud8PpLs7P6jYuzZaLiOUbBVLznKu5NDtvTw4ykfaiSgHfEsErs/i++mxtqSVxhV 7xIauaop7i1vAj2WCFEM5KJVK2Yol+TdE8/coiOMQkcQ3RqIbPHhybDlSivpaLjp0o+R 0EJJcL7RlPl+1RM8sKi1DN/bypVpN1E+mpwftQA6iAvSNPRXpSQfEAX790ir9rBx6UWh kwJw== 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=7Wo0+fFwq7rABuuXi5KtFPf0qvwBfMRVThS00FaESXA=; b=YSTS+tgs+6gn9sI4dH6jf+ABAOkmnY1Kl1JcrWF/fB6qv5EmnYjVCX2Z9qA3SxHmjh 1Hwl1ftl48ir5pnIS8HqZT1EqUMxcM48rlZAE8tR3ZCLypmGwkcxVwTSK93g8t9Ne9k7 xD2YCGEBzeXaK7rzYSGprT3ngF9T3vyGorEul1kFHBD7K3LtdjmLPC9fk4T9PJLlABOX 7pbUE2XcJtlV5q5D1rEWafzL/Vu97YUaUkwVR8YB9h4D3mKIUXDwfUHc+/sUOF1US1P/ 7rbzC4LphiWGNc0iX2NWUCEhkOijpl9mL80hvY5W1Urv+qul4Dhf+F7DUD555Kkpjj9M qA2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oo6qjxn5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 b15si2490714eju.362.2019.11.22.02.31.39; Fri, 22 Nov 2019 02:31:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=oo6qjxn5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727374AbfKVKbg (ORCPT + 26 others); Fri, 22 Nov 2019 05:31:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:51720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727316AbfKVKb3 (ORCPT ); Fri, 22 Nov 2019 05:31: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 A807220731; Fri, 22 Nov 2019 10:31:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418689; bh=yb2jTU2J1Pcb1tIvnOIHJBWKHeSbxjsNa/OwZZEyHl0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oo6qjxn58J23CCOWvWeEIfkalwtj2WO/jEjoi7H1f6V+i6A5/8bI+WDGd1jL7e3Dv HRMvpTmFS9rk9K8plTaxamjydVr0ABykvTvqIodTfV5v9UFPOsQUZcxb1nDE9UOVEy BjgPb51I453K8L+kDJ68FmWgye35pFRnfF76fO1Q= 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.4 019/159] ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook Date: Fri, 22 Nov 2019 11:26:50 +0100 Message-Id: <20191122100720.731102034@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 f811dc8006605..0d46f754070e4 100644 --- a/arch/arm/boot/dts/exynos5250-snow-rev5.dts +++ b/arch/arm/boot/dts/exynos5250-snow-rev5.dts @@ -23,6 +23,14 @@ samsung,model = "Snow-I2S-MAX98090"; samsung,audio-codec = <&max98090>; + + cpu { + sound-dai = <&i2s0 0>; + }; + + codec { + sound-dai = <&max98090 0>, <&hdmi>; + }; }; }; @@ -34,6 +42,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 Fri Nov 22 10:26:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179959 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13271ilf; Fri, 22 Nov 2019 02:32:23 -0800 (PST) X-Google-Smtp-Source: APXvYqwir5DjlATepZTrrEMgiPoiAHRGmt4iNjeQfIHdZLcVDreGSuXMnt5K3Y9bjkK0r4PVCPUB X-Received: by 2002:a17:906:80c:: with SMTP id e12mr21614880ejd.59.1574418743656; Fri, 22 Nov 2019 02:32:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574418743; cv=none; d=google.com; s=arc-20160816; b=Ls1mg1tXOmLuJpea2fexgfvKu5zO1XRk4MBse8Zgo80vK9KXo2R5FMGF7WJQfyt2td ginfYuylJZfTM4aFYqzE70J78Wm4/gcWYH05+x7W1N9DJCSXg4B1Dwt8kJS90z+rJdvd Y1IMOK2QbMZJSX1BZLzHW8FvuQXsGUuE7BjnEC9fuute4aoXxuATGQB76k87DHuOYFbL aXz4qL8qmRZYfXikt8id9ibZBPMnlbr2DR+St2OZaYTn+yOYgJCLkcbQjNEJo3CuDPIf jDsWzjgs4XMK1niG7CMruH+nKvcvo9KeograB/Cw/rKjnwLI4SVN9H+qaOMRxOYBsD9y 4Nlg== 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=yqOTtP6WbaWUXH8TkZBIvkczm4/+7DpakSRsvUDI/34=; b=BtHngLs9z5bhJnOlusFgDFbqN5uQHE1YDplo4vHinCXmHy/6NGJJWzrNcn5Md8mq/I 9zqZy8MMjgSd+jBbeMHlhiMOLZXz4Ip7bMGTkDMXSgjyXm8fuIKAAmwJkHJ4F9okKDXX ccmKXZJwft/q+6eVlVrtOgwUQKheBnsidLbba8ZA7QpEbPUD58G13wHFAeqDWGDSXoIh ZcvV/QlrjFdSh4P6Dt+7un0KOMyAF8McYZxpypcCmspfTIYikqx9ILKFTFtcqp6msgsf a/Q5gJOMXJg8EtZsyVDL+WEiGDx1+TQ4UmuojuZS8GJK1HxX/VlB/j3RQiZMD5DaA5tO f7ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AHYHGior; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 w18si1811156eji.346.2019.11.22.02.32.23; Fri, 22 Nov 2019 02:32:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=AHYHGior; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727646AbfKVKcU (ORCPT + 26 others); Fri, 22 Nov 2019 05:32:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:53596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726880AbfKVKcR (ORCPT ); Fri, 22 Nov 2019 05:32:17 -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 6FB1220731; Fri, 22 Nov 2019 10:32:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418736; bh=gMqcaMz6j2FWdYm0XIoeIVYKUfS15ZJ0xT91Kpz2NNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AHYHGiorIGQCrqrLOF+hcl589Qa2J0pVlAd9n/VyWXKF4jt0KFcGJvmZSfBOewG6q a4UTAF/dc7pjHL/LHqnDTUUAxHKI5GA/1u1PpBQMS6OPuDkrQEv5/8rO1sq6fc+Ffb BA9FOKyDp2RVHkymHqQBpHo2HEXmyd4ujMmLHXAI= 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.4 027/159] ARM: dts: exynos: Disable pull control for S5M8767 PMIC Date: Fri, 22 Nov 2019 11:26:58 +0100 Message-Id: <20191122100724.918456999@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marek Szyprowski [ Upstream commit ef2ecab9af5feae97c47b7f61cdd96f7f49b2c23 ] S5M8767 PMIC interrupt line on Exynos5250-based Arndale board has external pull-up resistors, so disable any pull control for it in in controller node. This fixes support for S5M8767 interrupts and enables operation of wakeup from S5M8767 RTC alarm. Signed-off-by: Marek Szyprowski Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- arch/arm/boot/dts/exynos5250-arndale.dts | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.20.1 diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index c000532c14446..b425b77f8fb65 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -170,6 +170,8 @@ reg = <0x66>; interrupt-parent = <&gpx3>; interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&s5m8767_irq>; vinb1-supply = <&main_dc_reg>; vinb2-supply = <&main_dc_reg>; @@ -552,6 +554,13 @@ cap-sd-highspeed; }; +&pinctrl_0 { + s5m8767_irq: s5m8767-irq { + samsung,pins = "gpx3-2"; + samsung,pin-pud = ; + }; +}; + &rtc { status = "okay"; }; From patchwork Fri Nov 22 10:27:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 180052 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp80212ilf; Fri, 22 Nov 2019 03:27:30 -0800 (PST) X-Google-Smtp-Source: APXvYqxSAMkNhT2BbEj75p9uMs0ZzkqtdcocwnMaDhMNCY8wUydPD0Adv5uotEo0+Ghi1brISASs X-Received: by 2002:a17:906:1354:: with SMTP id x20mr22087395ejb.131.1574422050790; Fri, 22 Nov 2019 03:27:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574422050; cv=none; d=google.com; s=arc-20160816; b=agzajy+gNAwoDtqulFA8sFMMg/ICXsDYIWJ5k6NQf9KEfMS4zuRjRlXc3ioYzWhaFV AVYhD+oD/27EzaANSlBxj2fOhenM4C0VCEtZpIBJ85O3/UqxJ/B6HlWhbbaPXSin0wSS oJx3nMeGVUj130M3EGdtyYASSUlYGB3jaaaSuV+koyLg4KIb+3qR/VbWs1E3XUynsNQR +UrYHJm0FbjDkyYYD9PmyPzXpkgD3Wl5RKNTFvPjF9qiFHEzB5KDf/IBJ/7AL84tp6YV k/cNksjoSoi/4PIFqWjAlawFFkhZyZR4ksl+o7gR0yUQAlc6yEAfXgX4hinFYOYECLSb SzFQ== 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=bpaexqij0zu2wyTy840S7+pXGDrekb6olUrfceFJM9w=; b=0fCFM1clXumsqpkOACK7vxqwFeRwTVB48hdJccfsa/sfZVjvujCZQCvdyl0ZHHuXpq Udqg7R0hwOvqqmuX2oMRqoH+F+V/AntAhs8KNxfGR19019vHix0xM8yW5zfMxCT7BMVm 7hdwhJbhMN5mLDOSkrpqAuyRL4U2XGdoOjBiD5RX6Z0WpRcQDYEekV/qGr6hJNSOETaU sComW30RDkQ6zui9+ReUnUlUgWcglgRKAQJ1zGr6OBGAEEAH70q2wN85zCYB/M1faF+I mAM5cqyOaDUWW67bMrpre+VeIw2RrddRcJxQgPJNC0LYbNAa505YW7c/QKzJanw6s2B0 0tbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MvZ76YWH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 c6si4152997ejc.350.2019.11.22.03.27.29; Fri, 22 Nov 2019 03:27:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=MvZ76YWH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727779AbfKVKco (ORCPT + 26 others); Fri, 22 Nov 2019 05:32:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:54474 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727747AbfKVKcm (ORCPT ); Fri, 22 Nov 2019 05:32:42 -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 E4B9820714; Fri, 22 Nov 2019 10:32:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418762; bh=NRLAl6V12SzZIvNvM/58GkrMfGcZ5KGi5UFCtt3HtR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MvZ76YWHk9fFNmmJLfNok5UEohb/qzt0RV+PKSFgy19SFKMzyjs652BWN366JJlwv 5rx4DHrE2i9NiRTIpPXYNBOyoFQQXZUGEOTEKPpmlpBCJqoVLlOa3eCycrRXSYm9xC UBkCgco0pHh8eOq1/eJTK+j8b6jWqXJZ2gFTaidw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Niklas Cassel , Srinivas Kandagatla , Sasha Levin Subject: [PATCH 4.4 044/159] nvmem: core: return error code instead of NULL from nvmem_device_get Date: Fri, 22 Nov 2019 11:27:15 +0100 Message-Id: <20191122100737.184105147@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit ca6ac25cecf0e740d7cc8e03e0ebbf8acbeca3df ] nvmem_device_get() should return ERR_PTR() on error or valid pointer on success, but one of the code path seems to return NULL, so fix it. Reported-by: Niklas Cassel Signed-off-by: Srinivas Kandagatla Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/nvmem/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 931cc33e46f02..5d6d1bb4f1106 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -457,7 +457,7 @@ static struct nvmem_device *nvmem_find(const char *name) d = bus_find_device(&nvmem_bus_type, NULL, (void *)name, nvmem_match); if (!d) - return NULL; + return ERR_PTR(-ENOENT); return to_nvmem_device(d); } From patchwork Fri Nov 22 10:27:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179961 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp15178ilf; Fri, 22 Nov 2019 02:33:49 -0800 (PST) X-Google-Smtp-Source: APXvYqy3DCYtgg21vjvd4iSjDNTU991TTeCAjT8iRp34Uu/FXzMrVT4vnz2QOPV/JyqZsTDWFEw5 X-Received: by 2002:a17:906:3f8a:: with SMTP id b10mr21032981ejj.315.1574418829635; Fri, 22 Nov 2019 02:33:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574418829; cv=none; d=google.com; s=arc-20160816; b=foVIePzBxAoGnqG5R2MPRZNEMYX/Iepxgl16vCH8a6hibq+qxmjtHmjq3uNj8JtbNy joEf0PhQMScCMt3i3d+AnQEMYIEY1utvfJc0+scYNvd6LFqBlRRI5j9CLoQAoLm+qEin hlFMeVzZzRZhKkEDnr4rdDN1/GpvXgweDKXO/nDzxopb1XiSN2fbCT+rYskW4TKslSFB 12LR8YcFhq5nu4GzM23LQ9Q1VFTt3jco1WT7LgfWk6q6bLUKuUVveztKRJ80/EYfKW8p /1tLq5CFIqpFlqlf2DI4gaGNn8dhxn1kNhxdfw03Xi1HtsMKUFbfF3z7QjuW41R0ay0E sKQQ== 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=Sm6VYi+yMmk2HqjoRa97AC4aNmnfR18DmcmdzyQ9EeU=; b=F+IAPf9l426kHOT2/n2/fhKQ5Cgw4jsq5pd/7xJcqu7n6sHvMs8ruIQsAOqJGPmkb9 LcgrUiMCLVGR0m+Ndizt7zGogRILH93l5bqjHcvuh3FGl9kIUo0/ewHWzmha98iIR4Cc dDeY2afuVqVAejVMeI5ofhNQK5KEjB/ynpp9txUlCSXqO97vE10d1P/CJ1k3fWw0nzIM 6Nu6QseQudj5KPgRogsn+W9y0KsYnkdHO3InQkYBFulum4njIO8dVh/TisW+DacBHap4 kI1GGnHExPIh9r/aNz7xJb+W/7TTh2r/hMpN2CvuoJzlJGZcMp3fDxMsLAGhdyKtP3kO IzNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FwZjmDhq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 14si1997016edz.130.2019.11.22.02.33.49; Fri, 22 Nov 2019 02:33:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=FwZjmDhq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727993AbfKVKdq (ORCPT + 26 others); Fri, 22 Nov 2019 05:33:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:56822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727976AbfKVKdm (ORCPT ); Fri, 22 Nov 2019 05:33:42 -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 6C02720708; Fri, 22 Nov 2019 10:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418821; bh=0K5Le4/yUVvQ+7LVnDH2eIxwNTpwnAm+e6EkDjNqOyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FwZjmDhqYV+rgw2kcZLQWnPHu+66eFQ35Z27AbL3SsoGImpjiy2EXlxe6h5tlp/JP eIzSqJ+eKbNd6GhpWLOCtL4EBPE1u2Yb/a+fWbz8/J1WrRaEjj4bP81hh10cnBZ9Af 4nK1P7o3QSq0uJcG78mjZfk8iSyN/8eEOuRfAdrE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Russell King , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Rob Herring , Sasha Levin Subject: [PATCH 4.4 062/159] libfdt: Ensure INT_MAX is defined in libfdt_env.h Date: Fri, 22 Nov 2019 11:27:33 +0100 Message-Id: <20191122100752.929251532@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 53dd9dce6979bc54d64a3a09a2fb20187a025be7 ] The next update of libfdt has a new dependency on INT_MAX. Update the instances of libfdt_env.h in the kernel to either include the necessary header with the definition or define it locally. Cc: Russell King Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: linux-arm-kernel@lists.infradead.org Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Rob Herring Signed-off-by: Sasha Levin --- arch/arm/boot/compressed/libfdt_env.h | 2 ++ arch/powerpc/boot/libfdt_env.h | 2 ++ include/linux/libfdt_env.h | 1 + 3 files changed, 5 insertions(+) -- 2.20.1 diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h index 17ae0f3efac8e..005bf4ff1b4cb 100644 --- a/arch/arm/boot/compressed/libfdt_env.h +++ b/arch/arm/boot/compressed/libfdt_env.h @@ -5,6 +5,8 @@ #include #include +#define INT_MAX ((int)(~0U>>1)) + typedef __be16 fdt16_t; typedef __be32 fdt32_t; typedef __be64 fdt64_t; diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h index 7e3789ea396b8..0b3db6322c793 100644 --- a/arch/powerpc/boot/libfdt_env.h +++ b/arch/powerpc/boot/libfdt_env.h @@ -4,6 +4,8 @@ #include #include +#define INT_MAX ((int)(~0U>>1)) + #include "of.h" typedef u32 uint32_t; diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h index 2a663c6bb4285..8850e243c9406 100644 --- a/include/linux/libfdt_env.h +++ b/include/linux/libfdt_env.h @@ -1,6 +1,7 @@ #ifndef _LIBFDT_ENV_H #define _LIBFDT_ENV_H +#include /* For INT_MAX */ #include #include From patchwork Fri Nov 22 10:27:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179963 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp15599ilf; Fri, 22 Nov 2019 02:34:11 -0800 (PST) X-Google-Smtp-Source: APXvYqzBasc7cKu5ZUlUCWvwWC5CkluY7xIPm/R8d1M3cdFEuQnib/7OocC/MyhcVtfZSGof268v X-Received: by 2002:a05:6402:1609:: with SMTP id f9mr188032edv.37.1574418851130; Fri, 22 Nov 2019 02:34:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574418851; cv=none; d=google.com; s=arc-20160816; b=RWvMCQAIwIOmnAo9m5WwV2YO+cIFmwRC9i1i1JJVSTriszipEj50LSV+gKGCMN+9D+ LzWN8BYTg9Tji0m26XGQv17hqTRcY0jKtxalI9hwaTe/7neRV18+++V2szpmARcjfpV4 p6hivdCeV5M1tSxXrJj4+vHnKEJglyqR1Cgdxu0Hat7dRFVt3eAJDsL39ogWNmMqVRkl WZ74+kewtocurB+nTDYYfvvwyxrx6KwatVO/6vFUqCEgrsvVPClvx1xATHYzAv0nyvKO mGg1Xrgq63ohYjtw1KeYDvxoLr/q+Fx75bEyeuzJ9k07ZFEt+x0uRAorLF455lKcjSY2 qD9g== 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=gqRiU45m22ZMfdkqYLZ/w0FV0gxWuYTtqQKBWzo3hz0=; b=fCpObPVMySLHo/xtFhl63yPEt+RySob77CvT6P+g5NCCbY0iWsNd1xSb3HoWb4paAg G7bSkrFova8bQM1LdXadGGPmWTz/gMG0jZsLYD6GcHfAzYtLL9Cm+BR+0vrkSIT8Czo2 Y6tYudjdxUGODyoMYxszo9xmIE+Y2Mn3XJJ0uueKuJEDCOV9kOD3hDbipULyd++zkqb5 QpqsleM4LxmG0zXcOtc/Zjhda0BxwKSO7TOk8nFYd+vOBGIBSxbJK9P0P7DEhxyh0Na4 p10x2AEdHTf0TIjdwPfwp6U1ZmJxZWqVt/Snyvo0dffbkNiqiJnATrdBjAGUEVkyXE6D 8pWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZiQyoWuw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 i26si3770626edy.197.2019.11.22.02.34.10; Fri, 22 Nov 2019 02:34:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=ZiQyoWuw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728056AbfKVKeJ (ORCPT + 26 others); Fri, 22 Nov 2019 05:34:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:57934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728036AbfKVKeE (ORCPT ); Fri, 22 Nov 2019 05:34: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 D5E7B20637; Fri, 22 Nov 2019 10:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418844; bh=/NIyCPyZeLdBwZL2f6/XlX7dwDQA8o09yF4PJxAG3WA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZiQyoWuwMhtktmy0vQqNWwsBOvmoeI1P6DxQVoNrVN6DtWvdGm5eYGwDH6OJHABy9 Z6ny+y0JZDshpKHZ539LNpq/vWWYcjV37zWzrPt5z1TriOwIM4lTNHRAGAsP/JVjy+ PLxGm4RRIk4rCoXaKDqooerOQL7d61rh4vTklcac= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Loic Poulain , Peter Chen , Sasha Levin Subject: [PATCH 4.4 069/159] usb: chipidea: Fix otg event handler Date: Fri, 22 Nov 2019 11:27:40 +0100 Message-Id: <20191122100755.872467415@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Loic Poulain [ Upstream commit 59739131e0ca06db7560f9073fff2fb83f6bc2a5 ] At OTG work running time, it's possible that several events need to be addressed (e.g. ID and VBUS events). The current implementation handles only one event at a time which leads to ignoring the other one. Fix it. Signed-off-by: Loic Poulain Signed-off-by: Peter Chen Signed-off-by: Sasha Levin --- drivers/usb/chipidea/otg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c index f36a1ac3bfbdf..b8650210be0f7 100644 --- a/drivers/usb/chipidea/otg.c +++ b/drivers/usb/chipidea/otg.c @@ -206,14 +206,17 @@ static void ci_otg_work(struct work_struct *work) } pm_runtime_get_sync(ci->dev); + if (ci->id_event) { ci->id_event = false; ci_handle_id_switch(ci); - } else if (ci->b_sess_valid_event) { + } + + if (ci->b_sess_valid_event) { ci->b_sess_valid_event = false; ci_handle_vbus_change(ci); - } else - dev_err(ci->dev, "unexpected event occurs at %s\n", __func__); + } + pm_runtime_put_sync(ci->dev); enable_irq(ci->irq); From patchwork Fri Nov 22 10:27:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 180049 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp77565ilf; Fri, 22 Nov 2019 03:25:14 -0800 (PST) X-Google-Smtp-Source: APXvYqya66ufbDU1BBixkvhyFC6DqyVHndgiNhdwn2E4Dlc4f4UvmVLsqLP0lgO6ou6mIrNuUrxC X-Received: by 2002:a17:906:37cd:: with SMTP id o13mr21200972ejc.148.1574421914208; Fri, 22 Nov 2019 03:25:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574421914; cv=none; d=google.com; s=arc-20160816; b=sMIh9fLKBb2yrW//FWHcAE4ilYmppz60jHnV+5DfSYP1tebnF0udLckk8JX7Kc/M7s KOUHWVTE7lKT6NuBkKN6U5SrgoEiFhk85cMfDm2wZo2aiQRdOGkZQ6ZrhGyWvrGirZUl AVu5EkhLxr8C+8hKQt0Dd2rFLkMkcrVgsgCpw43wenEdcOoZ5E2Ax9Aj2UeUEDjbGUln ZtAA5GyDCDEBqWTDL+mtr1aTwSWt2JA4xfjplL+SGFcbNX6z36+5UCh/qGo92YkWHoCe qzu0WLdC9LNyaYeKmgjgfOFhYQF4h/gx+CWnPxnVQ9QwSrzlo1+C7EpzVoMntY0vQR8g R05w== 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=E/2PG6b3IOy4dtKkG+KGU8Jt8O4mqU+FuoEKnuYC1Yo=; b=Fy3FWPWEYwCCgchd+HDTRKZjw+HTYLHouLYx1WoJuvzhaG4qpjg7frv7A7lLOwN4Ek ba6SsFGcZ12ROIl/WlFDkmLzRzKuFnwTwf8Wcyq/Y69t6alTjHkHZdqc8SvmKZ8OzoP1 Nw1fxL2EN/kAZzxR0sWXCVH1wgR1nO+dN7+N4xijBsXnWI7+W7gXS17VnEkbhYbpqdWZ LWgRDeOPX/sejoyyIoWUCavtSl9fbCmC7C69mlEmfcOujG6qWculuGBKyPFpOnvydKKM mXVtKSM1O++QRZiNEWUDc5RkbN9IG+U0Yr4FS6hNyCCM0sDeb4AhElTumptWB6M4u2Iz Q/hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zNYMCAga; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 bi17si4896155edb.430.2019.11.22.03.25.14; Fri, 22 Nov 2019 03:25:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=zNYMCAga; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728467AbfKVKg4 (ORCPT + 26 others); Fri, 22 Nov 2019 05:36:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:37386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727187AbfKVKgw (ORCPT ); Fri, 22 Nov 2019 05:36: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 D1F4520707; Fri, 22 Nov 2019 10:36:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419012; bh=MtK3rPQd3SaaIQnnxCs2zvWntZfSe1hn9rDCp09C3wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zNYMCAgaPZ1JecJpKE8ajWXv64/niL4HhXStMaBWM0OgJK/g/Jl/ujYJB71EoZPj0 Nitc09nNcvWCnOcTaLLOKf0wLzj1Ntl+8vlifZ0CfsOhqDk2HschIze+V+TbVXd3mo oMK+mrcUXNEqusc8vsCv82XKryK60vtobTSzfrHM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Herring , Linus Walleij , Sasha Levin Subject: [PATCH 4.4 073/159] ARM: dts: ste: Fix SPI controller node names Date: Fri, 22 Nov 2019 11:27:44 +0100 Message-Id: <20191122100757.722169339@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 2f967f9e9fa076affb711da1a8389b5d33814fc6 ] SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the name enables dtc SPI bus checks. Signed-off-by: Rob Herring Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/arm/boot/dts/ste-dbx5x0.dtsi | 4 ++-- arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- arch/arm/boot/dts/ste-snowball.dts | 2 +- arch/arm/boot/dts/ste-u300.dts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index 86bd320057a38..b2b23ceb6d557 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -894,7 +894,7 @@ power-domains = <&pm_domains DOMAIN_VAPE>; }; - ssp@80002000 { + spi@80002000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x80002000 0x1000>; interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>; @@ -908,7 +908,7 @@ power-domains = <&pm_domains DOMAIN_VAPE>; }; - ssp@80003000 { + spi@80003000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x80003000 0x1000>; interrupts = <0 52 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi index b0278f4c486ce..55a6a1ac03370 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi @@ -57,7 +57,7 @@ }; }; - ssp@80002000 { + spi@80002000 { /* * On the first generation boards, this SSP/SPI port was connected * to the AB8500. diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index e80e421638836..bb1b64d6ab5e8 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -311,7 +311,7 @@ pinctrl-1 = <&i2c3_sleep_mode>; }; - ssp@80002000 { + spi@80002000 { pinctrl-names = "default"; pinctrl-0 = <&ssp0_snowball_mode>; }; diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts index 82a661677e97e..fb6ca7f864176 100644 --- a/arch/arm/boot/dts/ste-u300.dts +++ b/arch/arm/boot/dts/ste-u300.dts @@ -451,7 +451,7 @@ dma-names = "rx"; }; - spi: ssp@c0006000 { + spi: spi@c0006000 { compatible = "arm,pl022", "arm,primecell"; reg = <0xc0006000 0x1000>; interrupt-parent = <&vica>; From patchwork Fri Nov 22 10:28: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: 179965 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp16882ilf; Fri, 22 Nov 2019 02:35:16 -0800 (PST) X-Google-Smtp-Source: APXvYqxFxkM2YDDLxn6wo5UoIrs6sgswaueAskMlzFkkl8RkxC64vhmJ+sgYZXXXLH3vjd3ukUiq X-Received: by 2002:aa7:cb19:: with SMTP id s25mr191654edt.148.1574418916775; Fri, 22 Nov 2019 02:35:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574418916; cv=none; d=google.com; s=arc-20160816; b=OKvuqpiVaLVBNjqTF52Q1lETwe/bIkerbVYHO05HBun5sxanbrZ1IBzp/N9ZMyB6c0 8D9M7yxxflcolTlfS0xb4w1+BeEA2Hzh42ZWY5oWrB1FlV2yU09qg8/v4fo4rdb0r5W8 I8OyUY01Xd8kDvCc5lkkjf9gTeI6a2mpXiAAO+FCMAx/v19g9AkVERDxT4jPuVJ03olG ++apIaglPdo4y9S16kqgPqRoGMnCPt9OOOhyz+lbZbRfApQMyjHIB5o2pf5/imal/8n+ 83lZlzXC3+zyAEUZ4fgEyrIEN46/FLyIdMgWVDKQsGRGA9XRIQwpTK0r4xd14tQTZXlV kNoA== 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=H5v/YBplqeXc5H1x2vyDOfeLPPfXfUAAj0Lxm2TKNOI=; b=Udco9nkhOBSa8a6V4WiTmUpxrLUyePBxzaALmDhIfbUEv3xy+IGinnsxvGQ5ltS8uf GmN+D2HLowzsBSkYnu67rTGl56uhTLBR0P9xcEjwAL+zSa8Gh2OMCva52o9moNYO6w1b iccvJnj4BVLnhonQk/H+ri4ENRDIQkJbvZpwIM5J2X8b+K+j2mzMdfCUOUzktZnUsYok 9/RS4w/B7pnnz1u1ilfoMn5w1q81LHFvLvjDytzbFO4E2Azz5SnczhzNYYF7aAGLT9so dCQh4teYoxdISbw5XXiJHC1tx2r202uCt474+ZYKiES0BblG8Xdc9Ab8ItZ3arkf6298 Wg/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Fjlmm52C; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 h26si192827ede.359.2019.11.22.02.35.16; Fri, 22 Nov 2019 02:35:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=Fjlmm52C; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727667AbfKVKfO (ORCPT + 26 others); Fri, 22 Nov 2019 05:35:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:32966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728217AbfKVKfN (ORCPT ); Fri, 22 Nov 2019 05:35:13 -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 DD96E20708; Fri, 22 Nov 2019 10:35:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418912; bh=sqb++TXGGyVWzTbjaKuwOI/0PkCaHEm9xxhq7qwYYes=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fjlmm52Cs8+QQOZtQywMkf3NLwm+kv2qergEdF5ndw1o/Qsyu8qy2xR015ot2wqyB hVJUgPBots2ZXtyLAvidnb/xJMVZDyxwRUh7oi3I8NSHv5vh/HsyYEUnVnftB6alF8 K7+JRTEIlcPjycaV9gOsAyravc4vMavQjE+2p+U4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brijesh Singh , Suravee Suthikulpanit , Tom Lendacky , Rob Herring , Arnd Bergmann , Sasha Levin Subject: [PATCH 4.4 094/159] arm64: dts: amd: Fix SPI bus warnings Date: Fri, 22 Nov 2019 11:28:05 +0100 Message-Id: <20191122100815.429043688@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit e9f0878c4b2004ac19581274c1ae4c61ae3ca70e ] dtc has new checks for SPI buses. Fix the warnings in node names. arch/arm64/boot/dts/amd/amd-overdrive.dtb: Warning (spi_bus_bridge): /smb/ssp@e1030000: node name for SPI buses should be 'spi' arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dtb: Warning (spi_bus_bridge): /smb/ssp@e1030000: node name for SPI buses should be 'spi' arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dtb: Warning (spi_bus_bridge): /smb/ssp@e1030000: node name for SPI buses should be 'spi' Cc: Brijesh Singh Cc: Suravee Suthikulpanit Cc: Tom Lendacky Signed-off-by: Rob Herring Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi b/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi index 2874d92881fda..a3030c868be5f 100644 --- a/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi +++ b/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi @@ -84,7 +84,7 @@ clock-names = "uartclk", "apb_pclk"; }; - spi0: ssp@e1020000 { + spi0: spi@e1020000 { status = "disabled"; compatible = "arm,pl022", "arm,primecell"; #gpio-cells = <2>; @@ -95,7 +95,7 @@ clock-names = "apb_pclk"; }; - spi1: ssp@e1030000 { + spi1: spi@e1030000 { status = "disabled"; compatible = "arm,pl022", "arm,primecell"; #gpio-cells = <2>; From patchwork Fri Nov 22 10:29: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: 180047 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp76988ilf; Fri, 22 Nov 2019 03:24:44 -0800 (PST) X-Google-Smtp-Source: APXvYqw5rSUNC00u9W7iGdKtFzMLALNB25zhmDMpT1MOijPLlB/xWUZXt8HSOPrGZ8j0H2ad8qpi X-Received: by 2002:a50:f747:: with SMTP id j7mr417721edn.247.1574421884143; Fri, 22 Nov 2019 03:24:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574421884; cv=none; d=google.com; s=arc-20160816; b=BoPOfuq9aRpvb7mIJ3+f+4EW8U86bLPft+ryuMKrfKopWRWPtMh62XyPDJe3S6YSue SOK5iY7Py6yKaXnVXLZsXz9JfY9koLwlCb2evqqokxFNNNa2KkCzoiaL6jLNPEajspzy PFNCXJof7o/X6d+lq2MuTPuML/rIn0rCfRjMW5o7agIxRMwpwGR2a27MsEmeebNUxymp qoHr15aSPWSN9mrkE9jsOwIpoRFLL9ZItfPpBT4dWrEDa9fPiZ2F50QsAN+pvIPZLlRX 1KdxDLy6SQbdYfeaIS+Ja8BUa2xw/czOE0xDRf8yq/R+oQLMKAorTQGtwCHm3niSTsot DE6Q== 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=p1kyYLm9YMJYJJ3lhhbzA08USQrBOk2L665kCOyOjvQ=; b=W6VNxm6HW3hEF9VnX+GTGPLpDk9h7PxgzbooiGQOH/+vbRyzvCGKq3zdcvbP+bQ1R5 iwagd+itu2PbcgabCdwwy1bfW8BVWP0v1zNXu5jJQyOAeyUYNsMqGUJm34SQz7NDwyFG bwcshKElgxsJ72JgGQQRGXaQ4y5Zr2TzDDOD2zzI/oAQ3SyvsXci9DDiHjk/dN7rVIfv lzlAxBYwvxi4H3KmvOEIwYOwdKCLNCF+qmOiIqBeBwUvXl7K+TVeDJcA8y9M9eTuo8jG xVlSp8VjZ8mbJjUCjZqsQ+YcogvP8Y+H9xO1MYfJdxK+C8hiANkB8RgdImgu4SUyM6tM /q+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uujFmvcp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 fx12si4011332ejb.154.2019.11.22.03.24.43; Fri, 22 Nov 2019 03:24:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=uujFmvcp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728635AbfKVKiT (ORCPT + 26 others); Fri, 22 Nov 2019 05:38:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:40486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728628AbfKVKiP (ORCPT ); Fri, 22 Nov 2019 05:38:15 -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 3B5592073F; Fri, 22 Nov 2019 10:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419094; bh=kZ3eFbfzpF8RN+2f4cfw+2bjwJ52lRnc7ozYNT8kUPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uujFmvcpMYhMmjXh7AcDESITdTdypnuBI0Ae4GJMXmFKYCj+O1XqcPH5OOkOZjrQ3 KFY1IbY8kg8/k19qQ9IHtxTj7+KR+VTMH+Zkwo08yF2RT8kBLRXGQeCXmKbwnVwKaz K10uwklL7i0dGwcBuBziSKgzPwwjcHKg8zOAQCAo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Timothy E Baldwin , Eugene Syromyatnikov , Kees Cook , Russell King , Sasha Levin Subject: [PATCH 4.4 154/159] ARM: 8802/1: Call syscall_trace_exit even when system call skipped Date: Fri, 22 Nov 2019 11:29:05 +0100 Message-Id: <20191122100847.872357164@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Timothy E Baldwin [ Upstream commit f18aef742c8fbd68e280dff0a63ba0ca6ee8ad85 ] On at least x86 and ARM64, and as documented in the ptrace man page a skipped system call will still cause a syscall exit ptrace stop. Previous to this commit 32-bit ARM did not, resulting in strace being confused when seccomp skips system calls. This change also impacts programs that use ptrace to skip system calls. Fixes: ad75b51459ae ("ARM: 7579/1: arch/allow a scno of -1 to not cause a SIGILL") Signed-off-by: Timothy E Baldwin Signed-off-by: Eugene Syromyatnikov Reviewed-by: Kees Cook Tested-by: Kees Cook Tested-by: Eugene Syromyatnikov Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/kernel/entry-common.S | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index e969b18d9ff93..d31f0300d2c98 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -261,16 +261,15 @@ __sys_trace: cmp scno, #-1 @ skip the syscall? bne 2b add sp, sp, #S_OFF @ restore stack - b ret_slow_syscall -__sys_trace_return: - str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 +__sys_trace_return_nosave: + enable_irq_notrace mov r0, sp bl syscall_trace_exit b ret_slow_syscall -__sys_trace_return_nosave: - enable_irq_notrace +__sys_trace_return: + str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 mov r0, sp bl syscall_trace_exit b ret_slow_syscall