From patchwork Tue Nov 19 05:18:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179722 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp183010ilf; Mon, 18 Nov 2019 22:04:58 -0800 (PST) X-Google-Smtp-Source: APXvYqw5ChFvHqjZNEVkKfCusyDAwDmEvFuk8KwgsrO0WeL+s9CwZCgfJXHvxwSmjp6pqit0F2KS X-Received: by 2002:a17:906:344c:: with SMTP id d12mr31223915ejb.227.1574143498481; Mon, 18 Nov 2019 22:04:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143498; cv=none; d=google.com; s=arc-20160816; b=or3DW12hZjZdP5LsVMIOXZdiixYJNFodil1PM6p83/qmNeYCmMvd0Y/05i8RkFpr6v SLEBuu1TudsNBgKi6WI93D5MvEjyZMjKKafAf2QKsXlwXfSFbjlnxs2kQRd8vAe6eHy9 PPjoE4m0AXUhr6TDYy/+ziJl90gccKHgKSX+UKtaWSA3tob45sT7oYk+yXJk4G/A/zem Wa22ZlpC9uGO+6mYHdBtVS2PhDpiD0xsj4OP1jxW9EiuuW/1xCUJQefD1d9FRG3DNscv fl71Of4qZLO/7Q7ca5OQ9UMIewntyd54xuSgiNg2yzTVxxHlLpamWK2i6iwdRpC/KWI/ VBnw== 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=SiF+pSt7/kcMD3PlyYZ1jhNwMYXbLDUiE+wNoZo82DmDYfJ33uqpPCqz9IO0DZdT0Y FDFcPSRsH+JPyhH9GGB9FWL1Yd41F+L9HFcT6MPsQ8XRg9GVCHNQqRsnkZO+JKvkxbXi H7AxBDP8/K40+CVs2EXqiDkCyVvplYp0LbpjFazZP/SYc+OFSJRKmhpCCq8B3GJEkvot XiUshGJRFlT2KD3QlYXdkZIsmc1+MCtf6R1kngWjv9mnyIkW0dJ3svHtR4+06c1BxHaZ 2f2lydj3kNUccIpl9Sm6nB9bvVYhJ5jtX8LqSqDh5sMFStVxsd1Xp2aqTJuzWWLTZfnf hccQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rhzauzkD; 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 nw21si10479048ejb.222.2019.11.18.22.04.57; Mon, 18 Nov 2019 22:04:58 -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=rhzauzkD; 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 S1727795AbfKSFhf (ORCPT + 26 others); Tue, 19 Nov 2019 00:37:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:59370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729163AbfKSFhb (ORCPT ); Tue, 19 Nov 2019 00:37:31 -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 8302821783; Tue, 19 Nov 2019 05:37:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141851; bh=5UlIQR2DCq+pOvDPurmJbhIK5FNedXV0/VZEjZx8hAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rhzauzkDPLi8fSoKziZfusqjjZBX1+Xq0tgdqf1zJC8vkZ3l9oXTY2wqZXNcyZYTJ ZgS5IFI1nyyrmppjwIoFdjUs4bSnIWMSY9EH+sPTygBcMPgM+aAGdpVf2ddrTiOYT0 1bXsZy4i2NsmeCj5wOkQj26Ql8dNaMHVU7TCpXho= 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.19 301/422] ARM: dts: ux500: Fix LCDA clock line muxing Date: Tue, 19 Nov 2019 06:18:18 +0100 Message-Id: <20191119051418.506508118@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 */