On Thu, Nov 12, 2015 at 5:11 PM, Pavel Pisa <p...@cmp.felk.cvut.cz> wrote:
> From: Premysl Houdek <kom541...@gmail.com>
>
> Signed-off-by: Premysl Houdek <kom541...@gmail.com>
> ---
> c/src/lib/libbsp/arm/tms570/Makefile.am | 3 +-
> .../lib/libbsp/arm/tms570/include/tms570-pinmux.h | 122
> +++++++++++++++++++++
> c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c | 88 +++++++++++++++
> c/src/lib/libbsp/arm/tms570/preinstall.am | 4 +
> 4 files changed, 216 insertions(+), 1 deletion(-)
> create mode 100644 c/src/lib/libbsp/arm/tms570/include/tms570-pinmux.h
> create mode 100644 c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c
>
> diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am
> b/c/src/lib/libbsp/arm/tms570/Makefile.am
> index a278aa2..7936b07 100644
> --- a/c/src/lib/libbsp/arm/tms570/Makefile.am
> +++ b/c/src/lib/libbsp/arm/tms570/Makefile.am
> @@ -41,6 +41,7 @@ include_bsp_HEADERS += include/tms570-vim.h
> include_bsp_HEADERS += include/tms570-pom.h
> include_bsp_HEADERS += include/tms570-sci-driver.h
> include_bsp_HEADERS += include/system-clocks.h
> +include_bsp_HEADERS += include/tms570-pinmux.h
>
> include_bsp_ti_hercules_HEADERS = include/ti_herc/reg_adc.h
> include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_ccmsr.h
> @@ -151,7 +152,7 @@ libbsp_a_SOURCES += clock/benchmark_timer.c
> # RTC
>
> # GPIO
> -
> +libbsp_a_SOURCES += pinmux/pinmux.c
> # Timer
>
> # Benchmark Timer
> diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pinmux.h
> b/c/src/lib/libbsp/arm/tms570/include/tms570-pinmux.h
> new file mode 100644
> index 0000000..46c4ae5
> --- /dev/null
> +++ b/c/src/lib/libbsp/arm/tms570/include/tms570-pinmux.h
> @@ -0,0 +1,122 @@
> +/**
> + * @file tms570-pinmux.h
> + *
> + * @ingroup tms570
> + *
> + * @brief I/O Multiplexing Module (IOMM) basic support
> + */
> +
> +/*
> + * Copyright (c) 2015 Premysl Houdek <kom541...@gmail.com>
> + *
> + * Google Summer of Code 2014 at
> + * Czech Technical University in Prague
> + * Zikova 1903/4
> + * 166 36 Praha 6
> + * Czech Republic
> + *
> + * The license and distribution terms for this file may be
> + * found in the file LICENSE in this distribution or at
> + * http://www.rtems.org/license/LICENSE.
> + */
> +
> +#ifndef LIBBSP_ARM_TMS570_PINMUX_H
> +#define LIBBSP_ARM_TMS570_PINMUX_H
> +
> +#ifndef ASM
> +#include <bsp/tms570.h>
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif /* __cplusplus */
> +
> +
> +#define TMS570_PIN_NUM_SHIFT 0
> +#define TMS570_PIN_NUM_MASK 0x0fff
> +
> +#define TMS570_PIN_FNC_SHIFT 12
> +#define TMS570_PIN_FNC_MASK 0xf000
> +
> +#define TMS570_PIN_FNC_AUTO (-1)
> +
> +#define TMS570_PIN_AND_FNC(pin, fnc) \
> + ((pin) | ((fnc)<<TMS570_PIN_FNC_SHIFT))
> +
> +#define TMS570_BALL_WITH_MMR(mmrx, pos) \
> + ((pos) | ((mmrx)<<2))
> +
> +/* Definition for pins/balls which has to be set for Ethernet MII */
> +
> +#define TMS570_BALL_C3 TMS570_BALL_WITH_MMR(0, 2)
> +#define TMS570_BALL_C3_MIBSPI3NCS_3 TMS570_PIN_AND_FNC(TMS570_BALL_C3, 0)
> +#define TMS570_BALL_C3_I2C_SCL TMS570_PIN_AND_FNC(TMS570_BALL_C3, 1)
> +
> +#define TMS570_BALL_F3 TMS570_BALL_WITH_MMR(20, 2)
> +#define TMS570_BALL_F3_MII_COL TMS570_PIN_AND_FNC(TMS570_BALL_F3, 2)
> +
> +#define TMS570_BALL_B4 TMS570_BALL_WITH_MMR(17, 2)
> +#define TMS570_BALL_B4_MII_CRS TMS570_PIN_AND_FNC(TMS570_BALL_B4, 1)
> +
> +#define TMS570_BALL_B11 TMS570_BALL_WITH_MMR(19, 1)
> +#define TMS570_BALL_B11_MII_RX_DV TMS570_PIN_AND_FNC(TMS570_BALL_B11, 1)
> +
> +#define TMS570_BALL_N19 TMS570_BALL_WITH_MMR(10, 0)
> +#define TMS570_BALL_N19_MII_RX_ER TMS570_PIN_AND_FNC(TMS570_BALL_N19, 1)
> +
> +#define TMS570_BALL_K19 TMS570_BALL_WITH_MMR(14, 1)
> +#define TMS570_BALL_K19_MII_RX_CLK TMS570_PIN_AND_FNC(TMS570_BALL_K19, 1)
> +
> +#define TMS570_BALL_P1 TMS570_BALL_WITH_MMR(11, 3)
> +#define TMS570_BALL_P1_MII_RXD_0 TMS570_PIN_AND_FNC(TMS570_BALL_P1, 2)
> +
> +#define TMS570_BALL_A14 TMS570_BALL_WITH_MMR(12, 0)
> +#define TMS570_BALL_A14_MII_RXD_1 TMS570_PIN_AND_FNC(TMS570_BALL_A14, 1)
> +
> +#define TMS570_BALL_G19 TMS570_BALL_WITH_MMR(12, 2)
> +#define TMS570_BALL_G19_MII_RXD_2 TMS570_PIN_AND_FNC(TMS570_BALL_G19, 2)
> +
> +#define TMS570_BALL_H18 TMS570_BALL_WITH_MMR(12, 3)
> +#define TMS570_BALL_H18_MII_RXD_3 TMS570_PIN_AND_FNC(TMS570_BALL_H18, 2)
> +
> +#define TMS570_BALL_D19 TMS570_BALL_WITH_MMR(17, 0)
> +#define TMS570_BALL_D19_MII_TX_CLK TMS570_PIN_AND_FNC(TMS570_BALL_D19, 1)
> +
> +#define TMS570_BALL_J18 TMS570_BALL_WITH_MMR(13, 0)
> +#define TMS570_BALL_J18_MII_TXD_0 TMS570_PIN_AND_FNC(TMS570_BALL_J18, 2)
> +
> +#define TMS570_BALL_J19 TMS570_BALL_WITH_MMR(13, 1)
> +#define TMS570_BALL_J19_MII_TXD_1 TMS570_PIN_AND_FNC(TMS570_BALL_J19, 2)
> +
> +#define TMS570_BALL_R2 TMS570_BALL_WITH_MMR(13, 3)
> +#define TMS570_BALL_R2_MII_TXD_2 TMS570_PIN_AND_FNC(TMS570_BALL_R2, 2)
> +
> +#define TMS570_BALL_E18 TMS570_BALL_WITH_MMR(14, 0)
> +#define TMS570_BALL_E18_MII_TXD_3 TMS570_PIN_AND_FNC(TMS570_BALL_E18, 2)
> +
> +#define TMS570_BALL_H19 TMS570_BALL_WITH_MMR(13, 2)
> +#define TMS570_BALL_H19_MII_TXEN TMS570_PIN_AND_FNC(TMS570_BALL_H19, 2)
> +
> +#define TMS570_BALL_V5 TMS570_BALL_WITH_MMR(7, 1)
> +#define TMS570_BALL_V5_MDCLK TMS570_PIN_AND_FNC(TMS570_BALL_V5, 2)
> +
> +#define TMS570_BALL_G3 TMS570_BALL_WITH_MMR(8, 1)
> +#define TMS570_BALL_G3_MDIO TMS570_PIN_AND_FNC(TMS570_BALL_G3, 2)
> +
> +#define TMS570_BALL_XX TMS570_BALL_WITH_MMR(29, 3)
> +#define TMS570_BALL_XX_GMII_SEL TMS570_PIN_AND_FNC(TMS570_BALL_XX, 0)
> +
> +/* Generic functions select pin to peripheral connection */
> +
> +void tms570_bsp_pin_set_function(int pin_num, int pin_fnc);
> +
> +void tms570_bsp_pin_clear_function(int pin_num, int pin_fnc);
> +
> +#endif
> +
> +/** @} */
> +
> +#ifdef __cplusplus
> +}
> +#endif /* __cplusplus */
> +
> +#endif /* LIBBSP_ARM_TMS570_IRQ_H */
> diff --git a/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c
> b/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c
> new file mode 100644
> index 0000000..79d6b1e
> --- /dev/null
> +++ b/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c
> @@ -0,0 +1,88 @@
> +/**
> + * @file pinmux.c
> + *
> + * @ingroup tms570
> + *
> + * @brief I/O Multiplexing Module (IOMM) basic support
> + */
> +
> +/*
> + * Copyright (c) 2015 Premysl Houdek <kom541...@gmail.com>
> + *
> + * Google Summer of Code 2014 at
> + * Czech Technical University in Prague
> + * Zikova 1903/4
> + * 166 36 Praha 6
> + * Czech Republic
> + *
> + * The license and distribution terms for this file may be
> + * found in the file LICENSE in this distribution or at
> + * http://www.rtems.org/license/LICENSE.
> + */
> +
> +#include <bsp/tms570.h>
> +#include <bsp/tms570-pinmux.h>
> +
> +/**
> + * @brief select desired function of pin/ball
> + *
> + * The function setups multiplexer to interconnect pin with
> + * specified function/peripheral. Pin number is index into pinmux
> + * entries array. Predefined values for pins are in a format
> + * TMS570_BALL_<column><row> (for example TMS570_BALL_N19).
> + * The multiplexer allows to interconnect one pin to multiple
> + * signal sources/sings in the theory but it is usually bad choice.
sinks
> + * The function sets only specified function and clears all other
> + * connections.
> + *
> + * @param[in] pin_num pin/ball identifier (index into pinmux array)
> + * @param[in] pin_fnc function number 0 .. 7, if value TMS570_PIN_FNC_AUTO
> + * is specified then pin function is extracted from
> + * pin_num argument
> + * @retval Void
> + */
> +void
> +tms570_bsp_pin_set_function(int pin_num, int pin_fnc)
> +{
> + unsigned int pin_shift;
> + typeof(TMS570_IOMM.PINMUX.PINMMR0) *pinmmrx;
> +
Avoid compiler extension use directly. You may use a macro to define
RTEMS_COMPILER_TYPEOF or some such in basedefs, that might work.
Wherever we define the compiler attributes macros.
> + if ( pin_fnc == TMS570_PIN_FNC_AUTO ) {
> + pin_fnc = (pin_num & TMS570_PIN_FNC_MASK) >> TMS570_PIN_FNC_SHIFT;
> + }
> + pin_num = (pin_num & TMS570_PIN_NUM_MASK) >> TMS570_PIN_NUM_SHIFT;
> +
> + pinmmrx = &TMS570_IOMM.PINMUX.PINMMR0;
> + pinmmrx += (pin_num >> 2);
> + pin_shift = (pin_num & 0x3)*8;
> + *pinmmrx = (*pinmmrx & ~(0xff << pin_shift)) | (1 << (pin_fnc +
> pin_shift));
> +}
> +
> +/**
> + * @brief clear connection between pin and specified peripherals/function
> + *
> + * This function switches off given connection and leaves rest
> + * of multiplexer setup intact.
> + *
> + * @param[in] pin_num pin/ball identifier (index into pinmux array)
> + * @param[in] pin_fnc function number 0 .. 7, if value TMS570_PIN_FNC_AUTO
> + * is specified then pin function is extracted from
> + * pin_num argument
> + * @retval Void
> + */
> +void
> +tms570_bsp_pin_clear_function(int pin_num, int pin_fnc)
> +{
> + unsigned int pin_shift;
> + typeof(TMS570_IOMM.PINMUX.PINMMR0) *pinmmrx;
> +
> + if ( pin_fnc == TMS570_PIN_FNC_AUTO ) {
> + pin_fnc = (pin_num & TMS570_PIN_FNC_MASK) >> TMS570_PIN_FNC_SHIFT;
> + }
> + pin_num = (pin_num & TMS570_PIN_NUM_MASK) >> TMS570_PIN_NUM_SHIFT;
> +
> + pinmmrx = &TMS570_IOMM.PINMUX.PINMMR0;
> + pinmmrx += (pin_num >> 2);
> + pin_shift = (pin_num & 0x3)*8;
copy-paste should be refactored to a helper function.
> + *pinmmrx = *pinmmrx & ~(1 << (pin_fnc+pin_shift));
> +}
> diff --git a/c/src/lib/libbsp/arm/tms570/preinstall.am
> b/c/src/lib/libbsp/arm/tms570/preinstall.am
> index c6408cb..2fddba8 100644
> --- a/c/src/lib/libbsp/arm/tms570/preinstall.am
> +++ b/c/src/lib/libbsp/arm/tms570/preinstall.am
> @@ -114,6 +114,10 @@ $(PROJECT_INCLUDE)/bsp/system-clocks.h:
> include/system-clocks.h $(PROJECT_INCLUD
> $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/system-clocks.h
> PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/system-clocks.h
>
> +$(PROJECT_INCLUDE)/bsp/tms570-pinmux.h: include/tms570-pinmux.h
> $(PROJECT_INCLUDE)/bsp/$(dirstamp)
> + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-pinmux.h
> +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-pinmux.h
> +
> $(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h: include/ti_herc/reg_adc.h
> $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
> $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h
> PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h
> --
> 1.9.1
>
> _______________________________________________
> devel mailing list
> devel@rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
