Skip to content

Commit

Permalink
arch: arm: soc: cc2650: Remove dead code.
Browse files Browse the repository at this point in the history
Remove the dead code that was guarded by previously removed
Kconfig symbols for the sensortag board.

With b028a51,
this fixes #7873

Signed-off-by: Gil Pitney <gil.pitney@linaro.org>
  • Loading branch information
Gil Pitney authored and nashif committed May 31, 2018
1 parent 9a7538b commit ec7d483
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions arch/arm/soc/ti_simplelink/cc2650/soc.c
Expand Up @@ -66,11 +66,6 @@ ti_ccfg[CCFG_SIZE / sizeof(u32_t)] = {
static const u32_t clkloadctl =
REG_ADDR(TI_CC2650_PRCM_40082000_BASE_ADDRESS,
CC2650_PRCM_CLKLOADCTL);
#ifdef CONFIG_CC2650_TRNG_ENTROPY_GENERATOR
static const u32_t secdmaclkgr =
REG_ADDR(TI_CC2650_PRCM_40082000_BASE_ADDRESS,
CC2650_PRCM_SECDMACLKGR);
#endif
static const u32_t gpioclkgr =
REG_ADDR(TI_CC2650_PRCM_40082000_BASE_ADDRESS,
CC2650_PRCM_GPIOCLKGR);
Expand All @@ -90,11 +85,10 @@ static const u32_t uartclkgr =
static void setup_modules_prcm(void)
{
#if defined(CONFIG_GPIO_CC2650) || \
defined(CONFIG_CC2650_TRNG_ENTROPY_GENERATOR) || \
defined(CONFIG_SERIAL)

/* Setup power */
#if defined(CONFIG_GPIO_CC2650) || defined(CONFIG_CC2650_TRNG_ENTROPY_GENERATOR)
#if defined(CONFIG_GPIO_CC2650)
sys_set_bit(pdctl0, CC2650_PRCM_PDCTL0_PERIPH_ON_POS);
#endif
#ifdef CONFIG_SERIAL
Expand All @@ -105,9 +99,6 @@ static void setup_modules_prcm(void)
#ifdef CONFIG_GPIO_CC2650
sys_set_bit(gpioclkgr, CC2650_PRCM_GPIOCLKGR_CLK_EN_POS);
#endif
#ifdef CONFIG_CC2650_TRNG_ENTROPY_GENERATOR
sys_set_bit(secdmaclkgr, CC2650_PRCM_SECDMACLKGR_TRNG_CLK_EN_POS);
#endif
#ifdef CONFIG_SERIAL
sys_set_bit(uartclkgr, CC2650_PRCM_UARTCLKGR_CLK_EN_POS);
#endif
Expand All @@ -117,7 +108,7 @@ static void setup_modules_prcm(void)
/* Wait for power to be completely on, to avoid bus faults
* when accessing modules' registers.
*/
#if defined(CONFIG_GPIO_CC2650) || defined(CONFIG_CC2650_TRNG_ENTROPY_GENERATOR)
#if defined(CONFIG_GPIO_CC2650)
while (!(sys_read32(pdstat0) &
BIT(CC2650_PRCM_PDSTAT0_PERIPH_ON_POS))) {
continue;
Expand Down

0 comments on commit ec7d483

Please sign in to comment.