From patchwork Wed Jan 4 13:34:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 9497815 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6A6E3606A9 for ; Wed, 4 Jan 2017 21:21:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EC812824F for ; Wed, 4 Jan 2017 21:21:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 511B628339; Wed, 4 Jan 2017 21:21:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EA6A32824F for ; Wed, 4 Jan 2017 21:21:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cOsyb-0004VW-Mx; Wed, 04 Jan 2017 21:20:05 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cOsqB-0005NE-Te for linux-arm-kernel@bombadil.infradead.org; Wed, 04 Jan 2017 21:11:24 +0000 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cOliL-000075-NA for linux-arm-kernel@lists.infradead.org; Wed, 04 Jan 2017 13:34:52 +0000 Received: by mail-wm0-x233.google.com with SMTP id k184so260908632wme.1 for ; Wed, 04 Jan 2017 05:34:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=GhFqAsjGNHopHTnY1sCZ7/ul9mk4WQ006dlPZwkkhis=; b=ZDmsN4tuW4ptqH5NgAtGx0RfepuUjN0/c9VIwk6buEHy4Kb9clEjHnTy2t62zBaGKe xjLVbrj7bWfIRtCCvpxitadKmWWfX0f0R/GVnIUkXJmOZgCTJmX/ucXA//1yjxe9K7wm RdM7kXyesZtFfLVAylbFblq+181uojAsdG0u4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GhFqAsjGNHopHTnY1sCZ7/ul9mk4WQ006dlPZwkkhis=; b=aSAayPkxALQzPLVOqSTJBQt8pUTjzePRpml3X8v7Dh4pLMrF829uec+LIUqKmHca41 3feOVqQ47aseJ7nZk7FSKpz1V/+P/6f0vytdfreU06qZ65AZ9trWKbBCTAZThNB3Ihr4 gqzQXnEsCmBXHS7cG7HsPo6asyMlZYnuC5859KM0trVA4QjPNdMXeF8l8q74ODeL6gOD 1H162mra05lzGGD+Ia+TchdQpQz6tOsQPkkIWQLb6Is3mid1f4V2MZ2YbJnBj+Wrsqbt LQxPHTbjADJZ8LEU1x3h09Xx+TRc3kl4uwKOLPSraw+iiUphym6EXzVM+gbTfKv37Gz9 CZeQ== X-Gm-Message-State: AIkVDXKKpRVv/Lmn2Nt+bkXWhcReftspFt1dlW/WCcNoEH4sKJNXhuhBOMy/7Sbo+ZA4AdEJ X-Received: by 10.28.125.136 with SMTP id y130mr61002159wmc.112.1483536866247; Wed, 04 Jan 2017 05:34:26 -0800 (PST) Received: from localhost.localdomain (host-2-98-102-117.as13285.net. [2.98.102.117]) by smtp.gmail.com with ESMTPSA id z9sm45824864wjf.17.2017.01.04.05.34.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jan 2017 05:34:25 -0800 (PST) From: Srinivas Kandagatla To: Andy Gross Subject: [PATCH 1/4] ARM: dts: move hdmi pinctrl out of board file. Date: Wed, 4 Jan 2017 13:34:11 +0000 Message-Id: <1483536854-21389-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170104_133449_800238_7C73250C X-CRM114-Status: GOOD ( 13.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, David Brown , Rob Herring , Srinivas Kandagatla , linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch moves hdmi pinctrl defination from board file to soc level pinctrl file. If not this pinctrl setup will be duplicated across all the apq8064 based board files. Signed-off-by: Srinivas Kandagatla Reviewed-by: Archit Taneja --- arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 22 ---------------------- arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 19 +++++++++++++++++++ arch/arm/boot/dts/qcom-apq8064.dtsi | 2 ++ 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts index 3d37cab..881ce70 100644 --- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts +++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts @@ -75,25 +75,6 @@ bias-disable; }; }; - - hdmi_pinctrl: hdmi-pinctrl { - mux { - pins = "gpio70", "gpio71", "gpio72"; - function = "hdmi"; - }; - - pinconf_ddc { - pins = "gpio70", "gpio71"; - bias-pull-up; - drive-strength = <2>; - }; - - pinconf_hpd { - pins = "gpio72"; - bias-pull-down; - drive-strength = <16>; - }; - }; }; rpm@108000 { @@ -368,9 +349,6 @@ hpd-gpios = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&hdmi_pinctrl>; - ports { port@0 { endpoint { diff --git a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi index 6b801e7..cba4450 100644 --- a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi @@ -284,4 +284,23 @@ bias-disable = <0>; }; }; + + hdmi_pinctrl: hdmi-pinctrl { + mux { + pins = "gpio70", "gpio71", "gpio72"; + function = "hdmi"; + }; + + pinconf_ddc { + pins = "gpio70", "gpio71"; + bias-pull-up; + drive-strength = <2>; + }; + + pinconf_hpd { + pins = "gpio72"; + bias-pull-down; + drive-strength = <16>; + }; + }; }; diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index 407a461..e68a8a1 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -1327,6 +1327,8 @@ hdmi: hdmi-tx@4a00000 { compatible = "qcom,hdmi-tx-8960"; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_pinctrl>; reg = <0x04a00000 0x2f0>; reg-names = "core_physical"; interrupts = ;