| Message ID | 1417103514-17027-17-git-send-email-t-kristo@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 27/11/14 17:51, Tero Kristo wrote: > OMAP4 is DT only now, so the legacy mux support is not needed anymore. > Padconf is used instead from the driver / DT. This removes the need > for having the mux APIs exported from the control module driver. We still use those mux functions for DT. The mux registers for DSI are so funny that we can't use the normal padconf for them. I did do some work to use syscon, but I never had time to finish it. Tomi
On 11/27/2014 06:09 PM, Tomi Valkeinen wrote: > On 27/11/14 17:51, Tero Kristo wrote: >> OMAP4 is DT only now, so the legacy mux support is not needed anymore. >> Padconf is used instead from the driver / DT. This removes the need >> for having the mux APIs exported from the control module driver. > > We still use those mux functions for DT. The mux registers for DSI are > so funny that we can't use the normal padconf for them. Ah hmm, so it seems, I overlooked the omapdss_init_of() function. Looks like some of the patches in this set needs to be dropped for now then, namely 16, 17, and patch 18 has to be modified. The direct omap4 padconf hacks are very bad though. Maybe it should be changed to only allow access to that single DSIPHY register. -Tero > I did do some work to use syscon, but I never had time to finish it. > > Tomi > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 27 Nov 2014, Tero Kristo wrote: > OMAP4 is DT only now, so the legacy mux support is not needed anymore. > Padconf is used instead from the driver / DT. This removes the need > for having the mux APIs exported from the control module driver. > > Signed-off-by: Tero Kristo <t-kristo@ti.com> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Dropping since Tomi mentioned legacy mux support is still in use. - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 7a050f9..c5a4592 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -104,51 +104,13 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = { { "dss_hdmi", "omapdss_hdmi", -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; -} - 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)
OMAP4 is DT only now, so the legacy mux support is not needed anymore. Padconf is used instead from the driver / DT. This removes the need for having the mux APIs exported from the control module driver. Signed-off-by: Tero Kristo <t-kristo@ti.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> --- arch/arm/mach-omap2/display.c | 38 -------------------------------------- 1 file changed, 38 deletions(-)