STM32 PM update

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4908 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-07-04 23:19:59 +00:00
parent 8c9d2a06c4
commit d3bd7367a6
10 changed files with 1989 additions and 18 deletions
+13 -1
View File
@@ -65,7 +65,19 @@ ifneq ($(CONFIG_IDLE_CUSTOM),y)
CHIP_CSRCS += lpc43_idle.c
endif
ifneq ($(CONFIG_DEBUG),y)
ifeq ($(CONFIG_DEBUG),y)
CHIP_CSRCS += lpc43_debug.c
endif
ifeq ($(CONFIG_LPC43_SPI),y)
CHIP_CSRCS += lpc43_spi.c
endif
ifeq ($(CONFIG_LPC43_SSP0),y)
CHIP_CSRCS += lpc43_ssp.c
else
ifeq ($(CONFIG_LPC43_SSP1),y)
CHIP_CSRCS += lpc43_ssp.c
endif
endif
File diff suppressed because it is too large Load Diff
+179
View File
@@ -0,0 +1,179 @@
/************************************************************************************
* arch/arm/src/lpc43xx/lpc43_spi.h
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LPC43XX_SPI_H
#define __ARCH_ARM_SRC_LPC43XX_SPI_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <chip/lpc32_spi.h>
#ifdef CONFIG_LPC43_SPI
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/* This header file defines interfaces to common SPI logic. To use this common SPI
* logic on your board:
*
* 1. Provide logic in lpc43_boardinitialize() to configure SPI chip select pins.
* 2. Provide the lpc43_spiselect() and lpc43_spistatus() functions in your
* board-specific logic. These functions will perform chip selection
* and status operations using GPIOs in the way your board is configured.
* 3. If CONFIG_SPI_CMDDATA is defined in the NuttX configuration, provide
* lpc43_spicmddata() functions in your board-specific logic. This
* function will perform cmd/data selection operations using GPIOs in the
* way your board is configured.
* 4. Your low level board initialization logic should call lpc43_sspiinitialize.
* 5. The handle returned by lpc43_spiinitialize() may then be used to bind the
* SPI driver to higher level logic (e.g., calling mmcsd_spislotinitialize(),
* for example, will bind the SPI driver to the SPI MMC/SD driver).
*/
/************************************************************************************
* Public Types
************************************************************************************/
/************************************************************************************
* Public Data
************************************************************************************/
#ifndef __ASSEMBLY__
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
extern "C" {
#else
#define EXTERN extern
#endif
/************************************************************************************
* Public Functions
************************************************************************************/
/************************************************************************************
* Name: lpc43_spiinitialize
*
* Description:
* Initialize the SPI port
*
* Input Parameter:
* port Port number (must be zero)
*
* Returned Value:
* Valid SPI device structure reference on succcess; a NULL on failure
*
************************************************************************************/
EXTERN FAR struct spi_dev_s *lpc43_spiinitialize(int port);
/************************************************************************************
* Name: lpc43_spiselect, lpc43_spistatus, and lpc43_spicmddata
*
* Description:
* These functions must be provided in your board-specific logic. The
* lpc43_spiselect function will perform chip selection and the lpc43_spistatus
* will perform status operations using GPIOs in the way your board is configured.
*
* If CONFIG_SPI_CMDDATA is defined in the NuttX configuration, then
* lpc43_spicmddata must also be provided. This functions performs cmd/data
* selection operations using GPIOs in the way your board is configured.
*
************************************************************************************/
EXTERN void lpc43_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool selected);
EXTERN uint8_t lpc43_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#ifdef CONFIG_SPI_CMDDATA
EXTERN int lpc43_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool cmd);
#endif
/****************************************************************************
* Name: spi_flush
*
* Description:
* Flush and discard any words left in the RX fifo. This can be called
* from spiselect after a device is deselected (if you worry about such
* things).
*
* Input Parameters:
* dev - Device-specific state data
*
* Returned Value:
* None
*
****************************************************************************/
EXTERN void spi_flush(FAR struct spi_dev_s *dev);
/****************************************************************************
* Name: lpc43_spi/spiregister
*
* Description:
* If the board supports a card detect callback to inform the SPI-based
* MMC/SD drvier when an SD card is inserted or removed, then
* CONFIG_SPI_CALLBACK should be defined and the following function(s) must
* must be implemented. These functiosn implements the registercallback
* method of the SPI interface (see include/nuttx/spi.h for details)
*
* Input Parameters:
* dev - Device-specific state data
* callback - The funtion to call on the media change
* arg - A caller provided value to return with the callback
*
* Returned Value:
* 0 on success; negated errno on failure.
*
****************************************************************************/
#ifdef CONFIG_SPI_CALLBACK
EXTERN int lpc43_spiregister(FAR struct spi_dev_s *dev,
spi_mediachange_t callback, void *arg);
#endif
#undef EXTERN
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_LPC43_SPI */
#endif /* __ARCH_ARM_SRC_LPC43XX_SPI_H */
File diff suppressed because it is too large Load Diff
+196
View File
@@ -0,0 +1,196 @@
/************************************************************************************
* arch/arm/src/lpc43xx/lpc43_ssp.h
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LPC43XX_SSP_H
#define __ARCH_ARM_SRC_LPC43XX_SSP_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <chip/lpc43_ssp.h>
#if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1)
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/* This header file defines interfaces to common SSP logic. To use this common SSP
* logic on your board:
*
* 1. Provide logic in lpc43_boardinitialize() to configure SSP chip select pins.
* 2. Provide lpc43_ssp0/1select() and lpc43_ssp0/1status() functions in your
* board-specific logic. These functions will perform chip selection
* and status operations using GPIOs in the way your board is configured.
* 3. If CONFIG_SPI_CMDDATA is defined in the NuttX configuration, provide
* lpc43_ssp0/1cmddata() functions in your board-specific logic. These
* functions will perform cmd/data selection operations using GPIOs in the
* way your board is configured.
* 4. Your low level board initialization logic should call lpc43_sspinitialize.
* 5. The handle returned by lpc43_sspinitialize() may then be used to bind the
* SSP driver to higher level logic (e.g., calling mmcsd_spislotinitialize(),
* for example, will bind the SPI driver to the SPI MMC/SD driver).
*/
/************************************************************************************
* Public Types
************************************************************************************/
/************************************************************************************
* Public Data
************************************************************************************/
#ifndef __ASSEMBLY__
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
extern "C" {
#else
#define EXTERN extern
#endif
/************************************************************************************
* Public Functions
************************************************************************************/
/****************************************************************************
* Name: lpc43_sspinitialize
*
* Description:
* Initialize the selected SSP port (0=SSP0, 1=SSP1)
*
* Input Parameter:
* port - Port number (0=SSP0, 1=SSP1)
*
* Returned Value:
* Valid SPI device structure reference on succcess; a NULL on failure
*
****************************************************************************/
FAR struct spi_dev_s *lpc43_sspinitialize(int port)
/************************************************************************************
* Name: lpc43_ssp0/1select, lpc43_ssp0/1status, and lpc43_ssp0/1cmddata
*
* Description:
* These functions must be provided in your board-specific logic. The
* lpc43_ssp0/1select functions will perform chip selection and the
* lpc43_ssp0/1status will perform status operations using GPIOs in the way your
* board is configured.
*
* If CONFIG_SPI_CMDDATA is defined in the NuttX configuration, then
* lpc43_ssp0/1cmddata must also be provided. This functions performs cmd/data
* selection operations using GPIOs in the way your board is configured.
*
************************************************************************************/
#ifdef CONFIG_LPC43_SSP0
EXTERN void lpc43_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
EXTERN uint8_t lpc43_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#ifdef CONFIG_SPI_CMDDATA
EXTERN int lpc43_ssp0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#endif
#ifdef CONFIG_LPC43_SSP1
EXTERN void lpc43_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
EXTERN uint8_t lpc43_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#ifdef CONFIG_SPI_CMDDATA
EXTERN int lpc43_ssp1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#endif
/****************************************************************************
* Name: spi_flush
*
* Description:
* Flush and discard any words left in the RX fifo. This can be called
* from ssp0/1select after a device is deselected (if you worry about such
* things).
*
* Input Parameters:
* dev - Device-specific state data
*
* Returned Value:
* None
*
****************************************************************************/
#if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1)
EXTERN void ssp_flush(FAR struct spi_dev_s *dev);
#endif
/****************************************************************************
* Name: lpc43_spi/ssp0/1register
*
* Description:
* If the board supports a card detect callback to inform the SPI-based
* MMC/SD drvier when an SD card is inserted or removed, then
* CONFIG_SPI_CALLBACK should be defined and the following function(s) must
* must be implemented. These functiosn implements the registercallback
* method of the SPI interface (see include/nuttx/spi.h for details)
*
* Input Parameters:
* dev - Device-specific state data
* callback - The funtion to call on the media change
* arg - A caller provided value to return with the callback
*
* Returned Value:
* 0 on success; negated errno on failure.
*
****************************************************************************/
#ifdef CONFIG_SPI_CALLBACK
#ifdef CONFIG_LPC43_SSP0
EXTERN int lpc43_ssp0register(FAR struct spi_dev_s *dev,
spi_mediachange_t callback, void *arg);
#endif
#ifdef CONFIG_LPC43_SSP1
EXTERN int lpc43_ssp1register(FAR struct spi_dev_s *dev,
spi_mediachange_t callback, void *arg);
#endif
#endif
#undef EXTERN
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_LPC43_SSP0/1 */
#endif /* __ARCH_ARM_SRC_LPC43XX_SSP_H */
+1 -1
View File
@@ -122,7 +122,7 @@ CONFIG_LPC43_USART3=n
CONFIG_LPC43_CAN1=n
CONFIG_LPC43_CAN2=n
CONFIG_LPC43_SPI=n
CONFIG_LPC43_SSP0=y
CONFIG_LPC43_SSP0=n
CONFIG_LPC43_SSP1=n
CONFIG_LPC43_I2C0=n
CONFIG_LPC43_I2C1=n
+13 -13
View File
@@ -179,18 +179,6 @@ void weak_function stm32_spiinitialize(void);
void weak_function stm32_usbinitialize(void);
/************************************************************************************
* Name: up_ledpminitialize
*
* Description:
* Register the LEDs to receive power management event callbacks
*
************************************************************************************/
#ifdef CONFIG_PM
void up_ledpminitialize(void);
#endif
/************************************************************************************
* Name: stm32_extcontextsave
*
@@ -304,6 +292,18 @@ void stm32_deselectlcd(void);
#endif /* CONFIG_STM32_FSMC */
/************************************************************************************
* Name: up_ledpminitialize
*
* Description:
* Register the LEDs to receive power management event callbacks
*
************************************************************************************/
#if defined(CONFIG_PM) && defined(CONFIG_ARCH_LEDS)
void up_ledpminitialize(void);
#endif
/************************************************************************************
* Name: up_pmbuttons
*
@@ -314,7 +314,7 @@ void stm32_deselectlcd(void);
************************************************************************************/
#if defined(CONFIG_PM) && defined(CONFIG_IDLE_CUSTOM)
EXTERN void up_pmbuttons(void);
void up_pmbuttons(void);
#endif
/************************************************************************************
+45 -2
View File
@@ -53,11 +53,12 @@
#include "stm32_pm.h"
#include "stm32_rcc.h"
#include "up_internal.h"
#include "stm3210e-internal.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
/* Does the board support an IDLE LED to indicate that the board is in the
* IDLE state?
*/
@@ -70,6 +71,22 @@
# define END_IDLE()
#endif
/* Values for the RTC Alarm to wake up from the PM_STANDBY mode */
#ifndef CONFIG_PM_ALARM_SEC
# define CONFIG_PM_ALARM_SEC 1
#endif
#ifndef CONFIG_PM_ALARM_NSEC
# define CONFIG_PM_ALARM_NSEC 0
#endif
/****************************************************************************
* Private Data
****************************************************************************/
static void up_alarmcb(void);
/****************************************************************************
* Private Functions
****************************************************************************/
@@ -85,11 +102,12 @@
#ifdef CONFIG_PM
static void up_idlepm(void)
{
struct timespec alarmtime;
static enum pm_state_e oldstate = PM_NORMAL;
enum pm_state_e newstate;
irqstate_t flags;
int ret;
/* Decide, which power saving level can be obtained */
newstate = pm_checkstate();
@@ -150,6 +168,18 @@ static void up_idlepm(void)
up_pmbuttons();
/* Configure the RTC alarm to Auto Wake the system */
alarmtime.tv_sec = CONFIG_PM_ALARM_SEC;
alarmtime.tv_nsec = CONFIG_PM_ALARM_NSEC;
ret = up_rtc_setalarm(&alarmtime, &up_alarmcb);
if (ret < 0)
{
lldbg("The alarm is already set to %d seconds \n",
alarmtime.tv_sec);
}
/* Call the STM32 stop mode */
stm32_pmstop(true);
@@ -173,6 +203,19 @@ static void up_idlepm(void)
# define up_idlepm()
#endif
/************************************************************************************
* Name: up_alarmcb
*
* Description:
* RTC alarm service routine
*
************************************************************************************/
static void up_alarmcb(void)
{
}
/****************************************************************************
* Public Functions
****************************************************************************/
+5
View File
@@ -45,6 +45,7 @@
#include "up_internal.h"
#include "stm32_pm.h"
#include "stm3210e-internal.h"
#ifdef CONFIG_PM
@@ -91,6 +92,10 @@ void up_pminitialize(void)
/* Then initialize the NuttX power management subsystem proper */
pm_initialize();
/* Initialize the LED PM */
up_ledpminitialize();
}
#endif /* CONFIG_PM */
+3 -1
View File
@@ -51,13 +51,13 @@
#include "nvic.h"
#include "stm32_pwr.h"
#include "stm32_pm.h"
#include "stm3210e-internal.h"
#if defined(CONFIG_PM) && defined(CONFIG_IDLE_CUSTOM)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
#ifndef CONFIG_ARCH_BUTTONS
@@ -124,6 +124,8 @@
# define CONFIG_PM_BUTTON_ACTIVITY 10
#endif
/* Miscellaneous Definitions ************************************************/
#ifndef MIN
# define MIN(a,b) (a < b ? a : b)
#endif