From 0dfee125d347237621889ad25db2eecfd66da6d9 Mon Sep 17 00:00:00 2001
From: Chris KIM <codewalker@hardkernel.com>
Date: Wed, 26 Jun 2019 13:52:01 +0900
Subject: [PATCH] ODROID-C4: Fix dts like odroidn2.

Change-Id: Ica2602ef558050e0ddcd2759b4ef71e53a5178f8
---
 .../dts/amlogic/meson64_odroidc4_android.dts  | 47 +++++++++++++++++--
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts
index 70b3f43675be..859c8c38c59e 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts
@@ -21,11 +21,6 @@
 	firmware {
 		android {
 			compatible = "android,firmware";
-			vbmeta {
-				compatible = "android,vbmeta";
-				parts = "boot,system,vendor";
-				by_name_prefix="/dev/block";
-			};
 			fstab {
 				compatible = "android,fstab";
 				system {
@@ -49,9 +44,51 @@
 					mnt_flags = "rw";
 					fsmgr_flags = "wait";
 				};
+				product {
+					compatible = "android,product";
+					dev = "/dev/block/product";
+					type = "ext4";
+					mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
+					fsmgr_flags = "wait";
+				};
 			};
 		};
 	};
+
+	odroid_sysfs {
+		compatible = "odroid-sysfs";
+		status = "okay";
+	};
+
+	gpio_keys_polled {
+		status = "disabled";
+		compatible =
+			"gpio-keys-polled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			poll-interval = <100>;
+			autorepeat;
+			button@1 {
+				label = "GPIO Key F7";
+				linux,code = <65>;
+				gpios = <&gpio GPIOX_3 1>;
+			};
+			button@2 {
+				label = "GPIO Key F8";
+				linux,code = <66>;
+				gpios = <&gpio GPIOX_4 1>;
+			};
+			button@3 {
+				label = "GPIO Key F9";
+				linux,code = <67>;
+				gpios = <&gpio GPIOX_7 1>;
+			};
+			button@4 {
+				label = "GPIO Key F10";
+				linux,code = <68>;
+				gpios = <&gpio GPIOX_8 1>;
+			};
+	};
 };
 
 &custom_maps {