Your ROOT_URL in app.ini is https://src.whiteboxsystems.nl/ but you are visiting http://src.whiteboxsystems.nl/Whitebox/u-boot/commit/25223a68e5f7cc32eebb44313efe8ff15a0f5fd6 You should set ROOT_URL correctly, otherwise the web may not work correctly.
Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

omap: reuse omap3 gpio support in omap4

Browse Source 
Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
master
Aneesh V 14 years ago committed by U-Boot
parent 924eb369e3
commit 25223a68e5
10 changed files with 105 additions and 51 deletions
  1. 1
      arch/arm/cpu/armv7/omap-common/Makefile
  2. 41
      arch/arm/cpu/armv7/omap-common/gpio.c
  3. 1
      arch/arm/cpu/armv7/omap3/Makefile
  4. 12
      arch/arm/cpu/armv7/omap3/board.c
  5. 12
      arch/arm/cpu/armv7/omap4/board.c
  6. 2
      arch/arm/cpu/armv7/omap4/clocks.c
  7. 26
      arch/arm/include/asm/arch-omap3/cpu.h
  8. 26
      arch/arm/include/asm/arch-omap4/cpu.h
  9. 8
      arch/arm/include/asm/arch-omap4/omap4.h
  10. 27
      arch/arm/include/asm/omap_gpio.h

1
arch/arm/cpu/armv7/omap-common/Makefile
Unescape View File

@ -29,6 +29,7 @@ SOBJS := reset.o
COBJS := timer.o
COBJS += utils.o
COBJS += gpio.o
ifdef CONFIG_SPL_BUILD
COBJS += spl.o

41
arch/arm/cpu/armv7/omap3/gpio.c → arch/arm/cpu/armv7/omap-common/gpio.c
Unescape View File

