diff options
| author | David Wu <david.wu@rock-chips.com> | 2018-01-13 13:53:57 +0800 |
|---|---|---|
| committer | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2018-01-28 17:12:36 +0100 |
| commit | 77c4261130b4690f11248642b00802cb34f6be40 (patch) | |
| tree | b8134c58a53f47e5d529ee3b8692b1d05bd3e044 /board/rockchip | |
| parent | 0788a31e0351a55646070eac597d953582018a76 (diff) | |
| download | u-boot-77c4261130b4690f11248642b00802cb34f6be40.tar.gz u-boot-77c4261130b4690f11248642b00802cb34f6be40.tar.bz2 u-boot-77c4261130b4690f11248642b00802cb34f6be40.zip | |
rockchip: pinctrl: rv1108: Move the iomux definitions into pinctrl-driver
If we include both the rk3288_grf.h and rv1108_grf.h, it will cause the
conflicts of redefinition. Clean the iomux definitions at grf_rv1108.h,
and move them into pinctrl-driver.
Signed-off-by: David Wu <david.wu@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Diffstat (limited to 'board/rockchip')
| -rw-r--r-- | board/rockchip/evb_rv1108/evb_rv1108.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/board/rockchip/evb_rv1108/evb_rv1108.c b/board/rockchip/evb_rv1108/evb_rv1108.c index fe37eac420..54bd08bfad 100644 --- a/board/rockchip/evb_rv1108/evb_rv1108.c +++ b/board/rockchip/evb_rv1108/evb_rv1108.c @@ -16,6 +16,23 @@ int mach_cpu_init(void) { int node; struct rv1108_grf *grf; + enum { + GPIO3C3_SHIFT = 6, + GPIO3C3_MASK = 3 << GPIO3C3_SHIFT, + + GPIO3C2_SHIFT = 4, + GPIO3C2_MASK = 3 << GPIO3C2_SHIFT, + + GPIO2D2_SHIFT = 4, + GPIO2D2_MASK = 3 << GPIO2D2_SHIFT, + GPIO2D2_GPIO = 0, + GPIO2D2_UART2_SOUT_M0, + + GPIO2D1_SHIFT = 2, + GPIO2D1_MASK = 3 << GPIO2D1_SHIFT, + GPIO2D1_GPIO = 0, + GPIO2D1_UART2_SIN_M0, + }; node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "rockchip,rv1108-grf"); grf = (struct rv1108_grf *)fdtdec_get_addr(gd->fdt_blob, node, "reg"); |