drm: omapdrm: Move FEAT_DPI_USES_VDDS_DSI feature to dpi code (d178e034) · Commits · 戴 / test

drivers/gpu/drm/omapdrm/dss/dpi.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include <linux/string.h>
		#include <linux/of.h>
		#include <linux/clk.h>
		#include <linux/sys_soc.h>

		#include "omapdss.h"
		#include "dss.h"
		@@ -565,11 +566,21 @@ static int dpi_verify_pll(struct dss_pll *pll)
		return 0;
		}

		static const struct soc_device_attribute dpi_soc_devices[] = {
		{ .family = "OMAP3[456]*" },
		{ .family = "[AD]M37*" },
		{ /* sentinel */ }
		};

		static int dpi_init_regulator(struct dpi_data *dpi)
		{
		struct regulator *vdds_dsi;

		if (!dss_has_feature(FEAT_DPI_USES_VDDS_DSI))
		/*
		* The DPI uses the DSI VDDS on OMAP34xx, OMAP35xx, OMAP36xx, AM37xx and
		* DM37xx only.
		*/
		if (!soc_device_match(dpi_soc_devices))
		return 0;

		if (dpi->vdds_dsi_reg)

+0 −2

Original line number	Diff line number	Diff line
		@@ -171,7 +171,6 @@ static const enum dss_feat_id omap3430_dss_feat_list[] = {
		FEAT_ALPHA_FIXED_ZORDER,
		FEAT_FIFO_MERGE,
		FEAT_OMAP3_DSI_FIFO_BUG,
		FEAT_DPI_USES_VDDS_DSI,
		};

		static const enum dss_feat_id am35xx_dss_feat_list[] = {
		@@ -219,7 +218,6 @@ static const enum dss_feat_id omap3630_dss_feat_list[] = {
		FEAT_ALPHA_FIXED_ZORDER,
		FEAT_FIFO_MERGE,
		FEAT_OMAP3_DSI_FIFO_BUG,
		FEAT_DPI_USES_VDDS_DSI,
		};

		static const enum dss_feat_id omap4430_es1_0_dss_feat_list[] = {

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ enum dss_feat_id {
		/* Independent core clk divider */
		FEAT_CORE_CLK_DIV,
		FEAT_LCD_CLK_SRC,
		FEAT_DPI_USES_VDDS_DSI,
		FEAT_HANDLE_UV_SEPARATE,
		FEAT_ATTR2,
		FEAT_CPR,