[U-Boot] [PATCH] rockchip: rk3399-puma: set gpio4cd iodomain to 1.8V

[U-Boot] [PATCH] rockchip: rk3399-puma: set gpio4cd iodomain to 1.8V

[Jakob Unterwurzacher]

The PCIe reset signal is connected to GPIO4_C6 on the Puma
module. This pin is supplied by 1.8V, but the default iodomain
setting is 3.0V and in this situation the pin is unable to go
high.

Linux assumes that this signal works in early boot
as PCIe is probed before loading the iodomain driver.

Make PCIe work in Linux by setting the gpio4cd iodomain to 1.8V.

Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
---

 board/theobroma-systems/puma_rk3399/puma-rk3399.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index c9768dd75c..8d407940e5 100644
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -9,10 +9,15 @@
 #include <misc.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <asm/io.h>
 #include <asm/setup.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/grf_rk3399.h>
 #include <asm/arch/periph.h>
 #include <power/regulator.h>
 #include <spl.h>
+#include <syscon.h>
 #include <u-boot/sha256.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -145,10 +150,25 @@ static void setup_serial(void)
 #endif
 }
 
+static void setup_iodomain(void)
+{
+	const u32 GRF_IO_VSEL_GPIO4CD_SHIFT = 3;
+	struct rk3399_grf_regs *grf =
+	    syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
+
+	/*
+	 * Set bit 3 in GRF_IO_VSEL so PCIE_RST# works (pin GPIO4_C6).
+	 * Linux assumes that PCIE_RST# works out of the box as it probes
+	 * PCIe before loading the iodomain driver.
+	 */
+	rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_GPIO4CD_SHIFT);
+}
+
 int misc_init_r(void)
 {
 	setup_serial();
 	setup_macaddr();
+	setup_iodomain();
 
 	return 0;
 }
-- 
2.11.0

[U-Boot] rockchip: rk3399-puma: set gpio4cd iodomain to 1.8V

[Philipp Tomsich]

> The PCIe reset signal is connected to GPIO4_C6 on the Puma
> module. This pin is supplied by 1.8V, but the default iodomain
> setting is 3.0V and in this situation the pin is unable to go
> high.
> 
> Linux assumes that this signal works in early boot
> as PCIe is probed before loading the iodomain driver.
> 
> Make PCIe work in Linux by setting the gpio4cd iodomain to 1.8V.
> 
> Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
> ---
> 
>  board/theobroma-systems/puma_rk3399/puma-rk3399.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

[U-Boot] rockchip: rk3399-puma: set gpio4cd iodomain to 1.8V

[Philipp Tomsich]

> The PCIe reset signal is connected to GPIO4_C6 on the Puma
> module. This pin is supplied by 1.8V, but the default iodomain
> setting is 3.0V and in this situation the pin is unable to go
> high.
> 
> Linux assumes that this signal works in early boot
> as PCIe is probed before loading the iodomain driver.
> 
> Make PCIe work in Linux by setting the gpio4cd iodomain to 1.8V.
> 
> Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
>  board/theobroma-systems/puma_rk3399/puma-rk3399.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 

Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

[U-Boot] rockchip: rk3399-puma: set gpio4cd iodomain to 1.8V

[Philipp Tomsich]

> The PCIe reset signal is connected to GPIO4_C6 on the Puma
> module. This pin is supplied by 1.8V, but the default iodomain
> setting is 3.0V and in this situation the pin is unable to go
> high.
> 
> Linux assumes that this signal works in early boot
> as PCIe is probed before loading the iodomain driver.
> 
> Make PCIe work in Linux by setting the gpio4cd iodomain to 1.8V.
> 
> Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
>  board/theobroma-systems/puma_rk3399/puma-rk3399.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 

Applied to u-boot-rockchip, thanks!

[U-Boot] rockchip: rk3399-puma: set gpio4cd iodomain to 1.8V

[Philipp Tomsich]

> The PCIe reset signal is connected to GPIO4_C6 on the Puma
> module. This pin is supplied by 1.8V, but the default iodomain
> setting is 3.0V and in this situation the pin is unable to go
> high.
> 
> Linux assumes that this signal works in early boot
> as PCIe is probed before loading the iodomain driver.
> 
> Make PCIe work in Linux by setting the gpio4cd iodomain to 1.8V.
> 
> Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
>  board/theobroma-systems/puma_rk3399/puma-rk3399.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 

Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>