Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sansa Connect: Disable USB clocks when disconnected.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31323 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomasz Moń 2011-12-16 11:20:38 +00:00
parent a47982eb60
commit a0b81bdbfc
4 changed files with 106 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c
View file

@ -230,7 +230,7 @@ static void spi_txrx(unsigned char *buf_tx, unsigned char *buf_rx, int n)
IO_SERIAL1_TX_DATA = buf_tx[i];
/* a short wait for AVR to process data */
sleep(HZ/1000);
sleep(0);
do
{
@ -407,13 +407,9 @@ void GIO0(void)
queue_post(&btn_queue, BTN_INTERRUPT, 0);
}
void GIO2(void) __attribute__ ((section(".icode")));
void GIO2(void)
static int headphones_inserted_callback(struct timeout *tmo)
{
/* Clear interrupt */
IO_INTC_IRQ1 = (1 << 7);
/* Disable interrupt */
IO_INTC_EINT1 &= ~INTR_EINT1_EXT2;
(void)tmo;
if (IO_GIO_BITSET0 & 0x04)
{
@ -424,7 +420,19 @@ void GIO2(void)
aic3x_switch_output(true);
}
IO_INTC_EINT1 |= INTR_EINT1_EXT2;
return 0;
}
void GIO2(void) __attribute__ ((section(".icode")));
void GIO2(void)
{
static struct timeout headphones_oneshot;
/* Clear interrupt */
IO_INTC_IRQ1 = (1 << 7);
timeout_register(&headphones_oneshot, headphones_inserted_callback,
HZ/2, 0);
}
#endif

6
firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c
View file

@ -89,13 +89,11 @@ void lcd_init_device(void)
/* Disable Video Encoder clock */
bitclr16(&IO_CLK_MOD1, CLK_MOD1_VENC);
/* configure GIO39, GIO34 and GIO33 as outputs */
IO_GIO_DIR2 &= ~((1 << 7) /* GIO39 */ | (1 << 2) /* GIO34 */ |
(1 << 1) /* GIO33 */);
/* configure GIO39, GIO34 as outputs */
IO_GIO_DIR2 &= ~((1 << 7) /* GIO39 */ | (1 << 2) /* GIO34 */);
IO_GIO_FSEL3 = (IO_GIO_FSEL3 & ~(0x300F)) |
(0x1000) /* GIO39 - FIELD_VENC */ |
(0x3) /* GIO33 - CLKOUT1B (bootloader does this) */ |
(0x4); /* GIO34 - PWM1 (brightness control) */
/* OSD Clock = VENC Clock /2,

91
firmware/target/arm/tms320dm320/sansa-connect/usb-sansaconnect.c
View file

@ -28,6 +28,60 @@
#include "usb_core.h"
#endif
static bool usb_is_connected = false;
static int usb_detect_callback(struct timeout *tmo)
{
(void)tmo;
if (IO_GIO_BITSET0 & (1 << 9))
{
/* Set GIO33 as normal output, drive it low */
IO_GIO_FSEL3 &= ~(0x0003);
IO_GIO_BITCLR2 = (1 << 1);
/* Disable M48XI crystal resonator */
IO_CLK_LPCTL1 |= 0x01;
/* Drive reset low */
IO_GIO_BITCLR0 = (1 << 7);
/* Disable VLYNQ clock */
IO_CLK_MOD2 &= ~(1 << 13);
usb_is_connected = false;
}
else
{
/* Enable M48XI crystal resonator */
IO_CLK_LPCTL1 &= ~(0x01);
/* Set GIO33 as CLKOUT1B */
IO_GIO_FSEL3 |= 0x0003;
/* Drive reset high */
IO_GIO_BITSET0 = (1 << 7);
/* Enable VLYNQ clock */
IO_CLK_MOD2 |= (1 << 13);
usb_is_connected = true;
}
return 0;
}
void GIO9(void) __attribute__ ((section(".icode")));
void GIO9(void)
{
static struct timeout usb_oneshot;
/* Clear interrupt */
IO_INTC_IRQ1 = (1 << 14);
timeout_register(&usb_oneshot, usb_detect_callback, HZ, 0);
}
bool usb_drv_connected(void)
{
return false;
@ -35,20 +89,47 @@ bool usb_drv_connected(void)
int usb_detect(void)
{
if (usb_is_connected == true)
{
return USB_INSERTED;
}
else
{
return USB_EXTRACTED;
}
}
void usb_init_device(void)
{
/* set TNETV USB nreset high */
IO_GIO_DIR0 &= ~(1 << 7);
IO_GIO_BITSET0 = (1 << 7);
/* set VLYNQ port functions */
IO_GIO_FSEL1 = 0xAAAA;
IO_GIO_FSEL2 = (IO_GIO_FSEL2 & 0xFFF0) | 0xA;
return;
/* set GIO7 as output (TNETV reset) */
/* set GIO9 as input (USB inserted indicator) */
IO_GIO_INV0 &= ~((1 << 7) | (1 << 9));
IO_GIO_DIR0 = (IO_GIO_DIR0 & ~(1 << 7)) | (1 << 9);
/* Enable interrupt on GIO9 change (any edge) */
IO_GIO_IRQPORT |= (1 << 9);
IO_GIO_IRQEDGE |= (1 << 9);
/* set GIO33 as output (TNETV clock) */
IO_GIO_DIR2 &= ~(1 << 1);
IO_GIO_INV2 &= ~(1 << 1);
/* use M48XI clock on GIO33 */
IO_CLK_OSEL = (IO_CLK_OSEL & 0xF0F) | 0x50;
/* Powerdown internal USB */
IO_CLK_LPCTL1 = 0x11;
/* Disable internal USB clock */
IO_CLK_MOD2 &= ~(1 << 6);
/* Enable USB insert detection interrupt */
IO_INTC_EINT1 |= (1 << 14);
/* Check if USB is connected */
usb_detect_callback(NULL);
}
void usb_enable(bool on)

2
firmware/target/arm/tms320dm320/sdmmc-dm320.c
View file

@ -893,7 +893,7 @@ int sd_init(void)
/* mmc module clock: 75 Mhz (AHB) / 2 = ~37.5 Mhz
* (Frequencies above are taken from Sansa Connect's OF source code) */
IO_CLK_DIV3 = (IO_CLK_DIV3 & 0xFF00) | 0x01;
IO_CLK_DIV3 = (IO_CLK_DIV3 & 0xFF00) | 0x02; /* OF uses 1 */
bitset16(&IO_CLK_MOD2, CLK_MOD2_MMC);