ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #103 from 0xc0170/dev_kl46z 

Dev kl46z
pull/104/head
Emilio Monti 2013-11-05 13:37:06 -08:00
parent 17bdeb4924 f4591dbbab
commit 887fd2ba3a
6 changed files with 1964 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2107
libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL46Z/MKL46Z4.h
View File

File diff suppressed because it is too large Load Diff

46
libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL46Z/system_MKL46Z4.c
View File

@ -1,37 +1,43 @@
/* /*
** ################################################################### ** ###################################################################
** Processor: MKL46Z128VLK4 ** Processors: MKL46Z256VLH4
** MKL46Z128VLH4
** MKL46Z256VLL4
** MKL46Z128VLL4
** MKL46Z256VMC4
** MKL46Z128VMC4
**
** Compilers: ARM Compiler ** Compilers: ARM Compiler
** Freescale C/C++ for Embedded ARM ** Freescale C/C++ for Embedded ARM
** GNU C Compiler ** GNU C Compiler
** IAR ANSI C/C++ Compiler for ARM ** IAR ANSI C/C++ Compiler for ARM
** **
** Reference manual: KL25RM, Rev.1, Jun 2012 ** Reference manual: KL46P121M48SF4RM, Rev.1 Draft A, Aug 2012
** Version: rev. 1.1, 2012-06-21 ** Version: rev. 2.0, 2012-12-12
** **
** Abstract: ** Abstract:
** Provides a system configuration function and a global variable that ** Provides a system configuration function and a global variable that
** contains the system frequency. It configures the device and initializes ** contains the system frequency. It configures the device and initializes
** the oscillator (PLL) that is part of the microcontroller device. ** the oscillator (PLL) that is part of the microcontroller device.
** **
** Copyright: 2012 Freescale Semiconductor, Inc. All Rights Reserved. ** Copyright: 2012 Freescale, Inc. All Rights Reserved.
** **
** http: www.freescale.com ** http: www.freescale.com
** mail: support@freescale.com ** mail: support@freescale.com
** **
** Revisions: ** Revisions:
** - rev. 1.0 (2012-06-13) ** - rev. 1.0 (2012-10-16)
** Initial version. ** Initial version.
** - rev. 1.1 (2012-06-21) ** - rev. 2.0 (2012-12-12)
** Update according to reference manual rev. 1. ** Update to reference manual rev. 1.
** **
** ################################################################### ** ###################################################################
*/ */
/** /**
* @file MKL46Z4 * @file MKL46Z4
* @version 1.1 * @version 2.0
* @date 2012-06-21 * @date 2012-12-12
* @brief Device specific configuration file for MKL46Z4 (implementation file) * @brief Device specific configuration file for MKL46Z4 (implementation file)
* *
* Provides a system configuration function and a global variable that contains * Provides a system configuration function and a global variable that contains
@ -100,8 +106,8 @@ void SystemInit (void) {
/* Switch to FEI Mode */ /* Switch to FEI Mode */
/* MCG->C1: CLKS=0,FRDIV=0,IREFS=1,IRCLKEN=1,IREFSTEN=0 */ /* MCG->C1: CLKS=0,FRDIV=0,IREFS=1,IRCLKEN=1,IREFSTEN=0 */
MCG->C1 = (uint8_t)0x06U; MCG->C1 = (uint8_t)0x06U;
/* MCG_C2: LOCRE0=0,??=0,RANGE0=0,HGO0=0,EREFS0=0,LP=0,IRCS=0 */ /* MCG_C2: LOCRE0=0,RANGE0=0,HGO0=0,EREFS0=0,LP=0,IRCS=0 */
MCG->C2 = (uint8_t)0x00U; MCG->C2 &= (uint8_t)~(uint8_t)0xBFU;
/* MCG->C4: DMX32=0,DRST_DRS=1 */ /* MCG->C4: DMX32=0,DRST_DRS=1 */
MCG->C4 = (uint8_t)((MCG->C4 & (uint8_t)~(uint8_t)0xC0U) | (uint8_t)0x20U); MCG->C4 = (uint8_t)((MCG->C4 & (uint8_t)~(uint8_t)0xC0U) | (uint8_t)0x20U);
/* OSC0->CR: ERCLKEN=1,??=0,EREFSTEN=0,??=0,SC2P=0,SC4P=0,SC8P=0,SC16P=0 */ /* OSC0->CR: ERCLKEN=1,??=0,EREFSTEN=0,??=0,SC2P=0,SC4P=0,SC8P=0,SC16P=0 */
@ -124,11 +130,11 @@ void SystemInit (void) {
/* PORTA->PCR19: ISF=0,MUX=0 */ /* PORTA->PCR19: ISF=0,MUX=0 */
PORTA->PCR[19] &= (uint32_t)~0x01000700UL; PORTA->PCR[19] &= (uint32_t)~0x01000700UL;
/* Switch to FBE Mode */ /* Switch to FBE Mode */
/* OSC0->CR: ERCLKEN=1,??=0,EREFSTEN=0,??=0,SC2P=1,SC4P=0,SC8P=0,SC16P=1 */ /* MCG_C2: LOCRE0=0,RANGE0=2,HGO0=0,EREFS0=1,LP=0,IRCS=0 */
OSC0->CR = (uint8_t)0x89U; MCG->C2 = (uint8_t)((MCG->C2 & (uint8_t)~(uint8_t)0x9BU) | (uint8_t)0x24U);
/* MCG->C2: LOCRE0=0,??=0,RANGE0=2,HGO0=0,EREFS0=1,LP=0,IRCS=0 */ /* OSC0->CR: ERCLKEN=1,??=0,EREFSTEN=0,??=0,SC2P=1,SC4P=0,SC8P=0,SC16P=0 */
MCG->C2 = (uint8_t)0x24U; OSC0->CR = (uint8_t)0x80U;
/* MCG->C1: CLKS=2,FRDIV=3,IREFS=0,IRCLKEN=1,IREFSTEN=0 */ /* MCG_C1: CLKS=2,FRDIV=3,IREFS=0,IRCLKEN=1,IREFSTEN=0 */
MCG->C1 = (uint8_t)0x9AU; MCG->C1 = (uint8_t)0x9AU;
/* MCG->C4: DMX32=0,DRST_DRS=0 */ /* MCG->C4: DMX32=0,DRST_DRS=0 */
MCG->C4 &= (uint8_t)~(uint8_t)0xE0U; MCG->C4 &= (uint8_t)~(uint8_t)0xE0U;
@ -162,10 +168,10 @@ void SystemInit (void) {
/* PORTA->PCR19: ISF=0,MUX=0 */ /* PORTA->PCR19: ISF=0,MUX=0 */
PORTA->PCR[19] &= (uint32_t)~0x01000700UL; PORTA->PCR[19] &= (uint32_t)~0x01000700UL;
/* Switch to FBE Mode */ /* Switch to FBE Mode */
/* OSC0->CR: ERCLKEN=1,??=0,EREFSTEN=0,??=0,SC2P=1,SC4P=0,SC8P=0,SC16P=1 */
OSC0->CR = (uint8_t)0x89U;
/* MCG->C2: LOCRE0=0,??=0,RANGE0=2,HGO0=0,EREFS0=1,LP=0,IRCS=0 */ /* MCG->C2: LOCRE0=0,??=0,RANGE0=2,HGO0=0,EREFS0=1,LP=0,IRCS=0 */
MCG->C2 = (uint8_t)0x24U; MCG->C2 = (uint8_t)0x24U;
/* OSC0->CR: ERCLKEN=1,??=0,EREFSTEN=0,??=0,SC2P=1,SC4P=0,SC8P=0,SC16P=0 */
OSC0->CR = (uint8_t)0x80U;
/* MCG->C1: CLKS=2,FRDIV=3,IREFS=0,IRCLKEN=1,IREFSTEN=0 */ /* MCG->C1: CLKS=2,FRDIV=3,IREFS=0,IRCLKEN=1,IREFSTEN=0 */
MCG->C1 = (uint8_t)0x9AU; MCG->C1 = (uint8_t)0x9AU;
/* MCG->C4: DMX32=0,DRST_DRS=0 */ /* MCG->C4: DMX32=0,DRST_DRS=0 */
@ -179,8 +185,8 @@ void SystemInit (void) {
while((MCG->S & 0x0CU) != 0x08U) { /* Wait until external reference clock is selected as MCG output */ while((MCG->S & 0x0CU) != 0x08U) { /* Wait until external reference clock is selected as MCG output */
} }
/* Switch to BLPE Mode */ /* Switch to BLPE Mode */
/* MCG->C2: LOCRE0=0,??=0,RANGE0=2,HGO0=0,EREFS0=1,LP=1,IRCS=0 */ /* MCG_C2: LOCRE0=0,RANGE0=2,HGO0=0,EREFS0=1,LP=1,IRCS=0 */
MCG->C2 = (uint8_t)0x26U; MCG->C2 = (uint8_t)((MCG->C2 & (uint8_t)~(uint8_t)0x99U) | (uint8_t)0x26U);
while((MCG->S & 0x0CU) != 0x08U) { /* Wait until external reference clock is selected as MCG output */ while((MCG->S & 0x0CU) != 0x08U) { /* Wait until external reference clock is selected as MCG output */
} }
#endif /* (CLOCK_SETUP == 2) */ #endif /* (CLOCK_SETUP == 2) */

24
libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL46Z/system_MKL46Z4.h
View File

@ -1,37 +1,43 @@
/* /*
** ################################################################### ** ###################################################################
** Processor: MKL46Z128VLK4 ** Processors: MKL46Z256VLH4
** MKL46Z128VLH4
** MKL46Z256VLL4
** MKL46Z128VLL4
** MKL46Z256VMC4
** MKL46Z128VMC4
**
** Compilers: ARM Compiler ** Compilers: ARM Compiler
** Freescale C/C++ for Embedded ARM ** Freescale C/C++ for Embedded ARM
** GNU C Compiler ** GNU C Compiler
** IAR ANSI C/C++ Compiler for ARM ** IAR ANSI C/C++ Compiler for ARM
** **
** Reference manual: KL25RM, Rev.1, Jun 2012 ** Reference manual: KL46P121M48SF4RM, Rev.1 Draft A, Aug 2012
** Version: rev. 1.1, 2012-06-21 ** Version: rev. 2.0, 2012-12-12
** **
** Abstract: ** Abstract:
** Provides a system configuration function and a global variable that ** Provides a system configuration function and a global variable that
** contains the system frequency. It configures the device and initializes ** contains the system frequency. It configures the device and initializes
** the oscillator (PLL) that is part of the microcontroller device. ** the oscillator (PLL) that is part of the microcontroller device.
** **
** Copyright: 2012 Freescale Semiconductor, Inc. All Rights Reserved. ** Copyright: 2012 Freescale, Inc. All Rights Reserved.
** **
** http: www.freescale.com ** http: www.freescale.com
** mail: support@freescale.com ** mail: support@freescale.com
** **
** Revisions: ** Revisions:
** - rev. 1.0 (2012-06-13) ** - rev. 1.0 (2012-10-16)
** Initial version. ** Initial version.
** - rev. 1.1 (2012-06-21) ** - rev. 2.0 (2012-12-12)
** Update according to reference manual rev. 1. ** Update to reference manual rev. 1.
** **
** ################################################################### ** ###################################################################
*/ */
/** /**
* @file MKL46Z4 * @file MKL46Z4
* @version 1.1 * @version 2.0
* @date 2012-06-21 * @date 2012-12-12
* @brief Device specific configuration file for MKL46Z4 (header file) * @brief Device specific configuration file for MKL46Z4 (header file)
* *
* Provides a system configuration function and a global variable that contains * Provides a system configuration function and a global variable that contains

2
libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL46Z/objects.h
View File

@ -46,7 +46,7 @@ struct pwmout_s {
}; };
struct serial_s { struct serial_s {
UARTLP_Type *uart; UART0_Type *uart;
int index; int index;
}; };

6
libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL46Z/serial_api.c
View File

@ -71,7 +71,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) {
error("Serial pinout mapping failed"); error("Serial pinout mapping failed");
} }
obj->uart = (UARTLP_Type *)uart; obj->uart = (UART0_Type *)uart;
// enable clk // enable clk
switch (uart) { switch (uart) {
case UART_0: SIM->SOPT2 |= SIM_SOPT2_PLLFLLSEL_MASK | (1<<SIM_SOPT2_UART0SRC_SHIFT); case UART_0: SIM->SOPT2 |= SIM_SOPT2_PLLFLLSEL_MASK | (1<<SIM_SOPT2_UART0SRC_SHIFT);
@ -200,8 +200,8 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
// enable 10bit mode if needed // enable 10bit mode if needed
if (obj->index == 0) { if (obj->index == 0) {
obj->uart->C4 &= ~UARTLP_C4_M10_MASK; obj->uart->C4 &= ~UART0_C4_M10_MASK;
obj->uart->C4 |= (m10 << UARTLP_C4_M10_SHIFT); obj->uart->C4 |= (m10 << UART0_C4_M10_SHIFT);
} }
// stop bits // stop bits

56
libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL46Z/spi_api.c
View File

@ -96,7 +96,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
// enable power and clocking // enable power and clocking
switch ((int)obj->spi) { switch ((int)obj->spi) {
case SPI_0: SIM->SCGC5 |= 1 << 11; SIM->SCGC4 |= 1 << 22; break; case SPI_0: SIM->SCGC5 |= 1 << 13; SIM->SCGC4 |= 1 << 22; break;
case SPI_1: SIM->SCGC5 |= 1 << 13; SIM->SCGC4 |= 1 << 23; break; case SPI_1: SIM->SCGC5 |= 1 << 13; SIM->SCGC4 |= 1 << 23; break;
} }
@ -110,6 +110,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
// enable SPI // enable SPI
obj->spi->C1 |= SPI_C1_SPE_MASK; obj->spi->C1 |= SPI_C1_SPE_MASK;
obj->spi->C2 &= ~SPI_C2_SPIMODE_MASK; //8bit
// pin out the spi pins // pin out the spi pins
pinmap_pinout(mosi, PinMap_SPI_MOSI); pinmap_pinout(mosi, PinMap_SPI_MOSI);
@ -124,8 +125,8 @@ void spi_free(spi_t *obj) {
// [TODO] // [TODO]
} }
void spi_format(spi_t *obj, int bits, int mode, int slave) { void spi_format(spi_t *obj, int bits, int mode, int slave) {
if (bits != 8) { if ((bits != 8) && (bits != 16)) {
error("Only 8bits SPI supported"); error("Only 8/16 bits SPI supported");
} }
if ((mode < 0) || (mode > 3)) { if ((mode < 0) || (mode > 3)) {
@ -141,6 +142,11 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {
// write new value // write new value
obj->spi->C1 |= c1_data; obj->spi->C1 |= c1_data;
if (bits == 8) {
obj->spi->C2 &= ~SPI_C2_SPIMODE_MASK;
} else {
obj->spi->C2 |= SPI_C2_SPIMODE_MASK;
}
} }
void spi_frequency(spi_t *obj, int hz) { void spi_frequency(spi_t *obj, int hz) {
@ -184,13 +190,28 @@ static inline int spi_readable(spi_t * obj) {
} }
int spi_master_write(spi_t *obj, int value) { int spi_master_write(spi_t *obj, int value) {
// wait tx buffer empty int ret;
while(!spi_writeable(obj)); if (obj->spi->C2 & SPI_C2_SPIMODE_MASK) {
obj->spi->D = (value & 0xff); // 16bit
while(!spi_writeable(obj));
obj->spi->DL = (value & 0xff);
obj->spi->DH = ((value >> 8) & 0xff);
// wait rx buffer full // wait rx buffer full
while (!spi_readable(obj)); while (!spi_readable(obj));
return obj->spi->D & 0xff; ret = obj->spi->DH;
ret = (ret << 8) | obj->spi->DL;
} else {
//8bit
while(!spi_writeable(obj));
obj->spi->DL = (value & 0xff);
// wait rx buffer full
while (!spi_readable(obj));
ret = (obj->spi->DL & 0xff);
}
return ret;
} }
int spi_slave_receive(spi_t *obj) { int spi_slave_receive(spi_t *obj) {
@ -198,10 +219,23 @@ int spi_slave_receive(spi_t *obj) {
} }
int spi_slave_read(spi_t *obj) { int spi_slave_read(spi_t *obj) {
return obj->spi->D; int ret;
if (obj->spi->C2 & SPI_C2_SPIMODE_MASK) {
ret = obj->spi->DH;
ret = ((ret << 8) | obj->spi->DL);
} else {
ret = obj->spi->DL;
}
return ret;
} }
void spi_slave_write(spi_t *obj, int value) { void spi_slave_write(spi_t *obj, int value) {
while (!spi_writeable(obj)); while (!spi_writeable(obj));
obj->spi->D = value; if (obj->spi->C2 & SPI_C2_SPIMODE_MASK) {
obj->spi->DL = (value & 0xff);
obj->spi->DH = ((value >> 8) & 0xff);
} else {
obj->spi->DL = value;
}
} }