summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJorge A. Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>2015-07-31 12:04:22 -0400
committerJorge A. Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>2015-07-31 12:04:22 -0400
commit5b0ad61e4517482b425402558b03089f6edd8d0a (patch)
tree83490a1f85c9fda4105f26a4c74a540fcca769e3 /arch
parent9212a5290edb67d5d0f0b235980f3ead171d1703 (diff)
Revert "Working syspll get from registers v3"
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/boot/dts/hi6220.dtsi3
-rw-r--r--arch/arm64/configs/defconfig3
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/hi6220.dtsi b/arch/arm64/boot/dts/hi6220.dtsi
index 0fa2b60ab28c..e15c862600f5 100644
--- a/arch/arm64/boot/dts/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hi6220.dtsi
@@ -667,9 +667,6 @@
pd-gpio = <&gpio0 4 0>;
adi,input-depth = <8>;
adi,input-colorspace = "rgb";
- adi,input-clock = "1x";
- adi,clock-delay = <0>;
- adi,embedded-sync;
};
};
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index e6bca3542a87..63ff3ec9c42f 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -190,7 +190,6 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=64
CONFIG_CONNECTOR=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
@@ -277,7 +276,7 @@ CONFIG_MALI_SHARED_INTERRUPTS=y
CONFIG_MALI_DT=y
CONFIG_MALI_PLAT_SPECIFIC_DT=y
CONFIG_DRM=y
-CONFIG_DRM_I2C_ADV7511=y
+CONFIG_DRM_I2C_ADV7533=y
CONFIG_DRM_HISI=y
CONFIG_ION_HISI=y
CONFIG_FB_ARMCLCD=y