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 15/31] ARM: tegra: colibri_t20: add missing pinmux
Date: Wed, 29 Aug 2018 10:13:51 +0200 [thread overview]
Message-ID: <20180829081407.11304-16-marcel@ziswiler.com> (raw)
In-Reply-To: <20180829081407.11304-1-marcel@ziswiler.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Explicitly add pinmux' for all T20 SoC ball groups now:
- Colibri Address/Data Bus (GMI) further pins used as GPIOs
- Colibri BL_ON
- Colibri EXT_IO*
- Colibri L_BIAS, LCD_M1 is muxed with LCD_DE today's display need DE,
disable LCD_M1
- more Colibri LCD pins (L_* resp. LDD<*>)
- Colibri LCD (Optional 24 BPP Support)
- Colibri MMCCD
- uart_a_dsr and uart_a_dcd as GPIOs
- Colibri USB_CDET
- I2C3 (Optional)
- JTAG_RTCK
- LAN_RESET, LAN_EXT_WAKEUP and LAN_PME (All On-module)
- more NAND pins
- RESET_OUT
- THERMD_ALERT# (On-module), unlatched I2C address pin of LM95245
temperature sensor therefore requires disabling for now
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
arch/arm/boot/dts/tegra20-colibri-iris.dts | 40 +++++++++
arch/arm/boot/dts/tegra20-colibri.dtsi | 134 +++++++++++++++++++++++++----
2 files changed, 159 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts
index f2f01b0d9336..be531d4c2ae8 100644
--- a/arch/arm/boot/dts/tegra20-colibri-iris.dts
+++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts
@@ -29,6 +29,10 @@
pinmux@70000014 {
state_default: pinmux {
+ bl_on {
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
ddc {
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
@@ -37,10 +41,38 @@
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
+ i2c {
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
+ lcd {
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
+ lm1 {
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
mmc {
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
+ mmccd {
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
+ pwm_a_b {
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
+ pwm_c_d {
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
+ ssp {
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
uart_a {
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
@@ -48,6 +80,14 @@
uart_b {
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
+
+ uart_c {
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
+ usbh_pen {
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
};
};
diff --git a/arch/arm/boot/dts/tegra20-colibri.dtsi b/arch/arm/boot/dts/tegra20-colibri.dtsi
index 2e6ecc3040f7..a7403ce9ee99 100644
--- a/arch/arm/boot/dts/tegra20-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri.dtsi
@@ -75,20 +75,36 @@
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
- /* Colibri Address/Data Bus (GMI) */
- gpio_gmi {
- nvidia,pins = "ata", "atc", "atd", "ate",
- "dap1", "dap2", "dap4", "gpu", "irrx",
- "irtx", "spia", "spib", "spic";
+ /*
+ * Colibri Address/Data Bus (GMI)
+ * Note: spid and spie optionally used for SPI1
+ */
+ gmi {
+ nvidia,pins = "atc", "atd", "ate", "dap1",
+ "dap2", "dap4", "gmd", "gpu",
+ "irrx", "irtx", "spia", "spib",
+ "spic", "spid", "spie", "uca",
+ "ucb";
nvidia,function = "gmi";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
- nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
+ /* Further pins may be used as GPIOs */
+ gmi_gpio1 {
+ nvidia,pins = "lpw0", "lsc1", "lsck", "lsda";
+ nvidia,function = "hdmi";
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
+ gmi_gpio2 {
+ nvidia,pins = "lcsn", "ldc", "lm0", "lsdi";
+ nvidia,function = "rsvd4";
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
/* Colibri BL_ON */
bl_on {
nvidia,pins = "dta";
- nvidia,function = "vi";
+ nvidia,function = "rsvd1";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
@@ -113,8 +129,8 @@
* Note: dtf optionally used for I2C3
*/
ext_io {
- nvidia,pins = "dtf";
- nvidia,function = "i2c3";
+ nvidia,pins = "dtf", "spdi";
+ nvidia,function = "rsvd2";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
@@ -151,15 +167,31 @@
nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
+ /*
+ * Colibri L_BIAS, LCD_M1 is muxed with LCD_DE
+ * today's display need DE, disable LCD_M1
+ */
+ lm1 {
+ nvidia,pins = "lm1";
+ nvidia,function = "rsvd3";
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
+
/* Colibri LCD (L_* resp. LDD<*>) */
lcd {
nvidia,pins = "ld0", "ld1", "ld2", "ld3",
"ld4", "ld5", "ld6", "ld7",
"ld8", "ld9", "ld10", "ld11",
"ld12", "ld13", "ld14", "ld15",
- "ld16", "ld17", "lhs", "lpw0",
- "lpw2", "lsc0", "lsc1", "lsck",
- "lsda", "lspi", "lvs";
+ "ld16", "ld17", "lhs", "lsc0",
+ "lspi", "lvs";
+ nvidia,function = "displaya";
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
+ /* Colibri LCD (Optional 24 BPP Support) */
+ lcd_24 {
+ nvidia,pins = "ldi", "lhp0", "lhp1", "lhp2",
+ "lpp", "lvp1";
nvidia,function = "displaya";
nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
@@ -172,6 +204,14 @@
nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
+ /* Colibri MMCCD */
+ mmccd {
+ nvidia,pins = "gmb";
+ nvidia,function = "gmi_int";
+ nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
+
/* Colibri MMC (Optional 8-bit) */
mmc_8bit {
nvidia,pins = "gme";
@@ -220,6 +260,16 @@
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
+ uart_a_dsr {
+ nvidia,pins = "lpw1";
+ nvidia,function = "rsvd3";
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
+ uart_a_dcd {
+ nvidia,pins = "lpw2";
+ nvidia,function = "hdmi";
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
/* Colibri UART-B */
uart_b {
@@ -237,12 +287,20 @@
nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
+ /* Colibri USB_CDET */
+ usb_cdet {
+ nvidia,pins = "spdo";
+ nvidia,function = "rsvd2";
+ nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
+
/* Colibri USBH_OC */
usbh_oc {
nvidia,pins = "spih";
nvidia,function = "spi2_alt";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
- nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
/* Colibri USBH_PEN */
@@ -250,7 +308,7 @@
nvidia,pins = "spig";
nvidia,function = "spi2_alt";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
- nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
/* Colibri VGA not supported */
@@ -261,6 +319,33 @@
nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
+ /* I2C3 (Optional) */
+ i2c3 {
+ nvidia,pins = "dtf";
+ nvidia,function = "i2c3";
+ nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
+
+ /* JTAG_RTCK */
+ jtag_rtck {
+ nvidia,pins = "gpu7";
+ nvidia,function = "rtck";
+ nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
+
+ /*
+ * LAN_RESET, LAN_EXT_WAKEUP and LAN_PME
+ * (All On-module)
+ */
+ gpio_gpv {
+ nvidia,pins = "gpv";
+ nvidia,function = "rsvd2";
+ nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
/*
* LAN_V_BUS, VDD_FAULT, BATT_FAULT, WM9712 PENDOWN
* (All On-module); Colibri CAN_INT
@@ -274,7 +359,7 @@
/* NAND (On-module) */
nand {
- nvidia,pins = "kbca", "kbcc", "kbcd",
+ nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
"kbce", "kbcf";
nvidia,function = "nand";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
@@ -297,6 +382,14 @@
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
+ /* RESET_OUT */
+ reset_out {
+ nvidia,pins = "ata";
+ nvidia,function = "gmi";
+ nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+
/*
* SPI1 (Optional)
* Note: spid and spie used for Colibri Address/Data
@@ -308,6 +401,17 @@
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_ENABLE>;
};
+
+ /*
+ * THERMD_ALERT# (On-module), unlatched I2C address pin
+ * of LM95245 temperature sensor therefore requires
+ * disabling for now
+ */
+ lvp0 {
+ nvidia,pins = "lvp0";
+ nvidia,function = "rsvd3";
+ nvidia,tristate = <TEGRA_PIN_ENABLE>;
+ };
};
};
--
2.14.4
next prev parent reply other threads:[~2018-08-29 8:14 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-29 8:13 [PATCH 00/31] ARM: dts: tegra: colibri_t20: major revamp incl. eval board support Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 01/31] ARM: tegra: colibri_t20: move aliases from module to carrier board Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 02/31] ARM: tegra: colibri_t20: iris: integrate i2c real time clock support Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 03/31] ARM: tegra: colibri_t20: iris: annotate i2c busses Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 04/31] ARM: tegra: colibri_t20: iris: add missing aliases Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 05/31] ARM: tegra: colibri_t20: add local-mac-address property Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 06/31] ARM: tegra: colibri_t20: reorder host1x/hdmi properties Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 07/31] ARM: tegra: colibri_t20: iris: use no-1-8-v Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 08/31] ARM: tegra: colibri_t20: regulator clean-up Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 09/31] ARM: tegra: colibri_t20: add missing regulators Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 10/31] ARM: tegra: colibri_t20: annotate usb ehci instances Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 11/31] ARM: tegra: colibri_t20: remove phy-reset-gpio from controller node Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 12/31] ARM: tegra: colibri_t20: indentation/line-feed/white-space clean-up Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 13/31] ARM: tegra: colibri_t20: update sound nvidia,model Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 14/31] ARM: tegra: colibri_t20: pinmux clean-up Marcel Ziswiler
2018-08-29 8:13 ` Marcel Ziswiler [this message]
2018-08-29 8:13 ` [PATCH 16/31] ARM: tegra: colibri_t20: iris: display controller rgb panel support Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 17/31] ARM: tegra: colibri_t20: iris: annotate uarts Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 18/31] ARM: tegra: colibri_t20: iris: add uart-c Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 19/31] ARM: tegra: colibri_t20: use high speed uart driver Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 20/31] ARM: tegra: colibri_t20: iris: add gpio wakeup key Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 21/31] ARM: tegra: colibri_t20: iris: add dr_mode property Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 22/31] ARM: tegra: colibri_t20: annotate/rename lm95245 temperature sensor Marcel Ziswiler
2018-08-29 8:13 ` [PATCH 23/31] ARM: tegra: colibri_t20: add i2c-thermtrip Marcel Ziswiler
2018-08-29 8:14 ` [PATCH 24/31] ARM: tegra: colibri_t20: add gpio hog to unreset usb ethernet chip Marcel Ziswiler
2018-08-29 8:14 ` [PATCH 25/31] ARM: tegra: colibri_t20: add gpio hogs for gmi_wr_n buffers Marcel Ziswiler
2018-08-29 8:14 ` [PATCH 26/31] ARM: tegra: colibri_t20: annotate/move sd card detect Marcel Ziswiler
2018-08-29 8:14 ` [PATCH 27/31] ARM: tegra: colibri_t20: add compatibility comment Marcel Ziswiler
2018-08-29 8:14 ` [PATCH 28/31] ARM: tegra: colibri_t20: simplify model and compatible properties Marcel Ziswiler
2018-08-29 8:14 ` [PATCH 29/31] ARM: tegra: colibri_t20: iris: " Marcel Ziswiler
2018-08-29 8:14 ` [PATCH 30/31] ARM: tegra: colibri_t20: iris: add colibri ssp support Marcel Ziswiler
2018-08-29 8:14 ` [PATCH 31/31] ARM: tegra: colibri_t20: add eval board device tree 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=20180829081407.11304-16-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
all inboxes | Powered by JetHome®