From patchwork Tue Jan 29 13:23:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 156988 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4657532jaa; Tue, 29 Jan 2019 05:23:55 -0800 (PST) X-Google-Smtp-Source: ALg8bN4yWFvONM3fxN2i6crDyO/67xsJFkGjKif7UhLPiZL78Ik5Uhs9qiPYtffqQfzvZ3+khI9y X-Received: by 2002:a17:902:8607:: with SMTP id f7mr25332106plo.123.1548768235858; Tue, 29 Jan 2019 05:23:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548768235; cv=none; d=google.com; s=arc-20160816; b=gmNhBAJCaRHmo7qxPbp9lMgs8TVD2DGuYKuF3wFzydsHZSanZukShlcAzEWEQgIcl0 IwrEJS7xsBwXW/V+c6CxdG53CR4Eof9xKI2U8nYf2bKBbGdQNS+Sw7A8S2VckvfdD2sR 5HW4i4nEPEY9oZosn5Z7PT1fXPuHX/GFU0yB44VYZuPqPXIdt1AL6O25PSOoU3hMzB/4 k8UKeXHRqm6b/SvzQtTsEEYz2sfRohPB+Ue2xlEwpr4xeSu9tELPX+g7+zsL3tigXArN zx7zHrvEexfItlDOgmtbADMeeX+RlRcHDhDt1mz5BnK/bWD5I60VlnQgecd/X3pv5VLF M7SQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+iUaGMGKWn9N83ma0ITcBvsEGTsrPVKtGMn9CVZ2yxg=; b=eJHIcwpzTEzuMfH81FGnewW9GglvKiRq6dvs2gSFmCP9kFsK4p/GghW1qMR4ht0ier vw4dYlCBFGxa7w7C6/5rzAOxMemjrKXWDhwTHaW0m4eXr+MLHQGymUZSyj0PCgnlvr9k 3v5zg+vunwz1I8gC5PTLKSClratfxUj4voZABrQVxswRKIaG3ahPVy/KLvQsWVq2EYvn 79RzQUTQkE5kMvprxyrmE4d+BHeX7FGgHbBpembhqfap8K7x6ggEpr2n5nwDZAl6rsrE gmdtPEYyGiZb2ZDiA5LI0Ne7YF4zK4B2RTxXgSBRZrHOeY3vox/DlkpcMSXn04yu1YKp HMPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=itYg1ZnB; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i6si26218218pgq.207.2019.01.29.05.23.55; Tue, 29 Jan 2019 05:23:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-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=@linaro.org header.s=google header.b=itYg1ZnB; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727073AbfA2NXz (ORCPT + 7 others); Tue, 29 Jan 2019 08:23:55 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37646 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726857AbfA2NXy (ORCPT ); Tue, 29 Jan 2019 08:23:54 -0500 Received: by mail-wr1-f66.google.com with SMTP id s12so22029234wrt.4 for ; Tue, 29 Jan 2019 05:23:53 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=+iUaGMGKWn9N83ma0ITcBvsEGTsrPVKtGMn9CVZ2yxg=; b=itYg1ZnBFqTT8OEIbW6NsGc8XTFUE4zxH8Me1Q2KohBZ8RHYlDfZ9JpxIZFXPaSoqb LRYSqugdWDsFlrCHrmkNbvl5M9NXShdm9KIgoh+IMFROAIYDv9Tq5sB1oL02vqZhg0GG ur8+Q2MxvdTVP858MqQqCNZ5x9yJCKMIyvLm8= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=+iUaGMGKWn9N83ma0ITcBvsEGTsrPVKtGMn9CVZ2yxg=; b=sAAOcpiH8gSXFlrpwoQ5fW3XhpguMD5eBGWYKX/jsnhnkFIORTU/FYUc3kKyXkyMhe 5pc2JTQ0cf3MqxhKZkPct70p1WMqKVzKwKK5/yyD6yIEn5F7P/sGZRE/wvEVceOJki7O 82XkmVjaAPSIOw6qgxRefuxWX5/XRioeXzU8PGRn/pUUC+Zp61+sAU4A8OxXTFXyEtIV 7ZMkAtWGwliHivIYmSj314Tai9Z6QL1kc1TMXaUxpO3iVuQRUMIdxDUJFDQ/kas4qc6j nQHZxueJt696ljnas4v2yCg92pFkBM7eAn2BXbEANaE/iMjg3UqZx73YDDOR+jHwk9+d QXGg== X-Gm-Message-State: AJcUukcpYwpHZMEOzACDGPzptZtncWKb2MgtoM3Pi4Ni5Qp8cnASQgVb 5zDO7EhXWJiiEKgiYVFFHmGhfg== X-Received: by 2002:adf:fe11:: with SMTP id n17mr25308535wrr.329.1548768232946; Tue, 29 Jan 2019 05:23:52 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id w80sm3739628wme.38.2019.01.29.05.23.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jan 2019 05:23:52 -0800 (PST) From: Srinivas Kandagatla To: andy.gross@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Archit Taneja , Vivek Gautam , Srinivas Kandagatla Subject: [PATCH 2/6] arm64: dts: msm8996: Add display smmu node Date: Tue, 29 Jan 2019 13:23:31 +0000 Message-Id: <20190129132335.30695-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> References: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Archit Taneja Add device node for display smmu, aka. mdp_smmu. Signed-off-by: Archit Taneja Signed-off-by: Vivek Gautam Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -- 2.20.1 diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index c9b80d175fd4..96adda520bd5 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -1155,6 +1155,23 @@ power-domains = <&mmcc GPU_GDSC>; }; + mdp_smmu: arm,smmu@d00000 { + compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2"; + reg = <0xd00000 0x10000>; + + #global-interrupts = <1>; + interrupts = , + , + ; + #iommu-cells = <1>; + + clocks = <&mmcc SMMU_MDP_AHB_CLK>, + <&mmcc SMMU_MDP_AXI_CLK>; + clock-names = "iface", "bus"; + + power-domains = <&mmcc MDSS_GDSC>; + }; + agnoc@0 { power-domains = <&gcc AGGRE0_NOC_GDSC>; compatible = "simple-pm-bus"; From patchwork Tue Jan 29 13:23:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 156991 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4657608jaa; Tue, 29 Jan 2019 05:24:00 -0800 (PST) X-Google-Smtp-Source: ALg8bN7KxwbFdUUp49bVzvC0OPFHWky0R1/WhCJaOomna5LWTsP+YkGAb8HVSYxeMS6TW/YN57ZI X-Received: by 2002:a63:902:: with SMTP id 2mr22277285pgj.219.1548768240034; Tue, 29 Jan 2019 05:24:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548768240; cv=none; d=google.com; s=arc-20160816; b=GCoJC7H3fGdrZnlmqvI1bLHCsP2bpRqX+6258z97YjVzvpvo7ntzzMcmiOoJLq9j0w aJyQFrGq4hamp9XTHwxzKajJHoXneF8/xeGEr2G8wSnD/YvUZgd8XGGqQoI7OBeVN6wb 8YhdbGMOfmI6dwv88nC2tEVmABCwkn3mJay5a5O7Vg6FKP2pUP/kWIk/NKVT1DZL80uA 8GXLZO+Znq//L507rb0w/E/BRUQD/ScW10VDyQ2A4MJkaGO8wb75D5o4h5JioBKS+DWp bm3IH2vIl7mVOljH0RQ55iigD3M/4YhvEDCc+ph5Z0tXG5OX/We/5hvJysnu5GYQ/LvG UrjA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zk7ukQ/wi6+kO+yJuF8Jy/OYQIA9+hoCg3pOYSfcHV0=; b=MKfqTY2AdKiFtl+ycHnHumrs/8sOU3DSoCKjgmHnAcuHFDUT8FQQjxz+DlppjBzdWe ic2wlEL+yUxDPTKLnuNLztRnUv4s7498UDhxHE13zX7JPV7f0t5N4s2kvwQKZC4FpnNA 37rHumZZOsqbGBh/yW4Rx7Y18xkoUG7NXmCt/iY+5PutGBLcjCYmUo3ZkvtFqENw5vAU kGlJjGxnn2WCksfzAokI6lGy4Roz6QnKLSxB0IRMM0TNc6+Rt9I+yv49WZqK1sdZYhWG TkdKzwErqDrSFJABW74vPQDiTVkhtZZZFwne6NRGeyCfPh0cnexcbnxu79GFiyThrNiG j1wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EFtmYHyv; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i6si26218218pgq.207.2019.01.29.05.23.59; Tue, 29 Jan 2019 05:24:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-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=@linaro.org header.s=google header.b=EFtmYHyv; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727009AbfA2NX7 (ORCPT + 7 others); Tue, 29 Jan 2019 08:23:59 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38875 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727082AbfA2NX7 (ORCPT ); Tue, 29 Jan 2019 08:23:59 -0500 Received: by mail-wm1-f67.google.com with SMTP id m22so17876351wml.3 for ; Tue, 29 Jan 2019 05:23:57 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=zk7ukQ/wi6+kO+yJuF8Jy/OYQIA9+hoCg3pOYSfcHV0=; b=EFtmYHyvZYYKy5TBu8vq14EO6NSaXU97FGvpI4ek4T57Em0myXQoBF8xgnOWUr7shB aNoMTyq31Opj5ZRzcs2E79MPmWlBpuNuyYIQKaAJXYhyx4mWBp6CBa/tX582vHp2CNOX A0NgdPjq0tRYR6zyTRe/PjFVnTa3i7MfOZH4s= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=zk7ukQ/wi6+kO+yJuF8Jy/OYQIA9+hoCg3pOYSfcHV0=; b=e+07v4cm3Us21kc4T+ADR0xclIg4FuJJ+DsPdXUPK1Oq+v/HPh3FFu66sTFdegcYOB CNKhtTeQqFpo1xa5gfubiVgCNEvwsfE8STyHXZ866be34OwD/TAmUZmEgRWt5+EA7xx3 pmu87S+0D/KoMeEa/7hxbSUkCj42j5YVkmJ4pIuh94/qTe8PylW19IgzPiYwBU3cRCHa T8aYRn5vq7DLJiYk4sqFCWRxOEkYaCj3kG+ux0MW++P6p6YoB7ntazjqimhPz7QF69Ok s1ScNo6FNKThUJKDlZazFmkRV1PiQRAwi5bpwDDBGv6sQqaBUXEbTTsHpr7IU5oVZrOg l/ow== X-Gm-Message-State: AJcUukdzag+/L92BuCqyvlXT/zq0gQX/UItLTT7yN+s7nG4rIebtJoBa umXNUbTn4DL+NRCjrAfctSX/2g== X-Received: by 2002:a1c:bd86:: with SMTP id n128mr21139115wmf.22.1548768236470; Tue, 29 Jan 2019 05:23:56 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id w80sm3739628wme.38.2019.01.29.05.23.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jan 2019 05:23:55 -0800 (PST) From: Srinivas Kandagatla To: andy.gross@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Archit Taneja , Srinivas Kandagatla Subject: [PATCH 5/6] arm64: dts: apq8096-db820c: Add HDMI display support Date: Tue, 29 Jan 2019 13:23:34 +0000 Message-Id: <20190129132335.30695-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> References: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Archit Taneja The APQ8096 DB820c platform provides HDMI output. The MDSS block on 8x96 supports a direct HDMI out. Populate the MDSS, MDP and HDMI DT nodes. Also, add the HDMI HPD and DDC pinctrl nodes with the bias and driver strength specified for this platform. Signed-off-by: Archit Taneja Signed-off-by: Srinivas Kandagatla --- .../boot/dts/qcom/apq8096-db820c-pins.dtsi | 52 +++++++++++++++++++ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 27 ++++++++++ 2 files changed, 79 insertions(+) -- 2.20.1 diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi index 6a573875d45a..1c0d06f59d00 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi @@ -62,4 +62,56 @@ bias-disable; }; }; + + hdmi_hpd_active: hdmi_hpd_active { + mux { + pins = "gpio34"; + function = "hdmi_hot"; + }; + + config { + pins = "gpio34"; + bias-pull-down; + drive-strength = <16>; + }; + }; + + hdmi_hpd_suspend: hdmi_hpd_suspend { + mux { + pins = "gpio34"; + function = "hdmi_hot"; + }; + + config { + pins = "gpio34"; + bias-pull-down; + drive-strength = <2>; + }; + }; + + hdmi_ddc_active: hdmi_ddc_active { + mux { + pins = "gpio32", "gpio33"; + function = "hdmi_ddc"; + }; + + config { + pins = "gpio32", "gpio33"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + hdmi_ddc_suspend: hdmi_ddc_suspend { + mux { + pins = "gpio32", "gpio33"; + function = "hdmi_ddc"; + }; + + config { + pins = "gpio32", "gpio33"; + drive-strength = <2>; + bias-pull-down; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 6d50449fbcdf..1e78f0b47c89 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -452,6 +452,33 @@ perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>; }; }; + + mdss@900000 { + status = "okay"; + + mdp@901000 { + status = "okay"; + }; + + hdmi-phy@9a0600 { + status = "okay"; + + vddio-supply = <&pm8994_l12>; + vcca-supply = <&pm8994_l28>; + #phy-cells = <0>; + }; + + hdmi-tx@9a0000 { + status = "okay"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>; + pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>; + + core-vdda-supply = <&pm8994_l12>; + core-vcc-supply = <&pm8994_s4>; + }; + }; }; From patchwork Tue Jan 29 13:23:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 156992 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4657631jaa; Tue, 29 Jan 2019 05:24:01 -0800 (PST) X-Google-Smtp-Source: ALg8bN7cQOhLBKv2YTxcICtaUr7Pag3/MIf8LQEiwgQSDtn3bAGmL+8a0b/Gsmkt+Qg3KefNPMu9 X-Received: by 2002:aa7:810c:: with SMTP id b12mr25981449pfi.44.1548768241449; Tue, 29 Jan 2019 05:24:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548768241; cv=none; d=google.com; s=arc-20160816; b=lZ46fuNPKNV1bxczHmVIWO9iKLD/TaasMo62y//loB3KU1afL56VPO1Pw1sS/d7yef hiMG79qkgNgdMjG+txzBd/cZTatpURP2gqKdiZd+WXSJ+AUFs+MSaQTwDZrJuOyXqGfu 8NaAlFCuDFQyljUmZQpoDayxfJY/PGLwp4AB3Wp5Z2URXvB0q+cIeu2piJiUK3Hdr9ad 20LTGt0lkT+l/tTUUJmwQWZ23kkvvOc4q97fTWgz8p5mTnz4uStUBkcptSj7L3BUrn2l CC2pj1C7RC2UdDymM60V7wtn8g8hOomCwSxz4N0wyQdT4hVODK6CU41AkHbxE7eaMRMM GXgw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Msgns31ZbK/VjX9Dmlo4wvjAa3AXLeHqgTQrBGozsFk=; b=imNX0NDsno8yI7JN2zN8PqZTU18FVCsBhShF8X+BJ2978khew8sEq91uvpDok7BURE Dx28nKzxZqDNMzH59HLymKwc98qmcZvOSSAwL6ylCPe0gQ9PXOQRhEpdBasTHYZjYPGI D2tccahqjdFHaQlsQ4IYdOfgCqDVf3KHWopHiTyCqa7Z9sAtEXS5LCD28PS299oTh3tH OB3LmFVCfw+GamQteuOFrJwrAePs8vY+lHQVB/vSicuYaExH1qevLZabYbinc9BwmzWr chRyI0mpSRumWzoib6RaX6PlI0HCAvk7F36BeJt2pYpwDI6nVh2vEsnTeVIhnK6Uue/o NlXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PV22RLqx; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i6si26218218pgq.207.2019.01.29.05.24.01; Tue, 29 Jan 2019 05:24:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-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=@linaro.org header.s=google header.b=PV22RLqx; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725828AbfA2NYA (ORCPT + 7 others); Tue, 29 Jan 2019 08:24:00 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:33495 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727511AbfA2NYA (ORCPT ); Tue, 29 Jan 2019 08:24:00 -0500 Received: by mail-wm1-f67.google.com with SMTP id r24so12965595wmh.0 for ; Tue, 29 Jan 2019 05:23:58 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Msgns31ZbK/VjX9Dmlo4wvjAa3AXLeHqgTQrBGozsFk=; b=PV22RLqxiY9UtdvCnwk0gVQc4uabxFZjGlT3swLnINq7BAwoRgmf+xArmoAZRg0S6u 2+hZShUuUJE12Cnrn8p3MNqcpivXFe0Q9baWrq2v6RrcuVe41fnYOrO/61ygxeihbYNH P3hGEQPVz/4mjJ60lg9fvzBGnOHCTEkgF2ijA= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Msgns31ZbK/VjX9Dmlo4wvjAa3AXLeHqgTQrBGozsFk=; b=QLHU5W7vbQ4IcRnv66ZCJRTh40uBrDBFUiUFe6Jq5hH4flcnWR4nNCL51MuPu/qPrK PhYQDhks7ZwsJHJlFQuetCclRgjR6CE1G6XV5KuIMigZ8V6acGNtR4PjcdzoDpgQhZtk HblBxwHXWJOZWlWnF2O458ZhS9igyycnU3sPWRvwSwgg5JBlncl0KyjIM3B6kKBjnyR9 V3ZwdlK8qMmd1aVKPbAKAyq5saLSYKvqZ4T6ydxgSYfCwDivYdG4l5erfNiZS8iCAFwM B+fWEz/i2CnumgAXnDaGg1LV9avSrqhhU60lMLvswSqwHHQ1kS/y1rENBxH7SZRaJyk2 O+Hw== X-Gm-Message-State: AJcUukeoxCbEeBWon7bUzPv4id5csZJoY2DbU1mNaEnCzlBbYIv87PrZ VwrykvB30GC0ykzorq9pA+DSyg== X-Received: by 2002:a1c:a913:: with SMTP id s19mr20298935wme.4.1548768237528; Tue, 29 Jan 2019 05:23:57 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id w80sm3739628wme.38.2019.01.29.05.23.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jan 2019 05:23:56 -0800 (PST) From: Srinivas Kandagatla To: andy.gross@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 6/6] arm64: dts: db820c: Add sound card support Date: Tue, 29 Jan 2019 13:23:35 +0000 Message-Id: <20190129132335.30695-7-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> References: <20190129132335.30695-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch adds support both digital and analog audio on DB820c. This board has HDMI port and 3.5mm audio jack to support both digital and analog audio respectively. Signed-off-by: Srinivas Kandagatla --- .../dts/qcom/apq8096-db820c-pmic-pins.dtsi | 9 ++ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 98 ++++++++++++ arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 46 ++++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 140 ++++++++++++++++++ 4 files changed, 293 insertions(+) -- 2.20.1 diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi index a6ad3d7fe655..7c5045949c01 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi @@ -36,6 +36,15 @@ }; }; + + audio_mclk: clk_div1 { + pinconf { + pins = "gpio15"; + function = "func1"; + power-source = ; // 1.8V + }; + }; + volume_up_gpio: pm8996_gpio2 { pinconf { pins = "gpio2"; diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 1e78f0b47c89..56f78405587e 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -18,6 +18,8 @@ #include "apq8096-db820c-pmic-pins.dtsi" #include #include +#include +#include /* * GPIO name legend: proper name = the GPIO line is used as GPIO @@ -63,6 +65,7 @@ }; clocks { + compatible = "simple-bus"; divclk4: divclk4 { compatible = "fixed-clock"; #clock-cells = <0>; @@ -72,6 +75,15 @@ pinctrl-names = "default"; pinctrl-0 = <&divclk4_pin_a>; }; + + div1_mclk: divclk1 { + compatible = "gpio-gate-clock"; + pinctrl-0 = <&audio_mclk>; + pinctrl-names = "default"; + clocks = <&rpmcc RPM_SMD_DIV_CLK1>; + #clock-cells = <0>; + enable-gpios = <&pm8994_gpios 15 0>; + }; }; soc { @@ -453,6 +465,16 @@ }; }; + slim_msm: slim@91c0000 { + ngd@1 { + wcd9335: codec@1{ + clock-names = "mclk", "slimbus"; + clocks = <&div1_mclk>, + <&rpmcc RPM_SMD_BB_CLK1>; + }; + }; + }; + mdss@900000 { status = "okay"; @@ -479,6 +501,10 @@ core-vcc-supply = <&pm8994_s4>; }; }; + + remoteproc@2080000 { + status = "okay"; + }; }; @@ -666,3 +692,75 @@ }; }; }; + +&sound { + compatible = "qcom,apq8096-sndcard"; + model = "DB820c"; + audio-routing = "RX_BIAS", "MCLK"; + + mm1-dai-link { + link-name = "MultiMedia1"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + mm2-dai-link { + link-name = "MultiMedia2"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>; + }; + }; + + mm3-dai-link { + link-name = "MultiMedia3"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; + }; + }; + + hdmi-dai-link { + link-name = "HDMI"; + cpu { + sound-dai = <&q6afedai HDMI_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&hdmi 0>; + }; + }; + + slim-dai-link { + link-name = "SLIM Playback"; + cpu { + sound-dai = <&q6afedai SLIMBUS_6_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&wcd9335 6>; + }; + }; + + slimcap-dai-link { + link-name = "SLIM Capture"; + cpu { + sound-dai = <&q6afedai SLIMBUS_0_TX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&wcd9335 1>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi index 131878db9852..c7ae88100cb6 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi @@ -13,6 +13,52 @@ &msmgpio { + wcd9xxx_intr { + wcd_intr_default: wcd_intr_default{ + mux { + pins = "gpio54"; + function = "gpio"; + }; + + config { + pins = "gpio54"; + drive-strength = <2>; /* 2 mA */ + bias-pull-down; /* pull down */ + input-enable; + }; + }; + }; + + + cdc_reset_ctrl { + cdc_reset_sleep: cdc_reset_sleep { + mux { + pins = "gpio64"; + function = "gpio"; + }; + config { + pins = "gpio64"; + drive-strength = <16>; + bias-disable; + output-low; + }; + }; + cdc_reset_active:cdc_reset_active { + mux { + pins = "gpio64"; + function = "gpio"; + }; + config { + pins = "gpio64"; + drive-strength = <16>; + bias-pull-down; + output-high; + }; + }; + }; + + + blsp1_spi0_default: blsp1_spi0_default { pinmux { function = "blsp_spi1"; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index b5f23594905c..3c8e1eac8758 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -14,6 +14,7 @@ #include #include #include +#include / { interrupt-parent = <&intc>; @@ -1178,6 +1179,33 @@ power-domains = <&mmcc MDSS_GDSC>; }; + lpass_q6_smmu: arm,smmu-lpass_q6@1600000 { + compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2"; + reg = <0x1600000 0x20000>; + #iommu-cells = <1>; + power-domains = <&gcc HLOS1_VOTE_LPASS_CORE_GDSC>; + + #global-interrupts = <1>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + + clocks = <&gcc GCC_HLOS1_VOTE_LPASS_CORE_SMMU_CLK>, + <&gcc GCC_HLOS1_VOTE_LPASS_ADSP_SMMU_CLK>; + clock-names = "iface", "bus"; + status = "okay"; + }; + agnoc@0 { power-domains = <&gcc AGGRE0_NOC_GDSC>; compatible = "simple-pm-bus"; @@ -1344,6 +1372,66 @@ }; }; + slimbam:dma@9184000 + { + compatible = "qcom,bam-v1.7.0"; + qcom,controlled-remotely; + reg = <0x9184000 0x32000>; + num-channels = <31>; + interrupts = <0 164 IRQ_TYPE_LEVEL_HIGH>; + #dma-cells = <1>; + qcom,ee = <1>; + qcom,num-ees = <2>; + }; + + slim_msm: slim@91c0000 { + compatible = "qcom,slim-ngd-v1.5.0"; + reg = <0x91c0000 0x2C000>; + reg-names = "ctrl"; + interrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&slimbam 3>, <&slimbam 4>, + <&slimbam 5>, <&slimbam 6>; + dma-names = "rx", "tx", "tx2", "rx2"; + #address-cells = <1>; + #size-cells = <0>; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + + tasha_ifd: tas-ifd { + compatible = "slim217,1a0"; + reg = <0 0>; + }; + + wcd9335: codec@1{ + pinctrl-0 = <&cdc_reset_active &wcd_intr_default>; + pinctrl-names = "default"; + + compatible = "slim217,1a0"; + reg = <1 0>; + + interrupt-parent = <&msmgpio>; + interrupts = <54 IRQ_TYPE_LEVEL_HIGH>, + <53 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "intr1", "intr2"; + interrupt-controller; + #interrupt-cells = <1>; + reset-gpios = <&msmgpio 64 0>; + + slim-ifc-dev = <&tasha_ifd>; + + vdd-buck-supply = <&pm8994_s4>; + vdd-buck-sido-supply = <&pm8994_s4>; + vdd-tx-supply = <&pm8994_s4>; + vdd-rx-supply = <&pm8994_s4>; + vdd-io-supply = <&pm8994_s4>; + + #sound-dai-cells = <1>; + }; + }; + }; + gpu@b00000 { compatible = "qcom,adreno-530.2", "qcom,adreno"; #stream-id-cells = <16>; @@ -1473,6 +1561,7 @@ phys = <&hdmi_phy>; phy-names = "hdmi_phy"; + #sound-dai-cells = <1>; ports { #address-cells = <1>; @@ -1511,6 +1600,9 @@ }; }; + sound: sound { + }; + adsp-pil { compatible = "qcom,msm8996-adsp-pil"; @@ -1537,6 +1629,54 @@ mboxes = <&apcs_glb 8>; qcom,smd-edge = <1>; qcom,remote-pid = <2>; + #address-cells = <1>; + #size-cells = <0>; + apr { + power-domains = <&gcc HLOS1_VOTE_LPASS_ADSP_GDSC>; + compatible = "qcom,apr-v2"; + qcom,smd-channels = "apr_audio_svc"; + reg = ; + #address-cells = <1>; + #size-cells = <0>; + + q6core { + reg = ; + compatible = "qcom,q6core"; + }; + + q6afe: q6afe { + compatible = "qcom,q6afe"; + reg = ; + q6afedai: dais { + compatible = "qcom,q6afe-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + hdmi@1 { + reg = <1>; + }; + }; + }; + + q6asm: q6asm { + compatible = "qcom,q6asm"; + reg = ; + q6asmdai: dais { + compatible = "qcom,q6asm-dais"; + #sound-dai-cells = <1>; + iommus = <&lpass_q6_smmu 1>; + }; + }; + + q6adm: q6adm { + compatible = "qcom,q6adm"; + reg = ; + q6routing: routing { + compatible = "qcom,q6adm-routing"; + #sound-dai-cells = <0>; + }; + }; + }; }; };