Skip to content

Commit f1777aa

Browse files
airliedairlied
committed
Merge tag 'omapdrm-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-fixes
omapdrm fixes for 4.7 * multiple compile break fixes for missing includes, bad kconfig dependencies. * remove regulator API misuse causing deprecation warnings * OMAP5 HDMI fixes for DDC and AVI infoframe * OMAP4 HDMI fix for CEC * tag 'omapdrm-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: drm/omap: include gpio/consumer.h where needed drm/omap: include linux/seq_file.h where needed Revert "drm/omap: no need to select OMAP2_DSS" drm/omap: Remove regulator API abuse OMAPDSS: HDMI5: Change DDC timings OMAPDSS: HDMI5: Fix AVI infoframe drm/omap: fix OMAP4 hdmi_core_powerdown_disable() drm/omap: Fix missing includes drm/omapdrm: include pinctrl/consumer.h where needed
2 parents b160245 + d0196c8 commit f1777aa

25 files changed

+30
-42
lines changed

‎drivers/gpu/drm/omapdrm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ config DRM_OMAP
22
tristate "OMAP DRM"
33
depends on DRM
44
depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
5+
select OMAP2_DSS
56
select DRM_KMS_HELPER
67
select DRM_KMS_FB_HELPER
78
select FB_SYS_FILLRECT

‎drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* the Free Software Foundation.
1010
*/
1111

12+
#include <linux/gpio/consumer.h>
1213
#include <linux/slab.h>
1314
#include <linux/module.h>
1415
#include <linux/platform_device.h>

‎drivers/gpu/drm/omapdrm/displays/encoder-opa362.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* the Free Software Foundation.
1515
*/
1616

17-
#include <linux/gpio.h>
17+
#include <linux/gpio/consumer.h>
1818
#include <linux/module.h>
1919
#include <linux/platform_device.h>
2020
#include <linux/slab.h>

‎drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* the Free Software Foundation.
1010
*/
1111

12-
#include <linux/gpio.h>
12+
#include <linux/gpio/consumer.h>
1313
#include <linux/module.h>
1414
#include <linux/platform_device.h>
1515
#include <linux/slab.h>

‎drivers/gpu/drm/omapdrm/displays/panel-dpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* the Free Software Foundation.
1010
*/
1111

12-
#include <linux/gpio.h>
12+
#include <linux/gpio/consumer.h>
1313
#include <linux/module.h>
1414
#include <linux/platform_device.h>
1515
#include <linux/slab.h>

‎drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/backlight.h>
1515
#include <linux/delay.h>
1616
#include <linux/fb.h>
17-
#include <linux/gpio.h>
17+
#include <linux/gpio/consumer.h>
1818
#include <linux/interrupt.h>
1919
#include <linux/jiffies.h>
2020
#include <linux/module.h>

‎drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/spi/spi.h>
1616
#include <linux/mutex.h>
1717
#include <linux/gpio.h>
18+
#include <linux/gpio/consumer.h>
1819

1920
#include <video/omapdss.h>
2021
#include <video/omap-panel-data.h>

‎drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/delay.h>
1616
#include <linux/spi/spi.h>
1717
#include <linux/fb.h>
18-
#include <linux/gpio.h>
18+
#include <linux/gpio/consumer.h>
1919
#include <linux/of_gpio.h>
2020

2121
#include <video/omapdss.h>

‎drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111

1212
#include <linux/delay.h>
13-
#include <linux/gpio.h>
13+
#include <linux/gpio/consumer.h>
1414
#include <linux/module.h>
1515
#include <linux/of.h>
1616
#include <linux/of_gpio.h>

‎drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <linux/sched.h>
3030
#include <linux/backlight.h>
3131
#include <linux/fb.h>
32-
#include <linux/gpio.h>
32+
#include <linux/gpio/consumer.h>
3333
#include <linux/of.h>
3434
#include <linux/of_gpio.h>
3535

