GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: refactor gpio driver 

The gpio of rockchip SoCs(rk3288 & rk3399) are the same IP,
moving the gpio code of rk3288 to common then can be reused on rk3399.

BRANCH=none
BUG=chrome-os-partner:51537
TEST=build and boot into chromeos on veyron_jerry

Change-Id: I10a4b9d32afe60fd52512f2ad0007e9d2785033b
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 1c0c4b4b999790b0be7b0eeb70d2a7a86158f779
Original-Change-Id: If13b7760108831d81e8e8c950cdf61724d497b17
Original-Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/339846
Original-Commit-Ready: Vadim Bendebury <vbendeb@chromium.org>
Original-Tested-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://review.coreboot.org/14712
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Shunqian Zheng 2016-04-20 20:35:09 +08:00 committed by Patrick Georgi
parent 4f17374dfd
commit 015ae11bf6
4 changed files with 107 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/soc/rockchip/common/gpio.c Normal file
View File

@ -0,0 +1,66 @@
/*
* This file is part of the coreboot project.
*
* Copyright 2014 Rockchip Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include <arch/io.h>
#include <console/console.h>
#include <gpio.h>
#include <soc/gpio.h>
#include <soc/grf.h>
#include <soc/soc.h>
#include <stdlib.h>
enum {
PULLNONE = 0,
PULLUP,
PULLDOWN
};
static void __gpio_input(gpio_t gpio, u32 pull)
{
clrbits_le32(&gpio_port[gpio.port]->swporta_ddr, 1 << gpio.num);
if (is_pmu_gpio(gpio))
clrsetbits_le32(gpio_grf_reg(gpio), 3 << (gpio.idx * 2),
pull << (gpio.idx * 2));
else
write32(gpio_grf_reg(gpio), RK_CLRSETBITS(3 << (gpio.idx * 2),
pull << (gpio.idx * 2)));
}
void gpio_input(gpio_t gpio)
{
__gpio_input(gpio, PULLNONE);
}
void gpio_input_pulldown(gpio_t gpio)
{
__gpio_input(gpio, PULLDOWN);
}
void gpio_input_pullup(gpio_t gpio)
{
__gpio_input(gpio, PULLUP);
}
int gpio_get(gpio_t gpio)
{
return (read32(&gpio_port[gpio.port]->ext_porta) >> gpio.num) & 0x1;
}
void gpio_output(gpio_t gpio, int value)
{
setbits_le32(&gpio_port[gpio.port]->swporta_ddr, 1 << gpio.num);
clrsetbits_le32(&gpio_port[gpio.port]->swporta_dr, 1 << gpio.num,
!!value << gpio.num);
}

29
src/soc/rockchip/rk3288/include/soc/gpio.h → src/soc/rockchip/common/include/soc/gpio.h
View File

@ -1,7 +1,7 @@
/* /*
* This file is part of the coreboot project. * This file is part of the coreboot project.
* *
* Copyright 2014 Rockchip Inc. * Copyright 2016 Rockchip Inc.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -13,14 +13,14 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef __SOC_ROCKCHIP_RK3288_GPIO_H__ #ifndef __COREBOOT_SRC_SOC_ROCKCHIP_COMMON_INCLUDE_SOC_GPIO_H
#define __SOC_ROCKCHIP_RK3288_GPIO_H__ #define __COREBOOT_SRC_SOC_ROCKCHIP_COMMON_INCLUDE_SOC_GPIO_H
#include <types.h> #include <types.h>
#define GPIO(p, b, i) ((gpio_t){.port = p, .bank = GPIO_##b, .idx = i}) #define GPIO(p, b, i) ((gpio_t){.port = p, .bank = GPIO_##b, .idx = i})
struct rk3288_gpio_regs { struct rockchip_gpio_regs {
u32 swporta_dr; u32 swporta_dr;
u32 swporta_ddr; u32 swporta_ddr;
u32 reserved0[(0x30 - 0x08) / 4]; u32 reserved0[(0x30 - 0x08) / 4];
@ -36,7 +36,7 @@ struct rk3288_gpio_regs {
u32 reserved1[(0x60 - 0x54) / 4]; u32 reserved1[(0x60 - 0x54) / 4];
u32 ls_sync; u32 ls_sync;
}; };
check_member(rk3288_gpio_regs, ls_sync, 0x60); check_member(rockchip_gpio_regs, ls_sync, 0x60);
typedef union { typedef union {
u32 raw; u32 raw;
@ -44,13 +44,13 @@ typedef union {
u16 port; u16 port;
union { union {
struct { struct {
u16 num:5; u16 num : 5;
u16 :11; u16 reserved1 : 11;
}; };
struct { struct {
u16 idx:3; u16 idx : 3;
u16 bank:2; u16 bank : 2;
u16 :11; u16 reserved2 : 11;
}; };
}; };
}; };
@ -63,4 +63,11 @@ enum {
GPIO_D, GPIO_D,
}; };
#endif /* __SOC_ROCKCHIP_RK3288_GPIO_H__ */ extern struct rockchip_gpio_regs *gpio_port[];
/* Check if the gpio port is a pmu gpio */
int is_pmu_gpio(gpio_t gpio);
/* Return the io addr of gpio register */
void *gpio_grf_reg(gpio_t gpio);
#endif

4
src/soc/rockchip/rk3288/Makefile.inc
View File

