diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-02-19 18:50:12 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-02-19 18:50:12 -0800 |
| commit | b20ffdf4e53099d9348444a9247ac42786652e28 (patch) | |
| tree | bae81e4fa79a14e10742872545a606a602258b04 | |
| parent | 30540b635e67ec9729c247cc9d302c4e43537bcf (diff) | |
| parent | 89320fc16cdef8b1b468db970c13f6f03952df7f (diff) | |
| download | tangorpro-b20ffdf4e53099d9348444a9247ac42786652e28.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3
SBMerger: 478053055
Change-Id: I52d9c4394d522fd4f234021e271840ebd4b966fd
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | dts/gs201-tangorpro-display.dtsi | 2 | ||||
| -rw-r--r-- | pogo/pogo_transport.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/dts/gs201-tangorpro-display.dtsi b/dts/gs201-tangorpro-display.dtsi index cf9923a..77f0cf3 100644 --- a/dts/gs201-tangorpro-display.dtsi +++ b/dts/gs201-tangorpro-display.dtsi @@ -15,7 +15,7 @@ }; &s2mpu_dpu0 { - always-on; + dma-cons = <&drmdecon0>; }; &hsi2c_6 { diff --git a/pogo/pogo_transport.c b/pogo/pogo_transport.c index b070ac2..86ce2da 100644 --- a/pogo/pogo_transport.c +++ b/pogo/pogo_transport.c @@ -178,6 +178,7 @@ struct pogo_transport { static const unsigned int pogo_extcon_cable[] = { EXTCON_USB, EXTCON_DOCK, + EXTCON_NONE, }; static void pogo_transport_event(struct pogo_transport *pogo_transport, |