All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: tegra: Enable TPM on tegra124 nyan boards
@ 2015-05-13 14:13 ` Simon Glass
  0 siblings, 0 replies; 20+ messages in thread
From: Simon Glass @ 2015-05-13 14:13 UTC (permalink / raw)
  To: LKML
  Cc: Stephen Warren, Stephen Warren, Simon Glass, Russell King,
	Thierry Reding, devicetree, Kumar Gala, Ian Campbell, Rob Herring,
	Pawel Moll, linux-tegra, Mark Rutland, Alexandre Courbot,
	linux-arm-kernel

Regenerate the pinmux from the latest tegra-pinmux-scripts.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/arm/boot/dts/tegra124-nyan-big.dts   | 22 +++++++++++-----------
 arch/arm/boot/dts/tegra124-nyan-blaze.dts | 30 +++++++++++++++---------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts
index 2d21253..0eb2b0f 100644
--- a/arch/arm/boot/dts/tegra124-nyan-big.dts
+++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
@@ -30,7 +30,7 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinmux_default>;
 
-		pinmux_default: common {
+		state_default: pinmux {
 			clk_32k_out_pa0 {
 				nvidia,pins = "clk_32k_out_pa0";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
@@ -1098,19 +1098,19 @@
 			};
 			cam_i2c_scl_pbb1 {
 				nvidia,pins = "cam_i2c_scl_pbb1";
-				nvidia,function = "rsvd3";
-				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
-				nvidia,tristate = <TEGRA_PIN_ENABLE>;
-				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
-				nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+				nvidia,function = "i2c3";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+				nvidia,open-drain = <TEGRA_PIN_ENABLE>;
 			};
 			cam_i2c_sda_pbb2 {
 				nvidia,pins = "cam_i2c_sda_pbb2";
-				nvidia,function = "rsvd3";
-				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
-				nvidia,tristate = <TEGRA_PIN_ENABLE>;
-				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
-				nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+				nvidia,function = "i2c3";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+				nvidia,open-drain = <TEGRA_PIN_ENABLE>;
 			};
 			pbb3 {
 				nvidia,pins = "pbb3";
diff --git a/arch/arm/boot/dts/tegra124-nyan-blaze.dts b/arch/arm/boot/dts/tegra124-nyan-blaze.dts
index 0d30c51..1fc0da9 100644
--- a/arch/arm/boot/dts/tegra124-nyan-blaze.dts
+++ b/arch/arm/boot/dts/tegra124-nyan-blaze.dts
@@ -26,7 +26,7 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinmux_default>;
 
-		pinmux_default: common {
+		state_default: pinmux {
 			clk_32k_out_pa0 {
 				nvidia,pins = "clk_32k_out_pa0";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
@@ -437,18 +437,18 @@
 			usb_vbus_en0_pn4 {
 				nvidia,pins = "usb_vbus_en0_pn4";
 				nvidia,function = "usb";
-				nvidia,pull = <TEGRA_PIN_PULL_UP>;
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-				nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+				nvidia,open-drain = <TEGRA_PIN_ENABLE>;
 			};
 			usb_vbus_en1_pn5 {
 				nvidia,pins = "usb_vbus_en1_pn5";
 				nvidia,function = "usb";
-				nvidia,pull = <TEGRA_PIN_PULL_UP>;
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-				nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+				nvidia,open-drain = <TEGRA_PIN_ENABLE>;
 			};
 			hdmi_int_pn7 {
 				nvidia,pins = "hdmi_int_pn7";
@@ -1094,19 +1094,19 @@
 			};
 			cam_i2c_scl_pbb1 {
 				nvidia,pins = "cam_i2c_scl_pbb1";
-				nvidia,function = "rsvd3";
-				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
-				nvidia,tristate = <TEGRA_PIN_ENABLE>;
-				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
-				nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+				nvidia,function = "i2c3";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+				nvidia,open-drain = <TEGRA_PIN_ENABLE>;
 			};
 			cam_i2c_sda_pbb2 {
 				nvidia,pins = "cam_i2c_sda_pbb2";
-				nvidia,function = "rsvd3";
-				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
-				nvidia,tristate = <TEGRA_PIN_ENABLE>;
-				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
-				nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+				nvidia,function = "i2c3";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+				nvidia,open-drain = <TEGRA_PIN_ENABLE>;
 			};
 			pbb3 {
 				nvidia,pins = "pbb3";
-- 
2.2.0.rc0.207.ga3a616c

^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2015-07-03 23:06 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-13 14:13 [PATCH] ARM: tegra: Enable TPM on tegra124 nyan boards Simon Glass
2015-05-13 14:13 ` Simon Glass
     [not found] ` <1431526427-13340-1-git-send-email-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2015-05-13 14:45   ` Stephen Warren
2015-05-13 14:45     ` Stephen Warren
     [not found]     ` <5553637C.5010506-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2015-05-13 15:22       ` Simon Glass
2015-05-13 15:22         ` Simon Glass
     [not found]         ` <CAPnjgZ0ga6==w7YWQoeUtXRxUhCjQ+BHMJuCL7vbqN9WTLM2kQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-05-14 14:21           ` Stephen Warren
2015-05-14 14:21             ` Stephen Warren
2015-05-14 13:09       ` Tomeu Vizoso
2015-05-14 13:09         ` Tomeu Vizoso
     [not found]         ` <CAAObsKCxFJA=6kyHM5rtpJMVRZRDbBO3KSn+QdNoOQz1rXCWTQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-05-14 14:11           ` Stephen Warren
2015-05-14 14:11             ` Stephen Warren
     [not found]             ` <5554AD0B.1060106-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2015-05-14 14:28               ` Simon Glass
2015-05-14 14:28                 ` Simon Glass
     [not found]                 ` <CAPnjgZ2QrTu=D_AapTded+_NR1waZTbNoN8rCtHnTdd0OdnwLA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-05-14 15:47                   ` Stephen Warren
2015-05-14 15:47                     ` Stephen Warren
     [not found]                     ` <5554C399.4060807-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2015-05-14 16:30                       ` Simon Glass
2015-05-14 16:30                         ` Simon Glass
     [not found]                         ` <CAPnjgZ1o-DvWjJqkEjwbxKxx_0L7p1k8Mc58boqjHQEGh=yj3A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-07-03 23:06                           ` Simon Glass
2015-07-03 23:06                             ` Simon Glass

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.