GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

imx: Make imx25 compatible to mxc_gpio driver and fix in tx25

Browse source 
Adding support for mxc_gpio driver for imx25 and fix names of registers in tx25
board.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
This commit is contained in:
Matthias Weisser 2011-07-06 00:28:32 +00:00 • committed by Albert ARIBAUD
parent 23210d8e1b
commit 95d185894b
3 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/include/asm/arch-mx25/imx-regs.h
View file

@ -86,8 +86,8 @@ struct esdramc_regs {
/* GPIO registers */ /* GPIO registers */
struct gpio_regs { struct gpio_regs {
u32 dr; /* data */ u32 gpio_dr; /* data */
u32 dir; /* direction */ u32 gpio_dir; /* direction */
u32 psr; /* pad satus */ u32 psr; /* pad satus */
u32 icr1; /* interrupt config 1 */ u32 icr1; /* interrupt config 1 */
u32 icr2; /* interrupt config 2 */ u32 icr2; /* interrupt config 2 */
@ -357,4 +357,10 @@ struct aips_regs {
#define WSR_UNLOCK1 0x5555 #define WSR_UNLOCK1 0x5555
#define WSR_UNLOCK2 0xAAAA #define WSR_UNLOCK2 0xAAAA
/* Names used in GPIO driver */
#define GPIO1_BASE_ADDR IMX_GPIO1_BASE
#define GPIO2_BASE_ADDR IMX_GPIO2_BASE
#define GPIO3_BASE_ADDR IMX_GPIO3_BASE
#define GPIO4_BASE_ADDR IMX_GPIO4_BASE
#endif /* _IMX_REGS_H */ #endif /* _IMX_REGS_H */

26
board/karo/tx25/tx25.c
View file

@ -70,18 +70,18 @@ void tx25_fec_init(void)
writel(0x0, &padctl->pad_d11); writel(0x0, &padctl->pad_d11);
/* drop PHY power and assert reset (low) */ /* drop PHY power and assert reset (low) */
val = readl(&gpio4->dr) & ~((1 << 7) | (1 << 9)); val = readl(&gpio4->gpio_dr) & ~((1 << 7) | (1 << 9));
writel(val, &gpio4->dr); writel(val, &gpio4->gpio_dr);
val = readl(&gpio4->dir) | (1 << 7) | (1 << 9); val = readl(&gpio4->gpio_dir) | (1 << 7) | (1 << 9);
writel(val, &gpio4->dir); writel(val, &gpio4->gpio_dir);
mdelay(5); mdelay(5);
debug("resetting phy\n"); debug("resetting phy\n");
/* turn on PHY power leaving reset asserted */ /* turn on PHY power leaving reset asserted */
val = readl(&gpio4->dr) | 1 << 9; val = readl(&gpio4->gpio_dr) | 1 << 9;
writel(val, &gpio4->dr); writel(val, &gpio4->gpio_dr);
mdelay(10); mdelay(10);
@ -111,19 +111,19 @@ void tx25_fec_init(void)
/* /*
* set each to 1 and make each an output * set each to 1 and make each an output
*/ */
val = readl(&gpio3->dr) | (1 << 10) | (1 << 11) | (1 << 12); val = readl(&gpio3->gpio_dr) | (1 << 10) | (1 << 11) | (1 << 12);
writel(val, &gpio3->dr); writel(val, &gpio3->gpio_dr);
val = readl(&gpio3->dir) | (1 << 10) | (1 << 11) | (1 << 12); val = readl(&gpio3->gpio_dir) | (1 << 10) | (1 << 11) | (1 << 12);
writel(val, &gpio3->dir); writel(val, &gpio3->gpio_dir);
mdelay(22); /* this value came from RedBoot */ mdelay(22); /* this value came from RedBoot */
/* /*
* deassert PHY reset * deassert PHY reset
*/ */
val = readl(&gpio4->dr) | 1 << 7; val = readl(&gpio4->gpio_dr) | 1 << 7;
writel(val, &gpio4->dr); writel(val, &gpio4->gpio_dr);
writel(val, &gpio4->dr); writel(val, &gpio4->gpio_dr);
mdelay(5); mdelay(5);

5
include/mxc_gpio.h
View file

@ -24,6 +24,11 @@
#ifndef __MXC_GPIO_H #ifndef __MXC_GPIO_H
#define __MXC_GPIO_H #define __MXC_GPIO_H
/* Converts a GPIO port number and the internal bit position
* to the GPIO number
*/
#define MXC_GPIO_PORT_TO_NUM(port, bit) (((port - 1) << 5) + (bit & 0x1f))
enum mxc_gpio_direction { enum mxc_gpio_direction {
MXC_GPIO_DIRECTION_IN, MXC_GPIO_DIRECTION_IN,
MXC_GPIO_DIRECTION_OUT, MXC_GPIO_DIRECTION_OUT,