leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: ich6-gpio: Move setup_pch_gpios() to board support codes

Browse Source 
Movie setup_pch_gpios() in the ich6-gpio driver to the board support
codes, so that the driver does not need to know any platform specific
stuff (ie: include the platform specifc chipset header file).

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2014-12-12 21:05:23 +08:00 committed by Simon Glass
parent fe0c33a5ac
commit 2795573a8c
6 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/include/asm/arch-coreboot/gpio.h
View File

@ -7,4 +7,7 @@
#ifndef _X86_ARCH_GPIO_H_ #ifndef _X86_ARCH_GPIO_H_
#define _X86_ARCH_GPIO_H_ #define _X86_ARCH_GPIO_H_
/* Where in config space is the register that points to the GPIO registers? */
#define PCI_CFG_GPIOBASE 0x48
#endif /* _X86_ARCH_GPIO_H_ */ #endif /* _X86_ARCH_GPIO_H_ */

3
arch/x86/include/asm/arch-ivybridge/gpio.h
View File

@ -7,4 +7,7 @@
#ifndef _X86_ARCH_GPIO_H_ #ifndef _X86_ARCH_GPIO_H_
#define _X86_ARCH_GPIO_H_ #define _X86_ARCH_GPIO_H_
/* Where in config space is the register that points to the GPIO registers? */
#define PCI_CFG_GPIOBASE 0x48
#endif /* _X86_ARCH_GPIO_H_ */ #endif /* _X86_ARCH_GPIO_H_ */

1
arch/x86/include/asm/gpio.h
View File

@ -147,6 +147,7 @@ struct pch_gpio_map {
} set3; } set3;
}; };
void setup_pch_gpios(u32 gpiobase, const struct pch_gpio_map *gpio);
void ich_gpio_set_gpio_map(const struct pch_gpio_map *map); void ich_gpio_set_gpio_map(const struct pch_gpio_map *map);
#endif /* _X86_GPIO_H_ */ #endif /* _X86_GPIO_H_ */

6
board/coreboot/coreboot/coreboot.c
View File

@ -6,6 +6,7 @@
#include <common.h> #include <common.h>
#include <cros_ec.h> #include <cros_ec.h>
#include <asm/gpio.h>
int arch_early_init_r(void) int arch_early_init_r(void)
{ {
@ -14,3 +15,8 @@ int arch_early_init_r(void)
return 0; return 0;
} }
void setup_pch_gpios(u32 gpiobase, const struct pch_gpio_map *gpio)
{
return;
}

40
board/google/chromebook_link/link.c
View File

@ -7,6 +7,9 @@
#include <common.h> #include <common.h>
#include <cros_ec.h> #include <cros_ec.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h>
#include <asm/pci.h>
#include <asm/arch/pch.h>
int arch_early_init_r(void) int arch_early_init_r(void)
{ {
@ -121,3 +124,40 @@ int board_early_init_f(void)
return 0; return 0;
} }
void setup_pch_gpios(u32 gpiobase, const struct pch_gpio_map *gpio)
{
/* GPIO Set 1 */
if (gpio->set1.level)
outl(*((u32 *)gpio->set1.level), gpiobase + GP_LVL);
if (gpio->set1.mode)
outl(*((u32 *)gpio->set1.mode), gpiobase + GPIO_USE_SEL);
if (gpio->set1.direction)
outl(*((u32 *)gpio->set1.direction), gpiobase + GP_IO_SEL);
if (gpio->set1.reset)
outl(*((u32 *)gpio->set1.reset), gpiobase + GP_RST_SEL1);
if (gpio->set1.invert)
outl(*((u32 *)gpio->set1.invert), gpiobase + GPI_INV);
if (gpio->set1.blink)
outl(*((u32 *)gpio->set1.blink), gpiobase + GPO_BLINK);
/* GPIO Set 2 */
if (gpio->set2.level)
outl(*((u32 *)gpio->set2.level), gpiobase + GP_LVL2);
if (gpio->set2.mode)
outl(*((u32 *)gpio->set2.mode), gpiobase + GPIO_USE_SEL2);
if (gpio->set2.direction)
outl(*((u32 *)gpio->set2.direction), gpiobase + GP_IO_SEL2);
if (gpio->set2.reset)
outl(*((u32 *)gpio->set2.reset), gpiobase + GP_RST_SEL2);
/* GPIO Set 3 */
if (gpio->set3.level)
outl(*((u32 *)gpio->set3.level), gpiobase + GP_LVL3);
if (gpio->set3.mode)
outl(*((u32 *)gpio->set3.mode), gpiobase + GPIO_USE_SEL3);
if (gpio->set3.direction)
outl(*((u32 *)gpio->set3.direction), gpiobase + GP_IO_SEL3);
if (gpio->set3.reset)
outl(*((u32 *)gpio->set3.reset), gpiobase + GP_RST_SEL3);
}

