From 3d4ee6f061a4cf7e68e885a8d940901726d678ce Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 25 Apr 2013 10:35:18 -0600 Subject: [PATCH] KL25Z: No Ethernet, no SDHC. TPM instead of FTM --- arch/arm/src/kl/Kconfig | 125 ++-------------------------------- arch/arm/src/kl/chip/kl_sim.h | 2 +- arch/arm/src/kl/kl_config.h | 32 --------- arch/arm/src/kl/kl_internal.h | 66 ------------------ 4 files changed, 7 insertions(+), 218 deletions(-) diff --git a/arch/arm/src/kl/Kconfig b/arch/arm/src/kl/Kconfig index a03a18c2b8..3a0c4873d0 100644 --- a/arch/arm/src/kl/Kconfig +++ b/arch/arm/src/kl/Kconfig @@ -57,14 +57,6 @@ config KL_UART2 ---help--- Support UART2 -config KL_ENET - bool "Ethernet" - default n - depends on ARCH_FAMILY_K60 - select NET - ---help--- - Support Ethernet (K60 only) - config KL_RNGB bool "Random number generator" default n @@ -156,27 +148,20 @@ config KL_VREF ---help--- Support VREF -config KL_SDHC - bool "SDHC" - default n - select MMCSD_SDIO - ---help--- - Support SD host controller - -config KL_FTM0 - bool "FTM0" +config KL_TPM0 + bool "Timer/PWM Module 0" default n ---help--- Support FlexTimer 0 -config KL_FTM1 - bool "FTM1" +config KL_TPM1 + bool "Timer/PWM Module 1" default n ---help--- Support FlexTimer 1 -config KL_FTM2 - bool "FTM2" +config KL_TPM2 + bool "Timer/PWM Module 2" default n ---help--- Support FlexTimer 2 @@ -316,101 +301,3 @@ config KL_PORTEINTS endif -if KL_ENET - -comment "Kinetis Ethernet Configuration" - -config ENET_ENHANCEDBD - bool "Use enhanced buffer descriptors" - default n - ---help--- - Use enhanced, 32-byte buffer descriptors - -config ENET_NETHIFS - int "Number of Ethernet interfaces" - default 1 - ---help--- - Number of Ethernet interfaces supported by the hardware. Must be - one for now. - -config ENET_NRXBUFFERS - int "Number of Ethernet Rx buffers" - default 6 - ---help--- - Number of Ethernet Rx buffers to use. The size of one buffer is - determined by CONFIG_NET_BUFSIZE - -config ENET_NTXBUFFERS - int "Number of Ethernet Tx buffers" - default 2 - ---help--- - Number of Ethernet Tx buffers to use. The size of one buffer is - determined by CONFIG_NET_BUFSIZE - -config ENET_PHYADDR - int "PHY address" - default 1 - ---help--- - MII/RMII address of the PHY - -config ENET_USEMII - bool "Use MII interface" - default n - ---help--- - The the MII PHY interface. Default: Use RMII interface - -endif - -if KL_SDHC - -comment "Kinetis SDHC Configuration" - -config KL_SDHC_ABSFREQ - bool "Custom transfer frequencies" - default n - ---help--- - Select SDCLK frequencies corresponding to various modes of operation. - These values may be provided in either the NuttX configuration file - or in the board.h file - - NOTE: These settings are not currently used. Since there are only - four frequencies, it makes more sense to just "can" the fixed - frequency prescaler and divider values. - -if KL_SDHC_ABSFREQ - -config KL_IDMODE_FREQ - int "ID mode frequency" - default 400000 - ---help--- - Initial, ID mode SD frequency - -config KL_MMCXFR_FREQ - int "MMC transfer frequency" - default 20000000 - ---help--- - Frequency to use for transferring data to/from an MMC card - -config KL_SD1BIT_FREQ - int "SD 1-bit transfer frequency" - default 20000000 - depends on CONFIG_SDIO_WIDTH_D1_ONLY - ---help--- - Frequency to use for transferring data to/from an SD card using on a single data liune. - -config KL_SD4BIT_FREQ - int "SD 4-bit transfer frequency" - default 20000000 - depends on !CONFIG_SDIO_WIDTH_D1_ONLY - ---help--- - Frequency to use for transferring data to/from an SD card using all four data lines. - -endif - -config KL_SDHC_DMAPRIO - int "SDHC DMA priority" - depends on SDIO_DMA - ---help--- - SDHC DMA priority - -endif diff --git a/arch/arm/src/kl/chip/kl_sim.h b/arch/arm/src/kl/chip/kl_sim.h index 64d1b809b0..de59824aab 100644 --- a/arch/arm/src/kl/chip/kl_sim.h +++ b/arch/arm/src/kl/chip/kl_sim.h @@ -283,7 +283,7 @@ #define SIM_SCGC6_PIT (1 << 23) /* Bit 23: PIT Clock Gate Control */ #define SIM_SCGC6_TPM0 (1 << 24) /* Bit 24: TPM0 Clock Gate Control */ #define SIM_SCGC6_TPM1 (1 << 25) /* Bit 25: TPM1 Clock Gate Control */ -#define SIM_SCGC6_TPM6 (1 << 26) /* Bit 25: TPM2 Clock Gate Control */ +#define SIM_SCGC6_TPM2 (1 << 26) /* Bit 25: TPM2 Clock Gate Control */ #define SIM_SCGC6_ADC0 (1 << 27) /* Bit 27: ADC0 Clock Gate Control */ /* Bit 28: Reserved */ #define SIM_SCGC6_RTC (1 << 29) /* Bit 29: RTC Clock Gate Control */ diff --git a/arch/arm/src/kl/kl_config.h b/arch/arm/src/kl/kl_config.h index 2344e5eb5c..1a6d1f1e28 100644 --- a/arch/arm/src/kl/kl_config.h +++ b/arch/arm/src/kl/kl_config.h @@ -97,38 +97,6 @@ # undef CONFIG_UART1_FLOWCONTROL # undef CONFIG_UART2_FLOWCONTROL -/* Ethernet controller configuration */ - -#ifndef CONFIG_ENET_NRXBUFFERS -# define CONFIG_ENET_NRXBUFFERS 6 -#endif -#ifndef CONFIG_ENET_NTXBUFFERS -# define CONFIG_ENET_NTXBUFFERS 2 -#endif - -#ifndef CONFIG_ENET_PHYADDR -# define CONFIG_ENET_PHYADDR 1 -#endif - -#ifndef CONFIG_ENET_NETHIFS -# define CONFIG_ENET_NETHIFS 1 -#endif - -/* EMAC Default Interrupt Priorities */ - -#ifndef CONFIG_KL_EMACTMR_PRIO -# define CONFIG_KL_EMACTMR_PRIO NVIC_SYSH_PRIORITY_DEFAULT -#endif -#ifndef CONFIG_KL_EMACTX_PRIO -# define CONFIG_KL_EMACTX_PRIO NVIC_SYSH_PRIORITY_DEFAULT -#endif -#ifndef CONFIG_KL_EMACRX_PRIO -# define CONFIG_KL_EMACRX_PRIO NVIC_SYSH_PRIORITY_DEFAULT -#endif -#ifndef CONFIG_KL_EMACMISC_PRIO -# define CONFIG_KL_EMACMISC_PRIO NVIC_SYSH_PRIORITY_DEFAULT -#endif - /************************************************************************************ * Public Types ************************************************************************************/ diff --git a/arch/arm/src/kl/kl_internal.h b/arch/arm/src/kl/kl_internal.h index 9f6219b898..467cb2ab64 100644 --- a/arch/arm/src/kl/kl_internal.h +++ b/arch/arm/src/kl/kl_internal.h @@ -771,71 +771,5 @@ void kl_dmadump(DMA_HANDLE handle, const struct kl_dmaregs_s *regs, #endif #endif -/**************************************************************************** - * Name: sdhc_initialize - * - * Description: - * Initialize SDIO for operation. - * - * Input Parameters: - * slotno - Not used. - * - * Returned Values: - * A reference to an SDIO interface structure. NULL is returned on failures. - * - ****************************************************************************/ - -#ifdef CONFIG_KL_SDHC -struct sdio_dev_s; -FAR struct sdio_dev_s *sdhc_initialize(int slotno); -#endif - -/**************************************************************************** - * Name: sdhc_mediachange - * - * Description: - * Called by board-specific logic -- posssible from an interrupt handler -- - * in order to signal to the driver that a card has been inserted or - * removed from the slot - * - * Input Parameters: - * dev - An instance of the SDIO driver device state structure. - * cardinslot - true is a card has been detected in the slot; false if a - * card has been removed from the slot. Only transitions - * (inserted->removed or removed->inserted should be reported) - * - * Returned Values: - * None - * - ****************************************************************************/ - -#ifdef CONFIG_KL_SDHC -void sdhc_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot); -#endif - -/**************************************************************************** - * Name: sdio_wrprotect - * - * Description: - * Called by board-specific logic to report if the card in the slot is - * mechanically write protected. - * - * Input Parameters: - * dev - An instance of the SDIO driver device state structure. - * wrprotect - true is a card is writeprotected. - * - * Returned Values: - * None - * - ****************************************************************************/ - -#ifdef CONFIG_KL_SDHC -void sdhc_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect); -#endif -#undef EXTERN -#if defined(__cplusplus) -} -#endif - #endif /* __ASSEMBLY__ */ #endif /* __ARCH_ARM_SRC_KL_KL_INTERNAL_H */