Skip to contentSkip to conversation

arm: rockchip: rk3308: Initialize the iomux configuration

PATCH New Kever Yang 1 participant 1 message Dec 5, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Kever Yang

author
#1 lore raw

PATCH v2 1/1 arm: rockchip: rk3308: Initialize the iomux configuration

Quoted 9 lines · David Wu

When we want to use plus pinctrl feature, we need to enable them at spl.

---
Change in v2:
- Fix GPIO3B2_SEL_SRC_CTRL_SEL_PLUS

  arch/arm/mach-rockchip/rk3308/rk3308.c | 37 ++++++++++++++++++++++++++

Thanks,
- Kever

Quoted 68 lines
  1 file changed, 37 insertions(+)
arch/arm/mach-rockchip/rk3308/rk3308.c +37 -0
index f27f9e8c0b..b6815ddc55 100644
@@ -72,6 +72,11 @@ enum {
  	UART2_IO_SEL_M1,
  	UART2_IO_SEL_USB,
 
+	GPIO2C0_SEL_SRC_CTRL_SHIFT	= 11,
+	GPIO2C0_SEL_SRC_CTRL_MASK	= BIT(11),
+	GPIO2C0_SEL_SRC_CTRL_IOMUX	= 0,
+	GPIO2C0_SEL_SRC_CTRL_SEL_PLUS,
+
  	GPIO3B3_SEL_SRC_CTRL_SHIFT	= 7,
  	GPIO3B3_SEL_SRC_CTRL_MASK	= BIT(7),
  	GPIO3B3_SEL_SRC_CTRL_IOMUX	= 0,
@@ -97,6 +102,18 @@ enum {
  	GPIO3B2_SEL_PLUS_EMMC_RSTN,
  	GPIO3B2_SEL_PLUS_SPI1_MISO,
  	GPIO3B2_SEL_PLUS_LCDC_D22_M1,
+
+	I2C3_IOFUNC_SRC_CTRL_SHIFT	= 10,
+	I2C3_IOFUNC_SRC_CTRL_MASK	= BIT(10),
+	I2C3_IOFUNC_SRC_CTRL_SEL_PLUS	= 1,
+
+	GPIO2A3_SEL_SRC_CTRL_SHIFT	= 7,
+	GPIO2A3_SEL_SRC_CTRL_MASK	= BIT(7),
+	GPIO2A3_SEL_SRC_CTRL_SEL_PLUS	= 1,
+
+	GPIO2A2_SEL_SRC_CTRL_SHIFT	= 3,
+	GPIO2A2_SEL_SRC_CTRL_MASK	= BIT(3),
+	GPIO2A2_SEL_SRC_CTRL_SEL_PLUS	= 1,
  };
 
  enum {
@@ -166,10 +183,30 @@ __weak void board_debug_uart_init(void)
  int arch_cpu_init(void)
  {
  	static struct rk3308_sgrf * const sgrf = (void *)SGRF_BASE;
+	static struct rk3308_grf * const grf = (void *)GRF_BASE;
 
  	/* Set CRYPTO SDMMC EMMC NAND SFC USB master bus to be secure access */
  	rk_clrreg(&sgrf->con_secure0, 0x2b83);
 
+	/*
+	 * Enable plus options to use more pinctrl functions, including
+	 * GPIO2A2_PLUS, GPIO2A3_PLUS and I2C3_MULTI_SRC_PLUS.
+	 */
+	rk_clrsetreg(&grf->soc_con13,
+		     I2C3_IOFUNC_SRC_CTRL_MASK | GPIO2A3_SEL_SRC_CTRL_MASK |
+		     GPIO2A2_SEL_SRC_CTRL_MASK,
+		     I2C3_IOFUNC_SRC_CTRL_SEL_PLUS << I2C3_IOFUNC_SRC_CTRL_SHIFT |
+		     GPIO2A3_SEL_SRC_CTRL_SEL_PLUS << GPIO2A3_SEL_SRC_CTRL_SHIFT |
+		     GPIO2A2_SEL_SRC_CTRL_SEL_PLUS << GPIO2A2_SEL_SRC_CTRL_SHIFT);
+
+	/* Plus options about GPIO3B2_PLUS, GPIO3B3_PLUS and GPIO2C0_PLUS. */
+	rk_clrsetreg(&grf->soc_con15,
+		     GPIO2C0_SEL_SRC_CTRL_MASK | GPIO3B3_SEL_SRC_CTRL_MASK |
+		     GPIO3B2_SEL_SRC_CTRL_MASK,
+		     GPIO2C0_SEL_SRC_CTRL_SEL_PLUS << GPIO2C0_SEL_SRC_CTRL_SHIFT |
+		     GPIO3B3_SEL_SRC_CTRL_SEL_PLUS << GPIO3B3_SEL_SRC_CTRL_SHIFT |
+		     GPIO3B2_SEL_SRC_CTRL_SEL_PLUS << GPIO3B2_SEL_SRC_CTRL_SHIFT);
+
  	return 0;
  }
  #endif