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

Commit b4bba92d authored by Vincent Abriou's avatar Vincent Abriou
Browse files

drm/sti: remove stih415-416 platform support 



stih415 and stih416 platform are obsolete and no more supported.
Only stih407 and stih410 platform are maintained.

Signed-off-by: default avatarVincent Abriou <vincent.abriou@st.com>
Acked-by: default avatarBenjamin Gaignard <benjamin.gaignard@linaro.org>
Acked-by: default avatarPeter Griffin <peter.griffin@linaro.org>
parent 38fdb8d9

drivers/gpu/drm/sti/Kconfig

+3 −3
Original line number Diff line number Diff line 
config DRM_STI

	tristate "DRM Support for STMicroelectronics SoC stiH41x Series"

	depends on DRM && (SOC_STIH415 || SOC_STIH416 || ARCH_MULTIPLATFORM)

	tristate "DRM Support for STMicroelectronics SoC stiH4xx Series"

	depends on DRM && (ARCH_STI || ARCH_MULTIPLATFORM)

	select RESET_CONTROLLER

	select DRM_KMS_HELPER

	select DRM_GEM_CMA_HELPER
@@ -9,4 +9,4 @@ config DRM_STI 
	select FW_LOADER

	select SND_SOC_HDMI_CODEC if SND_SOC

	help

	  Choose this option to enable DRM on STM stiH41x chipset
 
	  Choose this option to enable DRM on STM stiH4xx chipset

drivers/gpu/drm/sti/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ sti-drm-y := \ 
	sti_crtc.o \

	sti_plane.o \

	sti_hdmi.o \

	sti_hdmi_tx3g0c55phy.o \

	sti_hdmi_tx3g4c28phy.o \

	sti_dvo.o \

	sti_awg_utils.o \

drivers/gpu/drm/sti/sti_compositor.c

+0 −19
Original line number Diff line number Diff line
@@ -39,22 +39,6 @@ static const struct sti_compositor_data stih407_compositor_data = { 
	},

};



/*

 * stiH416 compositor properties

 * Note:

 * on stih416 MIXER_AUX has a different base address from MIXER_MAIN

 * Moreover, GDPx is different for Main and Aux Mixer. So this subdev map does

 * not fit for stiH416 if we want to enable the MIXER_AUX.

 */

static const struct sti_compositor_data stih416_compositor_data = {

	.nb_subdev = 3,

	.subdev_desc = {

			{STI_GPD_SUBDEV, (int)STI_GDP_0, 0x100},

			{STI_GPD_SUBDEV, (int)STI_GDP_1, 0x200},

			{STI_MIXER_MAIN_SUBDEV, STI_MIXER_MAIN, 0xC00}

	},

};



int sti_compositor_debugfs_init(struct sti_compositor *compo,

				struct drm_minor *minor)

