sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM/MXS: pull-up and bitkeeper must be handled differently 

Since commit 2f6b1f7690 the pull-up and
bitkeeper handling for i.MX23/28 is correct. But now it is important to
distinguish these pin features as their programmed bit values are different.
With this patch the bitkeeper and pull-up enable/disable bits are now handled
separately.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Juergen Beisert 2012-07-20 15:34:49 +02:00 committed by Sascha Hauer
parent 4d1fe257a3
commit 0742542f87
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-mxs/include/mach/iomux-imx23.h
View File

@ -22,13 +22,14 @@
* ^^^^____ Bit offset
* ^^________ Function
* ^__________ Drive strength feature present
* ^___________ Pull up / bit keeper present
* ^___________ Pull up present
* ^^____________ Drive strength setting
* ^______________ Pull up / bit keeper setting
* ^_______________ Voltage select present
* ^________________ Voltage selection
* ^____________________ direction if enabled as GPIO (1 = output)
* ^_____________________ initial output value if enabled as GPIO and configured as output
* ^______________________ Bit keeper present
*/
#ifndef __ASM_MACH_IOMUX_H
#define __ASM_MACH_IOMUX_H
@ -63,7 +64,7 @@
/* control pad's pull up / bit keeper feature */
#define PE (1 << 10)
#define BK (1 << 11) /* FIXME useful to distinguish? */
#define BK (1 << 21)
#define PE_PRESENT(x) (!!((x) & PE))
#define BK_PRESENT(x) (!!((x) & BK))
#define PULLUP(x) ((x) << 13)

5
arch/arm/mach-mxs/include/mach/iomux-imx28.h
View File

@ -16,7 +16,7 @@
* ^^^______ Register Number
* ^^_________ Function
* ^___________ Drive strength feature present
* ^____________ Pull up / bit keeper present
* ^____________ Pull up present
* ^^_____________ Drive strength setting
* ^_______________ Pull up / bit keeper setting
* ^________________ Voltage select present
@ -24,6 +24,7 @@
* ^_____________________ direction if enabled as GPIO (1 = output)
* ^______________________ initial output value if enabled as GPIO
* and configured as output
* ^_______________________ Bit keeper present
*/
#ifndef __MACH_IOMUX_IMX28_H
#define __MACH_IOMUX_IMX28_H
@ -57,7 +58,7 @@
/* control pad's pull up / bit keeper feature */
#define PE (1 << 11)
#define BK (1 << 11) /* FIXME useful to distinguish? */
#define BK (1 << 22)
#define PE_PRESENT(x) (!!((x) & PE))
#define BK_PRESENT(x) (!!((x) & BK))
#define PULLUP(x) ((x) << 14)