apalis-tk1: remove platform dc initialization

DC initialization now relays only on device-tree entry.

Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

2 files changed, 0 insertions, 654 deletions

diff --git a/arch/arm/mach-tegra/board-apalis-tk1-panel.c b/arch/arm/mach-tegra/board-apalis-tk1-panel.c
index e4995841b8e4..4de2b009db33 100644
--- a/arch/arm/mach-tegra/board-apalis-tk1-panel.c
+++ b/arch/arm/mach-tegra/board-apalis-tk1-panel.c
@@ -66,394 +66,6 @@ struct platform_device *__init apalis_tk1_host1x_init(void)
 	return pdev;
 }
 
-/* hdmi related regulators */
-static struct regulator *apalis_tk1_hdmi_reg;
-static struct regulator *apalis_tk1_hdmi_pll;
-static struct regulator *apalis_tk1_hdmi_vddio;
-
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-static struct resource apalis_tk1_disp1_resources[] = {
-	{
-		.name	= "irq",
-		.start	= INT_DISPLAY_GENERAL,
-		.end	= INT_DISPLAY_GENERAL,
-		.flags	= IORESOURCE_IRQ,
-	},
-	{
-		.name	= "regs",
-		.start	= TEGRA_DISPLAY_BASE,
-		.end	= TEGRA_DISPLAY_BASE + TEGRA_DISPLAY_SIZE - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.name	= "fbmem",
-		.start	= 0, /* Filled in by apalis_tk1_panel_init() */
-		.end	= 0, /* Filled in by apalis_tk1_panel_init() */
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.name	= "ganged_dsia_regs",
-		.start	= 0, /* Filled in the panel file by init_resources() */
-		.end	= 0, /* Filled in the panel file by init_resources() */
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.name	= "ganged_dsib_regs",
-		.start	= 0, /* Filled in the panel file by init_resources() */
-		.end	= 0, /* Filled in the panel file by init_resources() */
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.name	= "dsi_regs",
-		.start	= 0, /* Filled in the panel file by init_resources() */
-		.end	= 0, /* Filled in the panel file by init_resources() */
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.name	= "mipi_cal",
-		.start	= TEGRA_MIPI_CAL_BASE,
-		.end	= TEGRA_MIPI_CAL_BASE + TEGRA_MIPI_CAL_SIZE - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-static struct resource apalis_tk1_disp1_edp_resources[] = {
-	{
-		.name	= "irq",
-		.start	= INT_DISPLAY_GENERAL,
-		.end	= INT_DISPLAY_GENERAL,
-		.flags	= IORESOURCE_IRQ,
-	},
-	{
-		.name	= "regs",
-		.start	= TEGRA_DISPLAY_BASE,
-		.end	= TEGRA_DISPLAY_BASE + TEGRA_DISPLAY_SIZE - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.name	= "fbmem",
-		.start	= 0, /* Filled in by apalis_tk1_panel_init() */
-		.end	= 0, /* Filled in by apalis_tk1_panel_init() */
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.name	= "mipi_cal",
-		.start	= TEGRA_MIPI_CAL_BASE,
-		.end	= TEGRA_MIPI_CAL_BASE + TEGRA_MIPI_CAL_SIZE - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.name   = "sor",
-		.start  = TEGRA_SOR_BASE,
-		.end    = TEGRA_SOR_BASE + TEGRA_SOR_SIZE - 1,
-		.flags  = IORESOURCE_MEM,
-	},
-	{
-		.name   = "dpaux",
-		.start  = TEGRA_DPAUX_BASE,
-		.end    = TEGRA_DPAUX_BASE + TEGRA_DPAUX_SIZE - 1,
-		.flags  = IORESOURCE_MEM,
-	},
-	{
-		.name	= "irq_dp",
-		.start	= INT_DPAUX,
-		.end	= INT_DPAUX,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-#endif
-
-static struct resource apalis_tk1_disp2_resources[] = {
-	{
-		.name	= "irq",
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-		.start	= INT_DISPLAY_B_GENERAL,
-		.end	= INT_DISPLAY_B_GENERAL,
-#else
-		.start	= INT_DISPLAY_GENERAL,
-		.end	= INT_DISPLAY_GENERAL,
-#endif
-		.flags	= IORESOURCE_IRQ,
-	},
-	{
-		.name	= "regs",
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-		.start	= TEGRA_DISPLAY2_BASE,
-		.end	= TEGRA_DISPLAY2_BASE + TEGRA_DISPLAY2_SIZE - 1,
-#else
-		.start	= TEGRA_DISPLAY_BASE,
-		.end	= TEGRA_DISPLAY_BASE + TEGRA_DISPLAY_SIZE - 1,
-#endif
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.name	= "fbmem",
-		.start	= 0, /* Filled in by apalis_tk1_panel_init() */
-		.end	= 0, /* Filled in by apalis_tk1_panel_init() */
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.name	= "hdmi_regs",
-		.start	= TEGRA_HDMI_BASE,
-		.end	= TEGRA_HDMI_BASE + TEGRA_HDMI_SIZE - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-static struct tegra_dc_sd_settings sd_settings;
-
-#ifndef APALIS_TK1_EDP
-static struct tegra_dc_out_pin lvds_out_pins[] = {
-	{
-		.name	= TEGRA_DC_OUT_PIN_H_SYNC,
-		.pol	= TEGRA_DC_OUT_PIN_POL_LOW,
-	},
-	{
-		.name	= TEGRA_DC_OUT_PIN_V_SYNC,
-		.pol	= TEGRA_DC_OUT_PIN_POL_LOW,
-	},
-	{
-		.name	= TEGRA_DC_OUT_PIN_PIXEL_CLOCK,
-		.pol	= TEGRA_DC_OUT_PIN_POL_HIGH,
-	},
-	{
-		.name   = TEGRA_DC_OUT_PIN_DATA_ENABLE,
-		.pol    = TEGRA_DC_OUT_PIN_POL_HIGH,
-	},
-};
-#endif /* !APALIS_TK1_EDP */
-
-static struct tegra_dc_out apalis_tk1_disp1_out = {
-#ifdef APALIS_TK1_EDP
-	.type		= TEGRA_DC_OUT_DSI,
-	.sd_settings	= &sd_settings,
-#else /* APALIS_TK1_EDP */
-	.align		= TEGRA_DC_ALIGN_MSB,
-	.order		= TEGRA_DC_ORDER_RED_BLUE,
-	.flags		= TEGRA_DC_OUT_CONTINUOUS_MODE,
-	.type		= TEGRA_DC_OUT_LVDS,
-	.default_mode	= "640x480-16@60",
-	.out_pins     	= lvds_out_pins,
-	.n_out_pins  	= ARRAY_SIZE(lvds_out_pins),
-#endif /* APALIS_TK1_EDP */
-};
-#endif
-
-static int apalis_tk1_hdmi_enable(struct device *dev)
-{
-	int ret;
-	if (!apalis_tk1_hdmi_reg) {
-		apalis_tk1_hdmi_reg = regulator_get(dev, "avdd_hdmi");
-		if (IS_ERR(apalis_tk1_hdmi_reg)) {
-			pr_err("hdmi: couldn't get regulator avdd_hdmi\n");
-			apalis_tk1_hdmi_reg = NULL;
-			return PTR_ERR(apalis_tk1_hdmi_reg);
-		}
-	}
-	ret = regulator_enable(apalis_tk1_hdmi_reg);
-	if (ret < 0) {
-		pr_err("hdmi: couldn't enable regulator avdd_hdmi\n");
-		return ret;
-	}
-	if (!apalis_tk1_hdmi_pll) {
-		apalis_tk1_hdmi_pll = regulator_get(dev, "avdd_hdmi_pll");
-		if (IS_ERR(apalis_tk1_hdmi_pll)) {
-			pr_err("hdmi: couldn't get regulator avdd_hdmi_pll\n");
-			apalis_tk1_hdmi_pll = NULL;
-			regulator_put(apalis_tk1_hdmi_reg);
-			apalis_tk1_hdmi_reg = NULL;
-			return PTR_ERR(apalis_tk1_hdmi_pll);
-		}
-	}
-	ret = regulator_enable(apalis_tk1_hdmi_pll);
-	if (ret < 0) {
-		pr_err("hdmi: couldn't enable regulator avdd_hdmi_pll\n");
-		return ret;
-	}
-	return 0;
-}
-
-static int apalis_tk1_hdmi_disable(void)
-{
-	if (apalis_tk1_hdmi_reg) {
-		regulator_disable(apalis_tk1_hdmi_reg);
-		regulator_put(apalis_tk1_hdmi_reg);
-		apalis_tk1_hdmi_reg = NULL;
-	}
-
-	if (apalis_tk1_hdmi_pll) {
-		regulator_disable(apalis_tk1_hdmi_pll);
-		regulator_put(apalis_tk1_hdmi_pll);
-		apalis_tk1_hdmi_pll = NULL;
-	}
-	return 0;
-}
-
-static int apalis_tk1_hdmi_postsuspend(void)
-{
-	if (apalis_tk1_hdmi_vddio) {
-		regulator_disable(apalis_tk1_hdmi_vddio);
-		regulator_put(apalis_tk1_hdmi_vddio);
-		apalis_tk1_hdmi_vddio = NULL;
-	}
-	return 0;
-}
-
-static int apalis_tk1_hdmi_hotplug_init(struct device *dev)
-{
-	if (!apalis_tk1_hdmi_vddio) {
-		apalis_tk1_hdmi_vddio = regulator_get(dev, "vdd_hdmi_5v0");
-		if (WARN_ON(IS_ERR(apalis_tk1_hdmi_vddio))) {
-			pr_err("%s: couldn't get regulator vdd_hdmi_5v0: %ld\n",
-			       __func__, PTR_ERR(apalis_tk1_hdmi_vddio));
-			apalis_tk1_hdmi_vddio = NULL;
-		} else {
-			return regulator_enable(apalis_tk1_hdmi_vddio);
-		}
-	}
-
-	return 0;
-}
-
-struct tmds_config apalis_tk1_tmds_config[] = {
-	{ /* 480p/576p / 25.2MHz/27MHz modes */
-	.version		= MKDEV(1, 0),
-	.pclk			= 27000000,
-	.pll0			= 0x01003010,
-	.pll1			= 0x00301B00,
-	.pe_current		= 0x00000000,
-	.drive_current		= 0x1F1F1F1F,
-	.peak_current		= 0x03030303,
-	.pad_ctls0_mask		= 0xfffff0ff,
-	.pad_ctls0_setting	= 0x00000400, /* BG_VREF_LEVEL */
-	},
-	{ /* 720p / 74.25MHz modes */
-	.version		= MKDEV(1, 0),
-	.pclk			= 74250000,
-	.pll0			= 0x01003110,
-	.pll1			= 0x00301500,
-	.pe_current		= 0x00000000,
-	.drive_current		= 0x2C2C2C2C,
-	.peak_current		= 0x07070707,
-	.pad_ctls0_mask		= 0xfffff0ff,
-	.pad_ctls0_setting	= 0x00000400, /* BG_VREF_LEVEL */
-	},
-	{ /* 1080p / 148.5MHz modes */
-	.version		= MKDEV(1, 0),
-	.pclk			= 148500000,
-	.pll0			= 0x01003310,
-	.pll1			= 0x00301500,
-	.pe_current		= 0x00000000,
-	.drive_current		= 0x33333333,
-	.peak_current		= 0x0C0C0C0C,
-	.pad_ctls0_mask		= 0xfffff0ff,
-	.pad_ctls0_setting	= 0x00000400, /* BG_VREF_LEVEL */
-	},
-	{
-	.version		= MKDEV(1, 0),
-	.pclk			= INT_MAX,
-	.pll0			= 0x01003F10,
-	.pll1			= 0x00300F00,
-	.pe_current		= 0x00000000,
-	/* lane3 needs a slightly lower current */
-	.drive_current		= 0x37373737,
-	.peak_current		= 0x17171717,
-	.pad_ctls0_mask		= 0xfffff0ff,
-	.pad_ctls0_setting	= 0x00000600, /* BG_VREF_LEVEL */
-	},
-};
-
-struct tegra_hdmi_out apalis_tk1_hdmi_out = {
-	.tmds_config	= apalis_tk1_tmds_config,
-	.n_tmds_config	= ARRAY_SIZE(apalis_tk1_tmds_config),
-};
-
-static struct tegra_dc_out apalis_tk1_disp2_out = {
-	.type		= TEGRA_DC_OUT_HDMI,
-	.flags		= TEGRA_DC_OUT_HOTPLUG_HIGH,
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-	.parent_clk	= "pll_d2",
-#else
-	.parent_clk	= "pll_d",
-#endif /* CONFIG_TEGRA_HDMI_PRIMARY */
-
-	.ddc_bus	= 3,
-	.hotplug_gpio	= apalis_tk1_hdmi_hpd,
-	.hdmi_out	= &apalis_tk1_hdmi_out,
-
-	/* TODO: update max pclk to POR */
-	.max_pixclock	= KHZ2PICOS(297000),
-#if defined(CONFIG_FRAMEBUFFER_CONSOLE) || defined(CONFIG_TEGRA_HDMI_PRIMARY)
-	.default_mode	= "1920x1080-16@60",
-	.depth		= 24,
-#endif /* CONFIG_FRAMEBUFFER_CONSOLE */
-
-	.align		= TEGRA_DC_ALIGN_MSB,
-	.order		= TEGRA_DC_ORDER_RED_BLUE,
-
-	.enable		= apalis_tk1_hdmi_enable,
-	.disable	= apalis_tk1_hdmi_disable,
-	.postsuspend	= apalis_tk1_hdmi_postsuspend,
-	.hotplug_init	= apalis_tk1_hdmi_hotplug_init,
-};
-
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-static struct tegra_fb_data apalis_tk1_disp1_fb_data = {
-	.win		= 0,
-	.flags		= TEGRA_FB_FLIP_ON_PROBE,
-};
-
-static struct tegra_dc_platform_data apalis_tk1_disp1_pdata = {
-	.flags		= TEGRA_DC_FLAG_ENABLED,
-	.default_out	= &apalis_tk1_disp1_out,
-	.fb		= &apalis_tk1_disp1_fb_data,
-	.emc_clk_rate	= 204000000,
-#ifdef CONFIG_TEGRA_DC_CMU
-	.cmu_enable	= 1,
-#endif
-	.low_v_win	= 0x02,
-};
-#endif
-
-static struct tegra_fb_data apalis_tk1_disp2_fb_data = {
-	.win		= 0,
-	.flags		= TEGRA_FB_FLIP_ON_PROBE,
-};
-
-static struct tegra_dc_platform_data apalis_tk1_disp2_pdata = {
-	.flags		= TEGRA_DC_FLAG_ENABLED,
-	.default_out	= &apalis_tk1_disp2_out,
-	.fb		= &apalis_tk1_disp2_fb_data,
-	.emc_clk_rate	= 300000000,
-};
-
-static struct platform_device apalis_tk1_disp2_device = {
-	.name		= "tegradc",
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-	.id		= 1,
-#else
-	.id		= 0,
-#endif
-	.resource	= apalis_tk1_disp2_resources,
-	.num_resources	= ARRAY_SIZE(apalis_tk1_disp2_resources),
-	.dev = {
-		.platform_data = &apalis_tk1_disp2_pdata,
-	},
-};
-
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-static struct platform_device apalis_tk1_disp1_device = {
-	.name		= "tegradc",
-	.id		= 0,
-	.resource	= apalis_tk1_disp1_resources,
-	.num_resources	= ARRAY_SIZE(apalis_tk1_disp1_resources),
-	.dev = {
-		.platform_data = &apalis_tk1_disp1_pdata,
-	},
-};
-#endif
-
 static struct nvmap_platform_carveout apalis_tk1_carveouts[] = {
 	[0] = {
 		.name		= "iram",
@@ -491,134 +103,6 @@ static struct platform_device apalis_tk1_nvmap_device = {
 	},
 };
 
-#ifdef APALIS_TK1_EDP
-static struct tegra_dc_dp_lt_settings apalis_tk1_edp_lt_data[] = {
-	{
-		.drive_current = {
-			DRIVE_CURRENT_L0,
-			DRIVE_CURRENT_L0,
-			DRIVE_CURRENT_L0,
-			DRIVE_CURRENT_L0,
-		},
-		.lane_preemphasis = {
-			PRE_EMPHASIS_L0,
-			PRE_EMPHASIS_L0,
-			PRE_EMPHASIS_L0,
-			PRE_EMPHASIS_L0,
-		},
-		.post_cursor = {
-			POST_CURSOR2_L0,
-			POST_CURSOR2_L0,
-			POST_CURSOR2_L0,
-			POST_CURSOR2_L0,
-		},
-		.tx_pu = 0,
-		.load_adj = 0x3,
-	},
-	{
-		.drive_current = {
-			DRIVE_CURRENT_L0,
-			DRIVE_CURRENT_L0,
-			DRIVE_CURRENT_L0,
-			DRIVE_CURRENT_L0,
-		},
-		.lane_preemphasis = {
-			PRE_EMPHASIS_L0,
-			PRE_EMPHASIS_L0,
-			PRE_EMPHASIS_L0,
-			PRE_EMPHASIS_L0,
-		},
-		.post_cursor = {
-			POST_CURSOR2_L0,
-			POST_CURSOR2_L0,
-			POST_CURSOR2_L0,
-			POST_CURSOR2_L0,
-		},
-		.tx_pu = 0,
-		.load_adj = 0x4,
-	},
-	{
-		.drive_current = {
-			DRIVE_CURRENT_L0,
-			DRIVE_CURRENT_L0,
-			DRIVE_CURRENT_L0,
-			DRIVE_CURRENT_L0,
-		},
-		.lane_preemphasis = {
-			PRE_EMPHASIS_L1,
-			PRE_EMPHASIS_L1,
-			PRE_EMPHASIS_L1,
-			PRE_EMPHASIS_L1,
-		},
-		.post_cursor = {
-			POST_CURSOR2_L0,
-			POST_CURSOR2_L0,
-			POST_CURSOR2_L0,
-			POST_CURSOR2_L0,
-		},
-		.tx_pu = 0,
-		.load_adj = 0x6,
-	},
-};
-
-static struct tegra_dp_out dp_settings = {
-	/* Panel can override this with its own LT data */
-	.lt_settings = apalis_tk1_edp_lt_data,
-	.n_lt_settings = ARRAY_SIZE(apalis_tk1_edp_lt_data),
-	.tx_pu_disable = true,
-};
-#endif /* APALIS_TK1_EDP */
-
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-/* can be called multiple times */
-static struct tegra_panel *apalis_tk1_panel_configure(void)
-{
-	struct tegra_panel *panel = NULL;
-
-	apalis_tk1_disp1_device.resource = apalis_tk1_disp1_edp_resources;
-	apalis_tk1_disp1_device.num_resources =
-			ARRAY_SIZE(apalis_tk1_disp1_edp_resources);
-#ifdef APALIS_TK1_EDP
-	apalis_tk1_disp1_out.dp_out = &dp_settings;
-	apalis_tk1_disp1_out.type = TEGRA_DC_OUT_DP;
-	panel = &edp_a_1080p_14_0;
-#else /* APALIS_TK1_EDP */
-	apalis_tk1_disp1_out.type = TEGRA_DC_OUT_LVDS;
-	panel = &lvds_c_1366_14;
-#endif /* APALIS_TK1_EDP */
-//	apalis_tk1_disp1_out.rotation = 180;
-
-	return panel;
-}
-
-static void apalis_tk1_panel_select(void)
-{
-	struct tegra_panel *panel = NULL;
-
-	panel = apalis_tk1_panel_configure();
-
-	if (panel) {
-		if (panel->init_sd_settings)
-			panel->init_sd_settings(&sd_settings);
-
-		if (panel->init_dc_out)
-			panel->init_dc_out(&apalis_tk1_disp1_out);
-
-		if (panel->init_cmu_data)
-			panel->init_cmu_data(&apalis_tk1_disp1_pdata);
-
-		if (panel->set_disp_device)
-			panel->set_disp_device(&apalis_tk1_disp1_device);
-
-		if (panel->register_bl_dev)
-			panel->register_bl_dev();
-
-		if (panel->register_i2c_bridge)
-			panel->register_i2c_bridge();
-	}
-
-}
-#endif
 
 int __init apalis_tk1_panel_init(void)
 {
@@ -626,21 +110,11 @@ int __init apalis_tk1_panel_init(void)
 	struct resource __maybe_unused *res;
 	struct platform_device *phost1x = NULL;
 
-	struct device_node *dc1_node = NULL;
-	struct device_node *dc2_node = NULL;
-	struct device_node *hdmi_node = NULL;
 #ifdef CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT
 	struct dma_declare_info vpr_dma_info;
 	struct dma_declare_info generic_dma_info;
 #endif
 
-	find_dc_node(&dc1_node, &dc2_node);
-	hdmi_node = of_find_node_by_path("/host1x/hdmi");
-
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-	apalis_tk1_panel_select();
-#endif
-
 #ifdef CONFIG_TEGRA_NVMAP
 	apalis_tk1_carveouts[1].base = tegra_carveout_start;
 	apalis_tk1_carveouts[1].size = tegra_carveout_size;
@@ -702,34 +176,6 @@ int __init apalis_tk1_panel_init(void)
 		return -EINVAL;
 	}
 
-	if (hdmi_node) {
-		struct device_node *ddc;
-		int id;
-		ddc = of_parse_phandle(hdmi_node, "nvidia,ddc-i2c-bus", 0);
-		if (ddc) {
-			id = of_alias_get_id(ddc, "i2c");
-			if (id >= 0) {
-				apalis_tk1_disp2_out.ddc_bus = id;
-			} else
-				pr_err("Invalid HDMI ddc in the device-tree\n");
-		} else
-			pr_err("No ddc for HDMI node in the device-tree\n");
-	}
-
-	if (!of_have_populated_dt() || !dc1_node ||
-	    !of_device_is_available(dc1_node)) {
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-		res = platform_get_resource_byname(&apalis_tk1_disp1_device,
-						   IORESOURCE_MEM, "fbmem");
-#else
-		res = platform_get_resource_byname(&apalis_tk1_disp2_device,
-						   IORESOURCE_MEM, "fbmem");
-#endif
-		res->start = tegra_fb_start;
-		res->end = tegra_fb_start + tegra_fb_size - 1;
-	}
-
-	/* Copy the bootloader fb to the fb. */
 	if (tegra_bootloader_fb_size)
 		__tegra_move_framebuffer(&apalis_tk1_nvmap_device,
 					 tegra_fb_start,
@@ -751,104 +197,5 @@ int __init apalis_tk1_panel_init(void)
 		__tegra_clear_framebuffer(&apalis_tk1_nvmap_device,
 					  tegra_fb2_start, tegra_fb2_size);
 
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-	if (!of_have_populated_dt() || !dc1_node ||
-	    !of_device_is_available(dc1_node)) {
-		apalis_tk1_disp1_device.dev.parent = &phost1x->dev;
-		err = platform_device_register(&apalis_tk1_disp1_device);
-		if (err) {
-			pr_err("disp1 device registration failed\n");
-			return err;
-		}
-	}
-#endif
-
-	apalis_tk1_tmds_config[1].pe_current = 0x08080808;
-	apalis_tk1_tmds_config[1].drive_current = 0x2d2d2d2d;
-	apalis_tk1_tmds_config[1].peak_current = 0x0;
-	apalis_tk1_tmds_config[2].pe_current = 0x0;
-	apalis_tk1_tmds_config[2].drive_current = 0x2d2d2d2d;
-	apalis_tk1_tmds_config[2].peak_current = 0x05050505;
-
-	if (!of_have_populated_dt() || !dc2_node ||
-	    !of_device_is_available(dc2_node)) {
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-		res = platform_get_resource_byname(&apalis_tk1_disp2_device,
-						   IORESOURCE_MEM, "fbmem");
-		res->start = tegra_fb2_start;
-		res->end = tegra_fb2_start + tegra_fb2_size - 1;
-#endif
-		apalis_tk1_disp2_device.dev.parent = &phost1x->dev;
-		err = platform_device_register(&apalis_tk1_disp2_device);
-		if (err) {
-			pr_err("disp2 device registration failed\n");
-			return err;
-		}
-	}
-
 	return err;
 }
-
-int __init apalis_tk1_display_init(void)
-{
-	struct clk *disp1_clk = clk_get_sys("tegradc.0", NULL);
-	struct clk *disp2_clk = clk_get_sys("tegradc.1", NULL);
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-	struct tegra_panel *panel;
-	long disp1_rate = 0;
-#endif
-	long disp2_rate = 0;
-
-	/*
-	 * TODO
-	 * Need to skip apalis_tk1_display_init
-	 * when disp is registered by device_tree
-	 */
-
-	if (WARN_ON(IS_ERR(disp1_clk))) {
-		if (disp2_clk && !IS_ERR(disp2_clk))
-			clk_put(disp2_clk);
-		return PTR_ERR(disp1_clk);
-	}
-
-	if (WARN_ON(IS_ERR(disp2_clk))) {
-		clk_put(disp1_clk);
-		return PTR_ERR(disp1_clk);
-	}
-
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-	panel = apalis_tk1_panel_configure();
-
-	if (panel && panel->init_dc_out) {
-		panel->init_dc_out(&apalis_tk1_disp1_out);
-		if (apalis_tk1_disp1_out.n_modes && apalis_tk1_disp1_out.modes)
-			disp1_rate = apalis_tk1_disp1_out.modes[0].pclk;
-	} else {
-		disp1_rate = 0;
-		if (!panel || !panel->init_dc_out)
-			pr_err("disp1 panel output not specified!\n");
-	}
-
-	pr_debug("disp1 pclk=%ld\n", disp1_rate);
-	if (disp1_rate)
-		tegra_dvfs_resolve_override(disp1_clk, disp1_rate);
-#endif
-
-	/* set up disp2 */
-	if (apalis_tk1_disp2_out.max_pixclock)
-		disp2_rate = PICOS2KHZ(apalis_tk1_disp2_out.max_pixclock)
-			     * 1000;
-	else
-		disp2_rate = 297000000; /* HDMI 4K */
-	pr_debug("disp2 pclk=%ld\n", disp2_rate);
-	if (disp2_rate)
-#ifndef CONFIG_TEGRA_HDMI_PRIMARY
-		tegra_dvfs_resolve_override(disp2_clk, disp2_rate);
-#else
-		tegra_dvfs_resolve_override(disp1_clk, disp2_rate);
-#endif
-
-	clk_put(disp1_clk);
-	clk_put(disp2_clk);
-	return 0;
-}
diff --git a/arch/arm/mach-tegra/board-apalis-tk1.c b/arch/arm/mach-tegra/board-apalis-tk1.c
index e3cbfbc88d83..5279da769eb0 100644
--- a/arch/arm/mach-tegra/board-apalis-tk1.c
+++ b/arch/arm/mach-tegra/board-apalis-tk1.c
@@ -519,7 +519,6 @@ static struct tegra_io_dpd pexclk2_io = {
 
 static void __init tegra_apalis_tk1_late_init(void)
 {
-	apalis_tk1_display_init();
 	apalis_tk1_uart_init();
 	apalis_tk1_usb_init();
 #ifdef CONFIG_TEGRA_XUSB_PLATFORM