devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

i.MX31: Allow interrupts in thread context, not just ISR context, during the lengthy DVFS voltage ramp-up delay. Also, explicitly enable them just before mc13783_init since that does anyway because of the PMIC write inside it.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29116 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-01-22 21:04:25 +00:00
parent 6d2e7769e2
commit 0a98e8af9d
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
firmware/target/arm/imx31/dvfs_dptc-imx31.c
View file

@ -81,16 +81,19 @@ static inline void wait_for_dvfs_update_en(void)
while (!(CCM_PMCR0 & CCM_PMCR0_UPDTEN)); while (!(CCM_PMCR0 & CCM_PMCR0_UPDTEN));
} }
/* Do the actual frequency and DVFS pin change - always call with IRQ masked */
static void do_dvfs_update(unsigned int level, bool in_isr) static void do_dvfs_update(unsigned int level)
{ {
const struct dvfs_clock_table_entry *setting = &dvfs_clock_table[level]; const struct dvfs_clock_table_entry *setting = &dvfs_clock_table[level];
unsigned long pmcr0 = CCM_PMCR0; unsigned long pmcr0 = CCM_PMCR0;
int oldlevel;
if (pmcr0 & CCM_PMCR0_DPTEN) if (pmcr0 & CCM_PMCR0_DPTEN)
{ {
/* Ignore voltage change request from DPTC. Voltage is *not* valid. */ /* Ignore voltage change request from DPTC. Voltage is *not* valid. */
pmcr0 &= ~CCM_PMCR0_DPVCR; pmcr0 &= ~CCM_PMCR0_DPVCR;
/* Mask DPTC interrupt for when called in thread context */
pmcr0 |= CCM_PMCR0_PTVAIM;
} }
pmcr0 &= ~CCM_PMCR0_VSCNT; pmcr0 &= ~CCM_PMCR0_VSCNT;
@ -127,12 +130,9 @@ static void do_dvfs_update(unsigned int level, bool in_isr)
CCM_PMCR0 = pmcr0; CCM_PMCR0 = pmcr0;
/* Note: changes to frequency with ints unmaked seem to cause spurious /* Note: changes to frequency with ints unmaked seem to cause spurious
* DVFS interrupts with value CCM_PMCR0_FSVAI_NO_INT. These aren't * DVFS interrupts with value CCM_PMCR0_FSVAI_NO_INT. These aren't
* supposed to happen. Only do the lengthy delay with them enabled iff * supposed to happen. Only do the lengthy delay with them enabled. */
* called from the IRQ handler. */
if (in_isr)
enable_irq(); enable_irq();
udelay(100); /* Software wait for voltage ramp-up */ udelay(100); /* Software wait for voltage ramp-up */
if (in_isr)
disable_irq(); disable_irq();
CCM_PDR0 = setting->pdr_val; CCM_PDR0 = setting->pdr_val;
@ -150,9 +150,10 @@ static void do_dvfs_update(unsigned int level, bool in_isr)
if (pmcr0 & CCM_PMCR0_DPTEN) if (pmcr0 & CCM_PMCR0_DPTEN)
{ {
update_dptc_counts(level, dptc_wp); update_dptc_counts(level, dptc_wp);
/* Enable DPTC to request voltage changes. Voltage is valid. */ /* Enable DPTC to request voltage changes, unmask interrupt. */
CCM_PMCR0 |= CCM_PMCR0_DPVCR; CCM_PMCR0 = (CCM_PMCR0 & ~CCM_PMCR0_PTVAIM) | CCM_PMCR0_DPVCR;
udelay(2); udelay(2);
/* Voltage is valid. */
CCM_PMCR0 |= CCM_PMCR0_DPVV; CCM_PMCR0 |= CCM_PMCR0_DPVV;
} }
} }
@ -167,7 +168,7 @@ static void set_current_dvfs_level(unsigned int level)
wait_for_dvfs_update_en(); wait_for_dvfs_update_en();
do_dvfs_update(level, false); do_dvfs_update(level);
wait_for_dvfs_update_en(); wait_for_dvfs_update_en();
@ -231,7 +232,7 @@ static void __attribute__((used)) dvfs_int(void)
return; /* Do nothing. Freq change is not required */ return; /* Do nothing. Freq change is not required */
} /* end switch */ } /* end switch */
do_dvfs_update(level, true); do_dvfs_update(level);
} }
@ -370,7 +371,8 @@ static void dptc_transfer_done_callback(struct spi_transfer_desc *xfer)
} }
/* Handle the DPTC interrupt and sometimes the manual setting */ /* Handle the DPTC interrupt and sometimes the manual setting - always call
* with IRQ masked. */
static void dptc_int(unsigned long pmcr0) static void dptc_int(unsigned long pmcr0)
{ {
const union dvfs_dptc_voltage_table_entry *entry; const union dvfs_dptc_voltage_table_entry *entry;
@ -433,6 +435,8 @@ static void dptc_int(unsigned long pmcr0)
} }
/* Handle setting the working point explicitly - always call with IRQ
* masked */
static void dptc_new_wp(unsigned int wp) static void dptc_new_wp(unsigned int wp)
{ {
dptc_wp = wp; dptc_wp = wp;
@ -550,7 +554,7 @@ void dvfs_stop(void)
{ {
/* Set default frequency level */ /* Set default frequency level */
wait_for_dvfs_update_en(); wait_for_dvfs_update_en();
do_dvfs_update(DVFS_LEVEL_DEFAULT, false); do_dvfs_update(DVFS_LEVEL_DEFAULT);
wait_for_dvfs_update_en(); wait_for_dvfs_update_en();
} }

1
firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c
View file

@ -69,6 +69,7 @@ void INIT_ATTR kernel_device_init(void)
{ {
sdma_init(); sdma_init();
spi_init(); spi_init();
enable_interrupt(IRQ_FIQ_STATUS);
mc13783_init(); mc13783_init();
dvfs_dptc_init(); dvfs_dptc_init();
dvfs_wfi_monitor(true); /* Monitor the WFI signal */ dvfs_wfi_monitor(true); /* Monitor the WFI signal */