Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit 12359a7

Browse files
sravnborgsravnborg
committed
Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip
2 parents fca6518 + 6de7452 commit 12359a7

File tree

159 files changed

+948
-514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+948
-514
lines changed

‎Documentation/devicetree/bindings/display/panel/panel-simple.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ properties:
141141
# Emerging Display Technology Corp. WVGA TFT Display with capacitive touch
142142
- edt,etm0700g0dh6
143143
- edt,etm0700g0edh6
144+
# Emerging Display Technology Corp. LVDS WSVGA TFT Display with capacitive touch
145+
- edt,etml0700y5dha
144146
# Emerging Display Technology Corp. 5.7" VGA TFT LCD panel with
145147
# capacitive touch
146148
- edt,etmv570g2dhu
@@ -162,6 +164,8 @@ properties:
162164
- hannstar,hsd070pww1
163165
# HannStar Display Corp. HSD100PXN1 10.1" XGA LVDS panel
164166
- hannstar,hsd100pxn1
167+
# HannStar Display Corp. HSD101PWW2 10.1" WXGA (1280x800) LVDS panel
168+
- hannstar,hsd101pww2
165169
# Hitachi Ltd. Corporation 9" WVGA (800x480) TFT LCD panel
166170
- hit,tx23d38vm0caa
167171
# InfoVision Optoelectronics M133NWF4 R0 13.3" FHD (1920x1080) TFT LCD panel
@@ -276,6 +280,8 @@ properties:
276280
- samsung,atna33xc20
277281
# Samsung 12.2" (2560x1600 pixels) TFT LCD panel
278282
- samsung,lsn122dl01-c01
283+
# Samsung Electronics 10.1" WXGA (1280x800) TFT LCD panel
284+
- samsung,ltl101al01
279285
# Samsung Electronics 10.1" WSVGA TFT LCD panel
280286
- samsung,ltn101nt05
281287
# Samsung Electronics 14" WXGA (1366x768) TFT LCD panel

‎Documentation/devicetree/bindings/display/panel/sharp,lq101r1sx01.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@ allOf:
3030

3131
properties:
3232
compatible:
33-
const: sharp,lq101r1sx01
33+
oneOf:
34+
- items:
35+
- const: sharp,lq101r1sx03
36+
- const: sharp,lq101r1sx01
37+
- items:
38+
- const: sharp,lq101r1sx01
3439

3540
reg: true
3641
power-supply: true

‎drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* Author: James.Qian.Wang <[email protected]>
55
*
66
*/
7+
#include <linux/of.h>
8+
79
#include <drm/drm_print.h>
810

911
#include "komeda_dev.h"

‎drivers/gpu/drm/armada/armada_510.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
#include <linux/clk.h>
88
#include <linux/io.h>
9+
#include <linux/of.h>
910
#include <drm/drm_probe_helper.h>
1011
#include "armada_crtc.h"
1112
#include "armada_drm.h"

‎drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99

1010
#include <linux/clk.h>
11+
#include <linux/media-bus-format.h>
1112
#include <linux/mfd/atmel-hlcdc.h>
1213
#include <linux/pinctrl/consumer.h>
1314
#include <linux/pm.h>

‎drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c

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

1111
#include <linux/media-bus-format.h>
12+
#include <linux/of.h>
1213
#include <linux/of_graph.h>
1314

1415
#include <drm/drm_bridge.h>

‎drivers/gpu/drm/bridge/adv7511/adv7511.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,7 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1);
394394
#else
395395
static inline int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511)
396396
{
397-
unsigned int offset = adv7511->type == ADV7533 ?
398-
ADV7533_REG_CEC_OFFSET : 0;
399-
400-
regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset,
397+
regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL,
401398
ADV7511_CEC_CTRL_POWER_DOWN);
402399
return 0;
403400
}

‎drivers/gpu/drm/bridge/adv7511/adv7511_cec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511)
359359
goto err_cec_alloc;
360360
}
361361

362-
regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, 0);
362+
regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, 0);
363363
/* cec soft reset */
364364
regmap_write(adv7511->regmap_cec,
365365
ADV7511_REG_CEC_SOFT_RESET + offset, 0x01);
@@ -386,7 +386,7 @@ int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511)
386386
dev_info(dev, "Initializing CEC failed with error %d, disabling CEC\n",
387387
ret);
388388
err_cec_parse_dt:
389-
regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset,
389+
regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL,
390390
ADV7511_CEC_CTRL_POWER_DOWN);
391391
return ret == -EPROBE_DEFER ? ret : 0;
392392
}

‎drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,16 +1340,15 @@ static int adv7511_remove(struct i2c_client *i2c)
13401340
{
13411341
struct adv7511 *adv7511 = i2c_get_clientdata(i2c);
13421342

1343-
i2c_unregister_device(adv7511->i2c_cec);
1344-
clk_disable_unprepare(adv7511->cec_clk);
1345-
13461343
adv7511_uninit_regulators(adv7511);
13471344

13481345
drm_bridge_remove(&adv7511->bridge);
13491346

13501347
adv7511_audio_exit(adv7511);
13511348

13521349
cec_unregister_adapter(adv7511->cec_adap);
1350+
i2c_unregister_device(adv7511->i2c_cec);
1351+
clk_disable_unprepare(adv7511->cec_clk);
13531352

13541353
i2c_unregister_device(adv7511->i2c_packet);
13551354
i2c_unregister_device(adv7511->i2c_edid);

0 commit comments

Comments
 (0)