From ea3b5e6a3ca53701e0b542b28fd8e5ef12fa9ba6 Mon Sep 17 00:00:00 2001
From: Luke go <sangch.go@gmail.com>
Date: Thu, 3 Sep 2020 11:45:04 +0900
Subject: [PATCH] ODROID-COMMON: arm64/dts: Changed the default gpio-key
 mapping.

- To avoid conflicts with the default gpio-power key pin and the SPI
  pin, default shortcut pin maps are changed.

Change-Id: If857eafc1e9df101357203ad61ea6ea81b11b571
---
 arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts | 8 ++++----
 arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts
index 859c8c38c59e..118334be6d51 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts
@@ -71,22 +71,22 @@
 			button@1 {
 				label = "GPIO Key F7";
 				linux,code = <65>;
-				gpios = <&gpio GPIOX_3 1>;
+				gpios = <&gpio GPIOX_4 1>;
 			};
 			button@2 {
 				label = "GPIO Key F8";
 				linux,code = <66>;
-				gpios = <&gpio GPIOX_4 1>;
+				gpios = <&gpio GPIOX_7 1>;
 			};
 			button@3 {
 				label = "GPIO Key F9";
 				linux,code = <67>;
-				gpios = <&gpio GPIOX_7 1>;
+				gpios = <&gpio GPIOX_0 1>;
 			};
 			button@4 {
 				label = "GPIO Key F10";
 				linux,code = <68>;
-				gpios = <&gpio GPIOX_8 1>;
+				gpios = <&gpio GPIOX_1 1>;
 			};
 	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts
index a1a22f4714cc..9f8b7835f043 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts
@@ -71,22 +71,22 @@
 			button@1 {
 				label = "GPIO Key F7";
 				linux,code = <65>;
-				gpios = <&gpio GPIOX_3 1>;
+				gpios = <&gpio GPIOX_4 1>;
 			};
 			button@2 {
 				label = "GPIO Key F8";
 				linux,code = <66>;
-				gpios = <&gpio GPIOX_4 1>;
+				gpios = <&gpio GPIOX_7 1>;
 			};
 			button@3 {
 				label = "GPIO Key F9";
 				linux,code = <67>;
-				gpios = <&gpio GPIOX_7 1>;
+				gpios = <&gpio GPIOX_0 1>;
 			};
 			button@4 {
 				label = "GPIO Key F10";
 				linux,code = <68>;
-				gpios = <&gpio GPIOX_8 1>;
+				gpios = <&gpio GPIOX_1 1>;
 			};
 	};
 };