summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPortisch <hugo.portisch@yahoo.de>2019-02-28 15:28:45 +0100
committerDongjin Kim <tobetter@gmail.com>2020-05-03 21:05:31 +0900
commitc23dee237cdd697af7f5e0c263a277d860a0525d (patch)
treec33f1ef2b2215ea8d48988bcaaa019606f3fcd88 /arch
parent94642644e8d50fe3f40b8f3806b2e743651d8ec1 (diff)
downloadu-boot-odroid-c1-c23dee237cdd697af7f5e0c263a277d860a0525d.tar.gz
BACKPORT: pwr_ctrl: enable and fix IR remote wakeup for g12a/b
Change-Id: I404a55bb7e09e1490772626cff7ff29ead2d64f5
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv8/g12a/firmware/scp_task/scp_remote.c7
-rw-r--r--arch/arm/cpu/armv8/g12b/firmware/scp_task/scp_remote.c7
2 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/cpu/armv8/g12a/firmware/scp_task/scp_remote.c b/arch/arm/cpu/armv8/g12a/firmware/scp_task/scp_remote.c
index aaf1015acc..ae36ba4219 100644
--- a/arch/arm/cpu/armv8/g12a/firmware/scp_task/scp_remote.c
+++ b/arch/arm/cpu/armv8/g12a/firmware/scp_task/scp_remote.c
@@ -334,7 +334,7 @@ unsigned bakeuAO_IR_DEC_LDR_REPEAT;
**
********************************************************************/
#if 1
-void backuremote_register(void)
+static void backup_remote_register(void)
{
backuAO_RTI_PIN_MUX_REG = readl(AO_RTI_PIN_MUX_REG);
backuAO_IR_DEC_REG0 = readl(AO_MF_IR_DEC_REG0);
@@ -345,7 +345,7 @@ void backuremote_register(void)
bakeuAO_IR_DEC_LDR_REPEAT = readl(AO_MF_IR_DEC_LDR_REPEAT);
}
-void resume_remote_register(void)
+static void restore_remote_register(void)
{
writel(backuAO_RTI_PIN_MUX_REG, AO_RTI_PIN_MUX_REG);
writel(backuAO_IR_DEC_REG0, AO_MF_IR_DEC_REG0);
@@ -398,11 +398,10 @@ static unsigned int kk[] = {
static int init_remote(void)
{
- return 0;
uart_put_hex(readl(AO_IR_DEC_STATUS), 32);
uart_put_hex(readl(AO_IR_DEC_FRAME), 32);
init_custom_trigger();
- //return 0;
+ return 0;
}
/*can be called in pwr_ctrl.c*/
diff --git a/arch/arm/cpu/armv8/g12b/firmware/scp_task/scp_remote.c b/arch/arm/cpu/armv8/g12b/firmware/scp_task/scp_remote.c
index aaf1015acc..ae36ba4219 100644
--- a/arch/arm/cpu/armv8/g12b/firmware/scp_task/scp_remote.c
+++ b/arch/arm/cpu/armv8/g12b/firmware/scp_task/scp_remote.c
@@ -334,7 +334,7 @@ unsigned bakeuAO_IR_DEC_LDR_REPEAT;
**
********************************************************************/
#if 1
-void backuremote_register(void)
+static void backup_remote_register(void)
{
backuAO_RTI_PIN_MUX_REG = readl(AO_RTI_PIN_MUX_REG);
backuAO_IR_DEC_REG0 = readl(AO_MF_IR_DEC_REG0);
@@ -345,7 +345,7 @@ void backuremote_register(void)
bakeuAO_IR_DEC_LDR_REPEAT = readl(AO_MF_IR_DEC_LDR_REPEAT);
}
-void resume_remote_register(void)
+static void restore_remote_register(void)
{
writel(backuAO_RTI_PIN_MUX_REG, AO_RTI_PIN_MUX_REG);
writel(backuAO_IR_DEC_REG0, AO_MF_IR_DEC_REG0);
@@ -398,11 +398,10 @@ static unsigned int kk[] = {
static int init_remote(void)
{
- return 0;
uart_put_hex(readl(AO_IR_DEC_STATUS), 32);
uart_put_hex(readl(AO_IR_DEC_FRAME), 32);
init_custom_trigger();
- //return 0;
+ return 0;
}
/*can be called in pwr_ctrl.c*/