From patchwork Mon Oct 2 14:13:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todor Tomov X-Patchwork-Id: 114617 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp729478qgn; Mon, 2 Oct 2017 07:14:39 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD4WU/QFsVOggQMfi3YZzUAqh5OLy68uzDz6A8O/u2YRjcJ+Fnc3Oh+Q5QSP2QwxJGRw6ZZ X-Received: by 10.84.132.129 with SMTP id e1mr14440785ple.444.1506953679155; Mon, 02 Oct 2017 07:14:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506953679; cv=none; d=google.com; s=arc-20160816; b=qsTFGkDtP1iKC7+TXQtCCyJzdRM6//3bu5rFVaIe2nzCQPYyTvIMWUMh622JQ3vKJ3 1TySmDlfwBIw2y1n/Fyrh7z6B4R5YTklqNZ2g6YSjAR8kfAIOWduwf7HRFLKnEb3cYLv V3Ngzfn9BpGaWCjpAWAbQAllYLDFgBwlCwtdPPWKVvtqjKAXfSbUyLG+PJTgN79s6gkx ekcwxnhb+yJS6NKrK6RFsShpFvAQPNMbHfEfLsL4AlO1G50mFy2HIiqgxzU10Y83QNHv yU9htSmSFVTD/O/86PIRm83hoIJkZt3bZlal/QpycDC5fz3Yvi3x1HbORNIKvfZLzT2B 7SHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=mCmiNq1tS76V1O+rfpzi3cCjPLOwt/zRDyZjWGvyLAo=; b=EHyDk+q5zHr83aE6EqkT11ybdrICKTn1YR7llLxHpR8U9E7JJsleXVZ7rBVay4hbb+ vo9aDFBe+tNp4M7AA0S0DK7v+1k6ihviaszHaghbbXG+blojAbpnxAXaKzKdYHfwyRBP H8DfEncj/XZjL8mXVKIrTF05cC9Zys5rsZ2EgQBXWYI7L/jbiosXLGb1ldcl3RCDqiNp EdcvXtq+eRQ8N/Km6p4ieME7cwy4WEFTs2z/vXdbbU7ai2phXLhAubEMXZKffcnBDakI wof9OW6o+nB88t00K7pLZllZ7RbFtL2STLN/fcWU41Xoqp+VMSDap5FzVnEE0J8v8FNI KORg== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (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 f9si4096313pgq.817.2017.10.02.07.14.38; Mon, 02 Oct 2017 07:14:39 -0700 (PDT) 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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751757AbdJBOOg (ORCPT + 26 others); Mon, 2 Oct 2017 10:14:36 -0400 Received: from ns.mm-sol.com ([37.157.136.199]:58793 "EHLO extserv.mm-sol.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751326AbdJBOOK (ORCPT ); Mon, 2 Oct 2017 10:14:10 -0400 Received: from mms-0439.qualcomm.mm-sol.com (unknown [37.157.136.206]) by extserv.mm-sol.com (Postfix) with ESMTPSA id A389C4F883; Mon, 2 Oct 2017 17:14:06 +0300 (EEST) From: Todor Tomov To: wsa@the-dreams.de, linux-i2c@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Todor Tomov , Andy Gross , Rob Herring , Mark Rutland , devicetree@vger.kernel.org, linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/4] arm64: dts: qcom: Add Camera Control Interface support Date: Mon, 2 Oct 2017 17:13:33 +0300 Message-Id: <1506953613-23875-5-git-send-email-todor.tomov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506953613-23875-1-git-send-email-todor.tomov@linaro.org> References: <1506953613-23875-1-git-send-email-todor.tomov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit adds the CCI node for the CCI controller that resides on the Qualcomm MSM8916 and MSM8996 platforms. CC: Andy Gross CC: Rob Herring CC: Mark Rutland CC: devicetree@vger.kernel.org CC: linux-soc@vger.kernel.org CC: linux-arm-kernel@lists.infradead.org Signed-off-by: Todor Tomov --- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 14 ++++++++++++++ arch/arm64/boot/dts/qcom/msm8916.dtsi | 21 +++++++++++++++++++++ arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 14 ++++++++++++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 24 ++++++++++++++++++++++++ 4 files changed, 73 insertions(+) -- 2.7.4 diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi index 4cb0b58..4fa6a72 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi @@ -733,4 +733,18 @@ bias-pull-up; }; }; + + cci_lines { + cci0_default: cci0_default { + pinmux { + function = "cci_i2c"; + pins = "gpio29", "gpio30"; + }; + pinconf { + pins = "gpio29", "gpio30"; + drive-strength = <16>; + bias-disable; + }; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index dc38175..4885360 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1325,6 +1325,27 @@ compatible = "venus-encoder"; }; }; + + cci: qcom,cci@1b0c000 { + compatible = "qcom,cci-v1.0.8"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x1b0c000 0x1000>; + reg-names = "cci"; + interrupts = ; + interrupt-names = "cci"; + clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>, + <&gcc GCC_CAMSS_CCI_AHB_CLK>, + <&gcc GCC_CAMSS_CCI_CLK>, + <&gcc GCC_CAMSS_AHB_CLK>; + clock-names = "camss_top_ahb", + "cci_ahb", + "cci", + "camss_ahb"; + pinctrl-names = "default"; + pinctrl-0 = <&cci0_default>; + status = "disabled"; + }; }; smd { diff --git a/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi index 6599404..3faaa4c 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi @@ -300,4 +300,18 @@ drive-strength = <2>; /* 2 MA */ }; }; + + cci_lines { + cci0_default: cci0_default { + pinmux { + function = "cci_i2c"; + pins = "gpio17", "gpio18"; + }; + pinconf { + pins = "gpio17", "gpio18"; + drive-strength = <16>; + bias-disable; + }; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 887b61c..118722f 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -819,6 +819,30 @@ phy-names = "usb2-phy", "usb3-phy"; }; }; + + cci: qcom,cci@a0c000 { + compatible = "qcom,cci-v1.4.0"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xa0c000 0x1000>; + reg-names = "cci"; + interrupts = ; + interrupt-names = "cci"; + power-domains = <&mmcc CAMSS_GDSC>; + clocks = <&mmcc MMSS_MMAGIC_AHB_CLK>, + <&mmcc CAMSS_TOP_AHB_CLK>, + <&mmcc CAMSS_CCI_AHB_CLK>, + <&mmcc CAMSS_CCI_CLK>, + <&mmcc CAMSS_AHB_CLK>; + clock-names = "mmss_mmagic_ahb", + "camss_top_ahb", + "cci_ahb", + "cci", + "camss_ahb"; + pinctrl-names = "default"; + pinctrl-0 = <&cci0_default>; + status = "disabled"; + }; }; adsp-pil {