From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
To: linux-tegra@vger.kernel.org
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>,
Russell King <linux@arm.linux.org.uk>,
Thierry Reding <thierry.reding@gmail.com>,
devicetree@vger.kernel.org, Kumar Gala <galak@codeaurora.org>,
Stephen Warren <swarren@wwwdotorg.org>,
linux-kernel@vger.kernel.org,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexandre Courbot <gnurou@gmail.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/9] arm: tegra: apalis_t30: fix pin muxing
Date: Fri, 28 Aug 2015 14:42:30 +0200 [thread overview]
Message-ID: <1440765756-1382-4-git-send-email-marcel.ziswiler@toradex.com> (raw)
In-Reply-To: <1440765756-1382-1-git-send-email-marcel.ziswiler@toradex.com>
Fix pin muxing which got broken due to certain stuff having been
fixed/renamed since.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
arch/arm/boot/dts/tegra30-apalis.dtsi | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index fd6c94e..84744dc 100644
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -66,7 +66,7 @@
/* BKL1_PWM_EN#, disable TPS65911 PMIC PWM backlight */
uart3_cts_n_pa1 {
nvidia,pins = "uart3_cts_n_pa1";
- nvidia,function = "rsvd1";
+ nvidia,function = "rsvd2";
nvidia,pull = <TEGRA_PIN_PULL_UP>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
@@ -152,32 +152,32 @@
};
/* Apalis PWM1 */
- gpio_pu6 {
- nvidia,pins = "gpio_pu6";
+ pu6 {
+ nvidia,pins = "pu6";
nvidia,function = "pwm3";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
/* Apalis PWM2 */
- gpio_pu5 {
- nvidia,pins = "gpio_pu5";
+ pu5 {
+ nvidia,pins = "pu5";
nvidia,function = "pwm2";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
/* Apalis PWM3 */
- gpio_pu4 {
- nvidia,pins = "gpio_pu4";
+ pu4 {
+ nvidia,pins = "pu4";
nvidia,function = "pwm1";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
/* Apalis PWM4 */
- gpio_pu3 {
- nvidia,pins = "gpio_pu3";
+ pu3 {
+ nvidia,pins = "pu3";
nvidia,function = "pwm0";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
--
2.4.3
next prev parent reply other threads:[~2015-08-28 12:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-28 12:42 [PATCH 0/9] arm: tegra: apalis_t30: fix pin mux, hdmi, wakeup and enable hda Marcel Ziswiler
2015-08-28 12:42 ` [PATCH 1/9] arm: tegra: apalis_t30: update hardware revisions compatibility comment Marcel Ziswiler
2015-08-28 12:42 ` [PATCH 2/9] arm: tegra: apalis_t30: fix hdmi supply Marcel Ziswiler
2015-08-28 12:42 ` Marcel Ziswiler [this message]
2015-08-28 12:42 ` [PATCH 4/9] arm: tegra: apalis_t30: add comment concerning emmc Marcel Ziswiler
2015-08-28 12:42 ` [PATCH 5/9] arm: tegra: apalis_t30: add digital audio pin muxing Marcel Ziswiler
2015-08-28 12:42 ` [PATCH 6/9] arm: tegra: apalis_t30: enable hda for eval board Marcel Ziswiler
2015-08-28 12:42 ` [PATCH 7/9] arm: tegra: apalis_t30: set otg dr_mode " Marcel Ziswiler
2015-08-28 12:42 ` [PATCH 8/9] arm: tegra: apalis_t30: fix backlight pwm comment " Marcel Ziswiler
2015-08-28 12:42 ` [PATCH 9/9] arm: tegra: apalis_t30: fix power/wakeup key " Marcel Ziswiler
2015-09-15 8:33 ` [PATCH 0/9] arm: tegra: apalis_t30: fix pin mux, hdmi, wakeup and enable hda Thierry Reding
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=1440765756-1382-4-git-send-email-marcel.ziswiler@toradex.com \
--to=marcel.ziswiler@toradex.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=gnurou@gmail.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=swarren@wwwdotorg.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®