erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rockchip/rk3399: Adjust gpio_t format to match ARM TF

Browse source 
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>
This commit is contained in:
Julius Werner 2017-07-14 14:25:39 -07:00
commit 4ed8b30553
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/soc/rockchip/common/include/soc/gpio.h
View file

@ -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;
};
};
};