Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23

[linux-2.6] / include / asm-arm / arch-omap / aic23.h

diff --git a/include/asm-arm/arch-omap/aic23.h b/include/asm-arm/arch-omap/aic23.h
index 590bac25b7c44c2806c2d1077a0c14df2249ffc3..aec2d65636229a5a49b05e970481eaf2386986db 100644 (file)
--- a/include/asm-arm/arch-omap/aic23.h
+++ b/include/asm-arm/arch-omap/aic23.h
@@ -57,6 +57,7 @@
 #define LHV_MIN                                0x0000
 
 // Analog audio path control register
+#define STA_REG(x)                     ((x)<<6)
 #define STE_ENABLED                    0x0020
 #define DAC_SELECTED                   0x0010
 #define BYPASS_ON                      0x0008
@@ -109,4 +110,7 @@
 #define TLV320AIC23ID1                  (0x1a) // cs low
 #define TLV320AIC23ID2                  (0x1b) // cs high
 
+void aic23_power_up(void);
+void aic23_power_down(void);
+
 #endif /* __ASM_ARCH_AIC23_H */