Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'

[oweals/u-boot.git] / arch / arm / include / asm / arch-tegra2 / clk_rst.h

diff --git a/arch/arm/include/asm/arch-tegra2/clk_rst.h b/arch/arm/include/asm/arch-tegra2/clk_rst.h
index d67a5d7c2ce3d9c9560ef9c83b3003ec40aabaa6..36e27b5f3fa72cc087b2de9cf826dbe71651e33d 100644 (file)
--- a/arch/arm/include/asm/arch-tegra2/clk_rst.h
+++ b/arch/arm/include/asm/arch-tegra2/clk_rst.h
@@ -160,8 +160,8 @@ struct clk_rst_ctlr {
 #define PLL_DIVP               (1 << 20)       /* post divider, b22:20 */
 #define PLL_DIVM               0x0C            /* input divider, b4:0 */
 
-#define SWR_UARTD_RST          (1 << 2)
-#define CLK_ENB_UARTD          (1 << 2)
+#define SWR_UARTD_RST          (1 << 1)
+#define CLK_ENB_UARTD          (1 << 1)
 #define SWR_UARTA_RST          (1 << 6)
 #define CLK_ENB_UARTA          (1 << 6)
 
@@ -189,4 +189,11 @@ struct clk_rst_ctlr {
 #define CPU0_CLK_STP           (1 << 8)
 #define CPU1_CLK_STP           (1 << 9)
 
+#define CPCON                  (1 << 8)
+
+#define SWR_SDMMC4_RST         (1 << 15)
+#define CLK_ENB_SDMMC4         (1 << 15)
+#define SWR_SDMMC3_RST         (1 << 5)
+#define CLK_ENB_SDMMC3         (1 << 5)
+
 #endif /* CLK_RST_H */