summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/include/mach
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-tegra/include/mach')
-rw-r--r--arch/arm/mach-tegra/include/mach/ac97.h87
-rw-r--r--arch/arm/mach-tegra/include/mach/dc.h11
-rw-r--r--arch/arm/mach-tegra/include/mach/kfuse.h2
-rw-r--r--arch/arm/mach-tegra/include/mach/tegra_usb_modem_power.h2
-rw-r--r--arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h2
-rw-r--r--arch/arm/mach-tegra/include/mach/thermal.h2
6 files changed, 100 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/include/mach/ac97.h b/arch/arm/mach-tegra/include/mach/ac97.h
new file mode 100644
index 000000000000..a62cb93123a9
--- /dev/null
+++ b/arch/arm/mach-tegra/include/mach/ac97.h
@@ -0,0 +1,87 @@
+/*
+ * arch/arm/mach-tegra/include/mach/ac97.h
+ *
+ * Copyright (C) 2011 Toradex, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __ARCH_ARM_MACH_TEGRA_AC97_H
+#define __ARCH_ARM_MACH_TEGRA_AC97_H
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+
+/* Offsets from TEGRA_AC97_BASE */
+#define AC_AC_CTRL_0 0
+#define AC_AC_CMD_0 4
+#define AC_AC_STATUS1_0 8
+/* ... */
+#define AC_AC_FIFO1_SCR_0 0x1c
+#define AC_AC_FIFO2_SCR_0 0x2c
+/* ... */
+#define AC_AC_FIFO_OUT1_0 0x40
+#define AC_AC_FIFO_IN1_0 0x80
+#define AC_AC_FIFO_OUT2_0 0x140
+#define AC_AC_FIFO_IN2_0 0x180
+
+/* AC_AC_CTRL_0 */
+#define AC_AC_CTRL_STM2_EN (1<<16)
+#define AC_AC_CTRL_DOUBLE_SAMPLING_EN (1<<11)
+#define AC_AC_CTRL_IO_CNTRL_EN (1<<10)
+#define AC_AC_CTRL_HSET_DAC_EN (1<<9)
+#define AC_AC_CTRL_LINE2_DAC_EN (1<<8)
+#define AC_AC_CTRL_PCM_LFE_EN (1<<7)
+#define AC_AC_CTRL_PCM_SUR_EN (1<<6)
+#define AC_AC_CTRL_PCM_CEN_DAC_EN (1<<5)
+#define AC_AC_CTRL_LINE1_DAC_EN (1<<4)
+#define AC_AC_CTRL_PCM_DAC_EN (1<<3)
+#define AC_AC_CTRL_COLD_RESET (1<<2)
+#define AC_AC_CTRL_WARM_RESET (1<<1)
+#define AC_AC_CTRL_STM_EN (1<<0)
+
+/* AC_AC_CMD_0 */
+#define AC_AC_CMD_CMD_ADDR_SHIFT (24)
+#define AC_AC_CMD_CMD_ADDR_MASK (0xff<<AC_AC_CMD_CMD_ADDR_SHIFT)
+#define AC_AC_CMD_CMD_DATA_SHIFT (8)
+#define AC_AC_CMD_CMD_DATA_MASK (0xffff<<AC_AC_CMD_CMD_DATA_SHIFT)
+#define AC_AC_CMD_CMD_ID_SHIFT (2)
+#define AC_AC_CMD_CMD_ID_MASK (0x3<<AC_AC_CMD_CMD_ID_SHIFT)
+#define AC_AC_CMD_BUSY (1<<0)
+
+/* AC_AC_STATUS1_0 */
+#define AC_AC_STATUS1_STA_ADDR1_SHIFT (24)
+#define AC_AC_STATUS1_STA_ADDR1_MASK (0xff<<AC_AC_STATUS1_STA_ADDR1_SHIFT)
+#define AC_AC_STATUS1_STA_DATA1_SHIFT (8)
+#define AC_AC_STATUS1_STA_DATA1_MASK (0xffff<<AC_AC_STATUS1_STA_DATA1_SHIFT)
+#define AC_AC_STATUS1_STA_VALID1 (1<<2)
+#define AC_AC_STATUS1_STANDBY1 (1<<1)
+#define AC_AC_STATUS1_CODEC1_RDY (1<<0)
+
+/* AC_AC_FIFO1_SCR_0 and AC_AC_FIFO2_SCR_0 */
+#define AC_AC_FIFOx_SCR_REC_FIFOx_MT_CNT_SHIFT (27)
+#define AC_AC_FIFOx_SCR_REC_FIFOx_MT_CNT_MASK (0x1f << REC_FIFO1_MT_CNT_SHIFT)
+#define AC_AC_FIFOx_SCR_PB_FIFOx_MT_CNT_SHIFT (22)
+#define AC_AC_FIFOx_SCR_PB_FIFOx_MT_CNT_MASK (0x1f << PB_FIFO1_MT_CNT_SHIFT)
+#define AC_AC_FIFOx_SCR_REC_FIFOx_OVERRUN_INT_STA (1<<19)
+#define AC_AC_FIFOx_SCR_PB_FIFOx_UNDERRUN_INT_STA (1<<18)
+#define AC_AC_FIFOx_SCR_RECx_FORCE_MT (1<<17)
+#define AC_AC_FIFOx_SCR_PBx_FORCE_MT (1<<16)
+#define AC_AC_FIFOx_SCR_REC_FIFOx_FULL_EN (1<<15)
+#define AC_AC_FIFOx_SCR_REC_FIFOx_3QRT_FULL_EN (1<<14)
+#define AC_AC_FIFOx_SCR_REC_FIFOx_QRT_FULL_EN (1<<13)
+#define AC_AC_FIFOx_SCR_REC_FIFOx_NOT_MT_EN (1<<12)
+#define AC_AC_FIFOx_SCR_PB_FIFOx_NOT_FULL_EN (1<<11)
+#define AC_AC_FIFOx_SCR_PB_FIFOx_QRT_MT_EN (1<<10)
+#define AC_AC_FIFOx_SCR_PB_FIFOx_3QRT_MT_EN (1<<9)
+#define AC_AC_FIFOx_SCR_PB_FIFOx_MT_EN (1<<8)
+
+#endif /* __ARCH_ARM_MACH_TEGRA_AC97_H */
diff --git a/arch/arm/mach-tegra/include/mach/dc.h b/arch/arm/mach-tegra/include/mach/dc.h
index d7aaed0bdcdc..a60e3e5b14fa 100644
--- a/arch/arm/mach-tegra/include/mach/dc.h
+++ b/arch/arm/mach-tegra/include/mach/dc.h
@@ -353,6 +353,8 @@ struct tegra_dc_out {
unsigned depth;
unsigned dither;
+ char *default_mode;
+
struct tegra_dc_mode *modes;
int n_modes;
@@ -544,10 +546,14 @@ void tegra_dc_incr_syncpt_min(struct tegra_dc *dc, int i, u32 val);
*/
int tegra_dc_update_windows(struct tegra_dc_win *windows[], int n);
int tegra_dc_sync_windows(struct tegra_dc_win *windows[], int n);
+#ifndef CONFIG_ANDROID
int tegra_dc_config_frame_end_intr(struct tegra_dc *dc, bool enable);
bool tegra_dc_is_within_n_vsync(struct tegra_dc *dc, s64 ts);
bool tegra_dc_does_vsync_separate(struct tegra_dc *dc, s64 new_ts, s64 old_ts);
+#endif /* !CONFIG_ANDROID */
+int tegra_dc_var_to_dc_mode(struct tegra_dc *dc, struct fb_var_screeninfo *var,
+ struct tegra_dc_mode *mode);
int tegra_dc_set_mode(struct tegra_dc *dc, const struct tegra_dc_mode *mode);
struct fb_videomode;
int tegra_dc_set_fb_mode(struct tegra_dc *dc, const struct fb_videomode *fbmode,
@@ -592,8 +598,9 @@ struct tegra_dc_edid {
struct tegra_dc_edid *tegra_dc_get_edid(struct tegra_dc *dc);
void tegra_dc_put_edid(struct tegra_dc_edid *edid);
-int tegra_dc_set_flip_callback(void (*callback)(void));
+int tegra_dc_set_flip_callback(int (*callback)(void));
int tegra_dc_unset_flip_callback(void);
int tegra_dc_get_panel_sync_rate(void);
-
+int tegra_fb_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
+ const char* option, unsigned int default_bpp);
#endif
diff --git a/arch/arm/mach-tegra/include/mach/kfuse.h b/arch/arm/mach-tegra/include/mach/kfuse.h
index cfe85cc86ff2..b9262a3d6d0f 100644
--- a/arch/arm/mach-tegra/include/mach/kfuse.h
+++ b/arch/arm/mach-tegra/include/mach/kfuse.h
@@ -1,5 +1,5 @@
/*
- * arch/arm/mach-tegra/kfuse.h
+ * arch/arm/mach-tegra/include/mach/kfuse.h
*
* Copyright (C) 2010-2011 NVIDIA Corporation.
*
diff --git a/arch/arm/mach-tegra/include/mach/tegra_usb_modem_power.h b/arch/arm/mach-tegra/include/mach/tegra_usb_modem_power.h
index 210b9f61ecb5..98abc9a35e3e 100644
--- a/arch/arm/mach-tegra/include/mach/tegra_usb_modem_power.h
+++ b/arch/arm/mach-tegra/include/mach/tegra_usb_modem_power.h
@@ -1,5 +1,5 @@
/*
- * arch/arm/mach-tegra/include/mach/tegra_usb_modem_power.c
+ * arch/arm/mach-tegra/include/mach/tegra_usb_modem_power.h
*
* Copyright (c) 2011-2012, NVIDIA CORPORATION. All rights reserved.
*
diff --git a/arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h b/arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h
index 944e410b4aec..50e5cc804893 100644
--- a/arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h
+++ b/arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h
@@ -1,5 +1,5 @@
/*
- * arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
+ * arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h
*
* Copyright 2011 NVIDIA, Inc.
*
diff --git a/arch/arm/mach-tegra/include/mach/thermal.h b/arch/arm/mach-tegra/include/mach/thermal.h
index ed71d0340a96..12262685d7cd 100644
--- a/arch/arm/mach-tegra/include/mach/thermal.h
+++ b/arch/arm/mach-tegra/include/mach/thermal.h
@@ -1,5 +1,5 @@
/*
- * arch/arm/mach-tegra/thermal.h
+ * arch/arm/mach-tegra/include/mach/thermal.h
*
* Copyright (C) 2010-2012 NVIDIA Corporation.
*