summaryrefslogtreecommitdiff
path: root/src/soc/rockchip/common/include
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2017-07-14 14:25:39 -0700
committerJulius Werner <jwerner@chromium.org>2017-07-19 18:15:10 +0000
commit4ed8b305539f661895d9fa950bb32fc653e37f47 (patch)
tree26f40a7967832a622f1224aefca4bb16fbb9f056 /src/soc/rockchip/common/include
parent1642e1315857654c6a58938c63cac484c76f34de (diff)
downloadcoreboot-4ed8b305539f661895d9fa950bb32fc653e37f47.tar.xz
rockchip/rk3399: Adjust gpio_t format to match ARM TF
Our structure packing for Rockchip's gpio_t was chosen arbitrarily. ARM Trusted Firmware has since become a thing and chosen a slightly different way to represent GPIOs in a 32-bit word. Let's align our format to them so we don't need to remember to convert the values every time we pass them through. CQ-DEPEND=CL:572228 Change-Id: I9ce33da28ee8a34d2d944bee010d8bfc06fe879b Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/20586 Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/rockchip/common/include')
-rw-r--r--src/soc/rockchip/common/include/soc/gpio.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/soc/rockchip/common/include/soc/gpio.h b/src/soc/rockchip/common/include/soc/gpio.h
index 4c1cfa03cf..c9fa4c8339 100644
--- a/src/soc/rockchip/common/include/soc/gpio.h
+++ b/src/soc/rockchip/common/include/soc/gpio.h
@@ -19,8 +19,6 @@
#include <types.h>
#define GPIO(p, b, i) ((gpio_t){.port = p, .bank = GPIO_##b, .idx = i})
-#define GET_GPIO_NUM(gpio) (gpio.port * 32 + gpio.bank * 8 + gpio.idx)
-
struct rockchip_gpio_regs {
u32 swporta_dr;
@@ -43,16 +41,16 @@ check_member(rockchip_gpio_regs, ls_sync, 0x60);
typedef union {
u32 raw;
struct {
- u16 port;
union {
struct {
- u16 num : 5;
- u16 reserved1 : 11;
+ u32 num : 5;
+ u32 reserved1 : 27;
};
struct {
- u16 idx : 3;
- u16 bank : 2;
- u16 reserved2 : 11;
+ u32 idx : 3;
+ u32 bank : 2;
+ u32 port : 4;
+ u32 reserved2 : 23;
};
};
};