@ -25,6 +25,7 @@ endif
bootblock-y += timer.c bootblock-y += timer.c
bootblock-y += clock.c bootblock-y += clock.c
bootblock-y += ../common/spi.c bootblock-y += ../common/spi.c
bootblock-y += ../common/gpio.c
bootblock-y += gpio.c bootblock-y += gpio.c
bootblock-y += ../common/i2c.c bootblock-y += ../common/i2c.c
bootblock-$(CONFIG_SOFTWARE_I2C) += software_i2c.c bootblock-$(CONFIG_SOFTWARE_I2C) += software_i2c.c
@ -33,6 +34,7 @@ bootblock-y += ../common/rk808.c
verstage-y += ../common/spi.c verstage-y += ../common/spi.c
verstage-y += timer.c verstage-y += timer.c
verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c
verstage-y += ../common/gpio.c
verstage-y += gpio.c verstage-y += gpio.c
verstage-y += clock.c verstage-y += clock.c
libverstage-y += crypto.c libverstage-y += crypto.c
@ -45,6 +47,7 @@ romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c
romstage-y += ../common/i2c.c romstage-y += ../common/i2c.c
romstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c romstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c
romstage-y += clock.c romstage-y += clock.c
romstage-y += ../common/gpio.c
romstage-y += gpio.c romstage-y += gpio.c
romstage-y += ../common/spi.c romstage-y += ../common/spi.c
romstage-y += sdram.c romstage-y += sdram.c
@ -60,6 +63,7 @@ ramstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c
ramstage-y += clock.c ramstage-y += clock.c
ramstage-y += ../common/spi.c ramstage-y += ../common/spi.c
ramstage-y += sdram.c ramstage-y += sdram.c
ramstage-y += ../common/gpio.c
ramstage-y += gpio.c ramstage-y += gpio.c
ramstage-y += ../common/rk808.c ramstage-y += ../common/rk808.c
ramstage-y += ../common/pwm.c ramstage-y += ../common/pwm.c

67
src/soc/rockchip/rk3288/gpio.c
View File

@ -16,66 +16,37 @@
#include <arch/io.h> #include <arch/io.h>
#include <console/console.h> #include <console/console.h>
#include <gpio.h> #include <gpio.h>
#include <soc/gpio.h>
#include <soc/grf.h> #include <soc/grf.h>
#include <soc/pmu.h> #include <soc/pmu.h>
#include <soc/soc.h> #include <soc/soc.h>
#include <stdlib.h> #include <stdlib.h>
struct rk3288_gpio_regs *gpio_port[] = { struct rockchip_gpio_regs *gpio_port[] = {
(struct rk3288_gpio_regs *)0xff750000, (struct rockchip_gpio_regs *)0xff750000,
(struct rk3288_gpio_regs *)0xff780000, (struct rockchip_gpio_regs *)0xff780000,
(struct rk3288_gpio_regs *)0xff790000, (struct rockchip_gpio_regs *)0xff790000,
(struct rk3288_gpio_regs *)0xff7a0000, (struct rockchip_gpio_regs *)0xff7a0000,
(struct rk3288_gpio_regs *)0xff7b0000, (struct rockchip_gpio_regs *)0xff7b0000,
(struct rk3288_gpio_regs *)0xff7c0000, (struct rockchip_gpio_regs *)0xff7c0000,
(struct rk3288_gpio_regs *)0xff7d0000, (struct rockchip_gpio_regs *)0xff7d0000,
(struct rk3288_gpio_regs *)0xff7e0000, (struct rockchip_gpio_regs *)0xff7e0000,
(struct rk3288_gpio_regs *)0xff7f0000 (struct rockchip_gpio_regs *)0xff7f0000
};
enum {
PULLNONE = 0,
PULLUP,
PULLDOWN
}; };
#define PMU_GPIO_PORT 0 #define PMU_GPIO_PORT 0
static void __gpio_input(gpio_t gpio, u32 pull) int is_pmu_gpio(gpio_t gpio)
{ {
clrbits_le32(&gpio_port[gpio.port]->swporta_ddr, 1 << gpio.num);
if (gpio.port == PMU_GPIO_PORT) if (gpio.port == PMU_GPIO_PORT)
clrsetbits_le32(&rk3288_pmu->gpio0pull[gpio.bank], return 1;
3 << (gpio.idx * 2), pull << (gpio.idx * 2)); return 0;
else
write32(&rk3288_grf->gpio1_p[(gpio.port - 1)][gpio.bank],
RK_CLRSETBITS(3 << (gpio.idx * 2),
pull << (gpio.idx * 2)));
} }
void gpio_input(gpio_t gpio) void *gpio_grf_reg(gpio_t gpio)
{ {
__gpio_input(gpio, PULLNONE); if (is_pmu_gpio(gpio))
} return &rk3288_pmu->gpio0pull[gpio.bank];
/* There is one pmu gpio, gpio0 , so " - 1" */
void gpio_input_pulldown(gpio_t gpio) return &rk3288_grf->gpio1_p[(gpio.port - 1)][gpio.bank];
{
__gpio_input(gpio, PULLDOWN);
}
void gpio_input_pullup(gpio_t gpio)
{
__gpio_input(gpio, PULLUP);
}
int gpio_get(gpio_t gpio)
{
return (read32(&gpio_port[gpio.port]->ext_porta) >> gpio.num) & 0x1;
}
void gpio_output(gpio_t gpio, int value)
{
setbits_le32(&gpio_port[gpio.port]->swporta_ddr, 1 << gpio.num);
clrsetbits_le32(&gpio_port[gpio.port]->swporta_dr, 1 << gpio.num,
!!value << gpio.num);
} }