diff mbox

[PATCH/RFC,10/7] ARM: OMAP2+: Remove DSI pin muxing

Message ID 1481680684-11585-3-git-send-email-laurent.pinchart@ideasonboard.com (mailing list archive)
State New, archived
Headers show

Commit Message

Laurent Pinchart Dec. 14, 2016, 1:58 a.m. UTC 
The DSI pin muxing platform callbacks are unused, remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 arch/arm/mach-omap2/display.c | 60 -------------------------------------------
 1 file changed, 60 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index b81b39aa47fe..5bb5f848a25a 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -26,8 +26,6 @@ 
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
-#include <linux/mfd/syscon.h>
-#include <linux/regmap.h>
 
 #include <linux/platform_data/omapdss.h>
 #include "omap_hwmod.h"
@@ -74,57 +72,6 @@  static struct platform_device omap_display_device = {
 	},
 };
 
-#define OMAP4_DSIPHY_SYSCON_OFFSET		0x78
-
-static struct regmap *omap4_dsi_mux_syscon;
-
-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;
-	}
-
-	regmap_read(omap4_dsi_mux_syscon, OMAP4_DSIPHY_SYSCON_OFFSET, &reg);
-
-	reg &= ~enable_mask;
-	reg &= ~pipd_mask;
-
-	reg |= (lanes << enable_shift) & enable_mask;
-	reg |= (lanes << pipd_shift) & pipd_mask;
-
-	regmap_write(omap4_dsi_mux_syscon, OMAP4_DSIPHY_SYSCON_OFFSET, reg);
-
-	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;
-}
-
-static void omap_dsi_disable_pads(int dsi_id, unsigned lane_mask)
-{
-	if (cpu_is_omap44xx())
-		omap4_dsi_mux_pads(dsi_id, 0);
-}
-
 static int omap_dss_set_min_bus_tput(struct device *dev, unsigned long tput)
 {
 	return omap_pm_set_min_bus_tput(dev, OCP_INITIATOR_AGENT, tput);
@@ -340,8 +287,6 @@  int __init omapdss_init_of(void)
 	struct platform_device *pdev;
 
 	static struct omap_dss_board_info board_data = {
-		.dsi_enable_pads = omap_dsi_enable_pads,
-		.dsi_disable_pads = omap_dsi_disable_pads,
 		.set_min_bus_tput = omap_dss_set_min_bus_tput,
 	};
 
@@ -406,10 +351,5 @@  int __init omapdss_init_of(void)
 		return r;
 	}
 
-	/* add DSI info for omap4 */
-	node = of_find_node_by_name(NULL, "omap4_padconf_global");
-	if (node)
-		omap4_dsi_mux_syscon = syscon_node_to_regmap(node);
-
 	return 0;
 }