Merge tag 'imx-drm-fixes-2017-02-17' of https://git.pengutronix.de/git/pza/linux into drm-next
imx-drm: TVE regulator, fb size limit, and ipu-v3 module fixes - Fix i.MX5 TV encoder probing in case no dac-supply regulator is set in the device tree. - Remove 64 pixel min_width/height limit, which unnecessarily prohibits creation of small frame buffers. - Add missing ipu_csi_set_downsize export, for media drivers built as modules. - Stop modifying pdev->dev.of_node for IPU client devices that do not have an OF modalias to fix module autoloading. * tag 'imx-drm-fixes-2017-02-17' of https://git.pengutronix.de/git/pza/linux: gpu: ipu-v3: Stop overwriting pdev->dev.of_node of child devices gpu: ipu-v3: export ipu_csi_set_downsize drm/imx: lift 64x64 pixel minimum framebuffer size requirement drm/imx: imx-tve: Do not set the regulator voltage
This commit is contained in:
@@ -98,6 +98,8 @@
|
||||
/* TVE_TST_MODE_REG */
|
||||
#define TVE_TVDAC_TEST_MODE_MASK (0x7 << 0)
|
||||
|
||||
#define IMX_TVE_DAC_VOLTAGE 2750000
|
||||
|
||||
enum {
|
||||
TVE_MODE_TVOUT,
|
||||
TVE_MODE_VGA,
|
||||
@@ -616,9 +618,8 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data)
|
||||
|
||||
tve->dac_reg = devm_regulator_get(dev, "dac");
|
||||
if (!IS_ERR(tve->dac_reg)) {
|
||||
ret = regulator_set_voltage(tve->dac_reg, 2750000, 2750000);
|
||||
if (ret)
|
||||
return ret;
|
||||
if (regulator_get_voltage(tve->dac_reg) != IMX_TVE_DAC_VOLTAGE)
|
||||
dev_warn(dev, "dac voltage is not %d uV\n", IMX_TVE_DAC_VOLTAGE);
|
||||
ret = regulator_enable(tve->dac_reg);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
Reference in New Issue
Block a user