‎drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/delay.h>
1515
#include <linux/spi/spi.h>
1616
#include <linux/regulator/consumer.h>
17-
#include <linux/gpio.h>
17+
#include <linux/gpio/consumer.h>
1818
#include <linux/err.h>
1919
#include <linux/slab.h>
2020
#include <linux/of_gpio.h>

‎drivers/gpu/drm/omapdrm/dss/dsi.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,15 +1180,6 @@ static int dsi_regulator_init(struct platform_device *dsidev)
11801180
return PTR_ERR(vdds_dsi);
11811181
}
11821182

1183-
if (regulator_can_change_voltage(vdds_dsi)) {
1184-
r = regulator_set_voltage(vdds_dsi, 1800000, 1800000);
1185-
if (r) {
1186-
devm_regulator_put(vdds_dsi);
1187-
DSSERR("can't set the DSI regulator voltage\n");
1188-
return r;
1189-
}
1190-
}
1191-
11921183
dsi->vdds_dsi_reg = vdds_dsi;
11931184

11941185
return 0;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <linux/delay.h>
3131
#include <linux/seq_file.h>
3232
#include <linux/clk.h>
33+
#include <linux/pinctrl/consumer.h>
3334
#include <linux/platform_device.h>
3435
#include <linux/pm_runtime.h>
3536
#include <linux/gfp.h>

‎drivers/gpu/drm/omapdrm/dss/hdmi4.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <linux/gpio.h>
3434
#include <linux/regulator/consumer.h>
3535
#include <linux/component.h>
36+
#include <linux/of.h>
3637
#include <video/omapdss.h>
3738
#include <sound/omap-hdmi-audio.h>
3839

@@ -114,15 +115,6 @@ static int hdmi_init_regulator(void)
114115
return PTR_ERR(reg);
115116
}
116117

117-
if (regulator_can_change_voltage(reg)) {
118-
r = regulator_set_voltage(reg, 1800000, 1800000);
119-
if (r) {
120-
devm_regulator_put(reg);
121-
DSSWARN("can't set the regulator voltage\n");
122-
return r;
123-
}
124-
}
125-
126118
hdmi.vdda_reg = reg;
127119

128120
return 0;

‎drivers/gpu/drm/omapdrm/dss/hdmi4_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ static void hdmi_core_init(struct hdmi_core_video_config *video_cfg)
211211
static void hdmi_core_powerdown_disable(struct hdmi_core_data *core)
212212
{
213213
DSSDBG("Enter hdmi_core_powerdown_disable\n");
214-
REG_FLD_MOD(core->base, HDMI_CORE_SYS_SYS_CTRL1, 0x0, 0, 0);
214+
REG_FLD_MOD(core->base, HDMI_CORE_SYS_SYS_CTRL1, 0x1, 0, 0);
215215
}
216216

217217
static void hdmi_core_swreset_release(struct hdmi_core_data *core)

‎drivers/gpu/drm/omapdrm/dss/hdmi5.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include <linux/gpio.h>
3939
#include <linux/regulator/consumer.h>
4040
#include <linux/component.h>
41+
#include <linux/of.h>
4142
#include <video/omapdss.h>
4243
#include <sound/omap-hdmi-audio.h>
4344

@@ -131,15 +132,6 @@ static int hdmi_init_regulator(void)
131132
return PTR_ERR(reg);
132133
}
133134

134-
if (regulator_can_change_voltage(reg)) {
135-
r = regulator_set_voltage(reg, 1800000, 1800000);
136-
if (r) {
137-
devm_regulator_put(reg);
138-
DSSWARN("can't set the regulator voltage\n");
139-
return r;
140-
}
141-
}
142-
143135
hdmi.vdda_reg = reg;
144136

145137
return 0;

