Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23d34981 authored by Tero Kristo's avatar Tero Kristo
Browse files

ARM: OMAP4: display: convert display to use syscon for dsi muxing 



The legacy control module APIs will be gone, thus convert the display
driver to use syscon. This change should eventually be moved to
display driver from the board directory.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
parent 7415b0b4

arch/arm/mach-omap2/display.c

+13 −2
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/slab.h>

#include <linux/mfd/syscon.h>

#include <linux/regmap.h>



#include <video/omapdss.h>

#include "omap_hwmod.h"
@@ -104,6 +106,10 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = { 
	{ "dss_hdmi", "omapdss_hdmi", -1 },

};



#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;
@@ -124,7 +130,7 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes) 
		return -ENODEV;

	}



	reg = omap4_ctrl_pad_readl(OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY);

	regmap_read(omap4_dsi_mux_syscon, OMAP4_DSIPHY_SYSCON_OFFSET, &reg);



	reg &= ~enable_mask;

	reg &= ~pipd_mask;
@@ -132,7 +138,7 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes) 
	reg |= (lanes << enable_shift) & enable_mask;

	reg |= (lanes << pipd_shift) & pipd_mask;



	omap4_ctrl_pad_writel(reg, OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY);

	regmap_write(omap4_dsi_mux_syscon, OMAP4_DSIPHY_SYSCON_OFFSET, reg);



	return 0;

}
@@ -665,5 +671,10 @@ 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;

}