Davinci: add a pin multiplexer configuration API
PATCH 1/1 Davinci: add a pin multiplexer configuration API
Davinci: add a pin multiplexer configuration API.
Creates a method allowing pin settings to be logically grouped into data structure arrays and provids an API to configure the PINMUX settings to enable the relevant pin functions.
---
Applies to: u-boot-ti
The PINMUXn definitions are already present in hardware.h.
The number of PINMUX fields per register and the width of the fields needs to be set per SoC. The initial settings are appropriate for at least DA8xx devices. These should be modified in misc.h to support other devices as required.
board/davinci/common/misc.c | 46 ++++++++++++++++++++++++++++++++++++++++++- board/davinci/common/misc.h | 12 +++++++++++ 2 files changed, 57 insertions(+), 1 deletions(-)
board/davinci/common/misc.c +45 -1
@@ -1,6 +1,7 @@/* * Miscelaneous DaVinci functions. * +* Copyright (C) 2009 Nick Thompson, GE Fanuc Ltd, <[email protected]> * Copyright (C) 2007 Sergey Kubushyn <[email protected]> * Copyright (C) 2008 Lyrtech <www.lyrtech.com> * Copyright (C) 2004 Texas Instruments.
@@ -27,7 +28,8 @@#include <i2c.h> #include <net.h> #include <asm/arch/hardware.h> - +#include <asm/io.h> +#include "misc.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -109,3 +111,45 @@ void dv_configure_mac_address(uint8_t *rom_enetaddr) }#endif /* DAVINCI_EMAC */ + +/* +* Change the setting of a pin multiplexer field. +* +* Takes an array of pinmux settings similar to: +* +* struct pinmux_config uart_pins[] = { +* { PINMUX8, 2, 7 }, +* { PINMUX9, 2, 0 } +* }; +* +* Stepping through the array, each PINMUXn register has the given value +* set in the pin mux field specified. +* +* The number of pins in the array must be passed (ARRAY_SIZE can provide +* this value conveniently). +* +* Returns 0 if all field numbers and values are in the correct range, +* else returns -1. +*/ +int davinci_configure_pin_mux (const struct pinmux_config *pins,int n_pins) +{ +int i; + +for (i =0 ; i < n_pins; i++) { +int value = pins[i].value; +int field = pins[i].field; + +if (field <PIN_MUX_NUM_FIELDS && + (value & ~PIN_MUX_FIELD_MASK ) ==0 ) { +int offset = field *PIN_MUX_FIELD_SIZE ; +unsigned int mux = pins[i].mux; +unsigned int mask =PIN_MUX_FIELD_MASK << offset; + value <<= offset; +writel (value | (readl (mux) & (~mask)), mux); + }else { +return -1 ; + } + } + +return 0 ; +}
board/davinci/common/misc.h +12 -0
@@ -22,8 +22,20 @@#ifndef __MISC_H#define __MISC_H +/* pin muxer definitions */ +#define PIN_MUX_NUM_FIELDS 8/* Per register */ +#define PIN_MUX_FIELD_SIZE 4/* n in bits */ +#define PIN_MUX_FIELD_MASK ((1 << PIN_MUX_FIELD_SIZE) - 1) + +/* pin definition */ +struct pinmux_config { +dv_reg *mux;/* Address of mux register */ +unsigned char value;/* Value to set in field */ +unsigned char field;/* field number */ +};int dvevm_read_mac_address (uint8_t *buf);void dv_configure_mac_address (uint8_t *rom_enetaddr); +int davinci_configure_pin_mux (const struct pinmux_config *pins,int n_pins);#endif /* __MISC_H */
PATCH 1/1 Davinci: add a pin multiplexer configuration API
board/davinci/common/misc.c void dv_configure_mac_address(uint8_t *rom_enetaddr) · line 143
Quoted 10 lines · On Thu, 29 Oct 2009 15:38:18 +0000 Nick Thompson <[email protected]>…
board/davinci/common/misc.c +10
-0+int davinci_configure_pin_mux (const struct pinmux_config *pins,int n_pins) +{ +int i; + +for (i =0 ; i < n_pins; i++) { +int value = pins[i].value; +int field = pins[i].field; + +if (field <PIN_MUX_NUM_FIELDS && + (value & ~PIN_MUX_FIELD_MASK ) ==0 ) {
the second line should not be indented as though it is the code subblock; it should fall directly underneath the column where 'field <..' starts, like this:
if (field < PIN_MUX_NUM_FIELDS &&
(value & ~PIN_MUX_FIELD_MASK) == 0) {board/davinci/common/misc.c void dv_configure_mac_address(uint8_t *rom_enetaddr) · line 146
Quoted 3 lines
board/davinci/common/misc.c +3
-0+int offset = field *PIN_MUX_FIELD_SIZE ; +unsigned int mux = pins[i].mux; +unsigned int mask =PIN_MUX_FIELD_MASK << offset;
also please just declare everything@the top of the function - same for value and field declarations above.
board/davinci/common/misc.c void dv_configure_mac_address(uint8_t *rom_enetaddr) · line 148
Quoted 2 lines
board/davinci/common/misc.c +2
-0+ value <<= offset; +writel (value | (readl (mux) & (~mask)), mux);
I guess arm doesn't have setbits32 and friends, huh.
Kim
PATCH 1/1 Davinci: add a pin multiplexer configuration API
Dear Kim Phillips,
Quoted 7 lines · In message <[email protected]> you wrote:
board/davinci/common/misc.c void dv_configure_mac_address(uint8_t *rom_enetaddr) · line 143
Quoted 3 lines
board/davinci/common/misc.c +2
-0+if (field <PIN_MUX_NUM_FIELDS && + (value & ~PIN_MUX_FIELD_MASK ) ==0 ) {the second line should not be indented as though it is the code subblock; it should fall directly underneath the column where 'field <..' starts, like this:
Agreed.
Quoted 9 lines
if (field <
PIN_MUX_NUM_FIELDS&&(value & ~PIN_MUX_FIELD_MASK) == 0) {board/davinci/common/misc.c void dv_configure_mac_address(uint8_t *rom_enetaddr) · line 146
Quoted 3 lines
board/davinci/common/misc.c +3
-0+int offset = field *PIN_MUX_FIELD_SIZE ; +unsigned int mux = pins[i].mux; +unsigned int mask =PIN_MUX_FIELD_MASK << offset;also please just declare everything at the top of the function - same for value and field declarations above.
No! Why should that be needed? It would be just a waste of stack space (except that recent compilers don't care abouyt this anyway), and keeping variables as localized as possible seems to be a good thing to me.
Quoted 4 lines
board/davinci/common/misc.c void dv_configure_mac_address(uint8_t *rom_enetaddr) · line 148
Quoted 2 lines
board/davinci/common/misc.c +2
-0+ value <<= offset; +writel (value | (readl (mux) & (~mask)), mux);I guess arm doesn't have setbits32 and friends, huh.
Not yet. Patches welcome!
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Evil does seek to maintain power by suppressing the truth." "Or by misleading the innocent." -- Spock and McCoy, "And The Children Shall Lead", stardate 5029.5.
PATCH 1/1 Davinci: add a pin multiplexer configuration API
Quoted 13 lines · On Fri, 30 Oct 2009 09:26:12 +0100 Wolfgang Denk <[email protected]> wrote:
Dear Kim Phillips,
Quoted 9 lines · In message <[email protected]> you wrote:
if (field <
PIN_MUX_NUM_FIELDS&&(value & ~PIN_MUX_FIELD_MASK) == 0) {board/davinci/common/misc.c void dv_configure_mac_address(uint8_t *rom_enetaddr) · line 146
Quoted 3 lines
board/davinci/common/misc.c +3
-0+int offset = field *PIN_MUX_FIELD_SIZE ; +unsigned int mux = pins[i].mux; +unsigned int mask =PIN_MUX_FIELD_MASK << offset;also please just declare everything at the top of the function - same for value and field declarations above.
Quoted 4 lines
No! Why should that be needed? It would be just a waste of stack space (except that recent compilers don't care abouyt this anyway), and keeping variables as localized as possible seems to be a good thing to me.
not when it sacrifices readability. I'm looking for assignments and finding 'unsigned'! Either put a blank line between the declarations and the rest of the code, or declare everything at the top of the function, since it does nothing for the compiler (my preference is the latter in this case).
Kim
PATCH 1/1 Davinci: add a pin multiplexer configuration API
From: Kim Phillips [mailto:kim.phillips at freescale.com]
Sent: 30 October 2009 14:57
Quoted 21 lines
Quoted 13 lines · On Fri, 30 Oct 2009 09:26:12 +0100 Wolfgang Denk <[email protected]> wrote:
Dear Kim Phillips,
Quoted 9 lines · In message <[email protected]> you wrote:
if (field <
PIN_MUX_NUM_FIELDS&&(value & ~PIN_MUX_FIELD_MASK) == 0) {board/davinci/common/misc.c void dv_configure_mac_address(uint8_t *rom_enetaddr) · line 146
Quoted 3 lines
board/davinci/common/misc.c +3
-0+int offset = field *PIN_MUX_FIELD_SIZE ; +unsigned int mux = pins[i].mux; +unsigned int mask =PIN_MUX_FIELD_MASK << offset;also please just declare everything at the top of the function - same for value and field declarations above.
Quoted 4 lines
No! Why should that be needed? It would be just a waste of stack space (except that recent compilers don't care abouyt this anyway), and keeping variables as localized as possible seems to be a good thing to me.
Quoted 7 lines
not when it sacrifices readability. I'm looking for assignments and finding 'unsigned'! Either put a blank line between the declarations and the rest of the code, or declare everything at the top of the function, since it does nothing for the compiler (my preference is the latter in this case).
Kim
All three of these declarations could be const, which may or may not help the compiler, but would be technically correct and document my intentions better.
This would not be possible if they where moved to the start of the function or if the declaration and assignments where split up in any other way.
Nick.
PATCH 1/1 Davinci: add a pin multiplexer configuration API
Quoted 32 lines · Intelligent Platforms)
From: Kim Phillips [mailto:kim.phillips at freescale.com]
Sent: 30 October 2009 14:57Quoted 21 lines
Quoted 13 lines · On Fri, 30 Oct 2009 09:26:12 +0100 Wolfgang Denk <[email protected]> wrote:
Dear Kim Phillips,
Quoted 9 lines · In message <[email protected]> you wrote:
if (field <
PIN_MUX_NUM_FIELDS&&(value & ~PIN_MUX_FIELD_MASK) == 0) {board/davinci/common/misc.c void dv_configure_mac_address(uint8_t *rom_enetaddr) · line 146
Quoted 3 lines
board/davinci/common/misc.c +3
-0+int offset = field *PIN_MUX_FIELD_SIZE ; +unsigned int mux = pins[i].mux; +unsigned int mask =PIN_MUX_FIELD_MASK << offset;also please just declare everything at the top of the function - same for value and field declarations above.
Quoted 4 lines
No! Why should that be needed? It would be just a waste of stack space (except that recent compilers don't care abouyt this anyway), and keeping variables as localized as possible seems to be a good thing to me.
Quoted 7 lines
not when it sacrifices readability. I'm looking for assignments and finding 'unsigned'! Either put a blank line between the declarations and the rest of the code, or declare everything at the top of the function, since it does nothing for the compiler (my preference is the latter in this case).
Kim
Quoted 7 lines
All three of these declarations could be const, which may or may not help the compiler, but would be technically correct and document my intentions better.
This would not be possible if they where moved to the start of the function or if the declaration and assignments where split up in any other way.
Even with a blank line?
Either comply to the level of compiler effectiveness you seek, or make the code more readable for the rest of us.
Kim