diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_enableclks.c b/arch/arm/src/tiva/cc13xx/cc13xx_enableclks.c index ea2ed5eccb2..fb6567ee530 100644 --- a/arch/arm/src/tiva/cc13xx/cc13xx_enableclks.c +++ b/arch/arm/src/tiva/cc13xx/cc13xx_enableclks.c @@ -48,10 +48,6 @@ #include "hardware/tiva_prcm.h" #include "tiva_enableclks.h" -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c b/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c index cf3a20127a4..ed77ce29d1f 100644 --- a/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c +++ b/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c @@ -71,9 +71,10 @@ static const uintptr_t g_rcgcr_base[PRCM_NPERIPH] = TIVA_PRCM_I2CCLKGR, /* Index 3 */ TIVA_PRCM_SECDMACLKGR, /* Index 4 */ TIVA_PRCM_GPIOCLKGR, /* Index 5 */ - TIVA_PRCM_I2CCLKGR /* Index 6 */ + TIVA_PRCM_I2SCLKGR /* Index 6 */ }; - +#define PRCM_PERIPH_GPIO _PRCM_PERIPH(13, 1, 5, PRCM_GPIOCLKG_CLKEN_SHIFT) +#define PRCM_PERIPH_I2S _PRCM_PERIPH(14, 1, 6, PRCM_I2SCLKG_CLKEN_SHIFT) /* Sleep mode registers */ static const uintptr_t g_scgcr_base[PRCM_NPERIPH] = @@ -84,7 +85,7 @@ static const uintptr_t g_scgcr_base[PRCM_NPERIPH] = TIVA_PRCM_I2CCLKGS, /* Index 3 */ TIVA_PRCM_SECDMACLKGS, /* Index 4 */ TIVA_PRCM_GPIOCLKGS, /* Index 5 */ - TIVA_PRCM_I2CCLKGS /* Index 6 */ + TIVA_PRCM_I2SCLKGS /* Index 6 */ }; /* Deep sleep mode registers */ @@ -97,7 +98,7 @@ static const uintptr_t g_dcgcr_base[PRCM_NPERIPH] = TIVA_PRCM_I2CCLKGDS, /* Index 3 */ TIVA_PRCM_SECDMACLKGDS, /* Index 4 */ TIVA_PRCM_GPIOCLKGDS, /* Index 5 */ - TIVA_PRCM_I2CCLKGDS /* Index 6 */ + TIVA_PRCM_I2SCLKGDS /* Index 6 */ }; /****************************************************************************** diff --git a/configs/launchxl-cc1310/README.txt b/configs/launchxl-cc1310/README.txt index 7d1b0bef86e..1ccf2f8265e 100644 --- a/configs/launchxl-cc1310/README.txt +++ b/configs/launchxl-cc1310/README.txt @@ -48,7 +48,7 @@ Using J-Link to the XDS110 Out / CC1310 In connector [RXD, TXD, RST, TMS, TCK, TDO, TDI, WDO]. After isolating the on-board probe, the CC130F128 device can be debugged using J-Link. Please note, that the J-Link needs to be connected - to the board using the CC1310 using the micro JTAG connector marked "In". + to the board using the CC1310 using the micro JTAG connector marked "In". The RXD/TXD can then be used for a Serial console using the appropriate TTL adapter (TTL to RS-232 or TTL to USB serial).