summaryrefslogtreecommitdiff
authorivan.nie <ivan.nie@amlogic.com>2018-04-18 09:21:30 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-04-21 07:56:15 (GMT)
commitec8b6c3dba089a6eb135bc3dd2f99bb56d92d9a6 (patch)
treea8a41bf15dfc213371628af6965d2c4a163e184d
parent79b90c6d5c1025eb8da6709729ff62868e7067e5 (diff)
downloadcommon-ec8b6c3dba089a6eb135bc3dd2f99bb56d92d9a6.zip
common-ec8b6c3dba089a6eb135bc3dd2f99bb56d92d9a6.tar.gz
common-ec8b6c3dba089a6eb135bc3dd2f99bb56d92d9a6.tar.bz2
dts: sync atom dts
PD#162872: emmc: Optimizing eMMC/sd/sdio timing parameter configuration method PD#162608: enable node amvenc_avc for encoder Change-Id: I9d666524dfb7051c4fd0385ffa3b8f9bb275bfe0
Diffstat
-rw-r--r--arch/arm64/boot/dts/amlogic/atom.dts3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/amlogic/atom.dts b/arch/arm64/boot/dts/amlogic/atom.dts
index c76597a..3d64f98 100644
--- a/arch/arm64/boot/dts/amlogic/atom.dts
+++ b/arch/arm64/boot/dts/amlogic/atom.dts
@@ -614,7 +614,7 @@
//memory-region = <&amvenc_avc_reserved>;
//memory-region = <&avc_cma_reserved>;
dev_name = "amvenc_avc";
- status = "disabled";
+ status = "okay";
interrupts = <0 45 1>;
interrupt-names = "mailbox_2";
};
@@ -713,7 +713,6 @@
caps2 = "MMC_CAP2_HS200", "MMC_CAP2_HS400";
f_min = <400000>;
f_max = <200000000>;
- tx_delay = <6>;
max_req_size = <0x20000>; /**128KB*/
gpio_dat3 = <&gpio BOOT_3 GPIO_ACTIVE_HIGH>;
hw_reset = <&gpio BOOT_9 GPIO_ACTIVE_HIGH>;