53
drivers/gpio/intel_ich6_gpio.c
View File

@ -34,16 +34,9 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/pci.h> #include <asm/pci.h>
#ifdef CONFIG_X86_RESET_VECTOR
#include <asm/arch/pch.h>
#define SUPPORT_GPIO_SETUP
#endif
#define GPIO_PER_BANK 32 #define GPIO_PER_BANK 32
/* Where in config space is the register that points to the GPIO registers? */
#define PCI_CFG_GPIOBASE 0x48
struct ich6_bank_priv { struct ich6_bank_priv {
/* These are I/O addresses */ /* These are I/O addresses */
uint32_t use_sel; uint32_t use_sel;
@ -51,52 +44,11 @@ struct ich6_bank_priv {
uint32_t lvl; uint32_t lvl;
}; };
#ifdef SUPPORT_GPIO_SETUP
static void setup_pch_gpios(const struct pch_gpio_map *gpio)
{
u16 gpiobase = pci_read_config16(PCH_LPC_DEV, GPIO_BASE) & 0xfffc;
/* GPIO Set 1 */
if (gpio->set1.level)
outl(*((u32 *)gpio->set1.level), gpiobase + GP_LVL);
if (gpio->set1.mode)
outl(*((u32 *)gpio->set1.mode), gpiobase + GPIO_USE_SEL);
if (gpio->set1.direction)
outl(*((u32 *)gpio->set1.direction), gpiobase + GP_IO_SEL);
if (gpio->set1.reset)
outl(*((u32 *)gpio->set1.reset), gpiobase + GP_RST_SEL1);
if (gpio->set1.invert)
outl(*((u32 *)gpio->set1.invert), gpiobase + GPI_INV);
if (gpio->set1.blink)
outl(*((u32 *)gpio->set1.blink), gpiobase + GPO_BLINK);
/* GPIO Set 2 */
if (gpio->set2.level)
outl(*((u32 *)gpio->set2.level), gpiobase + GP_LVL2);
if (gpio->set2.mode)
outl(*((u32 *)gpio->set2.mode), gpiobase + GPIO_USE_SEL2);
if (gpio->set2.direction)
outl(*((u32 *)gpio->set2.direction), gpiobase + GP_IO_SEL2);
if (gpio->set2.reset)
outl(*((u32 *)gpio->set2.reset), gpiobase + GP_RST_SEL2);
/* GPIO Set 3 */
if (gpio->set3.level)
outl(*((u32 *)gpio->set3.level), gpiobase + GP_LVL3);
if (gpio->set3.mode)
outl(*((u32 *)gpio->set3.mode), gpiobase + GPIO_USE_SEL3);
if (gpio->set3.direction)
outl(*((u32 *)gpio->set3.direction), gpiobase + GP_IO_SEL3);
if (gpio->set3.reset)
outl(*((u32 *)gpio->set3.reset), gpiobase + GP_RST_SEL3);
}
/* TODO: Move this to device tree, or platform data */ /* TODO: Move this to device tree, or platform data */
void ich_gpio_set_gpio_map(const struct pch_gpio_map *map) void ich_gpio_set_gpio_map(const struct pch_gpio_map *map)
{ {
gd->arch.gpio_map = map; gd->arch.gpio_map = map;
} }
#endif /* SUPPORT_GPIO_SETUP */
static int gpio_ich6_ofdata_to_platdata(struct udevice *dev) static int gpio_ich6_ofdata_to_platdata(struct udevice *dev)
{ {
@ -198,12 +150,11 @@ static int ich6_gpio_probe(struct udevice *dev)
struct gpio_dev_priv *uc_priv = dev->uclass_priv; struct gpio_dev_priv *uc_priv = dev->uclass_priv;
struct ich6_bank_priv *bank = dev_get_priv(dev); struct ich6_bank_priv *bank = dev_get_priv(dev);
#ifdef SUPPORT_GPIO_SETUP
if (gd->arch.gpio_map) { if (gd->arch.gpio_map) {
setup_pch_gpios(gd->arch.gpio_map); setup_pch_gpios(plat->base_addr, gd->arch.gpio_map);
gd->arch.gpio_map = NULL; gd->arch.gpio_map = NULL;
} }
#endif
uc_priv->gpio_count = GPIO_PER_BANK; uc_priv->gpio_count = GPIO_PER_BANK;
uc_priv->bank_name = plat->bank_name; uc_priv->bank_name = plat->bank_name;
bank->use_sel = plat->base_addr; bank->use_sel = plat->base_addr;