diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2020-08-29 15:16:28 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2020-08-29 15:48:55 +0800 |
| commit | 31cdeb79c069834e0fd79c297fb34c136295f6f9 (patch) | |
| tree | 78d2a3d1ebb93579d6b4de77c912889ac128d51c /arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | |
| parent | 14cae9c2e8aeef3ef9824f15e73aa3ab355e1f67 (diff) | |
| parent | 5206f78a3ffea1f4bff706e53ce1ff3640d513e0 (diff) | |
Merge branch 'mirror-android-4.14-stable' into android-hikey-linaro-4.14
* mirror-android-4.14-stable: (580 commits)
Revert "binder: Prevent context manager from incrementing ref 0"
Linux 4.14.195
KVM: arm/arm64: Don't reschedule in unmap_stage2_range()
clk: Evict unregistered clks from parent caches
xen: don't reschedule in preemption off sections
mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible
do_epoll_ctl(): clean the failure exits up a bit
epoll: Keep a reference on files added to the check list
powerpc/pseries: Do not initiate shutdown when system is running on UPS
net: dsa: b53: check for timeout
hv_netvsc: Fix the queue_mapping in netvsc_vf_xmit()
bonding: fix active-backup failover for current ARP slave
vfio/type1: Add proper error unwind for vfio_iommu_replay()
ASoC: intel: Fix memleak in sst_media_open
ASoC: msm8916-wcd-analog: fix register Interrupt offset
bonding: fix a potential double-unregister
bonding: show saner speed for broadcast mode
net: fec: correct the error path for regulator disable in probe
i40e: Fix crash during removing i40e driver
i40e: Set RX_ONLY mode for unicast promiscuous on VLAN
...
Test: boot tested with hikey/hikey960 aosp-master-throttled-copped#6749029 builds
Change-Id: Ic77fee26af3c22c2d227a7ed514442e7fadf9d73
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Diffstat (limited to 'arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts')
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index f72ba6c1f137..28b618cd40f4 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -350,6 +350,17 @@ status = "ok"; compatible = "adi,adv7533"; reg = <0x39>; + adi,dsi-lanes = <4>; + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + }; + port@1 { + reg = <1>; + }; + }; }; }; |