From: Konrad Dybcio <konradybcio@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Konrad Dybcio <konradybcio@gmail.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 12/14] arm64: dts: qcom: Update msm8992 pin configuration
Date: Sun, 31 May 2020 19:28:02 +0200 [thread overview]
Message-ID: <20200531172804.256335-13-konradybcio@gmail.com> (raw)
In-Reply-To: <20200531172804.256335-1-konradybcio@gmail.com>
Add support for i2c2 and i2c6 interfaces, wrap up
SDC pins into pmx_sdc groups (following msm8916).
Signed-off-by: Konrad Dybcio <konradybcio@gmail.com>
---
arch/arm64/boot/dts/qcom/msm8992-pins.dtsi | 149 ++++++++++++++++-----
1 file changed, 118 insertions(+), 31 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi
index c543c718c22d..17c9e048e414 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi
@@ -32,59 +32,146 @@ pinconf {
/* Order of pins */
/* SDC1: CLK -> 0, CMD -> 1, DATA -> 2, RCLK -> 3 */
/* SDC2: CLK -> 4, CMD -> 5, DATA -> 6 */
- sdc1_clk_on: clk-on {
- pinconf {
- pins = "sdc1_clk";
- bias-disable = <0>; /* No pull */
- drive-strength = <16>; /* 16mA */
+
+ pmx_sdc1_clk {
+ sdc1_clk_on: clk-on {
+ pinmux {
+ pins = "sdc1_clk";
+ };
+ pinconf {
+ pins = "sdc1_clk";
+ bias-disable; /* No pull */
+ drive-strength = <6>;
+ };
+ };
+
+ sdc1_clk_off: clk-off {
+ pinmux {
+ pins = "sdc1_clk";
+ };
+ pinconf {
+ pins = "sdc1_clk";
+ bias-disable; /* No pull */
+ drive-strength = <2>;
+ };
};
};
- sdc1_clk_off: clk-off {
- pinconf {
- pins = "sdc1_clk";
- bias-disable = <0>; /* No pull */
- drive-strength = <2>; /* 2mA */
+ pmx_sdc1_cmd {
+ sdc1_cmd_on: cmd-on {
+ pinmux {
+ pins = "sdc1_cmd";
+ };
+ pinconf {
+ pins = "sdc1_cmd";
+ bias-pull-up;
+ drive-strength = <6>;
+ };
+ };
+
+ sdc1_cmd_off: cmd-off {
+ pinmux {
+ pins = "sdc1_cmd";
+ };
+ pinconf {
+ pins = "sdc1_cmd";
+ bias-pull-up;
+ drive-strength = <2>;
+ };
};
};
- sdc1_cmd_on: cmd-on {
- pinconf {
- pins = "sdc1_cmd";
- bias-pull-up;
- drive-strength = <8>;
+ pmx_sdc1_data {
+ sdc1_data_on: data-on {
+ pinmux {
+ pins = "sdc1_data";
+ };
+ pinconf {
+ pins = "sdc1_data";
+ bias-pull-up;
+ drive-strength = <6>;
+ };
+ };
+
+ sdc1_data_off: data-off {
+ pinmux {
+ pins = "sdc1_data";
+ };
+ pinconf {
+ pins = "sdc1_data";
+ bias-pull-up;
+ drive-strength = <2>;
+ };
};
};
- sdc1_cmd_off: cmd-off {
- pinconf {
- pins = "sdc1_cmd";
- bias-pull-up = <0x3>; /* same as 3.10 ?? */
- drive-strength = <2>; /* 2mA */
+ pmx_sdc1_rclk {
+ sdc1_rclk_on: rclk-on {
+ pinmux {
+ pins = "sdc1_rclk";
+ };
+ pinconf {
+ pins = "sdc1_rclk";
+ bias-pull-down; /* pull down */
+ };
+ };
+
+ sdc1_rclk_off: rclk-off {
+ pinmux {
+ pins = "sdc1_rclk";
+ };
+ pinconf {
+ pins = "sdc1_rclk";
+ bias-pull-down; /* pull down */
+ };
};
};
- sdc1_data_on: data-on {
+ i2c2_default: i2c2_default {
+ pinmux {
+ function = "blsp_i2c2";
+ pins = "gpio6", "gpio7";
+ };
pinconf {
- pins = "sdc1_data";
- bias-pull-up;
- drive-strength = <8>; /* 8mA */
+ pins = "gpio6", "gpio7";
+ drive-strength = <2>;
+ bias-disable;
};
};
- sdc1_data_off: data-off {
+ i2c2_sleep: i2c2_sleep {
+ pinmux {
+ function = "gpio";
+ pins = "gpio6", "gpio7";
+ };
pinconf {
- pins = "sdc1_data";
- bias-pull-up;
+ pins = "gpio6", "gpio7";
drive-strength = <2>;
+ bias-disable;
};
};
- sdc1_rclk_on: rclk-on {
- bias-pull-down; /* pull down */
+ i2c6_default: i2c6_default {
+ pinmux {
+ function = "blsp_i2c6";
+ pins = "gpio28", "gpio27";
+ };
+ pinconf {
+ pins = "gpio28", "gpio27";
+ drive-strength = <2>;
+ bias-disable;
+ };
};
- sdc1_rclk_off: rclk-off {
- bias-pull-down; /* pull down */
+ i2c6_sleep: i2c6_sleep {
+ pinmux {
+ function = "gpio";
+ pins = "gpio28", "gpio27";
+ };
+ pinconf {
+ pins = "gpio28", "gpio27";
+ drive-strength = <2>;
+ bias-disable;
+ };
};
};
--
2.26.2
next prev parent reply other threads:[~2020-05-31 17:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-31 17:27 [PATCH 00/14] msm8992 DTS updates, peripheral enablement Konrad Dybcio
2020-05-31 17:27 ` [PATCH 01/14] arm64: dts: Add a proper CPU map for MSM8992 Konrad Dybcio
2020-05-31 17:27 ` [PATCH 02/14] arm64: dts: msm8992: Place clock nodes in clocks{} Konrad Dybcio
2020-05-31 17:27 ` [PATCH 03/14] arm64: dts: msm8992: Add a SCM node Konrad Dybcio
2020-05-31 17:27 ` [PATCH 04/14] firmware: qcom_scm: Add msm8992 compatible Konrad Dybcio
2020-06-23 23:20 ` Bjorn Andersson
2020-06-23 23:37 ` Konrad Dybcio
2020-05-31 17:27 ` [PATCH 05/14] Documentation: Document msm8992 qcom_scm compatible Konrad Dybcio
2020-06-09 22:16 ` Rob Herring
2020-05-31 17:27 ` [PATCH 06/14] arm64: dts: msm8992: Add a spmi_bus node Konrad Dybcio
2020-05-31 17:27 ` [PATCH 07/14] arm64: dts: msm8992: Add BLSP2 UART2 node Konrad Dybcio
2020-05-31 17:27 ` [PATCH 08/14] arm64: dts: msm8992: Add a BLSP I2C2 node Konrad Dybcio
2020-05-31 17:27 ` [PATCH 09/14] arm64: dts: msm8992: Add a BLSP I2C6 node Konrad Dybcio
2020-05-31 17:28 ` [PATCH 10/14] arm64: dts: msm8992: Add PMU node Konrad Dybcio
2020-05-31 17:28 ` [PATCH 11/14] arm64: dts: msm8992: Add PSCI support Konrad Dybcio
2020-05-31 17:28 ` Konrad Dybcio [this message]
2020-05-31 17:28 ` [PATCH 13/14] arm64: dts: qcom: Fix msm8992 SDHCI Konrad Dybcio
2020-05-31 17:28 ` [PATCH 14/14] arm64: dts: qcom: Add a label to the msm8992 rpm-requests node Konrad Dybcio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200531172804.256335-13-konradybcio@gmail.com \
--to=konradybcio@gmail.com \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.