{
@@ -179,9 +163,6 @@ static const struct component_ops sti_compositor_ops = { 


static const struct of_device_id compositor_of_match[] = {

	{

		.compatible = "st,stih416-compositor",

		.data = &stih416_compositor_data,

	}, {

		.compatible = "st,stih407-compositor",

		.data = &stih407_compositor_data,

	}, {

drivers/gpu/drm/sti/sti_hda.c

+3 −36
Original line number Diff line number Diff line
@@ -62,14 +62,8 @@ 
#define SCALE_CTRL_CR_DFLT              0x00DB0249



/* Video DACs control */

#define VIDEO_DACS_CONTROL_MASK         0x0FFF

#define VIDEO_DACS_CONTROL_SYSCFG2535   0x085C /* for stih416 */

#define DAC_CFG_HD_OFF_SHIFT            5

#define DAC_CFG_HD_OFF_MASK             (0x7 << DAC_CFG_HD_OFF_SHIFT)

#define VIDEO_DACS_CONTROL_SYSCFG5072   0x0120 /* for stih407 */

#define DAC_CFG_HD_HZUVW_OFF_MASK       BIT(1)





/* Upsampler values for the alternative 2X Filter */

#define SAMPLER_COEF_NB                 8

#define HDA_ANA_SRC_Y_CFG_ALT_2X        0x01130000
@@ -300,28 +294,14 @@ static bool hda_get_mode_idx(struct drm_display_mode mode, int *idx) 
 */

static void hda_enable_hd_dacs(struct sti_hda *hda, bool enable)

{

	u32 mask;



	if (hda->video_dacs_ctrl) {

		u32 val;



		switch ((u32)hda->video_dacs_ctrl & VIDEO_DACS_CONTROL_MASK) {

		case VIDEO_DACS_CONTROL_SYSCFG2535:

			mask = DAC_CFG_HD_OFF_MASK;

			break;

		case VIDEO_DACS_CONTROL_SYSCFG5072:

			mask = DAC_CFG_HD_HZUVW_OFF_MASK;

			break;

		default:

			DRM_INFO("Video DACS control register not supported\n");

			return;

		}



		val = readl(hda->video_dacs_ctrl);

		if (enable)

			val &= ~mask;

			val &= ~DAC_CFG_HD_HZUVW_OFF_MASK;

		else

			val |= mask;

			val |= DAC_CFG_HD_HZUVW_OFF_MASK;



		writel(val, hda->video_dacs_ctrl);

	}
@@ -352,24 +332,11 @@ static void hda_dbg_awg_microcode(struct seq_file *s, void __iomem *reg) 
static void hda_dbg_video_dacs_ctrl(struct seq_file *s, void __iomem *reg)

{

	u32 val = readl(reg);

	u32 mask;



	switch ((u32)reg & VIDEO_DACS_CONTROL_MASK) {

	case VIDEO_DACS_CONTROL_SYSCFG2535:

		mask = DAC_CFG_HD_OFF_MASK;

		break;

	case VIDEO_DACS_CONTROL_SYSCFG5072:

		mask = DAC_CFG_HD_HZUVW_OFF_MASK;

		break;

	default:

		DRM_DEBUG_DRIVER("Warning: DACS ctrl register not supported\n");

		return;

	}



	seq_puts(s, "\n");

	seq_printf(s, "\n  %-25s 0x%08X", "VIDEO_DACS_CONTROL", val);

	seq_puts(s, "\tHD DACs ");

	seq_puts(s, val & mask ? "disabled" : "enabled");

	seq_puts(s, val & DAC_CFG_HD_HZUVW_OFF_MASK ? "disabled" : "enabled");

}



static int hda_dbg_show(struct seq_file *s, void *data)

drivers/gpu/drm/sti/sti_hdmi.c

+0 −20
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include "sti_hdmi.h"

#include "sti_hdmi_tx3g4c28phy.h"

#include "sti_hdmi_tx3g0c55phy.h"

#include "sti_vtg.h"



#define HDMI_CFG                        0x0000
@@ -1374,9 +1373,6 @@ static const struct component_ops sti_hdmi_ops = { 


static const struct of_device_id hdmi_of_match[] = {

	{

		.compatible = "st,stih416-hdmi",

		.data = &tx3g0c55phy_ops,

	}, {

		.compatible = "st,stih407-hdmi",

		.data = &tx3g4c28phy_ops,

	}, {
@@ -1423,22 +1419,6 @@ static int sti_hdmi_probe(struct platform_device *pdev) 
		goto release_adapter;

	}



	if (of_device_is_compatible(np, "st,stih416-hdmi")) {

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						   "syscfg");

		if (!res) {

			DRM_ERROR("Invalid syscfg resource\n");

			ret = -ENOMEM;

			goto release_adapter;

		}

		hdmi->syscfg = devm_ioremap_nocache(dev, res->start,

						    resource_size(res));

		if (!hdmi->syscfg) {

			ret = -ENOMEM;

			goto release_adapter;

		}

	}



	hdmi->phy_ops = (struct hdmi_phy_ops *)

		of_match_node(hdmi_of_match, np)->data;