Merge git://git.denx.de/u-boot-usb

[platform/kernel/u-boot.git] / arch / arm / include / asm / arch-tegra124 / clock-tables.h

diff --git a/arch/arm/include/asm/arch-tegra124/clock-tables.h b/arch/arm/include/asm/arch-tegra124/clock-tables.h
index daf9a2b..3c67e72 100644 (file)
--- a/arch/arm/include/asm/arch-tegra124/clock-tables.h
+++ b/arch/arm/include/asm/arch-tegra124/clock-tables.h
@@ -25,6 +25,7 @@ enum clock_id {
        CLOCK_ID_XCPU = CLOCK_ID_FIRST_SIMPLE,
        CLOCK_ID_EPCI,
        CLOCK_ID_SFROM32KHZ,
+       CLOCK_ID_DP,    /* Special for Tegra124 */
 
        /* These are the base clocks (inputs to the Tegra SoC) */
        CLOCK_ID_32KHZ,
@@ -284,12 +285,12 @@ enum periph_id {
        /* 184 */
        PERIPH_ID_GPU,
        PERIPH_ID_AMX1,
-       PERIPH_ID_X_RESERVED26,
-       PERIPH_ID_X_RESERVED27,
-       PERIPH_ID_X_RESERVED28,
-       PERIPH_ID_X_RESERVED29,
-       PERIPH_ID_X_RESERVED30,
-       PERIPH_ID_X_RESERVED31,
+       PERIPH_ID_AFC5,
+       PERIPH_ID_AFC4,
+       PERIPH_ID_AFC3,
+       PERIPH_ID_AFC2,
+       PERIPH_ID_AFC1,
+       PERIPH_ID_AFC0,
 
        PERIPH_ID_COUNT,
        PERIPH_ID_NONE = -1,
@@ -424,7 +425,7 @@ enum periphc_internal_id {
 
        /* 0x58 */
        PERIPHC_58h,
-       PERIPHC_59h,
+       PERIPHC_SOR,
        PERIPHC_5ah,
        PERIPHC_5bh,
        PERIPHC_SATAOOB,