summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/as3525
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2017-01-26 21:08:55 -0500
committerMichael Sevakis <jethead71@rockbox.org>2017-11-21 07:52:02 -0500
commitf4c42213062170ddfcc706b3c5ed19f47517c253 (patch)
tree65f8058970e97d939660cf1e39f844a06df66f84 /firmware/target/arm/as3525
parent12bc24adbf919dc945928b2dcda74d51d33708f7 (diff)
downloadrockbox-f4c42213062170ddfcc706b3c5ed19f47517c253.tar.gz
rockbox-f4c42213062170ddfcc706b3c5ed19f47517c253.tar.bz2
rockbox-f4c42213062170ddfcc706b3c5ed19f47517c253.zip
Convert i.MX31 and AMS target to use RTC interrupt
Instead of checking ticks, set a sticky dirty flag that indicates that the RTC needs to be read. This gives a timely update and more accurate readout without actually reading the RTC until it changes. The implementation should atomically read the flag and clear it. Setting the flag would typically happen in an RTC tick ISR. Change-Id: I6fd325f22845029a485c502c884812d3676026ea
Diffstat (limited to 'firmware/target/arm/as3525')
-rw-r--r--firmware/target/arm/as3525/ascodec-as3525.c35
-rw-r--r--firmware/target/arm/as3525/rtc-target.h27
2 files changed, 53 insertions, 9 deletions
diff --git a/firmware/target/arm/as3525/ascodec-as3525.c b/firmware/target/arm/as3525/ascodec-as3525.c
index 1bd07c57b1..a8ad9706f8 100644
--- a/firmware/target/arm/as3525/ascodec-as3525.c
+++ b/firmware/target/arm/as3525/ascodec-as3525.c
@@ -131,6 +131,16 @@ static unsigned long ascodec_enrd0_shadow = 0;
static void ascodec_wait_cb(struct ascodec_request *req);
+/* RTC interrupt and status
+ * Caution: To avoid an extra variable, IRQ_RTC is used as a flag for
+ * ascodec_enrd0_shadow, which conflicts with RVDD_WASLOW, but we're not using
+ * that right now */
+#if CONFIG_RTC
+#define IFRTC_IRQ_RTC IRQ_RTC
+#else /* !CONFIG_RTC */
+#define IFRTC_IRQ_RTC 0
+#endif /* CONFIG_RTC */
+
/** --debugging help-- **/
#ifdef DEBUG
@@ -149,7 +159,6 @@ static struct int_audio_counters {
#define COUNT_INT(x) IFDEBUG((int_audio_counters.int_##x)++)
-
/** --stock request and callback functionality -- **/
/* init for common request data (call before submitting) */
@@ -510,13 +519,12 @@ static void ascodec_int_audio_cb(struct ascodec_request *req)
}
}
+#if CONFIG_RTC
if (data[2] & IRQ_RTC) { /* rtc irq */
- /*
- * Can be configured for once per second or once per minute,
- * default is once per second
- */
+ ascodec_enrd0_shadow |= IRQ_RTC;
COUNT_INT(rtc);
}
+#endif /* CONFIG_RTC */
if (data[2] & IRQ_ADC) { /* adc finished */
COUNT_INT(adc);
@@ -580,6 +588,14 @@ int ascodec_read_charger(void)
}
#endif /* CONFIG_CHARGING */
+#if CONFIG_RTC
+/* read sticky rtc dirty status */
+bool ascodec_rtc_dirty(void)
+{
+ return bitclr32(&ascodec_enrd0_shadow, IRQ_RTC) & IRQ_RTC;
+}
+#endif /* CONFIG_RTC */
+
/*
* NOTE:
* After the conversion to interrupts, ascodec_(lock|unlock) are only used by
@@ -635,8 +651,9 @@ void ascodec_init(void)
VIC_INT_ENABLE = INTERRUPT_I2C_AUDIO;
VIC_INT_ENABLE = INTERRUPT_AUDIO;
- /* detect if USB was connected at startup since there is no transition */
- ascodec_enrd0_shadow = ascodec_read(AS3514_IRQ_ENRD0);
+ /* detect if USB was connected at startup since there is no transition;
+ force an initial read of the clock (if CONFIG_RTC) */
+ ascodec_enrd0_shadow = ascodec_read(AS3514_IRQ_ENRD0) | IFRTC_IRQ_RTC;
if(ascodec_enrd0_shadow & USB_STATUS)
usb_insert_int();
@@ -651,10 +668,10 @@ void ascodec_init(void)
/* XIRQ = IRQ, active low reset signal, 6mA push-pull output */
ascodec_write_pmu(0x1a, 3, (1<<2)|3); /* 1A-3 = Out_Cntr3 register */
/* Generate irq on (rtc,) adc change */
- ascodec_write(AS3514_IRQ_ENRD2, /*IRQ_RTC |*/ IRQ_ADC);
+ ascodec_write(AS3514_IRQ_ENRD2, IFRTC_IRQ_RTC | IRQ_ADC);
#else
/* Generate irq for push-pull, active high, irq on rtc+adc change */
ascodec_write(AS3514_IRQ_ENRD2, IRQ_PUSHPULL | IRQ_HIGHACTIVE |
- /*IRQ_RTC |*/ IRQ_ADC);
+ IFRTC_IRQ_RTC | IRQ_ADC);
#endif
}
diff --git a/firmware/target/arm/as3525/rtc-target.h b/firmware/target/arm/as3525/rtc-target.h
new file mode 100644
index 0000000000..900aa357d0
--- /dev/null
+++ b/firmware/target/arm/as3525/rtc-target.h
@@ -0,0 +1,27 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2017 by Michael Sevakis
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef RTC_TARGET_H
+#define RTC_TARGET_H
+
+bool ascodec_rtc_dirty(void);
+#define rtc_dirty ascodec_rtc_dirty
+
+#endif /* RTC_TARGET_H */