@ -36,24 +36,13 @@
* published by the Free Software Foundation.
*/
#include <common.h>
#include <asm/arch/gpio.h>
#include <asm/omap_gpio.h>
#include <asm/io.h>
#include <asm/errno.h>
static struct gpio_bank gpio_bank_34xx[6] = {
{ (void *)OMAP34XX_GPIO1_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP34XX_GPIO2_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP34XX_GPIO3_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP34XX_GPIO4_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP34XX_GPIO5_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP34XX_GPIO6_BASE, METHOD_GPIO_24XX },
};
static struct gpio_bank *gpio_bank = &gpio_bank_34xx[0];
static inline struct gpio_bank *get_gpio_bank(int gpio)
static inline const struct gpio_bank *get_gpio_bank(int gpio)
{
return &gpio_bank[gpio >> 5];
return &omap_gpio_bank[gpio >> 5];
}
static inline int get_gpio_index(int gpio)
@ -79,14 +68,15 @@ static int check_gpio(int gpio)
return 0;
}
static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
static void _set_gpio_direction(const struct gpio_bank *bank, int gpio,
int is_input)
{
void *reg = bank->base;
u32 l;
switch (bank->method) {
case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_OE;
reg += OMAP_GPIO_OE;
break;
default:
return;
@ -101,7 +91,7 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
void omap_set_gpio_direction(int gpio, int is_input)
{
struct gpio_bank *bank;
const struct gpio_bank *bank;
if (check_gpio(gpio) < 0)
return;
@ -109,7 +99,8 @@ void omap_set_gpio_direction(int gpio, int is_input)
_set_gpio_direction(bank, get_gpio_index(gpio), is_input);
}
static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
static void _set_gpio_dataout(const struct gpio_bank *bank, int gpio,
int enable)
{
void *reg = bank->base;
u32 l = 0;
@ -117,9 +108,9 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
switch (bank->method) {
case METHOD_GPIO_24XX:
if (enable)
reg += OMAP24XX_GPIO_SETDATAOUT;
reg += OMAP_GPIO_SETDATAOUT;
else
reg += OMAP24XX_GPIO_CLEARDATAOUT;
reg += OMAP_GPIO_CLEARDATAOUT;
l = 1 << gpio;
break;
default:
@ -132,7 +123,7 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
void omap_set_gpio_dataout(int gpio, int enable)
{
struct gpio_bank *bank;
const struct gpio_bank *bank;
if (check_gpio(gpio) < 0)
return;
@ -142,7 +133,7 @@ void omap_set_gpio_dataout(int gpio, int enable)
int omap_get_gpio_datain(int gpio)
{
struct gpio_bank *bank;
const struct gpio_bank *bank;
void *reg;
if (check_gpio(gpio) < 0)
@ -151,7 +142,7 @@ int omap_get_gpio_datain(int gpio)
reg = bank->base;
switch (bank->method) {
case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_DATAIN;
reg += OMAP_GPIO_DATAIN;
break;
default:
return -EINVAL;
@ -160,7 +151,7 @@ int omap_get_gpio_datain(int gpio)
& (1 << get_gpio_index(gpio))) != 0;
}
static void _reset_gpio(struct gpio_bank *bank, int gpio)
static void _reset_gpio(const struct gpio_bank *bank, int gpio)
{
_set_gpio_direction(bank, get_gpio_index(gpio), 1);
}
@ -175,7 +166,7 @@ int omap_request_gpio(int gpio)
void omap_free_gpio(int gpio)
{
struct gpio_bank *bank;
const struct gpio_bank *bank;
if (check_gpio(gpio) < 0)
return;

1
arch/arm/cpu/armv7/omap3/Makefile
Unescape View File

@ -29,7 +29,6 @@ SOBJS := lowlevel_init.o
COBJS += board.o
COBJS += clock.o
COBJS += gpio.o
COBJS += mem.o
COBJS += sys_info.o

12
arch/arm/cpu/armv7/omap3/board.c
Unescape View File

@ -38,12 +38,24 @@
#include <asm/arch/mem.h>
#include <asm/cache.h>
#include <asm/armv7.h>
#include <asm/omap_gpio.h>
/* Declarations */
extern omap3_sysinfo sysinfo;
static void omap3_setup_aux_cr(void);
static void omap3_invalidate_l2_cache_secure(void);
static const struct gpio_bank gpio_bank_34xx[6] = {
{ (void *)OMAP34XX_GPIO1_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP34XX_GPIO2_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP34XX_GPIO3_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP34XX_GPIO4_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP34XX_GPIO5_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP34XX_GPIO6_BASE, METHOD_GPIO_24XX },
};
const struct gpio_bank *const omap_gpio_bank = gpio_bank_34xx;
/******************************************************************************
* Routine: delay
* Description: spinning delay to use before udelay works

12
arch/arm/cpu/armv7/omap4/board.c
Unescape View File

@ -33,12 +33,24 @@
#include <asm/arch/sys_proto.h>
#include <asm/sizes.h>
#include <asm/arch/emif.h>
#include <asm/omap_gpio.h>
#include "omap4_mux_data.h"
DECLARE_GLOBAL_DATA_PTR;
u32 *const omap4_revision = (u32 *)OMAP4_SRAM_SCRATCH_OMAP4_REV;
static const struct gpio_bank gpio_bank_44xx[6] = {
{ (void *)OMAP44XX_GPIO1_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP44XX_GPIO2_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP44XX_GPIO3_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP44XX_GPIO4_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP44XX_GPIO5_BASE, METHOD_GPIO_24XX },
{ (void *)OMAP44XX_GPIO6_BASE, METHOD_GPIO_24XX },
};
const struct gpio_bank *const omap_gpio_bank = gpio_bank_44xx;
#ifdef CONFIG_SPL_BUILD
/*
* We use static variables because global data is not ready yet.

2
arch/arm/cpu/armv7/omap4/clocks.c
Unescape View File

@ -830,9 +830,9 @@ void prcm_init(void)
case OMAP_INIT_CONTEXT_SPL:
case OMAP_INIT_CONTEXT_UBOOT_FROM_NOR:
case OMAP_INIT_CONTEXT_UBOOT_AFTER_CH:
enable_basic_clocks();
scale_vcores();
setup_dplls();
enable_basic_clocks();
setup_non_essential_dplls();
enable_non_essential_clocks();
break;

26
arch/arm/include/asm/arch-omap3/cpu.h
Unescape View File

@ -498,4 +498,30 @@ struct pm {
/* MUSB base */
#define MUSB_BASE (OMAP34XX_CORE_L4_IO_BASE + 0xAB000)
/* OMAP3 GPIO registers */
#define OMAP_GPIO_REVISION 0x0000
#define OMAP_GPIO_SYSCONFIG 0x0010
#define OMAP_GPIO_SYSSTATUS 0x0014
#define OMAP_GPIO_IRQSTATUS1 0x0018
#define OMAP_GPIO_IRQSTATUS2 0x0028
#define OMAP_GPIO_IRQENABLE2 0x002c
#define OMAP_GPIO_IRQENABLE1 0x001c
#define OMAP_GPIO_WAKE_EN 0x0020
#define OMAP_GPIO_CTRL 0x0030
#define OMAP_GPIO_OE 0x0034
#define OMAP_GPIO_DATAIN 0x0038
#define OMAP_GPIO_DATAOUT 0x003c
#define OMAP_GPIO_LEVELDETECT0 0x0040
#define OMAP_GPIO_LEVELDETECT1 0x0044
#define OMAP_GPIO_RISINGDETECT 0x0048
#define OMAP_GPIO_FALLINGDETECT 0x004c
#define OMAP_GPIO_DEBOUNCE_EN 0x0050
#define OMAP_GPIO_DEBOUNCE_VAL 0x0054
#define OMAP_GPIO_CLEARIRQENABLE1 0x0060
#define OMAP_GPIO_SETIRQENABLE1 0x0064
#define OMAP_GPIO_CLEARWKUENA 0x0080
#define OMAP_GPIO_SETWKUENA 0x0084
#define OMAP_GPIO_CLEARDATAOUT 0x0090
#define OMAP_GPIO_SETDATAOUT 0x0094
#endif /* _CPU_H */

26
arch/arm/include/asm/arch-omap4/cpu.h
Unescape View File

@ -142,4 +142,30 @@ struct watchdog {
/* MUSB base */
#define MUSB_BASE (OMAP44XX_L4_CORE_BASE + 0xAB000)
/* OMAP4 GPIO registers */
#define OMAP_GPIO_REVISION 0x0000
#define OMAP_GPIO_SYSCONFIG 0x0010
#define OMAP_GPIO_SYSSTATUS 0x0114
#define OMAP_GPIO_IRQSTATUS1 0x0118
#define OMAP_GPIO_IRQSTATUS2 0x0128
#define OMAP_GPIO_IRQENABLE2 0x012c
#define OMAP_GPIO_IRQENABLE1 0x011c
#define OMAP_GPIO_WAKE_EN 0x0120
#define OMAP_GPIO_CTRL 0x0130
#define OMAP_GPIO_OE 0x0134
#define OMAP_GPIO_DATAIN 0x0138
#define OMAP_GPIO_DATAOUT 0x013c
#define OMAP_GPIO_LEVELDETECT0 0x0140
#define OMAP_GPIO_LEVELDETECT1 0x0144
#define OMAP_GPIO_RISINGDETECT 0x0148
#define OMAP_GPIO_FALLINGDETECT 0x014c
#define OMAP_GPIO_DEBOUNCE_EN 0x0150
#define OMAP_GPIO_DEBOUNCE_VAL 0x0154
#define OMAP_GPIO_CLEARIRQENABLE1 0x0160
#define OMAP_GPIO_SETIRQENABLE1 0x0164
#define OMAP_GPIO_CLEARWKUENA 0x0180
#define OMAP_GPIO_SETWKUENA 0x0184
#define OMAP_GPIO_CLEARDATAOUT 0x0190
#define OMAP_GPIO_SETDATAOUT 0x0194
#endif /* _CPU_H */

8
arch/arm/include/asm/arch-omap4/omap4.h
Unescape View File

@ -153,4 +153,12 @@ struct s32ktimer {
#define DEV_DATA_PTR_OFFSET 0x18
#define BOOT_MODE_OFFSET 0x8
/* GPIO */
#define OMAP44XX_GPIO1_BASE 0x4A310000
#define OMAP44XX_GPIO2_BASE 0x48055000
#define OMAP44XX_GPIO3_BASE 0x48057000
#define OMAP44XX_GPIO4_BASE 0x48059000
#define OMAP44XX_GPIO5_BASE 0x4805B000
#define OMAP44XX_GPIO6_BASE 0x4805D000
#endif

27
arch/arm/include/asm/arch-omap3/gpio.h → arch/arm/include/asm/omap_gpio.h
Unescape View File

@ -38,36 +38,15 @@
#ifndef _GPIO_H
#define _GPIO_H
#define OMAP24XX_GPIO_REVISION 0x0000
#define OMAP24XX_GPIO_SYSCONFIG 0x0010
#define OMAP24XX_GPIO_SYSSTATUS 0x0014
#define OMAP24XX_GPIO_IRQSTATUS1 0x0018
#define OMAP24XX_GPIO_IRQSTATUS2 0x0028
#define OMAP24XX_GPIO_IRQENABLE2 0x002c
#define OMAP24XX_GPIO_IRQENABLE1 0x001c
#define OMAP24XX_GPIO_WAKE_EN 0x0020
#define OMAP24XX_GPIO_CTRL 0x0030
#define OMAP24XX_GPIO_OE 0x0034
#define OMAP24XX_GPIO_DATAIN 0x0038
#define OMAP24XX_GPIO_DATAOUT 0x003c
#define OMAP24XX_GPIO_LEVELDETECT0 0x0040
#define OMAP24XX_GPIO_LEVELDETECT1 0x0044
#define OMAP24XX_GPIO_RISINGDETECT 0x0048
#define OMAP24XX_GPIO_FALLINGDETECT 0x004c
#define OMAP24XX_GPIO_DEBOUNCE_EN 0x0050
#define OMAP24XX_GPIO_DEBOUNCE_VAL 0x0054
#define OMAP24XX_GPIO_CLEARIRQENABLE1 0x0060
#define OMAP24XX_GPIO_SETIRQENABLE1 0x0064
#define OMAP24XX_GPIO_CLEARWKUENA 0x0080
#define OMAP24XX_GPIO_SETWKUENA 0x0084
#define OMAP24XX_GPIO_CLEARDATAOUT 0x0090
#define OMAP24XX_GPIO_SETDATAOUT 0x0094
#include <asm/arch/cpu.h>
struct gpio_bank {
void *base;
int method;
};
extern const struct gpio_bank *const omap_gpio_bank;
#define METHOD_GPIO_24XX 4
/* This is the interface */
Write Preview
Loading…
Cancel
Save