msm: board-8960: Create a separate board file for display devices
Move the MSM8960 framebuffer and HDMI devices and
associated initialization code into a dedicated board file.
Change-Id: Ia9db958b13a7376d142b529773a4403505712682
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 7b7d09f..cb4f436 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -223,14 +223,14 @@
obj-$(CONFIG_ARCH_MSM8960) += acpuclock-8960.o
obj-$(CONFIG_ARCH_MSM8960) += memory_topology.o
obj-$(CONFIG_ARCH_MSM8960) += saw-regulator.o rpm-regulator.o rpm-regulator-8960.o
-obj-$(CONFIG_MACH_MSM8960_SIM) += board-msm8960.o board-msm8960-camera.o devices-8960.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8960_RUMI3) += board-msm8960.o board-msm8960-camera.o devices-8960.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8960_CDP) += board-msm8960.o board-msm8960-camera.o devices-8960.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8960_MTP) += board-msm8960.o board-msm8960-camera.o devices-8960.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8960_FLUID) += board-msm8960.o board-msm8960-camera.o devices-8960.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8930_CDP) += board-msm8960.o board-msm8960-camera.o devices-8960.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8930_MTP) += board-msm8960.o board-msm8960-camera.o devices-8960.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8930_FLUID) += board-msm8960.o board-msm8960-camera.o devices-8960.o board-msm8960-regulator.o
+obj-$(CONFIG_MACH_MSM8960_SIM) += board-msm8960.o board-msm8960-camera.o board-msm8960-display.o devices-8960.o board-msm8960-regulator.o
+obj-$(CONFIG_MACH_MSM8960_RUMI3) += board-msm8960.o board-msm8960-camera.o board-msm8960-display.o devices-8960.o board-msm8960-regulator.o
+obj-$(CONFIG_MACH_MSM8960_CDP) += board-msm8960.o board-msm8960-camera.o board-msm8960-display.o devices-8960.o board-msm8960-regulator.o
+obj-$(CONFIG_MACH_MSM8960_MTP) += board-msm8960.o board-msm8960-camera.o board-msm8960-display.o devices-8960.o board-msm8960-regulator.o
+obj-$(CONFIG_MACH_MSM8960_FLUID) += board-msm8960.o board-msm8960-camera.o board-msm8960-display.o devices-8960.o board-msm8960-regulator.o
+obj-$(CONFIG_MACH_MSM8930_CDP) += board-msm8960.o board-msm8960-camera.o board-msm8960-display.o devices-8960.o board-msm8960-regulator.o
+obj-$(CONFIG_MACH_MSM8930_MTP) += board-msm8960.o board-msm8960-camera.o board-msm8960-display.o devices-8960.o board-msm8960-regulator.o
+obj-$(CONFIG_MACH_MSM8930_FLUID) += board-msm8960.o board-msm8960-camera.o board-msm8960-display.o devices-8960.o board-msm8960-regulator.o
obj-$(CONFIG_ARCH_MSM8960) += bms-batterydata.o
obj-$(CONFIG_ARCH_APQ8064) += board-apq8064.o devices-8064.o board-apq8064-regulator.o
obj-$(CONFIG_ARCH_MSM9615) += board-9615.o devices-9615.o board-9615-regulator.o
@@ -303,3 +303,4 @@
endif
obj-$(CONFIG_ARCH_MSM8960) += mdm2.o mdm_common.o
+
diff --git a/arch/arm/mach-msm/board-msm8960-display.c b/arch/arm/mach-msm/board-msm8960-display.c
new file mode 100644
index 0000000..cdbfc59
--- /dev/null
+++ b/arch/arm/mach-msm/board-msm8960-display.c
@@ -0,0 +1,1030 @@
+/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/bootmem.h>
+#include <asm/mach-types.h>
+#include <mach/msm_bus_board.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/gpiomux.h>
+#include "devices.h"
+#include "board-msm8960.h"
+
+#ifdef CONFIG_FB_MSM_TRIPLE_BUFFER
+#define MSM_FB_PRIM_BUF_SIZE (1376 * 768 * 4 * 3) /* 4 bpp x 3 pages */
+#else
+#define MSM_FB_PRIM_BUF_SIZE (1376 * 768 * 4 * 2) /* 4 bpp x 2 pages */
+#endif
+
+#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL
+#define MSM_FB_EXT_BUF_SIZE (1920 * 1088 * 2 * 1) /* 2 bpp x 1 page */
+#elif defined(CONFIG_FB_MSM_TVOUT)
+#define MSM_FB_EXT_BUF_SIZE (720 * 576 * 2 * 2) /* 2 bpp x 2 pages */
+#else
+#define MSM_FB_EXT_BUF_SIZE 0
+#endif
+
+#ifdef CONFIG_FB_MSM_OVERLAY_WRITEBACK
+/* width x height x 3 bpp x 2 frame buffer */
+#define MSM_FB_WRITEBACK_SIZE (1376 * 768 * 3 * 2)
+#define MSM_FB_WRITEBACK_OFFSET \
+ (MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE)
+#else
+#define MSM_FB_WRITEBACK_SIZE 0
+#define MSM_FB_WRITEBACK_OFFSET 0
+#endif
+
+#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
+/* 4 bpp x 2 page HDMI case */
+#define MSM_FB_SIZE roundup((1920 * 1088 * 4 * 2), 4096)
+#else
+/* Note: must be multiple of 4096 */
+#define MSM_FB_SIZE roundup(MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE + \
+ MSM_FB_WRITEBACK_SIZE, 4096)
+#endif
+
+#define MDP_VSYNC_GPIO 0
+
+#define PANEL_NAME_MAX_LEN 30
+#define MIPI_CMD_NOVATEK_QHD_PANEL_NAME "mipi_cmd_novatek_qhd"
+#define MIPI_VIDEO_NOVATEK_QHD_PANEL_NAME "mipi_video_novatek_qhd"
+#define MIPI_VIDEO_TOSHIBA_WSVGA_PANEL_NAME "mipi_video_toshiba_wsvga"
+#define MIPI_VIDEO_CHIMEI_WXGA_PANEL_NAME "mipi_video_chimei_wxga"
+#define MIPI_VIDEO_SIMULATOR_VGA_PANEL_NAME "mipi_video_simulator_vga"
+#define MIPI_CMD_RENESAS_FWVGA_PANEL_NAME "mipi_cmd_renesas_fwvga"
+#define HDMI_PANEL_NAME "hdmi_msm"
+#define TVOUT_PANEL_NAME "tvout_msm"
+
+static int writeback_offset(void)
+{
+ return MSM_FB_WRITEBACK_OFFSET;
+}
+
+static struct resource msm_fb_resources[] = {
+ {
+ .flags = IORESOURCE_DMA,
+ }
+};
+
+static int msm_fb_detect_panel(const char *name)
+{
+ if (machine_is_msm8960_liquid()) {
+ if (!strncmp(name, MIPI_VIDEO_CHIMEI_WXGA_PANEL_NAME,
+ strnlen(MIPI_VIDEO_CHIMEI_WXGA_PANEL_NAME,
+ PANEL_NAME_MAX_LEN)))
+ return 0;
+ } else {
+ if (!strncmp(name, MIPI_VIDEO_TOSHIBA_WSVGA_PANEL_NAME,
+ strnlen(MIPI_VIDEO_TOSHIBA_WSVGA_PANEL_NAME,
+ PANEL_NAME_MAX_LEN)))
+ return 0;
+
+#ifndef CONFIG_FB_MSM_MIPI_PANEL_DETECT
+ if (!strncmp(name, MIPI_VIDEO_NOVATEK_QHD_PANEL_NAME,
+ strnlen(MIPI_VIDEO_NOVATEK_QHD_PANEL_NAME,
+ PANEL_NAME_MAX_LEN)))
+ return 0;
+
+ if (!strncmp(name, MIPI_CMD_NOVATEK_QHD_PANEL_NAME,
+ strnlen(MIPI_CMD_NOVATEK_QHD_PANEL_NAME,
+ PANEL_NAME_MAX_LEN)))
+ return 0;
+
+ if (!strncmp(name, MIPI_VIDEO_SIMULATOR_VGA_PANEL_NAME,
+ strnlen(MIPI_VIDEO_SIMULATOR_VGA_PANEL_NAME,
+ PANEL_NAME_MAX_LEN)))
+ return 0;
+
+ if (!strncmp(name, MIPI_CMD_RENESAS_FWVGA_PANEL_NAME,
+ strnlen(MIPI_CMD_RENESAS_FWVGA_PANEL_NAME,
+ PANEL_NAME_MAX_LEN)))
+ return 0;
+#endif
+ }
+
+ if (!strncmp(name, HDMI_PANEL_NAME,
+ strnlen(HDMI_PANEL_NAME,
+ PANEL_NAME_MAX_LEN)))
+ return 0;
+
+ if (!strncmp(name, TVOUT_PANEL_NAME,
+ strnlen(TVOUT_PANEL_NAME,
+ PANEL_NAME_MAX_LEN)))
+ return 0;
+
+ pr_warning("%s: not supported '%s'", __func__, name);
+ return -ENODEV;
+}
+
+static struct msm_fb_platform_data msm_fb_pdata = {
+ .detect_client = msm_fb_detect_panel,
+};
+
+static struct platform_device msm_fb_device = {
+ .name = "msm_fb",
+ .id = 0,
+ .num_resources = ARRAY_SIZE(msm_fb_resources),
+ .resource = msm_fb_resources,
+ .dev.platform_data = &msm_fb_pdata,
+};
+
+static bool dsi_power_on;
+
+/**
+ * LiQUID panel on/off
+ *
+ * @param on
+ *
+ * @return int
+ */
+static int mipi_dsi_liquid_panel_power(int on)
+{
+ static struct regulator *reg_l2, *reg_ext_3p3v;
+ static int gpio21, gpio24, gpio43;
+ int rc;
+
+ pr_info("%s: on=%d\n", __func__, on);
+
+ gpio21 = PM8921_GPIO_PM_TO_SYS(21); /* disp power enable_n */
+ gpio43 = PM8921_GPIO_PM_TO_SYS(43); /* Displays Enable (rst_n)*/
+ gpio24 = PM8921_GPIO_PM_TO_SYS(24); /* Backlight PWM */
+
+ if (!dsi_power_on) {
+
+ reg_l2 = regulator_get(&msm_mipi_dsi1_device.dev,
+ "dsi_vdda");
+ if (IS_ERR(reg_l2)) {
+ pr_err("could not get 8921_l2, rc = %ld\n",
+ PTR_ERR(reg_l2));
+ return -ENODEV;
+ }
+
+ rc = regulator_set_voltage(reg_l2, 1200000, 1200000);
+ if (rc) {
+ pr_err("set_voltage l2 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+
+ reg_ext_3p3v = regulator_get(&msm_mipi_dsi1_device.dev,
+ "vdd_lvds_3p3v");
+ if (IS_ERR(reg_ext_3p3v)) {
+ pr_err("could not get reg_ext_3p3v, rc = %ld\n",
+ PTR_ERR(reg_ext_3p3v));
+ return -ENODEV;
+ }
+
+ rc = gpio_request(gpio21, "disp_pwr_en_n");
+ if (rc) {
+ pr_err("request gpio 21 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+
+ rc = gpio_request(gpio43, "disp_rst_n");
+ if (rc) {
+ pr_err("request gpio 43 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+
+ rc = gpio_request(gpio24, "disp_backlight_pwm");
+ if (rc) {
+ pr_err("request gpio 24 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+
+ dsi_power_on = true;
+ }
+
+ if (on) {
+ rc = regulator_set_optimum_mode(reg_l2, 100000);
+ if (rc < 0) {
+ pr_err("set_optimum_mode l2 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ rc = regulator_enable(reg_l2);
+ if (rc) {
+ pr_err("enable l2 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+
+ rc = regulator_enable(reg_ext_3p3v);
+ if (rc) {
+ pr_err("enable reg_ext_3p3v failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+
+ /* set reset pin before power enable */
+ gpio_set_value_cansleep(gpio43, 0); /* disp disable (resx=0) */
+
+ gpio_set_value_cansleep(gpio21, 0); /* disp power enable_n */
+ msleep(20);
+ gpio_set_value_cansleep(gpio43, 1); /* disp enable */
+ msleep(20);
+ gpio_set_value_cansleep(gpio43, 0); /* disp enable */
+ msleep(20);
+ gpio_set_value_cansleep(gpio43, 1); /* disp enable */
+ msleep(20);
+ } else {
+ gpio_set_value_cansleep(gpio43, 0);
+ gpio_set_value_cansleep(gpio21, 1);
+
+ rc = regulator_disable(reg_l2);
+ if (rc) {
+ pr_err("disable reg_l2 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ rc = regulator_disable(reg_ext_3p3v);
+ if (rc) {
+ pr_err("disable reg_ext_3p3v failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ rc = regulator_set_optimum_mode(reg_l2, 100);
+ if (rc < 0) {
+ pr_err("set_optimum_mode l2 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
+
+static int mipi_dsi_cdp_panel_power(int on)
+{
+ static struct regulator *reg_l8, *reg_l23, *reg_l2;
+ static int gpio43;
+ int rc;
+
+ pr_info("%s: state : %d\n", __func__, on);
+
+ if (!dsi_power_on) {
+
+ reg_l8 = regulator_get(&msm_mipi_dsi1_device.dev,
+ "dsi_vdc");
+ if (IS_ERR(reg_l8)) {
+ pr_err("could not get 8921_l8, rc = %ld\n",
+ PTR_ERR(reg_l8));
+ return -ENODEV;
+ }
+ reg_l23 = regulator_get(&msm_mipi_dsi1_device.dev,
+ "dsi_vddio");
+ if (IS_ERR(reg_l23)) {
+ pr_err("could not get 8921_l23, rc = %ld\n",
+ PTR_ERR(reg_l23));
+ return -ENODEV;
+ }
+ reg_l2 = regulator_get(&msm_mipi_dsi1_device.dev,
+ "dsi_vdda");
+ if (IS_ERR(reg_l2)) {
+ pr_err("could not get 8921_l2, rc = %ld\n",
+ PTR_ERR(reg_l2));
+ return -ENODEV;
+ }
+ rc = regulator_set_voltage(reg_l8, 2800000, 3000000);
+ if (rc) {
+ pr_err("set_voltage l8 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ rc = regulator_set_voltage(reg_l23, 1800000, 1800000);
+ if (rc) {
+ pr_err("set_voltage l23 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ rc = regulator_set_voltage(reg_l2, 1200000, 1200000);
+ if (rc) {
+ pr_err("set_voltage l2 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ gpio43 = PM8921_GPIO_PM_TO_SYS(43);
+ rc = gpio_request(gpio43, "disp_rst_n");
+ if (rc) {
+ pr_err("request gpio 43 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ dsi_power_on = true;
+ }
+ if (on) {
+ rc = regulator_set_optimum_mode(reg_l8, 100000);
+ if (rc < 0) {
+ pr_err("set_optimum_mode l8 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ rc = regulator_set_optimum_mode(reg_l23, 100000);
+ if (rc < 0) {
+ pr_err("set_optimum_mode l23 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ rc = regulator_set_optimum_mode(reg_l2, 100000);
+ if (rc < 0) {
+ pr_err("set_optimum_mode l2 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ rc = regulator_enable(reg_l8);
+ if (rc) {
+ pr_err("enable l8 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ rc = regulator_enable(reg_l23);
+ if (rc) {
+ pr_err("enable l8 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ rc = regulator_enable(reg_l2);
+ if (rc) {
+ pr_err("enable l2 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ gpio_set_value_cansleep(gpio43, 1);
+ } else {
+ rc = regulator_disable(reg_l2);
+ if (rc) {
+ pr_err("disable reg_l2 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ rc = regulator_disable(reg_l8);
+ if (rc) {
+ pr_err("disable reg_l8 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ rc = regulator_disable(reg_l23);
+ if (rc) {
+ pr_err("disable reg_l23 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ rc = regulator_set_optimum_mode(reg_l8, 100);
+ if (rc < 0) {
+ pr_err("set_optimum_mode l8 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ rc = regulator_set_optimum_mode(reg_l23, 100);
+ if (rc < 0) {
+ pr_err("set_optimum_mode l23 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ rc = regulator_set_optimum_mode(reg_l2, 100);
+ if (rc < 0) {
+ pr_err("set_optimum_mode l2 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ gpio_set_value_cansleep(gpio43, 0);
+ }
+ return 0;
+}
+
+static int mipi_dsi_panel_power(int on)
+{
+ int ret;
+
+ pr_info("%s: on=%d\n", __func__, on);
+
+ if (machine_is_msm8960_liquid())
+ ret = mipi_dsi_liquid_panel_power(on);
+ else
+ ret = mipi_dsi_cdp_panel_power(on);
+
+ return ret;
+}
+
+static struct mipi_dsi_platform_data mipi_dsi_pdata = {
+ .vsync_gpio = MDP_VSYNC_GPIO,
+ .dsi_power_save = mipi_dsi_panel_power,
+};
+
+#ifdef CONFIG_MSM_BUS_SCALING
+
+static struct msm_bus_vectors mdp_init_vectors[] = {
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 0,
+ .ib = 0,
+ },
+};
+
+#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
+static struct msm_bus_vectors hdmi_as_primary_vectors[] = {
+ /* If HDMI is used as primary */
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 2000000000,
+ .ib = 2000000000,
+ },
+};
+static struct msm_bus_paths mdp_bus_scale_usecases[] = {
+ {
+ ARRAY_SIZE(mdp_init_vectors),
+ mdp_init_vectors,
+ },
+ {
+ ARRAY_SIZE(hdmi_as_primary_vectors),
+ hdmi_as_primary_vectors,
+ },
+ {
+ ARRAY_SIZE(hdmi_as_primary_vectors),
+ hdmi_as_primary_vectors,
+ },
+ {
+ ARRAY_SIZE(hdmi_as_primary_vectors),
+ hdmi_as_primary_vectors,
+ },
+ {
+ ARRAY_SIZE(hdmi_as_primary_vectors),
+ hdmi_as_primary_vectors,
+ },
+ {
+ ARRAY_SIZE(hdmi_as_primary_vectors),
+ hdmi_as_primary_vectors,
+ },
+};
+#else
+static struct msm_bus_vectors mdp_ui_vectors[] = {
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 216000000 * 2,
+ .ib = 270000000 * 2,
+ },
+};
+
+static struct msm_bus_vectors mdp_vga_vectors[] = {
+ /* VGA and less video */
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 216000000 * 2,
+ .ib = 270000000 * 2,
+ },
+};
+
+static struct msm_bus_vectors mdp_720p_vectors[] = {
+ /* 720p and less video */
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 230400000 * 2,
+ .ib = 288000000 * 2,
+ },
+};
+
+static struct msm_bus_vectors mdp_1080p_vectors[] = {
+ /* 1080p and less video */
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 334080000 * 2,
+ .ib = 417600000 * 2,
+ },
+};
+
+static struct msm_bus_paths mdp_bus_scale_usecases[] = {
+ {
+ ARRAY_SIZE(mdp_init_vectors),
+ mdp_init_vectors,
+ },
+ {
+ ARRAY_SIZE(mdp_ui_vectors),
+ mdp_ui_vectors,
+ },
+ {
+ ARRAY_SIZE(mdp_ui_vectors),
+ mdp_ui_vectors,
+ },
+ {
+ ARRAY_SIZE(mdp_vga_vectors),
+ mdp_vga_vectors,
+ },
+ {
+ ARRAY_SIZE(mdp_720p_vectors),
+ mdp_720p_vectors,
+ },
+ {
+ ARRAY_SIZE(mdp_1080p_vectors),
+ mdp_1080p_vectors,
+ },
+};
+#endif
+
+static struct msm_bus_scale_pdata mdp_bus_scale_pdata = {
+ mdp_bus_scale_usecases,
+ ARRAY_SIZE(mdp_bus_scale_usecases),
+ .name = "mdp",
+};
+
+#endif
+
+#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
+int mdp_core_clk_rate_table[] = {
+ 200000000,
+ 200000000,
+ 200000000,
+ 200000000,
+};
+#else
+int mdp_core_clk_rate_table[] = {
+ 85330000,
+ 85330000,
+ 160000000,
+ 200000000,
+};
+#endif
+
+static struct msm_panel_common_pdata mdp_pdata = {
+ .gpio = MDP_VSYNC_GPIO,
+#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
+ .mdp_core_clk_rate = 200000000,
+#else
+ .mdp_core_clk_rate = 85330000,
+#endif
+ .mdp_core_clk_table = mdp_core_clk_rate_table,
+ .num_mdp_clk = ARRAY_SIZE(mdp_core_clk_rate_table),
+#ifdef CONFIG_MSM_BUS_SCALING
+ .mdp_bus_scale_table = &mdp_bus_scale_pdata,
+#endif
+ .mdp_rev = MDP_REV_42,
+ .writeback_offset = writeback_offset,
+};
+
+static struct platform_device mipi_dsi_renesas_panel_device = {
+ .name = "mipi_renesas",
+ .id = 0,
+};
+
+static struct platform_device mipi_dsi_simulator_panel_device = {
+ .name = "mipi_simulator",
+ .id = 0,
+};
+
+#define LPM_CHANNEL0 0
+static int toshiba_gpio[] = {LPM_CHANNEL0};
+
+static struct mipi_dsi_panel_platform_data toshiba_pdata = {
+ .gpio = toshiba_gpio,
+};
+
+static struct platform_device mipi_dsi_toshiba_panel_device = {
+ .name = "mipi_toshiba",
+ .id = 0,
+ .dev = {
+ .platform_data = &toshiba_pdata,
+ }
+};
+
+#define FPGA_3D_GPIO_CONFIG_ADDR 0xB5
+static int dsi2lvds_gpio[2] = {
+ 0,/* Backlight PWM-ID=0 for PMIC-GPIO#24 */
+ 0x1F08 /* DSI2LVDS Bridge GPIO Output, mask=0x1f, out=0x08 */
+ };
+
+static struct msm_panel_common_pdata mipi_dsi2lvds_pdata = {
+ .gpio_num = dsi2lvds_gpio,
+};
+
+static struct mipi_dsi_phy_ctrl dsi_novatek_cmd_mode_phy_db = {
+
+/* DSI_BIT_CLK at 500MHz, 2 lane, RGB888 */
+ {0x0F, 0x0a, 0x04, 0x00, 0x20}, /* regulator */
+ /* timing */
+ {0xab, 0x8a, 0x18, 0x00, 0x92, 0x97, 0x1b, 0x8c,
+ 0x0c, 0x03, 0x04, 0xa0},
+ {0x5f, 0x00, 0x00, 0x10}, /* phy ctrl */
+ {0xff, 0x00, 0x06, 0x00}, /* strength */
+ /* pll control */
+ {0x40, 0xf9, 0x30, 0xda, 0x00, 0x40, 0x03, 0x62,
+ 0x40, 0x07, 0x03,
+ 0x00, 0x1a, 0x00, 0x00, 0x02, 0x00, 0x20, 0x00, 0x01},
+};
+
+static struct mipi_dsi_panel_platform_data novatek_pdata = {
+ .fpga_3d_config_addr = FPGA_3D_GPIO_CONFIG_ADDR,
+ .fpga_ctrl_mode = FPGA_SPI_INTF,
+ .phy_ctrl_settings = &dsi_novatek_cmd_mode_phy_db,
+};
+
+static struct platform_device mipi_dsi_novatek_panel_device = {
+ .name = "mipi_novatek",
+ .id = 0,
+ .dev = {
+ .platform_data = &novatek_pdata,
+ }
+};
+
+static struct platform_device mipi_dsi2lvds_bridge_device = {
+ .name = "mipi_tc358764",
+ .id = 0,
+ .dev.platform_data = &mipi_dsi2lvds_pdata,
+};
+
+#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL
+static struct resource hdmi_msm_resources[] = {
+ {
+ .name = "hdmi_msm_qfprom_addr",
+ .start = 0x00700000,
+ .end = 0x007060FF,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .name = "hdmi_msm_hdmi_addr",
+ .start = 0x04A00000,
+ .end = 0x04A00FFF,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .name = "hdmi_msm_irq",
+ .start = HDMI_IRQ,
+ .end = HDMI_IRQ,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static int hdmi_enable_5v(int on);
+static int hdmi_core_power(int on, int show);
+static int hdmi_cec_power(int on);
+
+static struct msm_hdmi_platform_data hdmi_msm_data = {
+ .irq = HDMI_IRQ,
+ .enable_5v = hdmi_enable_5v,
+ .core_power = hdmi_core_power,
+ .cec_power = hdmi_cec_power,
+};
+
+static struct platform_device hdmi_msm_device = {
+ .name = "hdmi_msm",
+ .id = 0,
+ .num_resources = ARRAY_SIZE(hdmi_msm_resources),
+ .resource = hdmi_msm_resources,
+ .dev.platform_data = &hdmi_msm_data,
+};
+#endif /* CONFIG_FB_MSM_HDMI_MSM_PANEL */
+
+#ifdef CONFIG_FB_MSM_WRITEBACK_MSM_PANEL
+static struct platform_device wfd_panel_device = {
+ .name = "wfd_panel",
+ .id = 0,
+ .dev.platform_data = NULL,
+};
+#endif
+
+#ifdef CONFIG_MSM_BUS_SCALING
+static struct msm_bus_vectors dtv_bus_init_vectors[] = {
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 0,
+ .ib = 0,
+ },
+};
+
+#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
+static struct msm_bus_vectors dtv_bus_def_vectors[] = {
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 2000000000,
+ .ib = 2000000000,
+ },
+};
+#else
+static struct msm_bus_vectors dtv_bus_def_vectors[] = {
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 566092800 * 2,
+ .ib = 707616000 * 2,
+ },
+};
+#endif
+
+static struct msm_bus_paths dtv_bus_scale_usecases[] = {
+ {
+ ARRAY_SIZE(dtv_bus_init_vectors),
+ dtv_bus_init_vectors,
+ },
+ {
+ ARRAY_SIZE(dtv_bus_def_vectors),
+ dtv_bus_def_vectors,
+ },
+};
+static struct msm_bus_scale_pdata dtv_bus_scale_pdata = {
+ dtv_bus_scale_usecases,
+ ARRAY_SIZE(dtv_bus_scale_usecases),
+ .name = "dtv",
+};
+
+static struct lcdc_platform_data dtv_pdata = {
+ .bus_scale_table = &dtv_bus_scale_pdata,
+};
+#endif
+
+static struct gpiomux_setting mdp_vsync_suspend_cfg = {
+ .func = GPIOMUX_FUNC_GPIO,
+ .drv = GPIOMUX_DRV_2MA,
+ .pull = GPIOMUX_PULL_DOWN,
+};
+
+static struct gpiomux_setting mdp_vsync_active_cfg = {
+ .func = GPIOMUX_FUNC_1,
+ .drv = GPIOMUX_DRV_2MA,
+ .pull = GPIOMUX_PULL_DOWN,
+};
+
+static struct msm_gpiomux_config msm8960_mdp_vsync_configs[] __initdata = {
+ {
+ .gpio = MDP_VSYNC_GPIO,
+ .settings = {
+ [GPIOMUX_ACTIVE] = &mdp_vsync_active_cfg,
+ [GPIOMUX_SUSPENDED] = &mdp_vsync_suspend_cfg,
+ },
+ }
+};
+
+#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL
+static struct gpiomux_setting hdmi_suspend_cfg = {
+ .func = GPIOMUX_FUNC_GPIO,
+ .drv = GPIOMUX_DRV_2MA,
+ .pull = GPIOMUX_PULL_DOWN,
+};
+
+static struct gpiomux_setting hdmi_active_1_cfg = {
+ .func = GPIOMUX_FUNC_1,
+ .drv = GPIOMUX_DRV_2MA,
+ .pull = GPIOMUX_PULL_UP,
+};
+
+static struct gpiomux_setting hdmi_active_2_cfg = {
+ .func = GPIOMUX_FUNC_1,
+ .drv = GPIOMUX_DRV_2MA,
+ .pull = GPIOMUX_PULL_DOWN,
+};
+
+static struct msm_gpiomux_config msm8960_hdmi_configs[] __initdata = {
+ {
+ .gpio = 99,
+ .settings = {
+ [GPIOMUX_ACTIVE] = &hdmi_active_1_cfg,
+ [GPIOMUX_SUSPENDED] = &hdmi_suspend_cfg,
+ },
+ },
+ {
+ .gpio = 100,
+ .settings = {
+ [GPIOMUX_ACTIVE] = &hdmi_active_1_cfg,
+ [GPIOMUX_SUSPENDED] = &hdmi_suspend_cfg,
+ },
+ },
+ {
+ .gpio = 101,
+ .settings = {
+ [GPIOMUX_ACTIVE] = &hdmi_active_1_cfg,
+ [GPIOMUX_SUSPENDED] = &hdmi_suspend_cfg,
+ },
+ },
+ {
+ .gpio = 102,
+ .settings = {
+ [GPIOMUX_ACTIVE] = &hdmi_active_2_cfg,
+ [GPIOMUX_SUSPENDED] = &hdmi_suspend_cfg,
+ },
+ },
+};
+
+static int hdmi_enable_5v(int on)
+{
+ /* TBD: PM8921 regulator instead of 8901 */
+ static struct regulator *reg_8921_hdmi_mvs; /* HDMI_5V */
+ static int prev_on;
+ int rc;
+
+ if (on == prev_on)
+ return 0;
+
+ if (!reg_8921_hdmi_mvs)
+ reg_8921_hdmi_mvs = regulator_get(&hdmi_msm_device.dev,
+ "hdmi_mvs");
+
+ if (on) {
+ rc = regulator_enable(reg_8921_hdmi_mvs);
+ if (rc) {
+ pr_err("'%s' regulator enable failed, rc=%d\n",
+ "8921_hdmi_mvs", rc);
+ return rc;
+ }
+ pr_debug("%s(on): success\n", __func__);
+ } else {
+ rc = regulator_disable(reg_8921_hdmi_mvs);
+ if (rc)
+ pr_warning("'%s' regulator disable failed, rc=%d\n",
+ "8921_hdmi_mvs", rc);
+ pr_debug("%s(off): success\n", __func__);
+ }
+
+ prev_on = on;
+
+ return 0;
+}
+
+static int hdmi_core_power(int on, int show)
+{
+ static struct regulator *reg_8921_l23, *reg_8921_s4;
+ static int prev_on;
+ int rc;
+
+ if (on == prev_on)
+ return 0;
+
+ /* TBD: PM8921 regulator instead of 8901 */
+ if (!reg_8921_l23) {
+ reg_8921_l23 = regulator_get(&hdmi_msm_device.dev, "hdmi_avdd");
+ if (IS_ERR(reg_8921_l23)) {
+ pr_err("could not get reg_8921_l23, rc = %ld\n",
+ PTR_ERR(reg_8921_l23));
+ return -ENODEV;
+ }
+ rc = regulator_set_voltage(reg_8921_l23, 1800000, 1800000);
+ if (rc) {
+ pr_err("set_voltage failed for 8921_l23, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ }
+ if (!reg_8921_s4) {
+ reg_8921_s4 = regulator_get(&hdmi_msm_device.dev, "hdmi_vcc");
+ if (IS_ERR(reg_8921_s4)) {
+ pr_err("could not get reg_8921_s4, rc = %ld\n",
+ PTR_ERR(reg_8921_s4));
+ return -ENODEV;
+ }
+ rc = regulator_set_voltage(reg_8921_s4, 1800000, 1800000);
+ if (rc) {
+ pr_err("set_voltage failed for 8921_s4, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ }
+
+ if (on) {
+ rc = regulator_set_optimum_mode(reg_8921_l23, 100000);
+ if (rc < 0) {
+ pr_err("set_optimum_mode l23 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ rc = regulator_enable(reg_8921_l23);
+ if (rc) {
+ pr_err("'%s' regulator enable failed, rc=%d\n",
+ "hdmi_avdd", rc);
+ return rc;
+ }
+ rc = regulator_enable(reg_8921_s4);
+ if (rc) {
+ pr_err("'%s' regulator enable failed, rc=%d\n",
+ "hdmi_vcc", rc);
+ return rc;
+ }
+ rc = gpio_request(100, "HDMI_DDC_CLK");
+ if (rc) {
+ pr_err("'%s'(%d) gpio_request failed, rc=%d\n",
+ "HDMI_DDC_CLK", 100, rc);
+ goto error1;
+ }
+ rc = gpio_request(101, "HDMI_DDC_DATA");
+ if (rc) {
+ pr_err("'%s'(%d) gpio_request failed, rc=%d\n",
+ "HDMI_DDC_DATA", 101, rc);
+ goto error2;
+ }
+ rc = gpio_request(102, "HDMI_HPD");
+ if (rc) {
+ pr_err("'%s'(%d) gpio_request failed, rc=%d\n",
+ "HDMI_HPD", 102, rc);
+ goto error3;
+ }
+ pr_debug("%s(on): success\n", __func__);
+ } else {
+ gpio_free(100);
+ gpio_free(101);
+ gpio_free(102);
+
+ rc = regulator_disable(reg_8921_l23);
+ if (rc) {
+ pr_err("disable reg_8921_l23 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ rc = regulator_disable(reg_8921_s4);
+ if (rc) {
+ pr_err("disable reg_8921_s4 failed, rc=%d\n", rc);
+ return -ENODEV;
+ }
+ rc = regulator_set_optimum_mode(reg_8921_l23, 100);
+ if (rc < 0) {
+ pr_err("set_optimum_mode l23 failed, rc=%d\n", rc);
+ return -EINVAL;
+ }
+ pr_debug("%s(off): success\n", __func__);
+ }
+
+ prev_on = on;
+
+ return 0;
+
+error3:
+ gpio_free(101);
+error2:
+ gpio_free(100);
+error1:
+ regulator_disable(reg_8921_l23);
+ regulator_disable(reg_8921_s4);
+ return rc;
+}
+
+static int hdmi_cec_power(int on)
+{
+ static int prev_on;
+ int rc;
+
+ if (on == prev_on)
+ return 0;
+
+ if (on) {
+ rc = gpio_request(99, "HDMI_CEC_VAR");
+ if (rc) {
+ pr_err("'%s'(%d) gpio_request failed, rc=%d\n",
+ "HDMI_CEC_VAR", 99, rc);
+ goto error;
+ }
+ pr_debug("%s(on): success\n", __func__);
+ } else {
+ gpio_free(99);
+ pr_debug("%s(off): success\n", __func__);
+ }
+
+ prev_on = on;
+
+ return 0;
+error:
+ return rc;
+}
+#endif /* CONFIG_FB_MSM_HDMI_MSM_PANEL */
+
+void __init msm8960_init_fb(void)
+{
+#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL
+ msm_gpiomux_install(msm8960_hdmi_configs,
+ ARRAY_SIZE(msm8960_hdmi_configs));
+#endif
+
+ msm_gpiomux_install(msm8960_mdp_vsync_configs,
+ ARRAY_SIZE(msm8960_mdp_vsync_configs));
+
+ platform_device_register(&msm_fb_device);
+
+ if (machine_is_msm8960_sim())
+ platform_device_register(&mipi_dsi_simulator_panel_device);
+
+ if (machine_is_msm8960_rumi3())
+ platform_device_register(&mipi_dsi_renesas_panel_device);
+
+ if (!machine_is_msm8960_sim() && !machine_is_msm8960_rumi3()) {
+ platform_device_register(&mipi_dsi_novatek_panel_device);
+
+#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL
+ platform_device_register(&hdmi_msm_device);
+#endif
+ }
+
+ if (machine_is_msm8960_liquid())
+ platform_device_register(&mipi_dsi2lvds_bridge_device);
+ else
+ platform_device_register(&mipi_dsi_toshiba_panel_device);
+
+ if (machine_is_msm8x60_rumi3()) {
+ msm_fb_register_device("mdp", NULL);
+ mipi_dsi_pdata.target_type = 1;
+ } else
+ msm_fb_register_device("mdp", &mdp_pdata);
+ msm_fb_register_device("mipi_dsi", &mipi_dsi_pdata);
+#ifdef CONFIG_MSM_BUS_SCALING
+ msm_fb_register_device("dtv", &dtv_pdata);
+#endif
+}
+
+void __init msm8960_allocate_fb_region(void)
+{
+ void *addr;
+ unsigned long size;
+
+ size = MSM_FB_SIZE;
+ addr = alloc_bootmem_align(size, 0x1000);
+ msm_fb_resources[0].start = __pa(addr);
+ msm_fb_resources[0].end = msm_fb_resources[0].start + size - 1;
+ pr_info("allocating %lu bytes at %p (%lx physical) for fb\n",
+ size, addr, __pa(addr));
+}
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index 2885fce..fcee0de 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -92,7 +92,6 @@
#include "smd_private.h"
#include "pm-boot.h"
#include "msm_watchdog.h"
-
#include "board-msm8960.h"
#define PLATFORM_IS_CHARM25() \
@@ -961,993 +960,11 @@
return soc_change_memory_power(start, size, change_type);
}
-#ifdef CONFIG_FB_MSM_TRIPLE_BUFFER
-#define MSM_FB_PRIM_BUF_SIZE (1376 * 768 * 4 * 3) /* 4 bpp x 3 pages */
-#else
-#define MSM_FB_PRIM_BUF_SIZE (1376 * 768 * 4 * 2) /* 4 bpp x 2 pages */
-#endif
-
-
-#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL
-#define MSM_FB_EXT_BUF_SIZE (1920 * 1088 * 2 * 1) /* 2 bpp x 1 page */
-#elif defined(CONFIG_FB_MSM_TVOUT)
-#define MSM_FB_EXT_BUF_SIZE (720 * 576 * 2 * 2) /* 2 bpp x 2 pages */
-#else
-#define MSM_FB_EXT_BUF_SIZE 0
-#endif
-
-#ifdef CONFIG_FB_MSM_OVERLAY_WRITEBACK
-/* width x height x 3 bpp x 2 frame buffer */
-#define MSM_FB_WRITEBACK_SIZE (1376 * 768 * 3 * 2)
-#define MSM_FB_WRITEBACK_OFFSET \
- (MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE)
-#else
-#define MSM_FB_WRITEBACK_SIZE 0
-#define MSM_FB_WRITEBACK_OFFSET 0
-#endif
-
-#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
-/* 4 bpp x 2 page HDMI case */
-#define MSM_FB_SIZE roundup((1920 * 1088 * 4 * 2), 4096)
-#else
-/* Note: must be multiple of 4096 */
-#define MSM_FB_SIZE roundup(MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE + \
- MSM_FB_WRITEBACK_SIZE, 4096)
-#endif
-
-static int writeback_offset(void)
-{
- return MSM_FB_WRITEBACK_OFFSET;
-}
-
-
-#define MDP_VSYNC_GPIO 0
-
-#define PANEL_NAME_MAX_LEN 30
-#define MIPI_CMD_NOVATEK_QHD_PANEL_NAME "mipi_cmd_novatek_qhd"
-#define MIPI_VIDEO_NOVATEK_QHD_PANEL_NAME "mipi_video_novatek_qhd"
-#define MIPI_VIDEO_TOSHIBA_WSVGA_PANEL_NAME "mipi_video_toshiba_wsvga"
-#define MIPI_VIDEO_CHIMEI_WXGA_PANEL_NAME "mipi_video_chimei_wxga"
-#define MIPI_VIDEO_SIMULATOR_VGA_PANEL_NAME "mipi_video_simulator_vga"
-#define MIPI_CMD_RENESAS_FWVGA_PANEL_NAME "mipi_cmd_renesas_fwvga"
-#define HDMI_PANEL_NAME "hdmi_msm"
-#define TVOUT_PANEL_NAME "tvout_msm"
-
-static struct resource msm_fb_resources[] = {
- {
- .flags = IORESOURCE_DMA,
- }
-};
-
-static int msm_fb_detect_panel(const char *name)
-{
- if (machine_is_msm8960_liquid()) {
- if (!strncmp(name, MIPI_VIDEO_CHIMEI_WXGA_PANEL_NAME,
- strnlen(MIPI_VIDEO_CHIMEI_WXGA_PANEL_NAME,
- PANEL_NAME_MAX_LEN)))
- return 0;
- } else {
- if (!strncmp(name, MIPI_VIDEO_TOSHIBA_WSVGA_PANEL_NAME,
- strnlen(MIPI_VIDEO_TOSHIBA_WSVGA_PANEL_NAME,
- PANEL_NAME_MAX_LEN)))
- return 0;
-
-#ifndef CONFIG_FB_MSM_MIPI_PANEL_DETECT
- if (!strncmp(name, MIPI_VIDEO_NOVATEK_QHD_PANEL_NAME,
- strnlen(MIPI_VIDEO_NOVATEK_QHD_PANEL_NAME,
- PANEL_NAME_MAX_LEN)))
- return 0;
-
- if (!strncmp(name, MIPI_CMD_NOVATEK_QHD_PANEL_NAME,
- strnlen(MIPI_CMD_NOVATEK_QHD_PANEL_NAME,
- PANEL_NAME_MAX_LEN)))
- return 0;
-
- if (!strncmp(name, MIPI_VIDEO_SIMULATOR_VGA_PANEL_NAME,
- strnlen(MIPI_VIDEO_SIMULATOR_VGA_PANEL_NAME,
- PANEL_NAME_MAX_LEN)))
- return 0;
-
- if (!strncmp(name, MIPI_CMD_RENESAS_FWVGA_PANEL_NAME,
- strnlen(MIPI_CMD_RENESAS_FWVGA_PANEL_NAME,
- PANEL_NAME_MAX_LEN)))
- return 0;
-#endif
- }
-
- if (!strncmp(name, HDMI_PANEL_NAME,
- strnlen(HDMI_PANEL_NAME,
- PANEL_NAME_MAX_LEN)))
- return 0;
-
- if (!strncmp(name, TVOUT_PANEL_NAME,
- strnlen(TVOUT_PANEL_NAME,
- PANEL_NAME_MAX_LEN)))
- return 0;
-
- pr_warning("%s: not supported '%s'", __func__, name);
- return -ENODEV;
-}
-
-static struct msm_fb_platform_data msm_fb_pdata = {
- .detect_client = msm_fb_detect_panel,
-};
-
-static struct platform_device msm_fb_device = {
- .name = "msm_fb",
- .id = 0,
- .num_resources = ARRAY_SIZE(msm_fb_resources),
- .resource = msm_fb_resources,
- .dev.platform_data = &msm_fb_pdata,
-};
-
-static bool dsi_power_on;
-
-/**
- * LiQUID panel on/off
- *
- * @param on
- *
- * @return int
- */
-static int mipi_dsi_liquid_panel_power(int on)
-{
- static struct regulator *reg_l2, *reg_ext_3p3v;
- static int gpio21, gpio24, gpio43;
- int rc;
-
- pr_info("%s: on=%d\n", __func__, on);
-
- gpio21 = PM8921_GPIO_PM_TO_SYS(21); /* disp power enable_n */
- gpio43 = PM8921_GPIO_PM_TO_SYS(43); /* Displays Enable (rst_n)*/
- gpio24 = PM8921_GPIO_PM_TO_SYS(24); /* Backlight PWM */
-
- if (!dsi_power_on) {
-
- reg_l2 = regulator_get(&msm_mipi_dsi1_device.dev,
- "dsi_vdda");
- if (IS_ERR(reg_l2)) {
- pr_err("could not get 8921_l2, rc = %ld\n",
- PTR_ERR(reg_l2));
- return -ENODEV;
- }
-
- rc = regulator_set_voltage(reg_l2, 1200000, 1200000);
- if (rc) {
- pr_err("set_voltage l2 failed, rc=%d\n", rc);
- return -EINVAL;
- }
-
- reg_ext_3p3v = regulator_get(&msm_mipi_dsi1_device.dev,
- "vdd_lvds_3p3v");
- if (IS_ERR(reg_ext_3p3v)) {
- pr_err("could not get reg_ext_3p3v, rc = %ld\n",
- PTR_ERR(reg_ext_3p3v));
- return -ENODEV;
- }
-
- rc = gpio_request(gpio21, "disp_pwr_en_n");
- if (rc) {
- pr_err("request gpio 21 failed, rc=%d\n", rc);
- return -ENODEV;
- }
-
- rc = gpio_request(gpio43, "disp_rst_n");
- if (rc) {
- pr_err("request gpio 43 failed, rc=%d\n", rc);
- return -ENODEV;
- }
-
- rc = gpio_request(gpio24, "disp_backlight_pwm");
- if (rc) {
- pr_err("request gpio 24 failed, rc=%d\n", rc);
- return -ENODEV;
- }
-
- dsi_power_on = true;
- }
-
- if (on) {
- rc = regulator_set_optimum_mode(reg_l2, 100000);
- if (rc < 0) {
- pr_err("set_optimum_mode l2 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- rc = regulator_enable(reg_l2);
- if (rc) {
- pr_err("enable l2 failed, rc=%d\n", rc);
- return -ENODEV;
- }
-
- rc = regulator_enable(reg_ext_3p3v);
- if (rc) {
- pr_err("enable reg_ext_3p3v failed, rc=%d\n", rc);
- return -ENODEV;
- }
-
- /* set reset pin before power enable */
- gpio_set_value_cansleep(gpio43, 0); /* disp disable (resx=0) */
-
- gpio_set_value_cansleep(gpio21, 0); /* disp power enable_n */
- msleep(20);
- gpio_set_value_cansleep(gpio43, 1); /* disp enable */
- msleep(20);
- gpio_set_value_cansleep(gpio43, 0); /* disp enable */
- msleep(20);
- gpio_set_value_cansleep(gpio43, 1); /* disp enable */
- msleep(20);
- } else {
- gpio_set_value_cansleep(gpio43, 0);
- gpio_set_value_cansleep(gpio21, 1);
-
- rc = regulator_disable(reg_l2);
- if (rc) {
- pr_err("disable reg_l2 failed, rc=%d\n", rc);
- return -ENODEV;
- }
- rc = regulator_disable(reg_ext_3p3v);
- if (rc) {
- pr_err("disable reg_ext_3p3v failed, rc=%d\n", rc);
- return -ENODEV;
- }
- rc = regulator_set_optimum_mode(reg_l2, 100);
- if (rc < 0) {
- pr_err("set_optimum_mode l2 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- }
-
- return 0;
-}
-
-static int mipi_dsi_cdp_panel_power(int on)
-{
- static struct regulator *reg_l8, *reg_l23, *reg_l2;
- static int gpio43;
- int rc;
-
- pr_info("%s: state : %d\n", __func__, on);
-
- if (!dsi_power_on) {
-
- reg_l8 = regulator_get(&msm_mipi_dsi1_device.dev,
- "dsi_vdc");
- if (IS_ERR(reg_l8)) {
- pr_err("could not get 8921_l8, rc = %ld\n",
- PTR_ERR(reg_l8));
- return -ENODEV;
- }
- reg_l23 = regulator_get(&msm_mipi_dsi1_device.dev,
- "dsi_vddio");
- if (IS_ERR(reg_l23)) {
- pr_err("could not get 8921_l23, rc = %ld\n",
- PTR_ERR(reg_l23));
- return -ENODEV;
- }
- reg_l2 = regulator_get(&msm_mipi_dsi1_device.dev,
- "dsi_vdda");
- if (IS_ERR(reg_l2)) {
- pr_err("could not get 8921_l2, rc = %ld\n",
- PTR_ERR(reg_l2));
- return -ENODEV;
- }
- rc = regulator_set_voltage(reg_l8, 2800000, 3000000);
- if (rc) {
- pr_err("set_voltage l8 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- rc = regulator_set_voltage(reg_l23, 1800000, 1800000);
- if (rc) {
- pr_err("set_voltage l23 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- rc = regulator_set_voltage(reg_l2, 1200000, 1200000);
- if (rc) {
- pr_err("set_voltage l2 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- gpio43 = PM8921_GPIO_PM_TO_SYS(43);
- rc = gpio_request(gpio43, "disp_rst_n");
- if (rc) {
- pr_err("request gpio 43 failed, rc=%d\n", rc);
- return -ENODEV;
- }
- dsi_power_on = true;
- }
- if (on) {
- rc = regulator_set_optimum_mode(reg_l8, 100000);
- if (rc < 0) {
- pr_err("set_optimum_mode l8 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- rc = regulator_set_optimum_mode(reg_l23, 100000);
- if (rc < 0) {
- pr_err("set_optimum_mode l23 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- rc = regulator_set_optimum_mode(reg_l2, 100000);
- if (rc < 0) {
- pr_err("set_optimum_mode l2 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- rc = regulator_enable(reg_l8);
- if (rc) {
- pr_err("enable l8 failed, rc=%d\n", rc);
- return -ENODEV;
- }
- rc = regulator_enable(reg_l23);
- if (rc) {
- pr_err("enable l8 failed, rc=%d\n", rc);
- return -ENODEV;
- }
- rc = regulator_enable(reg_l2);
- if (rc) {
- pr_err("enable l2 failed, rc=%d\n", rc);
- return -ENODEV;
- }
- gpio_set_value_cansleep(gpio43, 1);
- } else {
- rc = regulator_disable(reg_l2);
- if (rc) {
- pr_err("disable reg_l2 failed, rc=%d\n", rc);
- return -ENODEV;
- }
- rc = regulator_disable(reg_l8);
- if (rc) {
- pr_err("disable reg_l8 failed, rc=%d\n", rc);
- return -ENODEV;
- }
- rc = regulator_disable(reg_l23);
- if (rc) {
- pr_err("disable reg_l23 failed, rc=%d\n", rc);
- return -ENODEV;
- }
- rc = regulator_set_optimum_mode(reg_l8, 100);
- if (rc < 0) {
- pr_err("set_optimum_mode l8 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- rc = regulator_set_optimum_mode(reg_l23, 100);
- if (rc < 0) {
- pr_err("set_optimum_mode l23 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- rc = regulator_set_optimum_mode(reg_l2, 100);
- if (rc < 0) {
- pr_err("set_optimum_mode l2 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- gpio_set_value_cansleep(gpio43, 0);
- }
- return 0;
-}
-
-static int mipi_dsi_panel_power(int on)
-{
- int ret;
-
- pr_info("%s: on=%d\n", __func__, on);
-
- if (machine_is_msm8960_liquid())
- ret = mipi_dsi_liquid_panel_power(on);
- else
- ret = mipi_dsi_cdp_panel_power(on);
-
- return ret;
-}
-
-static struct mipi_dsi_platform_data mipi_dsi_pdata = {
- .vsync_gpio = MDP_VSYNC_GPIO,
- .dsi_power_save = mipi_dsi_panel_power,
-};
-
-#ifdef CONFIG_MSM_BUS_SCALING
-
-static struct msm_bus_vectors mdp_init_vectors[] = {
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 0,
- .ib = 0,
- },
-};
-
-#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
-static struct msm_bus_vectors hdmi_as_primary_vectors[] = {
- /* If HDMI is used as primary */
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 2000000000,
- .ib = 2000000000,
- },
-};
-static struct msm_bus_paths mdp_bus_scale_usecases[] = {
- {
- ARRAY_SIZE(mdp_init_vectors),
- mdp_init_vectors,
- },
- {
- ARRAY_SIZE(hdmi_as_primary_vectors),
- hdmi_as_primary_vectors,
- },
- {
- ARRAY_SIZE(hdmi_as_primary_vectors),
- hdmi_as_primary_vectors,
- },
- {
- ARRAY_SIZE(hdmi_as_primary_vectors),
- hdmi_as_primary_vectors,
- },
- {
- ARRAY_SIZE(hdmi_as_primary_vectors),
- hdmi_as_primary_vectors,
- },
- {
- ARRAY_SIZE(hdmi_as_primary_vectors),
- hdmi_as_primary_vectors,
- },
-};
-#else
-static struct msm_bus_vectors mdp_ui_vectors[] = {
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 216000000 * 2,
- .ib = 270000000 * 2,
- },
-};
-
-static struct msm_bus_vectors mdp_vga_vectors[] = {
- /* VGA and less video */
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 216000000 * 2,
- .ib = 270000000 * 2,
- },
-};
-
-static struct msm_bus_vectors mdp_720p_vectors[] = {
- /* 720p and less video */
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 230400000 * 2,
- .ib = 288000000 * 2,
- },
-};
-
-static struct msm_bus_vectors mdp_1080p_vectors[] = {
- /* 1080p and less video */
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 334080000 * 2,
- .ib = 417600000 * 2,
- },
-};
-
-static struct msm_bus_paths mdp_bus_scale_usecases[] = {
- {
- ARRAY_SIZE(mdp_init_vectors),
- mdp_init_vectors,
- },
- {
- ARRAY_SIZE(mdp_ui_vectors),
- mdp_ui_vectors,
- },
- {
- ARRAY_SIZE(mdp_ui_vectors),
- mdp_ui_vectors,
- },
- {
- ARRAY_SIZE(mdp_vga_vectors),
- mdp_vga_vectors,
- },
- {
- ARRAY_SIZE(mdp_720p_vectors),
- mdp_720p_vectors,
- },
- {
- ARRAY_SIZE(mdp_1080p_vectors),
- mdp_1080p_vectors,
- },
-};
-#endif
-
-static struct msm_bus_scale_pdata mdp_bus_scale_pdata = {
- mdp_bus_scale_usecases,
- ARRAY_SIZE(mdp_bus_scale_usecases),
- .name = "mdp",
-};
-
-#endif
-
-#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
-int mdp_core_clk_rate_table[] = {
- 200000000,
- 200000000,
- 200000000,
- 200000000,
-};
-#else
-int mdp_core_clk_rate_table[] = {
- 85330000,
- 85330000,
- 160000000,
- 200000000,
-};
-#endif
-
-static struct msm_panel_common_pdata mdp_pdata = {
- .gpio = MDP_VSYNC_GPIO,
-#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
- .mdp_core_clk_rate = 200000000,
-#else
- .mdp_core_clk_rate = 85330000,
-#endif
- .mdp_core_clk_table = mdp_core_clk_rate_table,
- .num_mdp_clk = ARRAY_SIZE(mdp_core_clk_rate_table),
-#ifdef CONFIG_MSM_BUS_SCALING
- .mdp_bus_scale_table = &mdp_bus_scale_pdata,
-#endif
- .mdp_rev = MDP_REV_42,
- .writeback_offset = writeback_offset,
-};
-
-static struct platform_device mipi_dsi_renesas_panel_device = {
- .name = "mipi_renesas",
- .id = 0,
-};
-
-static struct platform_device mipi_dsi_simulator_panel_device = {
- .name = "mipi_simulator",
- .id = 0,
-};
-
-#define LPM_CHANNEL0 0
-static int toshiba_gpio[] = {LPM_CHANNEL0};
-
-static struct mipi_dsi_panel_platform_data toshiba_pdata = {
- .gpio = toshiba_gpio,
-};
-
-static struct platform_device mipi_dsi_toshiba_panel_device = {
- .name = "mipi_toshiba",
- .id = 0,
- .dev = {
- .platform_data = &toshiba_pdata,
- }
-};
-
-#define FPGA_3D_GPIO_CONFIG_ADDR 0xB5
-static int dsi2lvds_gpio[2] = {
- 0,/* Backlight PWM-ID=0 for PMIC-GPIO#24 */
- 0x1F08 /* DSI2LVDS Bridge GPIO Output, mask=0x1f, out=0x08 */
- };
-
-static struct msm_panel_common_pdata mipi_dsi2lvds_pdata = {
- .gpio_num = dsi2lvds_gpio,
-};
-
-static struct mipi_dsi_phy_ctrl dsi_novatek_cmd_mode_phy_db = {
-
-/* DSI_BIT_CLK at 500MHz, 2 lane, RGB888 */
- {0x0F, 0x0a, 0x04, 0x00, 0x20}, /* regulator */
- /* timing */
- {0xab, 0x8a, 0x18, 0x00, 0x92, 0x97, 0x1b, 0x8c,
- 0x0c, 0x03, 0x04, 0xa0},
- {0x5f, 0x00, 0x00, 0x10}, /* phy ctrl */
- {0xff, 0x00, 0x06, 0x00}, /* strength */
- /* pll control */
- {0x40, 0xf9, 0x30, 0xda, 0x00, 0x40, 0x03, 0x62,
- 0x40, 0x07, 0x03,
- 0x00, 0x1a, 0x00, 0x00, 0x02, 0x00, 0x20, 0x00, 0x01},
-};
-
-static struct mipi_dsi_panel_platform_data novatek_pdata = {
- .fpga_3d_config_addr = FPGA_3D_GPIO_CONFIG_ADDR,
- .fpga_ctrl_mode = FPGA_SPI_INTF,
- .phy_ctrl_settings = &dsi_novatek_cmd_mode_phy_db,
-};
-
-static struct platform_device mipi_dsi_novatek_panel_device = {
- .name = "mipi_novatek",
- .id = 0,
- .dev = {
- .platform_data = &novatek_pdata,
- }
-};
-
-static struct platform_device mipi_dsi2lvds_bridge_device = {
- .name = "mipi_tc358764",
- .id = 0,
- .dev.platform_data = &mipi_dsi2lvds_pdata,
-};
-
-#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL
-static struct resource hdmi_msm_resources[] = {
- {
- .name = "hdmi_msm_qfprom_addr",
- .start = 0x00700000,
- .end = 0x007060FF,
- .flags = IORESOURCE_MEM,
- },
- {
- .name = "hdmi_msm_hdmi_addr",
- .start = 0x04A00000,
- .end = 0x04A00FFF,
- .flags = IORESOURCE_MEM,
- },
- {
- .name = "hdmi_msm_irq",
- .start = HDMI_IRQ,
- .end = HDMI_IRQ,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static int hdmi_enable_5v(int on);
-static int hdmi_core_power(int on, int show);
-static int hdmi_cec_power(int on);
-
-static struct msm_hdmi_platform_data hdmi_msm_data = {
- .irq = HDMI_IRQ,
- .enable_5v = hdmi_enable_5v,
- .core_power = hdmi_core_power,
- .cec_power = hdmi_cec_power,
-};
-
-static struct platform_device hdmi_msm_device = {
- .name = "hdmi_msm",
- .id = 0,
- .num_resources = ARRAY_SIZE(hdmi_msm_resources),
- .resource = hdmi_msm_resources,
- .dev.platform_data = &hdmi_msm_data,
-};
-#endif /* CONFIG_FB_MSM_HDMI_MSM_PANEL */
-
-#ifdef CONFIG_FB_MSM_WRITEBACK_MSM_PANEL
-static struct platform_device wfd_panel_device = {
- .name = "wfd_panel",
- .id = 0,
- .dev.platform_data = NULL,
-};
-#endif
-
-#ifdef CONFIG_MSM_BUS_SCALING
-static struct msm_bus_vectors dtv_bus_init_vectors[] = {
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 0,
- .ib = 0,
- },
-};
-
-#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
-static struct msm_bus_vectors dtv_bus_def_vectors[] = {
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 2000000000,
- .ib = 2000000000,
- },
-};
-#else
-static struct msm_bus_vectors dtv_bus_def_vectors[] = {
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 566092800 * 2,
- .ib = 707616000 * 2,
- },
-};
-#endif
-
-static struct msm_bus_paths dtv_bus_scale_usecases[] = {
- {
- ARRAY_SIZE(dtv_bus_init_vectors),
- dtv_bus_init_vectors,
- },
- {
- ARRAY_SIZE(dtv_bus_def_vectors),
- dtv_bus_def_vectors,
- },
-};
-static struct msm_bus_scale_pdata dtv_bus_scale_pdata = {
- dtv_bus_scale_usecases,
- ARRAY_SIZE(dtv_bus_scale_usecases),
- .name = "dtv",
-};
-
-static struct lcdc_platform_data dtv_pdata = {
- .bus_scale_table = &dtv_bus_scale_pdata,
-};
-#endif
-
-static void __init msm_fb_add_devices(void)
-{
- struct platform_device *ptr = NULL;
-
- if (machine_is_msm8960_liquid())
- ptr = &mipi_dsi2lvds_bridge_device;
- else
- ptr = &mipi_dsi_toshiba_panel_device;
- platform_add_devices(&ptr, 1);
-
- if (machine_is_msm8x60_rumi3()) {
- msm_fb_register_device("mdp", NULL);
- mipi_dsi_pdata.target_type = 1;
- } else
- msm_fb_register_device("mdp", &mdp_pdata);
- msm_fb_register_device("mipi_dsi", &mipi_dsi_pdata);
-#ifdef CONFIG_MSM_BUS_SCALING
- msm_fb_register_device("dtv", &dtv_pdata);
-#endif
-}
-
-static struct gpiomux_setting mdp_vsync_suspend_cfg = {
- .func = GPIOMUX_FUNC_GPIO,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_DOWN,
-};
-
-static struct gpiomux_setting mdp_vsync_active_cfg = {
- .func = GPIOMUX_FUNC_1,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_DOWN,
-};
-
-static struct msm_gpiomux_config msm8960_mdp_vsync_configs[] __initdata = {
- {
- .gpio = MDP_VSYNC_GPIO,
- .settings = {
- [GPIOMUX_ACTIVE] = &mdp_vsync_active_cfg,
- [GPIOMUX_SUSPENDED] = &mdp_vsync_suspend_cfg,
- },
- }
-};
-
-#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL
-static struct gpiomux_setting hdmi_suspend_cfg = {
- .func = GPIOMUX_FUNC_GPIO,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_DOWN,
-};
-
-static struct gpiomux_setting hdmi_active_1_cfg = {
- .func = GPIOMUX_FUNC_1,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_UP,
-};
-
-static struct gpiomux_setting hdmi_active_2_cfg = {
- .func = GPIOMUX_FUNC_1,
- .drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_DOWN,
-};
-
-static struct msm_gpiomux_config msm8960_hdmi_configs[] __initdata = {
- {
- .gpio = 99,
- .settings = {
- [GPIOMUX_ACTIVE] = &hdmi_active_1_cfg,
- [GPIOMUX_SUSPENDED] = &hdmi_suspend_cfg,
- },
- },
- {
- .gpio = 100,
- .settings = {
- [GPIOMUX_ACTIVE] = &hdmi_active_1_cfg,
- [GPIOMUX_SUSPENDED] = &hdmi_suspend_cfg,
- },
- },
- {
- .gpio = 101,
- .settings = {
- [GPIOMUX_ACTIVE] = &hdmi_active_1_cfg,
- [GPIOMUX_SUSPENDED] = &hdmi_suspend_cfg,
- },
- },
- {
- .gpio = 102,
- .settings = {
- [GPIOMUX_ACTIVE] = &hdmi_active_2_cfg,
- [GPIOMUX_SUSPENDED] = &hdmi_suspend_cfg,
- },
- },
-};
-
-static int hdmi_enable_5v(int on)
-{
- /* TBD: PM8921 regulator instead of 8901 */
- static struct regulator *reg_8921_hdmi_mvs; /* HDMI_5V */
- static int prev_on;
- int rc;
-
- if (on == prev_on)
- return 0;
-
- if (!reg_8921_hdmi_mvs)
- reg_8921_hdmi_mvs = regulator_get(&hdmi_msm_device.dev,
- "hdmi_mvs");
-
- if (on) {
- rc = regulator_enable(reg_8921_hdmi_mvs);
- if (rc) {
- pr_err("'%s' regulator enable failed, rc=%d\n",
- "8921_hdmi_mvs", rc);
- return rc;
- }
- pr_debug("%s(on): success\n", __func__);
- } else {
- rc = regulator_disable(reg_8921_hdmi_mvs);
- if (rc)
- pr_warning("'%s' regulator disable failed, rc=%d\n",
- "8921_hdmi_mvs", rc);
- pr_debug("%s(off): success\n", __func__);
- }
-
- prev_on = on;
-
- return 0;
-}
-
-static int hdmi_core_power(int on, int show)
-{
- static struct regulator *reg_8921_l23, *reg_8921_s4;
- static int prev_on;
- int rc;
-
- if (on == prev_on)
- return 0;
-
- /* TBD: PM8921 regulator instead of 8901 */
- if (!reg_8921_l23) {
- reg_8921_l23 = regulator_get(&hdmi_msm_device.dev, "hdmi_avdd");
- if (IS_ERR(reg_8921_l23)) {
- pr_err("could not get reg_8921_l23, rc = %ld\n",
- PTR_ERR(reg_8921_l23));
- return -ENODEV;
- }
- rc = regulator_set_voltage(reg_8921_l23, 1800000, 1800000);
- if (rc) {
- pr_err("set_voltage failed for 8921_l23, rc=%d\n", rc);
- return -EINVAL;
- }
- }
- if (!reg_8921_s4) {
- reg_8921_s4 = regulator_get(&hdmi_msm_device.dev, "hdmi_vcc");
- if (IS_ERR(reg_8921_s4)) {
- pr_err("could not get reg_8921_s4, rc = %ld\n",
- PTR_ERR(reg_8921_s4));
- return -ENODEV;
- }
- rc = regulator_set_voltage(reg_8921_s4, 1800000, 1800000);
- if (rc) {
- pr_err("set_voltage failed for 8921_s4, rc=%d\n", rc);
- return -EINVAL;
- }
- }
-
- if (on) {
- rc = regulator_set_optimum_mode(reg_8921_l23, 100000);
- if (rc < 0) {
- pr_err("set_optimum_mode l23 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- rc = regulator_enable(reg_8921_l23);
- if (rc) {
- pr_err("'%s' regulator enable failed, rc=%d\n",
- "hdmi_avdd", rc);
- return rc;
- }
- rc = regulator_enable(reg_8921_s4);
- if (rc) {
- pr_err("'%s' regulator enable failed, rc=%d\n",
- "hdmi_vcc", rc);
- return rc;
- }
- rc = gpio_request(100, "HDMI_DDC_CLK");
- if (rc) {
- pr_err("'%s'(%d) gpio_request failed, rc=%d\n",
- "HDMI_DDC_CLK", 100, rc);
- goto error1;
- }
- rc = gpio_request(101, "HDMI_DDC_DATA");
- if (rc) {
- pr_err("'%s'(%d) gpio_request failed, rc=%d\n",
- "HDMI_DDC_DATA", 101, rc);
- goto error2;
- }
- rc = gpio_request(102, "HDMI_HPD");
- if (rc) {
- pr_err("'%s'(%d) gpio_request failed, rc=%d\n",
- "HDMI_HPD", 102, rc);
- goto error3;
- }
- pr_debug("%s(on): success\n", __func__);
- } else {
- gpio_free(100);
- gpio_free(101);
- gpio_free(102);
-
- rc = regulator_disable(reg_8921_l23);
- if (rc) {
- pr_err("disable reg_8921_l23 failed, rc=%d\n", rc);
- return -ENODEV;
- }
- rc = regulator_disable(reg_8921_s4);
- if (rc) {
- pr_err("disable reg_8921_s4 failed, rc=%d\n", rc);
- return -ENODEV;
- }
- rc = regulator_set_optimum_mode(reg_8921_l23, 100);
- if (rc < 0) {
- pr_err("set_optimum_mode l23 failed, rc=%d\n", rc);
- return -EINVAL;
- }
- pr_debug("%s(off): success\n", __func__);
- }
-
- prev_on = on;
-
- return 0;
-
-error3:
- gpio_free(101);
-error2:
- gpio_free(100);
-error1:
- regulator_disable(reg_8921_l23);
- regulator_disable(reg_8921_s4);
- return rc;
-}
-
-static int hdmi_cec_power(int on)
-{
- static int prev_on;
- int rc;
-
- if (on == prev_on)
- return 0;
-
- if (on) {
- rc = gpio_request(99, "HDMI_CEC_VAR");
- if (rc) {
- pr_err("'%s'(%d) gpio_request failed, rc=%d\n",
- "HDMI_CEC_VAR", 99, rc);
- goto error;
- }
- pr_debug("%s(on): success\n", __func__);
- } else {
- gpio_free(99);
- pr_debug("%s(off): success\n", __func__);
- }
-
- prev_on = on;
-
- return 0;
-error:
- return rc;
-}
-#endif /* CONFIG_FB_MSM_HDMI_MSM_PANEL */
-
static void __init msm8960_allocate_memory_regions(void)
{
- void *addr;
- unsigned long size;
-
- size = MSM_FB_SIZE;
- addr = alloc_bootmem_align(size, 0x1000);
- msm_fb_resources[0].start = __pa(addr);
- msm_fb_resources[0].end = msm_fb_resources[0].start + size - 1;
- pr_info("allocating %lu bytes at %p (%lx physical) for fb\n",
- size, addr, __pa(addr));
-
+ msm8960_allocate_fb_region();
}
+
#ifdef CONFIG_WCD9310_CODEC
#define TABLA_INTERRUPT_BASE (NR_MSM_IRQS + NR_GPIO_IRQS + NR_PM8921_IRQS)
@@ -2348,14 +1365,6 @@
msm_gpiomux_install(msm8960_audio_auxpcm_configs,
ARRAY_SIZE(msm8960_audio_auxpcm_configs));
-#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL
- msm_gpiomux_install(msm8960_hdmi_configs,
- ARRAY_SIZE(msm8960_hdmi_configs));
-#endif
-
- msm_gpiomux_install(msm8960_mdp_vsync_configs,
- ARRAY_SIZE(msm8960_mdp_vsync_configs));
-
msm_gpiomux_install(wcnss_5wire_interface,
ARRAY_SIZE(wcnss_5wire_interface));
@@ -3566,7 +2575,6 @@
#endif
&android_pmem_audio_device,
#endif
- &msm_fb_device,
&msm_device_vidc,
&msm_device_bam_dmux,
&msm_fm_platform_init,
@@ -3604,7 +2612,6 @@
&msm_device_hsic_host,
&android_usb_device,
&msm_device_vidc,
- &mipi_dsi_simulator_panel_device,
&msm_bus_apps_fabric,
&msm_bus_sys_fabric,
&msm_bus_mm_fabric,
@@ -3642,7 +2649,6 @@
&msm_kgsl_3d0,
&msm_kgsl_2d0,
&msm_kgsl_2d1,
- &mipi_dsi_renesas_panel_device,
#ifdef CONFIG_MSM_GEMINI
&msm8960_gemini_device,
#endif
@@ -3671,7 +2677,6 @@
&msm_kgsl_2d0,
&msm_kgsl_2d1,
#endif
- &mipi_dsi_novatek_panel_device,
#ifdef CONFIG_MSM_GEMINI
&msm8960_gemini_device,
#endif
@@ -3683,9 +2688,6 @@
&msm_cpudai_afe_02_rx,
&msm_cpudai_afe_02_tx,
&msm_pcm_afe,
-#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL
- &hdmi_msm_device,
-#endif
&msm_pcm_hostless,
&msm_bus_apps_fabric,
&msm_bus_sys_fabric,
@@ -4390,7 +3392,7 @@
spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
msm8960_init_mmc();
- msm_fb_add_devices();
+ msm8960_init_fb();
slim_register_board_info(msm_slim_devices,
ARRAY_SIZE(msm_slim_devices));
msm_pm_set_platform_data(msm_pm_data, ARRAY_SIZE(msm_pm_data));
@@ -4423,7 +3425,7 @@
platform_add_devices(rumi3_devices, ARRAY_SIZE(rumi3_devices));
msm8960_init_mmc();
register_i2c_devices();
- msm_fb_add_devices();
+ msm8960_init_fb();
slim_register_board_info(msm_slim_devices,
ARRAY_SIZE(msm_slim_devices));
msm_pm_set_platform_data(msm_pm_data, ARRAY_SIZE(msm_pm_data));
@@ -4486,7 +3488,7 @@
if (machine_is_msm8960_liquid())
mxt_init_hw_liquid();
register_i2c_devices();
- msm_fb_add_devices();
+ msm8960_init_fb();
slim_register_board_info(msm_slim_devices,
ARRAY_SIZE(msm_slim_devices));
msm8960_init_dsps();
diff --git a/arch/arm/mach-msm/board-msm8960.h b/arch/arm/mach-msm/board-msm8960.h
index 2dda313..63d13dc 100644
--- a/arch/arm/mach-msm/board-msm8960.h
+++ b/arch/arm/mach-msm/board-msm8960.h
@@ -69,6 +69,8 @@
extern struct sx150x_platform_data msm8960_sx150x_data[];
void msm8960_init_cam(void);
+void msm8960_init_fb(void);
+void msm8960_allocate_fb_region(void);
#define MSM_8960_GSBI4_QUP_I2C_BUS_ID 4
#define MSM_8960_GSBI3_QUP_I2C_BUS_ID 3