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 Kroah-Hartman 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 */