diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-11-11 13:50:25 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-11-11 13:50:25 -0600 |
commit | d42f938f75aae69d740115e4bef33c851f4b1965 (patch) | |
tree | 1ffa87b6b0d3144bbcd3e482b84dc45a40dfd86d | |
parent | f81df8494bfc78d3a1143b1bfb1997b6776824ac (diff) | |
download | nuttx-d42f938f75aae69d740115e4bef33c851f4b1965.tar.gz nuttx-d42f938f75aae69d740115e4bef33c851f4b1965.tar.bz2 nuttx-d42f938f75aae69d740115e4bef33c851f4b1965.zip |
SAMA5 I2S Kconfig update
-rw-r--r-- | nuttx/arch/arm/src/sam34/Kconfig | 4 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sama5/Kconfig | 80 |
2 files changed, 32 insertions, 52 deletions
diff --git a/nuttx/arch/arm/src/sam34/Kconfig b/nuttx/arch/arm/src/sam34/Kconfig index 68e4d6404..77cc639c2 100644 --- a/nuttx/arch/arm/src/sam34/Kconfig +++ b/nuttx/arch/arm/src/sam34/Kconfig @@ -231,6 +231,10 @@ config ARCH_CHIP_SAM4L default n select ARCH_RAMFUNCS +config ARCH_CHIP_SAM4E + bool + default n + config ARCH_CHIP_SAM4S bool default n diff --git a/nuttx/arch/arm/src/sama5/Kconfig b/nuttx/arch/arm/src/sama5/Kconfig index 9caed8f56..3959a5ffb 100644 --- a/nuttx/arch/arm/src/sama5/Kconfig +++ b/nuttx/arch/arm/src/sama5/Kconfig @@ -1418,31 +1418,25 @@ choice default SAMA5_SSC0_RX_MCKDIV config SAMA5_SSC0_RX_RKINPUT - bool "External Clock" + bool "RK input" ---help--- The SSC receiver clock is an external clock provided on the RK input - pin. + pin. Sample rate determined by the external clock frequency. config SAMA5_SSC0_RX_TXCLK bool "Transmitter Clock" ---help--- - The SSC receiver clock is transmitter clock. + The SSC receiver clock is transmitter clock. RX sample rate is the same + as the TX sample rate. config SAMA5_SSC0_RX_MCKDIV bool "MCK/2" ---help--- - The SSC receiver clock is the MCK/2 divided by a up to 4095. + The SSC receiver clock is the MCK/2 divided by a up to 4095. Desired + sample rate must be provided below. endchoice # Receiver clock source -config SAMA5_SSC0_RX_EXTFREQ - int "External reciver clock frequency" - default 100 - depends on SAMA5_SSC0_RX_RKINPUT - ---help--- - If the receiver clock is provided via a clock input on the RK pin, - then the frequency of the receiver clock must be provided. - if !SAMA5_SSC0_RX_RKINPUT choice prompt "Receiver output clock" @@ -1474,31 +1468,25 @@ choice default SAMA5_SSC0_TX_MCKDIV config SAMA5_SSC0_TX_TKINPUT - bool "External Clock" + bool "TK input" ---help--- The SSC transmitter clock is an external clock provided on the TK input - pin. + pin. Sample rate determined by the external clock frequency. config SAMA5_SSC0_TX_RXCLK bool "Receiver Clock" ---help--- - The SSC transmitter clock is receiver clock. + The SSC transmitter clock is receiver clock. TX sample rate is the same + as the RX sample rate. config SAMA5_SSC0_TX_MCKDIV bool "MCK/2" ---help--- - The SSC transmitter clock is the MCK/2 divided by a up to 4095. + The SSC transmitter clock is the MCK/2 divided by a up to 4095. Desired + sample rate must be provided below. endchoice # Transmitter clock source -config SAMA5_SSC0_TX_EXTFREQ - int "External transmitter clock frequency" - default 100 - depends on SAMA5_SSC0_TX_TKINPUT - ---help--- - If the transmitter clock is provided via a clock input on the TK pin, - then the frequency of the transmitter clock must be provided. - if !SAMA5_SSC0_TX_TKINPUT choice prompt "Transmitter output clock" @@ -1518,8 +1506,8 @@ endif # !SAMA5_SSC0_TX_TKINPUT endif # SAMA5_SSC0_TX config SAMA5_SSC0_MCKDIV_SAMPLERATE - int "Internal transmitter clock frequency" - default 100 + int "Sample rate" + default 48000 depends on SAMA5_SSC0_RX_MCKDIV || SAMA5_SSC0_TX_MCKDIV ---help--- If the either the receiver or transmitter clock is provided by MCK/2 divided @@ -1570,31 +1558,25 @@ choice default SAMA5_SSC1_RX_MCKDIV config SAMA5_SSC1_RX_RKINPUT - bool "External Clock" + bool "RK input" ---help--- The SSC receiver clock is an external clock provided on the RK input - pin. + pin. Sample rate determined by the external clock frequency. config SAMA5_SSC1_RX_TXCLK bool "Transmitter Clock" ---help--- - The SSC receiver clock is transmitter clock. + The SSC receiver clock is transmitter clock. RX sample rate is the same + as the TX sample rate. config SAMA5_SSC1_RX_MCKDIV bool "MCK/2" ---help--- - The SSC receiver clock is the MCK/2 divided by a up to 4095. + The SSC receiver clock is the MCK/2 divided by a up to 4095. Desired + sample rate must be provided below. endchoice # Receiver clock source -config SAMA5_SSC1_RX_EXTFREQ - int "External reciver clock frequency" - default 100 - depends on SAMA5_SSC1_RX_RKINPUT - ---help--- - If the receiver clock is provided via a clock input on the RK pin, - then the frequency of the receiver clock must be provided. - if !SAMA5_SSC1_RX_RKINPUT choice prompt "Receiver output clock" @@ -1626,31 +1608,25 @@ choice default SAMA5_SSC1_TX_MCKDIV config SAMA5_SSC1_TX_TKINPUT - bool "External Clock" + bool "TK input" ---help--- The SSC transmitter clock is an external clock provided on the TK input - pin. + pin. Sample rate determined by the external clock frequency. config SAMA5_SSC1_TX_RXCLK bool "Receiver Clock" ---help--- - The SSC transmitter clock is receiver clock. + The SSC transmitter clock is receiver clock. TX sample rate is the same + as the RX sample rate. config SAMA5_SSC1_TX_MCKDIV bool "MCK/2" ---help--- - The SSC transmitter clock is the MCK/2 divided by a up to 4095. + The SSC transmitter clock is the MCK/2 divided by a up to 4095. Desired + sample rate must be provided below. endchoice # Transmitter clock source -config SAMA5_SSC1_TX_EXTFREQ - int "External transmitter clock frequency" - default 100 - depends on SAMA5_SSC1_TX_TKINPUT - ---help--- - If the transmitter clock is provided via a clock input on the TK pin, - then the frequency of the transmitter clock must be provided. - if !SAMA5_SSC1_TX_TKINPUT choice prompt "Transmitter output clock" @@ -1670,8 +1646,8 @@ endif # !SAMA5_SSC1_TX_TKINPUT endif # SAMA5_SSC1_TX config SAMA5_SSC1_MCKDIV_SAMPLERATE - int "Internal transmitter clock frequency" - default 100 + int "Sample rate" + default 48000 depends on SAMA5_SSC1_RX_MCKDIV || SAMA5_SSC1_TX_MCKDIV ---help--- If the either the receiver or transmitter clock is provided by MCK/2 divided |