|
@@ -42,3 +42,143 @@
|
|
|
#define DISPC_CONTROL3 0x0848
|
|
|
#define DISPC_IRQSTATUS 0x0018
|
|
|
|
|
|
+#define DSS_SYSCONFIG 0x10
|
|
|
+#define DSS_SYSSTATUS 0x14
|
|
|
+#define DSS_CONTROL 0x40
|
|
|
+#define DSS_SDI_CONTROL 0x44
|
|
|
+#define DSS_PLL_CONTROL 0x48
|
|
|
+
|
|
|
+#define LCD_EN_MASK (0x1 << 0)
|
|
|
+#define DIGIT_EN_MASK (0x1 << 1)
|
|
|
+
|
|
|
+#define FRAMEDONE_IRQ_SHIFT 0
|
|
|
+#define EVSYNC_EVEN_IRQ_SHIFT 2
|
|
|
+#define EVSYNC_ODD_IRQ_SHIFT 3
|
|
|
+#define FRAMEDONE2_IRQ_SHIFT 22
|
|
|
+#define FRAMEDONE3_IRQ_SHIFT 30
|
|
|
+#define FRAMEDONETV_IRQ_SHIFT 24
|
|
|
+
|
|
|
+/*
|
|
|
+ * FRAMEDONE_IRQ_TIMEOUT: how long (in milliseconds) to wait during DISPC
|
|
|
+ * reset before deciding that something has gone wrong
|
|
|
+ */
|
|
|
+#define FRAMEDONE_IRQ_TIMEOUT 100
|
|
|
+
|
|
|
+static struct platform_device omap_display_device = {
|
|
|
+ .name = "omapdss",
|
|
|
+ .id = -1,
|
|
|
+ .dev = {
|
|
|
+ .platform_data = NULL,
|
|
|
+ },
|
|
|
+};
|
|
|
+
|
|
|
+struct omap_dss_hwmod_data {
|
|
|
+ const char *oh_name;
|
|
|
+ const char *dev_name;
|
|
|
+ const int id;
|
|
|
+};
|
|
|
+
|
|
|
+static const struct omap_dss_hwmod_data omap2_dss_hwmod_data[] __initconst = {
|
|
|
+ { "dss_core", "omapdss_dss", -1 },
|
|
|
+ { "dss_dispc", "omapdss_dispc", -1 },
|
|
|
+ { "dss_rfbi", "omapdss_rfbi", -1 },
|
|
|
+ { "dss_venc", "omapdss_venc", -1 },
|
|
|
+};
|
|
|
+
|
|
|
+static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initconst = {
|
|
|
+ { "dss_core", "omapdss_dss", -1 },
|
|
|
+ { "dss_dispc", "omapdss_dispc", -1 },
|
|
|
+ { "dss_rfbi", "omapdss_rfbi", -1 },
|
|
|
+ { "dss_venc", "omapdss_venc", -1 },
|
|
|
+ { "dss_dsi1", "omapdss_dsi", 0 },
|
|
|
+};
|
|
|
+
|
|
|
+static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = {
|
|
|
+ { "dss_core", "omapdss_dss", -1 },
|
|
|
+ { "dss_dispc", "omapdss_dispc", -1 },
|
|
|
+ { "dss_rfbi", "omapdss_rfbi", -1 },
|
|
|
+ { "dss_dsi1", "omapdss_dsi", 0 },
|
|
|
+ { "dss_dsi2", "omapdss_dsi", 1 },
|
|
|
+ { "dss_hdmi", "omapdss_hdmi", -1 },
|
|
|
+};
|
|
|
+
|
|
|
+static void __init omap4_tpd12s015_mux_pads(void)
|
|
|
+{
|
|
|
+ omap_mux_init_signal("hdmi_cec",
|
|
|
+ OMAP_PIN_INPUT_PULLUP);
|
|
|
+ omap_mux_init_signal("hdmi_ddc_scl",
|
|
|
+ OMAP_PIN_INPUT_PULLUP);
|
|
|
+ omap_mux_init_signal("hdmi_ddc_sda",
|
|
|
+ OMAP_PIN_INPUT_PULLUP);
|
|
|
+}
|
|
|
+
|
|
|
+static void __init omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)
|
|
|
+{
|
|
|
+ u32 reg;
|
|
|
+ u16 control_i2c_1;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * CONTROL_I2C_1: HDMI_DDC_SDA_PULLUPRESX (bit 28) and
|
|
|
+ * HDMI_DDC_SCL_PULLUPRESX (bit 24) are set to disable
|
|
|
+ * internal pull up resistor.
|
|
|
+ */
|
|
|
+ if (flags & OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP) {
|
|
|
+ control_i2c_1 = OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_1;
|
|
|
+ reg = omap4_ctrl_pad_readl(control_i2c_1);
|
|
|
+ reg |= (OMAP4_HDMI_DDC_SDA_PULLUPRESX_MASK |
|
|
|
+ OMAP4_HDMI_DDC_SCL_PULLUPRESX_MASK);
|
|
|
+ omap4_ctrl_pad_writel(reg, control_i2c_1);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
|
|
|
+{
|
|
|
+ u32 enable_mask, enable_shift;
|
|
|
+ u32 pipd_mask, pipd_shift;
|
|
|
+ u32 reg;
|
|
|
+
|
|
|
+ if (dsi_id == 0) {
|
|
|
+ enable_mask = OMAP4_DSI1_LANEENABLE_MASK;
|
|
|
+ enable_shift = OMAP4_DSI1_LANEENABLE_SHIFT;
|
|
|
+ pipd_mask = OMAP4_DSI1_PIPD_MASK;
|
|
|
+ pipd_shift = OMAP4_DSI1_PIPD_SHIFT;
|
|
|
+ } else if (dsi_id == 1) {
|
|
|
+ enable_mask = OMAP4_DSI2_LANEENABLE_MASK;
|
|
|
+ enable_shift = OMAP4_DSI2_LANEENABLE_SHIFT;
|
|
|
+ pipd_mask = OMAP4_DSI2_PIPD_MASK;
|
|
|
+ pipd_shift = OMAP4_DSI2_PIPD_SHIFT;
|
|
|
+ } else {
|
|
|
+ return -ENODEV;
|
|
|
+ }
|
|
|
+
|
|
|
+ reg = omap4_ctrl_pad_readl(OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY);
|
|
|
+
|
|
|
+ reg &= ~enable_mask;
|
|
|
+ reg &= ~pipd_mask;
|
|
|
+
|
|
|
+ reg |= (lanes << enable_shift) & enable_mask;
|
|
|
+ reg |= (lanes << pipd_shift) & pipd_mask;
|
|
|
+
|
|
|
+ omap4_ctrl_pad_writel(reg, OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+int __init omap_hdmi_init(enum omap_hdmi_flags flags)
|
|
|
+{
|
|
|
+ if (cpu_is_omap44xx()) {
|
|
|
+ omap4_hdmi_mux_pads(flags);
|
|
|
+ omap4_tpd12s015_mux_pads();
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static int omap_dsi_enable_pads(int dsi_id, unsigned lane_mask)
|
|
|
+{
|
|
|
+ if (cpu_is_omap44xx())
|
|
|
+ return omap4_dsi_mux_pads(dsi_id, lane_mask);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|