From patchwork Fri Nov 22 10:27:43 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: 179964 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp15767ilf; Fri, 22 Nov 2019 02:34:19 -0800 (PST) X-Google-Smtp-Source: APXvYqzSrhcje8pJK7GbVT+ocJM6iWZmLJZo/zg/gQq9NBvFaFezcwFStpqsMv4JVLYmOpeOMXHJ X-Received: by 2002:a17:906:cca:: with SMTP id l10mr21206699ejh.161.1574418858935; Fri, 22 Nov 2019 02:34:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574418858; cv=none; d=google.com; s=arc-20160816; b=cQ/gjHbaS7c8RRAtkW31gznShMO5c8uBJECYmUkuP0OJus4IKVKzpKvqfUPceyI2Pq itA/CG9EgVdLRTUWGp8vUPAD95SIOARgb2r/eqYgv7/6UhlsTErKDvsqmef7FtaEHD/n TrO/NcJajzHpheYWd5rLhlsnbRQaDOQzEspDerkO20tyenSXgFdDRQeBnd8ksKb73JhV y66mOxikjWuU7udUta7wpvks8c5/H3vXq3ly7QKlKHYEJunNXsLcgG0+lxL32h9PIgRC 9RrGGW66Hv1bwcH1LS7Ym9xNBlpZDW+p55YyoiukIgRC/6UW1wojDwkhlFWW7labxRGW K8Pw== 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=qsgpB3SicJUUYiQ3a/UE4ZiXcuu7J+25/q3aLS5uIx/TmCKkJTHnqs0hh4VgAEB2dI SNefZCvMHr6msVfDOjRVV2upT+PBP8UaFY0FC3RdeUFLpvFR/aEfIsXX0iCD1RgOydMl BwMCPpRZ+53g0nzlNMsluCnumwYr9thaNmvUcMdUxnYuatf76Q+QwKSOZaSk+69tjwDD yZ4umc7DAiLqDBCubzSGhHsa17ylhYQaYSsZ60aB/CHVMeuIGxLWNtj8kMENB3IGtfpO afUmy24IOGW5W70xZ+3MPU9Fk7fPGJ0JYg3JldfJNckpA2G9lE0UWZ4TR9wLtMpdUT9r Tp/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bJtPjGO5; 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 d34si4643317eda.268.2019.11.22.02.34.18; Fri, 22 Nov 2019 02:34:18 -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=bJtPjGO5; 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 S1727329AbfKVKeO (ORCPT + 15 others); Fri, 22 Nov 2019 05:34:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:58382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728036AbfKVKeN (ORCPT ); Fri, 22 Nov 2019 05:34: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 B745D20656; Fri, 22 Nov 2019 10:34:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418853; bh=5UlIQR2DCq+pOvDPurmJbhIK5FNedXV0/VZEjZx8hAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bJtPjGO5R9I5aVkgRpIz8rtUDNla+5zbAb+swg/a6zp3s+jWHmgiyjf2H9F52tLnz F+yzuL8w32P6uh4p/NydCn/n3oqsbrcjZav9El+PSAiOVwX4BpThyrDmdnUavJaVX9 /yiveIr5RQMt+pAKgMPpvAKrvFh4qvxEt9TMUTCM= 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.4 072/159] ARM: dts: ux500: Fix LCDA clock line muxing Date: Fri, 22 Nov 2019 11:27:43 +0100 Message-Id: <20191122100757.430426569@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: 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 */