summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoy Cho <joy.cho@hardkernel.com>2020-03-25 11:28:34 +0300
committerJoy Cho <joy.cho@hardkernel.com>2020-03-25 11:46:01 +0300
commita2f9a0a9d67e799fc5a81f7932d612f43bff7b92 (patch)
tree4e78cb455c738e2cc3e6b3b41c97c72ef942a2bc
parent29ea56d0a928731b3ac158d80f7fe15667d24e3e (diff)
downloadu-boot-a2f9a0a9d67e799fc5a81f7932d612f43bff7b92.tar.xz
board: odroid-goA: Update gpio btn sw20/sw21 configuration
Change-Id: Idafa9b588d49ae2cd0e808b3fbcc7cdccbb49cd2
-rw-r--r--arch/arm/dts/odroidgo2-kernel-v11.dts8
-rw-r--r--board/rockchip/odroidgo2/odroidgo2.c1
-rw-r--r--cmd/odroidtest.h4
3 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/dts/odroidgo2-kernel-v11.dts b/arch/arm/dts/odroidgo2-kernel-v11.dts
index c6f7412e90..17824074af 100644
--- a/arch/arm/dts/odroidgo2-kernel-v11.dts
+++ b/arch/arm/dts/odroidgo2-kernel-v11.dts
@@ -120,13 +120,13 @@
};
sw20 {
gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
- label = "GPIO TOP-RIGHT2";
- linux,code = <BTN_TR2>;
+ label = "GPIO TOP-LEFT2";
+ linux,code = <BTN_TL2>;
};
sw21 {
gpios = <&gpio3 RK_PB2 GPIO_ACTIVE_LOW>;
- label = "GPIO TOP-LEFT2";
- linux,code = <BTN_TL2>;
+ label = "GPIO TOP-RIGHT2";
+ linux,code = <BTN_TR2>;
};
};
diff --git a/board/rockchip/odroidgo2/odroidgo2.c b/board/rockchip/odroidgo2/odroidgo2.c
index 86dcffdc12..62f997e459 100644
--- a/board/rockchip/odroidgo2/odroidgo2.c
+++ b/board/rockchip/odroidgo2/odroidgo2.c
@@ -109,6 +109,7 @@ void board_init_switch_gpio(void)
rk_clrsetreg(&grf->gpio1b_p, 0xff00, 0x5500);
rk_clrsetreg(&grf->gpio1a_p, 0xfcc0, 0x5440);
rk_clrsetreg(&grf->gpio2a_p, 0xffff, 0x5555);
+ rk_clrsetreg(&grf->gpio3b_p, 0xC030, 0x4010);
}
void board_check_mandatory_files(void)
diff --git a/cmd/odroidtest.h b/cmd/odroidtest.h
index 1558beb777..dd926228b8 100644
--- a/cmd/odroidtest.h
+++ b/cmd/odroidtest.h
@@ -42,8 +42,8 @@ struct key_arrays gpiokeys[NUMGPIOKEYS] = {
{"[sw14]", BTN_TRIGGER_HAPPY6, 384, 15, 0},
{"[sw15]", BTN_TL, 48, 5, 0},
{"[sw16]", BTN_TR, 384, 5, 0},
- {"[sw20]", BTN_TR2, 384, 3, 0},
- {"[sw21]", BTN_TL2, 48, 3, 0},
+ {"[sw20]", BTN_TL2, 48, 3, 0},
+ {"[sw21]", BTN_TR2, 384, 3, 0},
};
struct key_arrays adckeys[4] = {