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: 179978 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp27078ilf; Fri, 22 Nov 2019 02:44:41 -0800 (PST) X-Google-Smtp-Source: APXvYqwraVCDobTz8uCkWcEVfgnvyr43kkwXSfrp0CBPjdhU63Db6gA3EZxXVQkiGr6ZLnt79U1W X-Received: by 2002:a17:906:1fd5:: with SMTP id e21mr20527670ejt.320.1574419481084; Fri, 22 Nov 2019 02:44:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419481; cv=none; d=google.com; s=arc-20160816; b=bwEJTlmtiU4uU7I+USH4Wnn29Vhr4VGPUY/MK1Jgq03Zajci9iffba9K98uNQR4mQF 9dVEb/AkEBd0qh/3jdFXkAPVZQMZRcO0Y68YE+4oVELL7ovLkMAlr29IYzaFo56oOMjX N5f/nNXX15hCUYXpzOizAPt6vOzIJFYHK8SBNFQE/8mhhtgD9yRa+IXbXJXiiqKNs3IK hhLZUw+UpLpS7w3s4RSoHMwLjSJf6Bu364GWH1Xj+YxcA2sdvDnJJCjyV4C+Zo1ySV49 Ry8rKXvlVWDaX4f4w93HVJk4bTcDX8aumiG9S34diHL0if+T8+AX1VC8fzrbLtqxvgUB X4Kw== 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=r74oSxFHFUKFIMR0O8bfrOqYP2mWrkPoOuphuJjr5BI=; b=uV8FqDbK2tqidLaOVC0H1m1hxEEnXZDSCkTUg/rEqV2Fn6eo2BTWWAGpXBDJEzZ27X Q/XhKbK87jSE7BuSOJ7Vk+LtogKXGta9dR3tuWbCQQ5p9OWUqzAow1HB47Fx6hcjaNTa lUTpgMnTzVhk6LHfCwOq1y8AnrvFgaNu1ueUijblKYpth0VVu6OeiqI5UjYd09Evq6OP LB/VcxEVmrH+LSVjnbPQKKjX0AcWK8lQiEL0+2Ep0ZGQT/Fg+otW5sOiTuLA6jsBSSI/ MT/pqW7yLMHDxnXAFyB7fcMvvl7TOhwTctsCD0UGADa2MWOkuOHSpP3uHxyvDzSb17yl JHSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=stUPIqvg; 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 c5si921847eds.263.2019.11.22.02.44.40; Fri, 22 Nov 2019 02:44:41 -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=stUPIqvg; 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 S1728731AbfKVKoj (ORCPT + 15 others); Fri, 22 Nov 2019 05:44:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:50412 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727630AbfKVKo2 (ORCPT ); Fri, 22 Nov 2019 05:44:28 -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 D352820715; Fri, 22 Nov 2019 10:44:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419468; bh=FQ0vCQXPL083ioe8KY+j+YwWNQrwcnxBwoqJ1vEg9Fw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=stUPIqvgDSyP/D0Wbkb3iOGA8hfTirUCRXOpjSI8qmJfHLLJ8wb1k/PS9XAZu0MMH 71tS+Czh+uvASRy/hPLdU/e1igtkmBNQcGBIbxZgcT7MHdAOoh8zynk077ntdtFfvr kuGuI+PIIc7l09Ejojp6uF2+mAGOdS8czofEkUxs= 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.9 078/222] ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 Date: Fri, 22 Nov 2019 11:26:58 +0100 Message-Id: <20191122100909.019001611@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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 a935523a1eb85..147c73f68f1d9 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -744,7 +744,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 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: 179972 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp25531ilf; Fri, 22 Nov 2019 02:43:14 -0800 (PST) X-Google-Smtp-Source: APXvYqzYlySM2Hikq1Ahc1mtfvzN7IA8ZZ0DZ1juv7MT4w9OsFfjGg+wnN5PPOUIVo89aIsBrzRr X-Received: by 2002:a17:907:38e:: with SMTP id ss14mr20869937ejb.319.1574419394714; Fri, 22 Nov 2019 02:43:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419394; cv=none; d=google.com; s=arc-20160816; b=ZP9tnBtgQZzgmoZ/UAt0BSf4mQu5gQPzh6XJZWuAzq8cP5xfvhDO0p0knVSalAmwpc WaLFv6oQZnARhFe49qbDaPrOnXa0HCUqAocUU+xJRd8uOQIrG/3H9ovOfrwx06ORlhhP SUO2yX1qdAnDwEdRiIKGEBr8WkwQtOjbkNrgL9Cc7viG6ONXzxzP4IWDuf947NSecBY8 /z3UkXnAgcHivFXN2T+h9CbzZbJz+kZxTh3DOMVLVNs78ND4HS/QLIvflLzXqbml2lSc SNPriOdh0aKxsSFx63ikyCb4Klylm1qz6dYYvWDFPRn7ycJPHrL0FkjB5Lnqp+8WX5b5 bFTg== 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=HHnpwFMDa4oUyVCjt+JWDHKPQMH5e+ULzPkupGzbHajJKUL5jFcpEIK5DfvAGsLDwS zOWTiKLbYyzKZFcZIPQppi9F4/lBc4DJsI2blcdxz+QbmCU8RxxrmcS1OUIjyT3qTTA5 BBV1Z3gFGf7QYPf8rLqYuzue6eo39wGFO/7QMVW3TttuPqFX8+Yn0DOTul/+DWHryf5k TNfhYz4twFsebtXkhVkL4dp3Kovj+Snl3kbTWEVIHy2EKkMDJdKFoOuL/WPRtTHiXvhy ROfeXEPYjKcuAh+liHc/D/A4Bo23P31on8b8U8ipBg5gUMRg/cXxRBDW8YdglcFhAL1M 4gUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2pydndon; 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 c44si4483830ede.398.2019.11.22.02.43.14; Fri, 22 Nov 2019 02:43:14 -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=2pydndon; 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 S1729192AbfKVKnN (ORCPT + 15 others); Fri, 22 Nov 2019 05:43:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:48672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728031AbfKVKnJ (ORCPT ); Fri, 22 Nov 2019 05:43:09 -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 A6A6D20637; Fri, 22 Nov 2019 10:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419389; bh=/NIyCPyZeLdBwZL2f6/XlX7dwDQA8o09yF4PJxAG3WA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2pydndonjjVUX4nzh3zAsRHTma9XSxTXgCwCkjkSUas9/q0jj3w0nrwOBMSofU/rM pub70Fs5KaZDFOAfQmuZ66hPrTGQNWhHeS5OVSULa0kcN2TVAd8fru2o+3sBm/qjVU VhW2Hh3TZ8PIWLrKqwAO4WrQmYyCTSF9trcvupbQ= 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.9 095/222] usb: chipidea: Fix otg event handler Date: Fri, 22 Nov 2019 11:27:15 +0100 Message-Id: <20191122100910.315599583@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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: 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:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179973 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp25601ilf; Fri, 22 Nov 2019 02:43:19 -0800 (PST) X-Google-Smtp-Source: APXvYqx23t6DeTBgwDJUJH7x3QuLGlKFY1MApBQkS5nUMd6LSQLlOjkdY0GqKOSjJIiXGE1eE0Xp X-Received: by 2002:aa7:df8e:: with SMTP id b14mr224759edy.59.1574419399183; Fri, 22 Nov 2019 02:43:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419399; cv=none; d=google.com; s=arc-20160816; b=rxvswex+Kcxts3Nb1Jv5aY4n047e5AjMlVMt3wO+NpsaEo9VA/tgFcqI+KhymtwmG9 283/FgOF1jrih9J4lBZfjI2sfhnECylK+bp3czF6STySYWQIZ8y0iY0Ub/d3w7BCnitF 7mxoirtymXbyjz25XBpIfxzoYwEhuNjlapeOdOMZLYQAYIFEZxXH/dcaJ/N74rf/RHYx DxBS4Q4IDMfvB109K+7TAYycHIR/J03/zsZ2IEMXDj75EpcGugl22Xy6JwUCT2tyzS7/ yt8pHq1qFEdiGnkX+kvxaBgHgEjQOeOuUWyiYR9l3tBxblYZ3ko5jdQ72LVhECwvY7sv N/lw== 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=o7sjLLQZIXaCICQsK3aXSvKmKYweHPNvDNDb5NV2te4=; b=Jg/xFg7B1gIeRMwtIf10+ATRGQD99sE7uAgWtthxg1VU6exgQ2GgvTNlTECwIxLIjI CHaDU0ONDt2WD2gv5CcHCFIOz1cSW2VHsFHUH/h7P0RGohNgHEilcFubHFH/gVCMZc0F +WJF2ZSaLq5+whrAcn4K0evH5w3XVuqxou24Ho0BJ86lVUhn5vxNDIlLB+/+pzVYAcv1 1WD6AUmkDBrGfSwWQl6Hvg/Rb+4RYOeQPFGY/PAHUF8Amf29oS/9ZD3VvkvGZrZ4sxnv bVz4SJXZl6fXdKYG+EqKNPERYlw8GKGnMpGNeXUfMee3NmEfPomG6upGe3i5CeuD0Rlz zpdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZtbLd7Ef; 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 h49si795175edh.2.2019.11.22.02.43.19; Fri, 22 Nov 2019 02:43: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=ZtbLd7Ef; 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 S1729196AbfKVKnQ (ORCPT + 15 others); Fri, 22 Nov 2019 05:43:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:48814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729194AbfKVKnP (ORCPT ); Fri, 22 Nov 2019 05:43: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 7D53120718; Fri, 22 Nov 2019 10:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419395; bh=ikEzlp6skgbt7ucgJUk6QMGS3qo27ru8EhTypd6fYVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZtbLd7Ef0iV6zj+jJot5crIla8FyM82q7U+Mqon0O5KB11vQZS0IjeSSBh5W6VJnN Kib2lVX553VyKo7BSJhKaJD9oQX7QnPiTuBf6XmxE0s2Fy207NH24Ik51+5RjA55Kb vNM4FVjHF6+62TGvxea1Fh8WHtYu4xhCZ2U7jx3A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Grygorii Strashko , Tony Lindgren , Sasha Levin Subject: [PATCH 4.9 097/222] ARM: dts: am335x-evm: fix number of cpsw Date: Fri, 22 Nov 2019 11:27:17 +0100 Message-Id: <20191122100910.440822090@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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: Grygorii Strashko [ Upstream commit dcbf6b18d81bcdc51390ca1b258c17e2e13b7d0c ] am335x-evm has only one CPSW external port physically wired, but DT defines 2 ext. ports. As result, PHY connection failure reported for the second ext. port. Update DT to reflect am335x-evm board HW configuration, and, while here, switch to use phy-handle instead of phy_id. Signed-off-by: Grygorii Strashko Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/boot/dts/am335x-evm.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index e82432c79f85f..3f3ad09c7cd5f 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -701,6 +701,7 @@ pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; + slaves = <1>; }; &davinci_mdio { @@ -708,15 +709,14 @@ pinctrl-0 = <&davinci_mdio_default>; pinctrl-1 = <&davinci_mdio_sleep>; status = "okay"; -}; -&cpsw_emac0 { - phy_id = <&davinci_mdio>, <0>; - phy-mode = "rgmii-txid"; + ethphy0: ethernet-phy@0 { + reg = <0>; + }; }; -&cpsw_emac1 { - phy_id = <&davinci_mdio>, <1>; +&cpsw_emac0 { + phy-handle = <ðphy0>; phy-mode = "rgmii-txid"; }; From patchwork Fri Nov 22 10:27:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 180045 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp76125ilf; Fri, 22 Nov 2019 03:24:02 -0800 (PST) X-Google-Smtp-Source: APXvYqxVEbjIHnXzsGaf9GC8ms6N4KryDZxpC6sILDvQOJg3qZmPTAdkfx+tXexw1Mbb9O1ZKLJW X-Received: by 2002:a50:e002:: with SMTP id e2mr408222edl.278.1574421740198; Fri, 22 Nov 2019 03:22:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574421740; cv=none; d=google.com; s=arc-20160816; b=xhNXNbnYFiuWTxT2aPXaFjHhev8oSR1dFYPzvYKnkgs0N0Qq98z08jzY3UcjkCXsP4 SamTsV+aDLfZ+91qTUZ7CzefXWDcM7MglaSuoRkeI1kTwRKM7j3YqF7//suu7i9/oWOn gg+ZHAR0jO2cZSFyCzazsFLrDZa09fFvaddB6PN163WmutpRvnVfMsNIpRfxcwRLQJWb Cl/9R5oKpp9jutl9A9t/xuSPp6XfNEfbL/paJ/Dm/qXgoWjvfGtG0mASRrOzYZiTI2Xs rCLoxZtxyZlPM+NeggykpR6rJea9Itez1pq5BOY9Lg1YJZJWlGU8MJ9zHyzI170Dz9cJ Kg2A== 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=0c6EIYZyaU+HO0HM9UcfkPWDzgNeyGbJqIivB7bFU+8=; b=chXV2RZN1D2zPg3+grIMvCybXDie4CR6FShJ9Vn2nACiTB95R4OBTWRWXMqq1lBNGn LA/TrI1JJB+YutQ21nB4YS5invcM+NxQJg+Zvw5dC+PWq0RIZBRMlzJIvfwYk+kVdDT/ GeUP9TSAydIis6dMioOciinMFKU1/WU/sDfp1zfkJRtm1rcFGStaYk47X/ktA98u9zq7 nFdp07eaV6X3e7sAQwY/R0dS4u0qOP3yXnqG9kdEDXwPRKX3Hi1oG2U3EYnCzt4+YQF9 hALsttbrD/JeYPfwoyKXMtPxwS19yOhjwRzoEXKoBzh9XNVdW2CMx5wHMq5/RLp7ElZa tsuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DqhEl1EN; 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 e10si3885738ejq.413.2019.11.22.03.22.19; Fri, 22 Nov 2019 03:22:20 -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=DqhEl1EN; 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 S1727636AbfKVLWS (ORCPT + 15 others); Fri, 22 Nov 2019 06:22:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:49012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729231AbfKVKn1 (ORCPT ); Fri, 22 Nov 2019 05:43: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 53A0120707; Fri, 22 Nov 2019 10:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419406; bh=5UlIQR2DCq+pOvDPurmJbhIK5FNedXV0/VZEjZx8hAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DqhEl1ENfYOqg9bgVGXj/Ni318rTSfEbvlypGV30eTbp3uuJSxwtyEbBX2wR78HiY PC0ysLjbJcRJQJm0A9tZ/SJz0fhy+GDW24nxiHWp2XLmjQuVTHZb1XtOjK9SFcEecL nfZLn9DWqq5XLl+4dZRYPFNYMmtAJW/b2y0wIqvY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Sasha Levin Subject: [PATCH 4.9 100/222] ARM: dts: ux500: Fix LCDA clock line muxing Date: Fri, 22 Nov 2019 11:27:20 +0100 Message-Id: <20191122100910.620083043@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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: Linus Walleij [ Upstream commit ecde29569e3484e1d0a032bf4074449bce4d4a03 ] The "lcdaclk_b_1" group is muxed with the function "lcd" but needs a separate entry to be muxed in with "lcda" rather than "lcd". Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi b/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi index 5c5cea232743d..1ec193b0c5065 100644 --- a/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi +++ b/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi @@ -607,16 +607,20 @@ mcde { lcd_default_mode: lcd_default { - default_mux { + default_mux1 { /* Mux in VSI0 and all the data lines */ function = "lcd"; groups = "lcdvsi0_a_1", /* VSI0 for LCD */ "lcd_d0_d7_a_1", /* Data lines */ "lcd_d8_d11_a_1", /* TV-out */ - "lcdaclk_b_1", /* Clock line for TV-out */ "lcdvsi1_a_1"; /* VSI1 for HDMI */ }; + default_mux2 { + function = "lcda"; + groups = + "lcdaclk_b_1"; /* Clock line for TV-out */ + }; default_cfg1 { pins = "GPIO68_E1", /* VSI0 */ From patchwork Fri Nov 22 10:27:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179977 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp27057ilf; Fri, 22 Nov 2019 02:44:40 -0800 (PST) X-Google-Smtp-Source: APXvYqxiFNcCACZo8CeoDQVhu3vSNbXykbbezs7K/nvx7XucNkmGh5WD/aD+/+ODU1QIXTURIPcc X-Received: by 2002:a05:6402:512:: with SMTP id m18mr229666edv.250.1574419480431; Fri, 22 Nov 2019 02:44:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419480; cv=none; d=google.com; s=arc-20160816; b=cwM4W96WDQgHn8oVgQ480gieIekNLYH0oadf2bZbX3l1Zu7BxlzkgPsAAXtlLn7mYz eOzeEYOlX40f0uwqk5WybKSuRnAPhZf/R5Dy35kV9Rsli8QR2/NX8XMepxPqevBFLcCu 7tBlxX+nud8wyPeatST1Xb4EfvOEcUiteVDDDM6B2EM26014kNzWv6wF+anEUmnrcQ5i 1FoWhmKEZe1wZ9dDOYehVT1cTbu8XrHK42AGNmvAyLodCp8IfO/ilSC7xpSIwgexabh2 doncbiYhh2ptON6k5ru4R+WD125mgx69XEDjYxBDA0o5MhrVZKNAwQVONpy8INz6RVDt UPZw== 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=MEuiMn5xXhzKoAz8rqlknXvkGCSpLwXbW73JQTweZ44=; b=Gy9ewKX5dsIayZfvR+KRSZdZiopBP+7Y0kAflvvcq0w+aMGjrXFB3MM2rH7m5dWLh1 kFiag8J2p2jfroGf0hqSab/+k8vvSVE/OiKqzFDmvewAWXhcBsfJhWTwj7Hc1XQjQiBd d2SbQnSHrsQZbpllGE9AeDyfJTRcGAtS8AYXewdANsjIXlmaaohbxVOubuehpOUp+r+1 AwIUMTaxvQfCt2O8gXrcuUjwU6+18XaKLiTmYk2RvOQm1tBWPu5AUaPFoo+1dwVPEA/W D18VXgfoDfiGozPQAlBaacfvrT8bIF0thgfjIh2DLicZ8H49LlhBf8ZvDgRKm78zdyWw mMow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QWUdv5xx; 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 c5si921847eds.263.2019.11.22.02.44.40; Fri, 22 Nov 2019 02:44:40 -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=QWUdv5xx; 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 S1727989AbfKVKoi (ORCPT + 15 others); Fri, 22 Nov 2019 05:44:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:50542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727740AbfKVKog (ORCPT ); Fri, 22 Nov 2019 05:44:36 -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 B1DD7205C9; Fri, 22 Nov 2019 10:44:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419474; bh=xfI8/dPVmCK1BenNrBBdSQzPPGYrx8ypbcs/wGBHDaw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QWUdv5xx89L1G6ez34799qyJJ7g4yZn1VSaZ6Rd60b6BzqUvhStHEm1KQoqALU7ef nFnzfeWDa/4wA4e82Fnpy6CL0fYUTPBhU+BDzDL4IIoZYNU3liN3bW79vdkQrtHhp+ XJ/qS7EtaoC6RpmfSb4G1ixx68mWCIYF8Uop1HS4= 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.9 117/222] coresight: Fix handling of sinks Date: Fri, 22 Nov 2019 11:27:37 +0100 Message-Id: <20191122100911.607425908@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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 c71369de02b285d9da526a526d8f2affc7b17c59 ] The coresight components could be operated either in sysfs mode or in perf mode. For some of the components, the mode of operation doesn't matter as they simply relay the data to the next component in the trace path. But for sinks, they need to be able to provide the trace data back to the user. Thus we need to make sure that "mode" is handled appropriately. e.g, the sysfs mode could have multiple sources driving the trace data, while perf mode doesn't allow sharing the sink. The coresight_enable_sink() however doesn't really allow this check to trigger as it skips the "enable_sink" callback if the component is already enabled, irrespective of the mode. This could cause mixing of data from different modes or even same mode (in perf), if the sources are different. Also, if we fail to enable the sink while enabling a path (where sink is the first component enabled), we could end up in disabling the components in the "entire" path which were not enabled in this trial, causing disruptions in the existing trace paths. 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 --- drivers/hwtracing/coresight/coresight.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index 398e44a9ec45d..5ffabc388630e 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -132,12 +132,14 @@ static int coresight_enable_sink(struct coresight_device *csdev, u32 mode) { int ret; - if (!csdev->enable) { - if (sink_ops(csdev)->enable) { - ret = sink_ops(csdev)->enable(csdev, mode); - if (ret) - return ret; - } + /* + * We need to make sure the "new" session is compatible with the + * existing "mode" of operation. + */ + if (sink_ops(csdev)->enable) { + ret = sink_ops(csdev)->enable(csdev, mode); + if (ret) + return ret; csdev->enable = true; } @@ -331,8 +333,14 @@ int coresight_enable_path(struct list_head *path, u32 mode) switch (type) { case CORESIGHT_DEV_TYPE_SINK: ret = coresight_enable_sink(csdev, mode); + /* + * Sink is the first component turned on. If we + * failed to enable the sink, there are no components + * that need disabling. Disabling the path here + * would mean we could disrupt an existing session. + */ if (ret) - goto err; + goto out; break; case CORESIGHT_DEV_TYPE_SOURCE: /* sources are enabled from either sysFS or Perf */ From patchwork Fri Nov 22 10:27:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179981 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp28221ilf; Fri, 22 Nov 2019 02:45:42 -0800 (PST) X-Google-Smtp-Source: APXvYqyA9aYPw5l9/egWCXuhhEy7PqrbxK3qbU6Y6S7hk2CL8k70TzcM3GhN5206VO/2QQbS5MsJ X-Received: by 2002:aa7:d0c1:: with SMTP id u1mr231407edo.27.1574419542136; Fri, 22 Nov 2019 02:45:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419542; cv=none; d=google.com; s=arc-20160816; b=w8V6YlP10lFGLTD9CMZcRLcbJy+3tOQIgDDJqhVhkRKJRGmtcM91Nk7byGVNVK52KF YeNWpigwzE2us0gSLu6XUn8pgl1cQWhvMqly8asnZLxKHJe8B6u8M9EP0B/SQg1ZL8Vv dUA3LyjtUk0nN5pnYHtbvmxwb9/VQTAfZipzl8ofmWT1LGcQt6Wo2utCXFou6Qrz+yda ap952NcHOQY7WW3CLCD0SlzNMwoD38nhiUWJpdErwbXjsEL3QqTX9IkzuEU5ZyqJBA1k wzTdSkSFOkahH5IM1oo8UVe19A8NdoSZ06/3c/HZ65g8S9z4nJ8EHkKt6VaaB4tOCG2N Upjg== 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=fR5grtse5PNpdY8Mq7fjMKAWRdQEz9BfjGC/zSLvcaM=; b=f6JaH6tshbYJ88cZOD+viIs/kSUfdkWRRwHBeEgzJWbcy9HRcxV5KPECdZx1ln+3uC R10HtLQvkkOIOIv8cMg0K8+6jw7e0XVi7Jy94AAx1S01MgRhzPBXw8Vu1PHTLo+FmpVU dIvnr6HsHroin0l43f6TIOstBccyxxv6Y9vcaIJwa1+nDFdp73Rop+oSjy0a5H25HQe6 8jX8lIwpHq+FK2NRGVaXq/9Jm05weqAYNZAJRj7c3B33sCAqBnIESGDPJf/p5YnGrdti fP2da7upl6aVRzmKmj3NGug+B298OJ1gRZjCLAd5nQo/4bntYLbJQ9BRuz3/EXHoNlO/ UGZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TddfM8lq; 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 z16si4406966edx.337.2019.11.22.02.45.41; Fri, 22 Nov 2019 02:45:42 -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=TddfM8lq; 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 S1729486AbfKVKpk (ORCPT + 15 others); Fri, 22 Nov 2019 05:45:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:52148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727593AbfKVKpj (ORCPT ); Fri, 22 Nov 2019 05:45:39 -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 185342071C; Fri, 22 Nov 2019 10:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419538; bh=C/p5ffkx9IEH3kI+wV1/WForkf/HV3MApMb1oJBFRpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TddfM8lqTZN0X19SQHQJo9UcFLDMkvCZmOWVHr2nhgiUpqawGkTHioCtmL/SGkVUt PWAdmhsp3fzCxuRzO1gWL3vKCQCiHhNhPOkvuev5lBsKnXeAyhtV+dhN2nImhKHixI P5Sf9Pmsk7huGPmD2ZCCmiP79/okn4QNOk18WWZQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Mike Leach , Leo Yan , Sasha Levin Subject: [PATCH 4.9 119/222] coresight: tmc: Fix byte-address alignment for RRP Date: Fri, 22 Nov 2019 11:27:39 +0100 Message-Id: <20191122100911.718972632@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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: Leo Yan [ Upstream commit e7753f3937610633a540f2be81be87531f96ff04 ] >From the comment in the code, it claims the requirement for byte-address alignment for RRP register: 'for 32-bit, 64-bit and 128-bit wide trace memory, the four LSBs must be 0s. For 256-bit wide trace memory, the five LSBs must be 0s'. This isn't consistent with the program, the program sets five LSBs as zeros for 32/64/128-bit wide trace memory and set six LSBs zeros for 256-bit wide trace memory. After checking with the CoreSight Trace Memory Controller technical reference manual (ARM DDI 0461B, section 3.3.4 RAM Read Pointer Register), it proves the comment is right and the program does wrong setting. This patch fixes byte-address alignment for RRP by following correct definition in the technical reference manual. Cc: Mathieu Poirier Cc: Mike Leach Signed-off-by: Leo Yan Signed-off-by: Mathieu Poirier Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c index d6941ea24d8df..14df4e34c21cf 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c @@ -425,10 +425,10 @@ static void tmc_update_etf_buffer(struct coresight_device *csdev, case TMC_MEM_INTF_WIDTH_32BITS: case TMC_MEM_INTF_WIDTH_64BITS: case TMC_MEM_INTF_WIDTH_128BITS: - mask = GENMASK(31, 5); + mask = GENMASK(31, 4); break; case TMC_MEM_INTF_WIDTH_256BITS: - mask = GENMASK(31, 6); + mask = GENMASK(31, 5); break; } From patchwork Fri Nov 22 10:27: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: 179979 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp27296ilf; Fri, 22 Nov 2019 02:44:53 -0800 (PST) X-Google-Smtp-Source: APXvYqzgxrd5w2PCtvFna3k4+MvMrFw6jaFDKDqSYqDW3s/d0aDMq0hGBHThzFs2aNfGZhoNc65a X-Received: by 2002:a17:907:2122:: with SMTP id qo2mr21729171ejb.12.1574419493425; Fri, 22 Nov 2019 02:44:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419493; cv=none; d=google.com; s=arc-20160816; b=p1pMt93mKBTDrBeBisiGoohh0B4ACT0xJl4nWwm3RpvmPaWhUdzRN9wM69hSl/Fl8M zwNfYsIUMkSV3b6kM4PJVdAJS9e21hpKADPVXLr3hnBLHIwUEpdXk1nXizRPbmkjxl7g Qn5cYK3v2sU7yzTiDDWWCwdNj1jqxYvHVwZ/Pwz/2BI9ne/asd53/3H3iJxIhYD9TV2f tztlt5cD+u13yFr6maOjoEIEJKos4BPrEw7jlgqwr6Mr1hGgp2kQ+v3Nkjf+K2ySWGNC Q4mRgASCOBi84cSE6ilshw4U9UD1DE3r16VkgBxC1DD+ku+nE0o/o9HoUmI0pMBwRiMh nuRA== 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=s8dvM/qt/Oc1MFwWkNuSR3/SzVoMb29FDjvjGSbzgqM=; b=DC1/L6wTonBvgzayv6fCVQ9IiPHR4/8OJHZ0LLhb7ziljAZu/oEkpbE5cYKVPsMyhX QhCRJ9CXXLNT4+zXV1ppzgN0eLLeEK0nIyBYMiLgi1YIGXXo8K9kzHp/13WK6TpGKzli aBdZ5DftW32d/VZI3NZ1DQKFCFpVslAwUpUqwQL8Fr/15e949Qkjkam+560OJdsmVcph MlRsFHv2skRiG9SHHRtzfAjJFhgQbNm6iv9HQbtBsaxgjQ7bGPa/LSbvcq3b6H9r52Ep W5Azlt7YsLACYu0Vr0rW2YHuPZLGdgSrPphQCQzVyb1UpcFN8NH4jMSAr92d/RJuBjZA H1qQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iz0V+qhJ; 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 md8si576233ejb.386.2019.11.22.02.44.53; Fri, 22 Nov 2019 02:44: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=iz0V+qhJ; 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 S1729008AbfKVKov (ORCPT + 15 others); Fri, 22 Nov 2019 05:44:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:50902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727630AbfKVKov (ORCPT ); Fri, 22 Nov 2019 05:44:51 -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 AA7EE20717; Fri, 22 Nov 2019 10:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419490; bh=sbePzzQan0qJ7i3IEwqAf5vzUm2j7iCFP8XVjEA5+2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iz0V+qhJKQtnHNb2CCzDwCv6IRlwfrTphb6KCSWoTWUCiYquATziEoe9fx3YrXjBx hEUqTv4rJcneobepJJHIKqBrGzkcvNL5ESE6SrqZngBkZZt4GcOP4NhuRuGYb1eAJg rwnS4AkZ2cjMFKU7zLo3qa9+2rrAqgQkiM6a8IVo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Rob Herring , Sasha Levin Subject: [PATCH 4.9 130/222] ARM: dts: realview: Fix SPI controller node names Date: Fri, 22 Nov 2019 11:27:50 +0100 Message-Id: <20191122100912.365250983@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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 016add12977bcc30f77d7e48fc9a3a024cb46645 ] SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the name enables dtc SPI bus checks. Cc: Linus Walleij Signed-off-by: Rob Herring Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +- arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +- arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +- arch/arm/boot/dts/versatile-ab.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/arm-realview-eb.dtsi b/arch/arm/boot/dts/arm-realview-eb.dtsi index e2e9599596e25..05379b6c1c13b 100644 --- a/arch/arm/boot/dts/arm-realview-eb.dtsi +++ b/arch/arm/boot/dts/arm-realview-eb.dtsi @@ -334,7 +334,7 @@ clock-names = "uartclk", "apb_pclk"; }; - ssp: ssp@1000d000 { + ssp: spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; clocks = <&sspclk>, <&pclk>; diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts index c789564f28033..c1fd5615ddfe3 100644 --- a/arch/arm/boot/dts/arm-realview-pb1176.dts +++ b/arch/arm/boot/dts/arm-realview-pb1176.dts @@ -343,7 +343,7 @@ clock-names = "apb_pclk"; }; - pb1176_ssp: ssp@1010b000 { + pb1176_ssp: spi@1010b000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1010b000 0x1000>; interrupt-parent = <&intc_dc1176>; diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts index 3944765ac4b06..e306f1cceb4ec 100644 --- a/arch/arm/boot/dts/arm-realview-pb11mp.dts +++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts @@ -480,7 +480,7 @@ clock-names = "uartclk", "apb_pclk"; }; - ssp@1000d000 { + spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; interrupt-parent = <&intc_pb11mp>; diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi index aeb49c4bd773f..2bf3958b2e6b9 100644 --- a/arch/arm/boot/dts/arm-realview-pbx.dtsi +++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi @@ -318,7 +318,7 @@ clock-names = "uartclk", "apb_pclk"; }; - ssp: ssp@1000d000 { + ssp: spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; clocks = <&sspclk>, <&pclk>; diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts index 409e069b3a845..00d7d28e86f0b 100644 --- a/arch/arm/boot/dts/versatile-ab.dts +++ b/arch/arm/boot/dts/versatile-ab.dts @@ -303,7 +303,7 @@ clock-names = "apb_pclk"; }; - ssp@101f4000 { + spi@101f4000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x101f4000 0x1000>; interrupts = <11>; From patchwork Fri Nov 22 10:28: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: 179983 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp30460ilf; Fri, 22 Nov 2019 02:47:43 -0800 (PST) X-Google-Smtp-Source: APXvYqxd8KAZD56uASHQ5CUrEjj+tAfFJ5fC+TpTiVlV0pHOSXVrMZjdF2lqnDDJ8oeNWDYC4BFp X-Received: by 2002:a17:906:2893:: with SMTP id o19mr21815860ejd.32.1574419663325; Fri, 22 Nov 2019 02:47:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419663; cv=none; d=google.com; s=arc-20160816; b=tajVX51MJ4jtjpf/4wh17UO9dOBxsevrIxA0TMZKJ5plr8BL7YUU3apbUYatuRtvrv EKgANaI0nIf+7ONJYA6XfAnLMIBNtrrzFnADbvz64BnJ8kyuz9wdtjBGXu6tD2Jf1Oed SBhSkLi0y/2ZleCHdxOTpLunYH2bBAAUyb0nnF3RDKSu7i0juMID7DqOcePqZDg5bhB8 158kd0F9MoxO4+mHslg5wAzvk7ZwDSBByCasu+Nqi/7PQvrzF3pWWIhKWR5WdeZmq5UX vBpCh55YKOcLIXsJPmMCsEdVkDPa7jzCLK7GOB7ZJLe0hbcD9mXhyDD7pOEcmTRq0xBl XjDw== 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=S4VTd4wTlDvBnbz/rrMCeLOlHcQJEcm/DeLFJRH8S3o=; b=SiiaDg7iyt83lsddsNJ4NcSW5GMvzSnZE2RueNyThsOuc52xv5dpAkFwKVRz08JEYC URdaMECCMTdP1j54D0s1rGbnsbcEd/NiIFuhFpl7hsLN+F4vFgZ/23eFNLH1dg21otwg 7nd2EL9LKowBmzMGvCmqzCUNnLWQQE3BWe8VuBzKeTW8hSK0coRHeeG/Hsw90/L+4PQp 4aS14s4VG5xIM03KpEisVWqemU3juQoLNM9Kln8aGCjyd6D4peGU7Ce8HDMf/7RLwczJ mVObPecBeOReuuruo8BXOsqAqB8WnTnxEf7E+N5bw0V7xkCktnmhnhbyqTlQIAf1KL1K RZDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Rca6HGei; 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 24si4297543eje.293.2019.11.22.02.47.43; Fri, 22 Nov 2019 02:47:43 -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=Rca6HGei; 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 S1729083AbfKVKrl (ORCPT + 15 others); Fri, 22 Nov 2019 05:47:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:55712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729797AbfKVKrk (ORCPT ); Fri, 22 Nov 2019 05:47: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 E821720637; Fri, 22 Nov 2019 10:47:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419659; bh=Zgkwqrff4/iY33NyPBf0FfOVn1J4uPqkRyaGWhNjPxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rca6HGeiEXMG/vGT+mXRsvU0k/6tryAmflqgKqrneSWOXS1nE6w0JZDh8xOcmwiwM kXqmKOkdkD/7h5ajMi/pbSq01IRJ8nHUlrEtrP1ymW/3NFiGq7CCq7XXinULGJD84i g90WR8CPBl8G3tocBIcIoX1dH4iBEtXCh5gHGM0M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Sylwester Nawrocki , Sasha Levin Subject: [PATCH 4.9 188/222] clk: samsung: Use clk_hw API for calling clk framework from clk notifiers Date: Fri, 22 Nov 2019 11:28:48 +0100 Message-Id: <20191122100915.891944996@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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 1da220e3a5d22fccda0bc8542997abc1d1741268 ] clk_notifier_register() documentation states, that the provided notifier callbacks associated with the notifier must not re-enter into the clk framework by calling any top-level clk APIs. Fix this by replacing clk_get_rate() calls with clk_hw_get_rate(), which is safe in this context. Signed-off-by: Marek Szyprowski Signed-off-by: Sylwester Nawrocki Signed-off-by: Sasha Levin --- drivers/clk/samsung/clk-cpu.c | 6 +++--- drivers/clk/samsung/clk-cpu.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/drivers/clk/samsung/clk-cpu.c b/drivers/clk/samsung/clk-cpu.c index 8bf7e805fd349..1271315b0c25b 100644 --- a/drivers/clk/samsung/clk-cpu.c +++ b/drivers/clk/samsung/clk-cpu.c @@ -152,7 +152,7 @@ static int exynos_cpuclk_pre_rate_change(struct clk_notifier_data *ndata, struct exynos_cpuclk *cpuclk, void __iomem *base) { const struct exynos_cpuclk_cfg_data *cfg_data = cpuclk->cfg; - unsigned long alt_prate = clk_get_rate(cpuclk->alt_parent); + unsigned long alt_prate = clk_hw_get_rate(cpuclk->alt_parent); unsigned long alt_div = 0, alt_div_mask = DIV_MASK; unsigned long div0, div1 = 0, mux_reg; unsigned long flags; @@ -280,7 +280,7 @@ static int exynos5433_cpuclk_pre_rate_change(struct clk_notifier_data *ndata, struct exynos_cpuclk *cpuclk, void __iomem *base) { const struct exynos_cpuclk_cfg_data *cfg_data = cpuclk->cfg; - unsigned long alt_prate = clk_get_rate(cpuclk->alt_parent); + unsigned long alt_prate = clk_hw_get_rate(cpuclk->alt_parent); unsigned long alt_div = 0, alt_div_mask = DIV_MASK; unsigned long div0, div1 = 0, mux_reg; unsigned long flags; @@ -432,7 +432,7 @@ int __init exynos_register_cpu_clock(struct samsung_clk_provider *ctx, else cpuclk->clk_nb.notifier_call = exynos_cpuclk_notifier_cb; - cpuclk->alt_parent = __clk_lookup(alt_parent); + cpuclk->alt_parent = __clk_get_hw(__clk_lookup(alt_parent)); if (!cpuclk->alt_parent) { pr_err("%s: could not lookup alternate parent %s\n", __func__, alt_parent); diff --git a/drivers/clk/samsung/clk-cpu.h b/drivers/clk/samsung/clk-cpu.h index d4b6b517fe1b4..bd38c6aa38970 100644 --- a/drivers/clk/samsung/clk-cpu.h +++ b/drivers/clk/samsung/clk-cpu.h @@ -49,7 +49,7 @@ struct exynos_cpuclk_cfg_data { */ struct exynos_cpuclk { struct clk_hw hw; - struct clk *alt_parent; + struct clk_hw *alt_parent; void __iomem *ctrl_base; spinlock_t *lock; const struct exynos_cpuclk_cfg_data *cfg;