Merge 'u-boot-atmel/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / arch / arm / include / asm / arch-tegra20 / clock-tables.h

diff --git a/arch/arm/include/asm/arch-tegra20/clock-tables.h b/arch/arm/include/asm/arch-tegra20/clock-tables.h
index 089b3e7bfa7a36fcb522e6786571680a33b7b214..53708e04772b45df860b137bab89d7473a5b735c 100644 (file)
--- a/arch/arm/include/asm/arch-tegra20/clock-tables.h
+++ b/arch/arm/include/asm/arch-tegra20/clock-tables.h
@@ -165,11 +165,24 @@ enum periph_id {
 
        /* 88 */
        PERIPH_ID_CRAM2,
+       PERIPH_ID_SYNC_CLK_DOUBLER,
+       PERIPH_ID_CLK_M_DOUBLER,
+       PERIPH_ID_RESERVED91,
+       PERIPH_ID_SUS_OUT,
+       PERIPH_ID_DEV2_OUT,
+       PERIPH_ID_DEV1_OUT,
 
        PERIPH_ID_COUNT,
        PERIPH_ID_NONE = -1,
 };
 
+enum pll_out_id {
+       PLL_OUT1,
+       PLL_OUT2,
+       PLL_OUT3,
+       PLL_OUT4
+};
+
 /* Converts a clock number to a clock register: 0=L, 1=H, 2=U */
 #define PERIPH_REG(id) ((id) >> 5)