[coreboot-gerrit] Patch set updated for coreboot: tegra: Move pinmux enum constants from tegra/pinmux.h to soc-specific pinmux.h

Patrick Georgi (pgeorgi@google.com) gerrit at coreboot.org
Tue Jun 23 22:33:37 CEST 2015


Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10631

-gerrit

commit ed87584bfff943aea862408504a42b376fac376a
Author: Furquan Shaikh <furquan at google.com>
Date:   Tue Mar 17 17:53:19 2015 -0700

    tegra: Move pinmux enum constants from tegra/pinmux.h to soc-specific pinmux.h
    
    Since pinmux register format has changed completely for t210, move the
    constants to pinmux.h in soc-specific folders.
    
    BUG=chrome-os-partner:37546
    BRANCH=None
    TEST=Compiles successfully for ryu and foster.
    
    Change-Id: Ic1680ac50fc2619657d0c610a5dfc3fb51df7286
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 7844c941a6187f884b31a8f7cc52e64268d2c732
    Original-Change-Id: Icd3b2a72f3698e0772e888d9209e1fcd5d10e77d
    Original-Signed-off-by: Furquan Shaikh <furquan at google.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/260900
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Commit-Queue: Furquan Shaikh <furquan at chromium.org>
    Original-Trybot-Ready: Furquan Shaikh <furquan at chromium.org>
    Original-Tested-by: Furquan Shaikh <furquan at chromium.org>
---
 src/soc/nvidia/tegra/pinmux.h                | 16 ----------------
 src/soc/nvidia/tegra124/include/soc/pinmux.h | 16 ++++++++++++++++
 src/soc/nvidia/tegra132/include/soc/pinmux.h | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/soc/nvidia/tegra/pinmux.h b/src/soc/nvidia/tegra/pinmux.h
index 23947b3..5e6de67 100644
--- a/src/soc/nvidia/tegra/pinmux.h
+++ b/src/soc/nvidia/tegra/pinmux.h
@@ -25,20 +25,4 @@
 void pinmux_set_config(int pin_index, uint32_t config);
 uint32_t pinmux_get_config(int pin_index);
 
-enum {
-	PINMUX_FUNC_MASK = 3 << 0,
-
-	PINMUX_PULL_MASK = 3 << 2,
-	PINMUX_PULL_NONE = 0 << 2,
-	PINMUX_PULL_DOWN = 1 << 2,
-	PINMUX_PULL_UP = 2 << 2,
-
-	PINMUX_TRISTATE = 1 << 4,
-	PINMUX_INPUT_ENABLE = 1 << 5,
-	PINMUX_OPEN_DRAIN = 1 << 6,
-	PINMUX_LOCK = 1 << 7,
-	PINMUX_IO_RESET = 1 << 8,
-	PINMUX_RCV_SEL = 1 << 9
-};
-
 #endif	/* __SOC_NVIDIA_TEGRA_PINMUX_H__ */
diff --git a/src/soc/nvidia/tegra124/include/soc/pinmux.h b/src/soc/nvidia/tegra124/include/soc/pinmux.h
index e15519f..50f176b 100644
--- a/src/soc/nvidia/tegra124/include/soc/pinmux.h
+++ b/src/soc/nvidia/tegra124/include/soc/pinmux.h
@@ -23,6 +23,22 @@
 #include <soc/nvidia/tegra/pinmux.h>
 #include <stdint.h>
 
+enum {
+	PINMUX_FUNC_MASK = 3 << 0,
+
+	PINMUX_PULL_MASK = 3 << 2,
+	PINMUX_PULL_NONE = 0 << 2,
+	PINMUX_PULL_DOWN = 1 << 2,
+	PINMUX_PULL_UP = 2 << 2,
+
+	PINMUX_TRISTATE = 1 << 4,
+	PINMUX_INPUT_ENABLE = 1 << 5,
+	PINMUX_OPEN_DRAIN = 1 << 6,
+	PINMUX_LOCK = 1 << 7,
+	PINMUX_IO_RESET = 1 << 8,
+	PINMUX_RCV_SEL = 1 << 9
+};
+
 #define PINMUX_CONSTANTS(index, name, gpio, func0, func1, func2, func3) \
 	PINMUX_##name##_INDEX = index, \
 	PINMUX_##name##_FUNC_##func0 = 0, \
diff --git a/src/soc/nvidia/tegra132/include/soc/pinmux.h b/src/soc/nvidia/tegra132/include/soc/pinmux.h
index 822d091..949127c 100644
--- a/src/soc/nvidia/tegra132/include/soc/pinmux.h
+++ b/src/soc/nvidia/tegra132/include/soc/pinmux.h
@@ -24,6 +24,22 @@
 #include <soc/nvidia/tegra/gpio.h>
 #include <soc/nvidia/tegra/pinmux.h>
 
+enum {
+	PINMUX_FUNC_MASK = 3 << 0,
+
+	PINMUX_PULL_MASK = 3 << 2,
+	PINMUX_PULL_NONE = 0 << 2,
+	PINMUX_PULL_DOWN = 1 << 2,
+	PINMUX_PULL_UP = 2 << 2,
+
+	PINMUX_TRISTATE = 1 << 4,
+	PINMUX_INPUT_ENABLE = 1 << 5,
+	PINMUX_OPEN_DRAIN = 1 << 6,
+	PINMUX_LOCK = 1 << 7,
+	PINMUX_IO_RESET = 1 << 8,
+	PINMUX_RCV_SEL = 1 << 9
+};
+
 /* GPIO index constants. */
 
 #define GPIO_PORT_CONSTANTS(port) \



More information about the coreboot-gerrit mailing list