From: Marcel Ziswiler <marcel@ziswiler.com>
To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH 11/26] ARM: tegra: colibri_t30: pinmux clean-up
Date: Mon, 23 Jul 2018 14:36:42 +0200 [thread overview]
Message-ID: <20180723123658.980-12-marcel@ziswiler.com> (raw)
In-Reply-To: <20180723123658.980-1-marcel@ziswiler.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Clean-up pinmuxing:
- white-space clean-up
- explicitly disable LCD_M1 in favour of LCD_DE on L_BIAS
- explicitly disable multiplexed SSPFRM and SSPTXD
- get rid of nvidia,lock property
- add missing eMMC sdmmc4_cmd_pt7 and explicitly enable input
- explicitly disable lcd_dc1_pd2 (e.g. LM95245 I2C address pin)
- annotate TOUCH_PEN_INT# being on-module
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
arch/arm/boot/dts/tegra30-colibri.dtsi | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index fedcd2f7912b..55dcd9d0dcce 100644
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -38,10 +38,10 @@
nvidia,enable-input = <TEGRA_PIN_DISABLE>;
};
dap3_fs_pp0 {
- nvidia,pins = "dap3_fs_pp0",
- "dap3_sclk_pp3",
- "dap3_din_pp1",
- "dap3_dout_pp2";
+ nvidia,pins = "dap3_fs_pp0",
+ "dap3_sclk_pp3",
+ "dap3_din_pp1",
+ "dap3_dout_pp2";
nvidia,function = "i2s2";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
@@ -79,9 +79,9 @@
lcd_m1_pw1 {
nvidia,pins = "lcd_m1_pw1";
nvidia,function = "rsvd3";
- nvidia,pull = <TEGRA_PIN_PULL_NONE>;
- nvidia,tristate = <TEGRA_PIN_DISABLE>;
- nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+ nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ nvidia,enable-input = <TEGRA_PIN_DISABLE>;
};
/* Colibri MMC */
@@ -112,12 +112,14 @@
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
+ /* Multiplexed SSPFRM, SSPTXD and therefore disabled */
sdmmc3_dat6_pd3 {
nvidia,pins = "sdmmc3_dat6_pd3",
"sdmmc3_dat7_pd4";
nvidia,function = "spdif";
- nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+ nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ nvidia,enable-input = <TEGRA_PIN_DISABLE>;
};
/* Colibri UART_A */
@@ -155,13 +157,15 @@
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
- /* eMMC */
+ /* eMMC (On-module) */
sdmmc4_clk_pcc4 {
nvidia,pins = "sdmmc4_clk_pcc4",
+ "sdmmc4_cmd_pt7",
"sdmmc4_rst_n_pcc3";
nvidia,function = "sdmmc4";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ nvidia,enable-input = <TEGRA_PIN_ENABLE>;
};
sdmmc4_dat0_paa0 {
nvidia,pins = "sdmmc4_dat0_paa0",
@@ -175,6 +179,7 @@
nvidia,function = "sdmmc4";
nvidia,pull = <TEGRA_PIN_PULL_UP>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ nvidia,enable-input = <TEGRA_PIN_ENABLE>;
};
/* Power I2C (On-module) */
@@ -185,7 +190,6 @@
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
- nvidia,lock = <TEGRA_PIN_DISABLE>;
nvidia,open-drain = <TEGRA_PIN_ENABLE>;
};
@@ -197,12 +201,12 @@
lcd_dc1_pd2 {
nvidia,pins = "lcd_dc1_pd2";
nvidia,function = "rsvd3";
- nvidia,pull = <TEGRA_PIN_PULL_NONE>;
- nvidia,tristate = <TEGRA_PIN_DISABLE>;
- nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+ nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ nvidia,enable-input = <TEGRA_PIN_DISABLE>;
};
- /* TOUCH_PEN_INT# */
+ /* TOUCH_PEN_INT# (On-module) */
pv0 {
nvidia,pins = "pv0";
nvidia,function = "rsvd1";
--
2.14.4
next prev parent reply other threads:[~2018-07-23 12:39 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-23 12:36 [PATCH 00/26] ARM: dts: tegra: colibri_t30: major revamp Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 01/26] ARM: tegra: colibri_t30: enable broken-hpi on emmc Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 02/26] ARM: tegra: colibri_t30: add local-mac-address property Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 03/26] ARM: tegra: colibri_t30: reorder host1x/hdmi properties Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 04/26] ARM: tegra: colibri_t30: regulator clean-up Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 05/26] ARM: tegra: colibri_t30: add missing regulators Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 06/26] ARM: tegra: colibri_t30: annotate uarts Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 07/26] ARM: tegra: colibri_t30: white-space clean-up Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 08/26] ARM: tegra: colibri_t30: move dr_mode property from phy to controller Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 09/26] ARM: tegra: colibri_t30: reorder backlight properties Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 10/26] ARM: tegra: colibri_t30: drop pwmleds Marcel Ziswiler
2018-07-23 12:36 ` Marcel Ziswiler [this message]
2018-07-23 12:36 ` [PATCH 12/26] ARM: tegra: colibri_t30: add missing pinmux Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 13/26] ARM: tegra: colibri_t30: use proper irq-gpio for stmpe811 Marcel Ziswiler
2018-07-26 8:07 ` Stefan Agner
2018-08-29 14:56 ` Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 14/26] ARM: tegra: colibri_t30: further lm95245 temperature sensor annotation Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 15/26] ARM: tegra: colibri_t30: add i2c-thermtrip Marcel Ziswiler
2018-07-25 11:14 ` Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 16/26] ARM: tegra: colibri_t30: add proper emmc vmmc and vqmmc supplies Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 17/26] ARM: tegra: colibri_t30: enable emmc ddr52 mode Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 18/26] ARM: tegra: colibri_t30: rename clk to clock Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 19/26] ARM: tegra: colibri_t30: line break long compatible property line Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 20/26] ARM: tegra: colibri_t30: move input include to carrier board Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 21/26] ARM: tegra: colibri_t30: remove unused nvidia,is-wired property Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 22/26] ARM: tegra: colibri_t30: add gpio hog to unreset usb ethernet chip Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 23/26] ARM: tegra: colibri_t30: enable hda over hdmi Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 24/26] ARM: tegra: colibri_t30: annotate sd card detect Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 25/26] ARM: tegra: colibri_t30: annotate ehci instance 1 Marcel Ziswiler
2018-07-23 12:36 ` [PATCH 26/26] ARM: tegra: colibri_t30: update compatibility comment Marcel Ziswiler
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=20180723123658.980-12-marcel@ziswiler.com \
--to=marcel@ziswiler.com \
--cc=devicetree@vger.kernel.org \
--cc=jonathanh@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=marcel.ziswiler@toradex.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=thierry.reding@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).