‎drivers/gpu/drm/omapdrm/dss/hdmi5_core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ static void hdmi_core_ddc_init(struct hdmi_core_data *core)
5151
{
5252
void __iomem *base = core->base;
5353
const unsigned long long iclk = 266000000; /* DSS L3 ICLK */
54-
const unsigned ss_scl_high = 4000; /* ns */
55-
const unsigned ss_scl_low = 4700; /* ns */
54+
const unsigned ss_scl_high = 4600; /* ns */
55+
const unsigned ss_scl_low = 5400; /* ns */
5656
const unsigned fs_scl_high = 600; /* ns */
5757
const unsigned fs_scl_low = 1300; /* ns */
5858
const unsigned sda_hold = 1000; /* ns */
@@ -458,7 +458,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_core_data *core,
458458

459459
c = (ptr[1] >> 6) & 0x3;
460460
m = (ptr[1] >> 4) & 0x3;
461-
r = (ptr[1] >> 0) & 0x3;
461+
r = (ptr[1] >> 0) & 0xf;
462462

463463
itc = (ptr[2] >> 7) & 0x1;
464464
ec = (ptr[2] >> 4) & 0x7;

‎drivers/gpu/drm/omapdrm/dss/hdmi_phy.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/io.h>
1414
#include <linux/platform_device.h>
1515
#include <linux/slab.h>
16+
#include <linux/seq_file.h>
1617
#include <video/omapdss.h>
1718

1819
#include "dss.h"

‎drivers/gpu/drm/omapdrm/dss/hdmi_pll.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <linux/io.h>
1717
#include <linux/platform_device.h>
1818
#include <linux/clk.h>
19+
#include <linux/seq_file.h>
1920

2021
#include <video/omapdss.h>
2122

‎drivers/gpu/drm/omapdrm/dss/hdmi_wp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/err.h>
1515
#include <linux/io.h>
1616
#include <linux/platform_device.h>
17+
#include <linux/seq_file.h>
1718
#include <video/omapdss.h>
1819

1920
#include "dss.h"

‎drivers/gpu/drm/omapdrm/omap_debugfs.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20+
#include <linux/seq_file.h>
21+
2022
#include <drm/drm_crtc.h>
2123
#include <drm/drm_fb_helper.h>
2224

‎drivers/gpu/drm/omapdrm/omap_dmm_tiler.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <linux/module.h>
2828
#include <linux/platform_device.h> /* platform_device() */
2929
#include <linux/sched.h>
30+
#include <linux/seq_file.h>
3031
#include <linux/slab.h>
3132
#include <linux/time.h>
3233
#include <linux/vmalloc.h>

‎drivers/gpu/drm/omapdrm/omap_fb.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20+
#include <linux/seq_file.h>
21+
2022
#include <drm/drm_crtc.h>
2123
#include <drm/drm_crtc_helper.h>
2224

‎drivers/gpu/drm/omapdrm/omap_gem.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20+
#include <linux/seq_file.h>
2021
#include <linux/shmem_fs.h>
2122
#include <linux/spinlock.h>
2223
#include <linux/pfn_t.h>

‎drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ static void hdmi_core_ddc_init(struct hdmi_core_data *core)
5151
{
5252
void __iomem *base = core->base;
5353
const unsigned long long iclk = 266000000; /* DSS L3 ICLK */
54-
const unsigned ss_scl_high = 4000; /* ns */
55-
const unsigned ss_scl_low = 4700; /* ns */
54+
const unsigned ss_scl_high = 4600; /* ns */
55+
const unsigned ss_scl_low = 5400; /* ns */
5656
const unsigned fs_scl_high = 600; /* ns */
5757
const unsigned fs_scl_low = 1300; /* ns */
5858
const unsigned sda_hold = 1000; /* ns */
@@ -442,7 +442,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_core_data *core,
442442

443443
c = (ptr[1] >> 6) & 0x3;
444444
m = (ptr[1] >> 4) & 0x3;
445-
r = (ptr[1] >> 0) & 0x3;
445+
r = (ptr[1] >> 0) & 0xf;
446446

447447
itc = (ptr[2] >> 7) & 0x1;
448448
ec = (ptr[2] >> 4) & 0x7;

0 commit comments

Comments
 (0)