Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / keylargo.h

diff --git a/include/asm-powerpc/keylargo.h b/include/asm-powerpc/keylargo.h
index a669a3f0f5a26923b898b1721f22feb4fd5000bf..d8520ef121f90e1f86db8dd460b6199b62e6741f 100644 (file)
--- a/include/asm-powerpc/keylargo.h
+++ b/include/asm-powerpc/keylargo.h
@@ -1,3 +1,6 @@
+#ifndef _ASM_POWERPC_KEYLARGO_H
+#define _ASM_POWERPC_KEYLARGO_H
+#ifdef __KERNEL__
 /*
  * keylargo.h: definitions for using the "KeyLargo" I/O controller chip.
  *
@@ -232,10 +235,12 @@
 #define K2_FCR1_I2S0_RESET             0x00000800
 #define K2_FCR1_I2S0_CLK_ENABLE_BIT    0x00001000
 #define K2_FCR1_I2S0_ENABLE                    0x00002000
-
 #define K2_FCR1_PCI1_CLK_ENABLE                0x00004000
 #define K2_FCR1_FW_CLK_ENABLE          0x00008000
 #define K2_FCR1_FW_RESET_N             0x00010000
+#define K2_FCR1_I2S1_CELL_ENABLE       0x00020000
+#define K2_FCR1_I2S1_CLK_ENABLE_BIT    0x00080000
+#define K2_FCR1_I2S1_ENABLE            0x00100000
 #define K2_FCR1_GMAC_CLK_ENABLE                0x00400000
 #define K2_FCR1_GMAC_POWER_DOWN                0x00800000
 #define K2_FCR1_GMAC_RESET_N           0x01000000
@@ -246,3 +251,11 @@
 #define K2_FCR1_UATA_RESET_N           0x40000000
 #define K2_FCR1_UATA_CHOOSE_CLK66      0x80000000
 
+/* Shasta definitions */
+#define SH_FCR1_I2S2_CELL_ENABLE       0x00000010
+#define SH_FCR1_I2S2_CLK_ENABLE_BIT    0x00000040
+#define SH_FCR1_I2S2_ENABLE            0x00000080
+#define SH_FCR3_I2S2_CLK18_ENABLE      0x00008000
+
+#endif /* __KERNEL__ */
+#endif /* _ASM_POWERPC_KEYLARGO_H */