* [U-Boot] [PATCH 1/2] arm: rockchip: rk3308: Initialize the iomux configuration
@ 2019-11-26 1:06 David Wu
2019-11-26 1:06 ` [U-Boot] [PATCH 2/2] pinctrl: rockchip: Add pinctrl support for rk3308 David Wu
2019-11-27 3:02 ` [U-Boot] [PATCH 1/2] arm: rockchip: rk3308: Initialize the iomux configuration Kever Yang
0 siblings, 2 replies; 4+ messages in thread
From: David Wu @ 2019-11-26 1:06 UTC (permalink / raw)
To: u-boot
When we want to use plus iomux feature, we need to enable
them at spl.
Signed-off-by: David Wu <david.wu@rock-chips.com>
---
arch/arm/mach-rockchip/rk3308/rk3308.c | 33 ++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index f27f9e8c0b..bd99899094 100644
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -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,26 @@ __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);
+
+ 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);
+
+ 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 |
+ GPIO3B3_SEL_SRC_CTRL_SEL_PLUS << GPIO3B2_SEL_SRC_CTRL_SHIFT);
+
return 0;
}
#endif
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/2] pinctrl: rockchip: Add pinctrl support for rk3308
2019-11-26 1:06 [U-Boot] [PATCH 1/2] arm: rockchip: rk3308: Initialize the iomux configuration David Wu
@ 2019-11-26 1:06 ` David Wu
2019-11-27 3:14 ` Kever Yang
2019-11-27 3:02 ` [U-Boot] [PATCH 1/2] arm: rockchip: rk3308: Initialize the iomux configuration Kever Yang
1 sibling, 1 reply; 4+ messages in thread
From: David Wu @ 2019-11-26 1:06 UTC (permalink / raw)
To: u-boot
The most pins of rk3308 are 2bits iomux, but the banks's register
width is 0x8.
Signed-off-by: David Wu <david.wu@rock-chips.com>
---
drivers/pinctrl/rockchip/Makefile | 1 +
drivers/pinctrl/rockchip/pinctrl-rk3308.c | 464 ++++++++++++++++++
.../pinctrl/rockchip/pinctrl-rockchip-core.c | 3 +-
drivers/pinctrl/rockchip/pinctrl-rockchip.h | 1 +
4 files changed, 468 insertions(+), 1 deletion(-)
create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3308.c
diff --git a/drivers/pinctrl/rockchip/Makefile b/drivers/pinctrl/rockchip/Makefile
index 83913f668f..fcf19f877a 100644
--- a/drivers/pinctrl/rockchip/Makefile
+++ b/drivers/pinctrl/rockchip/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_ROCKCHIP_RK3128) += pinctrl-rk3128.o
obj-$(CONFIG_ROCKCHIP_RK3188) += pinctrl-rk3188.o
obj-$(CONFIG_ROCKCHIP_RK322X) += pinctrl-rk322x.o
obj-$(CONFIG_ROCKCHIP_RK3288) += pinctrl-rk3288.o
+obj-$(CONFIG_ROCKCHIP_RK3308) += pinctrl-rk3308.o
obj-$(CONFIG_ROCKCHIP_RK3328) += pinctrl-rk3328.o
obj-$(CONFIG_ROCKCHIP_RK3368) += pinctrl-rk3368.o
obj-$(CONFIG_ROCKCHIP_RK3399) += pinctrl-rk3399.o
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
new file mode 100644
index 0000000000..abd57e54a5
--- /dev/null
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
@@ -0,0 +1,464 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <dm/pinctrl.h>
+#include <regmap.h>
+#include <syscon.h>
+
+#include "pinctrl-rockchip.h"
+
+static struct rockchip_mux_recalced_data rk3308_mux_recalced_data[] = {
+ {
+ .num = 1,
+ .pin = 14,
+ .reg = 0x28,
+ .bit = 12,
+ .mask = 0xf
+ }, {
+ .num = 1,
+ .pin = 15,
+ .reg = 0x2c,
+ .bit = 0,
+ .mask = 0x3
+ }, {
+ .num = 1,
+ .pin = 18,
+ .reg = 0x30,
+ .bit = 4,
+ .mask = 0xf
+ }, {
+ .num = 1,
+ .pin = 19,
+ .reg = 0x30,
+ .bit = 8,
+ .mask = 0xf
+ }, {
+ .num = 1,
+ .pin = 20,
+ .reg = 0x30,
+ .bit = 12,
+ .mask = 0xf
+ }, {
+ .num = 1,
+ .pin = 21,
+ .reg = 0x34,
+ .bit = 0,
+ .mask = 0xf
+ }, {
+ .num = 1,
+ .pin = 22,
+ .reg = 0x34,
+ .bit = 4,
+ .mask = 0xf
+ }, {
+ .num = 1,
+ .pin = 23,
+ .reg = 0x34,
+ .bit = 8,
+ .mask = 0xf
+ }, {
+ .num = 3,
+ .pin = 12,
+ .reg = 0x68,
+ .bit = 8,
+ .mask = 0xf
+ }, {
+ .num = 3,
+ .pin = 13,
+ .reg = 0x68,
+ .bit = 12,
+ .mask = 0xf
+ }, {
+ .num = 2,
+ .pin = 2,
+ .reg = 0x608,
+ .bit = 0,
+ .mask = 0x7
+ }, {
+ .num = 2,
+ .pin = 3,
+ .reg = 0x608,
+ .bit = 4,
+ .mask = 0x7
+ }, {
+ .num = 2,
+ .pin = 16,
+ .reg = 0x610,
+ .bit = 8,
+ .mask = 0x7
+ }, {
+ .num = 3,
+ .pin = 10,
+ .reg = 0x610,
+ .bit = 0,
+ .mask = 0x7
+ }, {
+ .num = 3,
+ .pin = 11,
+ .reg = 0x610,
+ .bit = 4,
+ .mask = 0x7
+ },
+};
+
+static struct rockchip_mux_route_data rk3308_mux_route_data[] = {
+ {
+ /* rtc_clk */
+ .bank_num = 0,
+ .pin = 19,
+ .func = 1,
+ .route_offset = 0x314,
+ .route_val = BIT(16 + 0) | BIT(0),
+ }, {
+ /* uart2_rxm0 */
+ .bank_num = 1,
+ .pin = 22,
+ .func = 2,
+ .route_offset = 0x314,
+ .route_val = BIT(16 + 2) | BIT(16 + 3),
+ }, {
+ /* uart2_rxm1 */
+ .bank_num = 4,
+ .pin = 26,
+ .func = 2,
+ .route_offset = 0x314,
+ .route_val = BIT(16 + 2) | BIT(16 + 3) | BIT(2),
+ }, {
+ /* i2c3_sdam0 */
+ .bank_num = 0,
+ .pin = 15,
+ .func = 2,
+ .route_offset = 0x608,
+ .route_val = BIT(16 + 8) | BIT(16 + 9),
+ }, {
+ /* i2c3_sdam1 */
+ .bank_num = 3,
+ .pin = 12,
+ .func = 2,
+ .route_offset = 0x608,
+ .route_val = BIT(16 + 8) | BIT(16 + 9) | BIT(8),
+ }, {
+ /* i2c3_sdam2 */
+ .bank_num = 2,
+ .pin = 0,
+ .func = 3,
+ .route_offset = 0x608,
+ .route_val = BIT(16 + 8) | BIT(16 + 9) | BIT(9),
+ }, {
+ /* i2s-8ch-1-sclktxm0 */
+ .bank_num = 1,
+ .pin = 3,
+ .func = 2,
+ .route_offset = 0x308,
+ .route_val = BIT(16 + 3),
+ }, {
+ /* i2s-8ch-1-sclkrxm0 */
+ .bank_num = 1,
+ .pin = 4,
+ .func = 2,
+ .route_offset = 0x308,
+ .route_val = BIT(16 + 3),
+ }, {
+ /* i2s-8ch-1-sclktxm1 */
+ .bank_num = 1,
+ .pin = 13,
+ .func = 2,
+ .route_offset = 0x308,
+ .route_val = BIT(16 + 3) | BIT(3),
+ }, {
+ /* i2s-8ch-1-sclkrxm1 */
+ .bank_num = 1,
+ .pin = 14,
+ .func = 2,
+ .route_offset = 0x308,
+ .route_val = BIT(16 + 3) | BIT(3),
+ }, {
+ /* pdm-clkm0 */
+ .bank_num = 1,
+ .pin = 4,
+ .func = 3,
+ .route_offset = 0x308,
+ .route_val = BIT(16 + 12) | BIT(16 + 13),
+ }, {
+ /* pdm-clkm1 */
+ .bank_num = 1,
+ .pin = 14,
+ .func = 4,
+ .route_offset = 0x308,
+ .route_val = BIT(16 + 12) | BIT(16 + 13) | BIT(12),
+ }, {
+ /* pdm-clkm2 */
+ .bank_num = 2,
+ .pin = 6,
+ .func = 2,
+ .route_offset = 0x308,
+ .route_val = BIT(16 + 12) | BIT(16 + 13) | BIT(13),
+ }, {
+ /* pdm-clkm-m2 */
+ .bank_num = 2,
+ .pin = 4,
+ .func = 3,
+ .route_offset = 0x600,
+ .route_val = BIT(16 + 2) | BIT(2),
+ }, {
+ /* spi1_miso */
+ .bank_num = 3,
+ .pin = 10,
+ .func = 3,
+ .route_offset = 0x314,
+ .route_val = BIT(16 + 9),
+ }, {
+ /* spi1_miso_m1 */
+ .bank_num = 2,
+ .pin = 4,
+ .func = 2,
+ .route_offset = 0x314,
+ .route_val = BIT(16 + 9) | BIT(9),
+ }, {
+ /* mac_rxd0_m0 */
+ .bank_num = 1,
+ .pin = 20,
+ .func = 3,
+ .route_offset = 0x314,
+ .route_val = BIT(16 + 14),
+ }, {
+ /* mac_rxd0_m1 */
+ .bank_num = 4,
+ .pin = 2,
+ .func = 2,
+ .route_offset = 0x314,
+ .route_val = BIT(16 + 14) | BIT(14),
+ }, {
+ /* uart3_rx */
+ .bank_num = 3,
+ .pin = 12,
+ .func = 4,
+ .route_offset = 0x314,
+ .route_val = BIT(16 + 15),
+ }, {
+ /* uart3_rx_m1 */
+ .bank_num = 0,
+ .pin = 17,
+ .func = 3,
+ .route_offset = 0x314,
+ .route_val = BIT(16 + 15) | BIT(15),
+ },
+};
+
+static int rk3308_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)
+{
+ struct rockchip_pinctrl_priv *priv = bank->priv;
+ int iomux_num = (pin / 8);
+ struct regmap *regmap;
+ int reg, ret, mask, mux_type;
+ u8 bit;
+ u32 data, route_reg, route_val;
+
+ regmap = (bank->iomux[iomux_num].type & IOMUX_SOURCE_PMU)
+ ? priv->regmap_pmu : priv->regmap_base;
+
+ /* get basic quadrupel of mux registers and the correct reg inside */
+ mux_type = bank->iomux[iomux_num].type;
+ reg = bank->iomux[iomux_num].offset;
+ reg += rockchip_get_mux_data(mux_type, pin, &bit, &mask);
+
+ if (bank->recalced_mask & BIT(pin))
+ rockchip_get_recalced_mux(bank, pin, ®, &bit, &mask);
+
+ if (bank->route_mask & BIT(pin)) {
+ if (rockchip_get_mux_route(bank, pin, mux, &route_reg,
+ &route_val)) {
+ ret = regmap_write(regmap, route_reg, route_val);
+ if (ret)
+ return ret;
+ }
+ }
+
+ data = (mask << (bit + 16));
+ data |= (mux & mask) << bit;
+ ret = regmap_write(regmap, reg, data);
+
+ return ret;
+}
+
+#define RK3308_PULL_OFFSET 0xa0
+
+static void rk3308_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+ int pin_num, struct regmap **regmap,
+ int *reg, u8 *bit)
+{
+ struct rockchip_pinctrl_priv *priv = bank->priv;
+
+ *regmap = priv->regmap_base;
+ *reg = RK3308_PULL_OFFSET;
+ *reg += bank->bank_num * ROCKCHIP_PULL_BANK_STRIDE;
+ *reg += ((pin_num / ROCKCHIP_PULL_PINS_PER_REG) * 4);
+
+ *bit = (pin_num % ROCKCHIP_PULL_PINS_PER_REG);
+ *bit *= ROCKCHIP_PULL_BITS_PER_PIN;
+}
+
+static int rk3308_set_pull(struct rockchip_pin_bank *bank,
+ int pin_num, int pull)
+{
+ struct regmap *regmap;
+ int reg, ret;
+ u8 bit, type;
+ u32 data;
+
+ if (pull == PIN_CONFIG_BIAS_PULL_PIN_DEFAULT)
+ return -ENOTSUPP;
+
+ rk3308_calc_pull_reg_and_bit(bank, pin_num, ®map, ®, &bit);
+ type = bank->pull_type[pin_num / 8];
+ ret = rockchip_translate_pull_value(type, pull);
+ if (ret < 0) {
+ debug("unsupported pull setting %d\n", pull);
+ return ret;
+ }
+
+ /* enable the write to the equivalent lower bits */
+ data = ((1 << ROCKCHIP_PULL_BITS_PER_PIN) - 1) << (bit + 16);
+ data |= (ret << bit);
+
+ ret = regmap_write(regmap, reg, data);
+
+ return ret;
+}
+
+#define RK3308_DRV_GRF_OFFSET 0x100
+
+static void rk3308_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
+ int pin_num, struct regmap **regmap,
+ int *reg, u8 *bit)
+{
+ struct rockchip_pinctrl_priv *priv = bank->priv;
+
+ *regmap = priv->regmap_base;
+ *reg = RK3308_DRV_GRF_OFFSET;
+ *reg += bank->bank_num * ROCKCHIP_DRV_BANK_STRIDE;
+ *reg += ((pin_num / ROCKCHIP_DRV_PINS_PER_REG) * 4);
+
+ *bit = (pin_num % ROCKCHIP_DRV_PINS_PER_REG);
+ *bit *= ROCKCHIP_DRV_BITS_PER_PIN;
+}
+
+static int rk3308_set_drive(struct rockchip_pin_bank *bank,
+ int pin_num, int strength)
+{
+ struct regmap *regmap;
+ int reg, ret;
+ u32 data;
+ u8 bit;
+ int type = bank->drv[pin_num / 8].drv_type;
+
+ rk3308_calc_drv_reg_and_bit(bank, pin_num, ®map, ®, &bit);
+ ret = rockchip_translate_drive_value(type, strength);
+ if (ret < 0) {
+ debug("unsupported driver strength %d\n", strength);
+ return ret;
+ }
+
+ /* enable the write to the equivalent lower bits */
+ data = ((1 << ROCKCHIP_DRV_BITS_PER_PIN) - 1) << (bit + 16);
+ data |= (ret << bit);
+ ret = regmap_write(regmap, reg, data);
+ return ret;
+}
+
+#define RK3308_SCHMITT_PINS_PER_REG 8
+#define RK3308_SCHMITT_BANK_STRIDE 16
+#define RK3308_SCHMITT_GRF_OFFSET 0x1a0
+
+static int rk3308_calc_schmitt_reg_and_bit(struct rockchip_pin_bank *bank,
+ int pin_num,
+ struct regmap **regmap,
+ int *reg, u8 *bit)
+{
+ struct rockchip_pinctrl_priv *priv = bank->priv;
+
+ *regmap = priv->regmap_base;
+ *reg = RK3308_SCHMITT_GRF_OFFSET;
+
+ *reg += bank->bank_num * RK3308_SCHMITT_BANK_STRIDE;
+ *reg += ((pin_num / RK3308_SCHMITT_PINS_PER_REG) * 4);
+ *bit = pin_num % RK3308_SCHMITT_PINS_PER_REG;
+
+ return 0;
+}
+
+static int rk3308_set_schmitt(struct rockchip_pin_bank *bank,
+ int pin_num, int enable)
+{
+ struct regmap *regmap;
+ int reg;
+ u8 bit;
+ u32 data;
+
+ rk3308_calc_schmitt_reg_and_bit(bank, pin_num, ®map, ®, &bit);
+ /* enable the write to the equivalent lower bits */
+ data = BIT(bit + 16) | (enable << bit);
+
+ return regmap_write(regmap, reg, data);
+}
+
+static struct rockchip_pin_bank rk3308_pin_banks[] = {
+ PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT),
+ PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT),
+ PIN_BANK_IOMUX_FLAGS(2, 32, "gpio2", IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT),
+ PIN_BANK_IOMUX_FLAGS(3, 32, "gpio3", IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT),
+ PIN_BANK_IOMUX_FLAGS(4, 32, "gpio4", IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT,
+ IOMUX_8WIDTH_2BIT),
+};
+
+static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
+ .pin_banks = rk3308_pin_banks,
+ .nr_banks = ARRAY_SIZE(rk3308_pin_banks),
+ .grf_mux_offset = 0x0,
+ .iomux_recalced = rk3308_mux_recalced_data,
+ .niomux_recalced = ARRAY_SIZE(rk3308_mux_recalced_data),
+ .iomux_routes = rk3308_mux_route_data,
+ .niomux_routes = ARRAY_SIZE(rk3308_mux_route_data),
+ .set_mux = rk3308_set_mux,
+ .set_drive = rk3308_set_drive,
+ .set_pull = rk3308_set_pull,
+ .set_schmitt = rk3308_set_schmitt,
+};
+
+static const struct udevice_id rk3308_pinctrl_ids[] = {
+ {
+ .compatible = "rockchip,rk3308-pinctrl",
+ .data = (ulong)&rk3308_pin_ctrl
+ },
+ { }
+};
+
+U_BOOT_DRIVER(pinctrl_rk3308) = {
+ .name = "rockchip_rk3308_pinctrl",
+ .id = UCLASS_PINCTRL,
+ .of_match = rk3308_pinctrl_ids,
+ .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+ .ops = &rockchip_pinctrl_ops,
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
+ .bind = dm_scan_fdt_dev,
+#endif
+ .probe = rockchip_pinctrl_probe,
+};
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index 80dc431d20..0fd0416b18 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -539,7 +539,8 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data(struct udevice *d
* 4bit iomux'es are spread over two registers.
*/
inc = (iom->type & (IOMUX_WIDTH_4BIT |
- IOMUX_WIDTH_3BIT)) ? 8 : 4;
+ IOMUX_WIDTH_3BIT |
+ IOMUX_8WIDTH_2BIT)) ? 8 : 4;
if (iom->type & IOMUX_SOURCE_PMU)
pmu_offs += inc;
else
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip.h b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
index 9651e9c7a6..5edc7cbd74 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip.h
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
@@ -16,6 +16,7 @@
#define IOMUX_SOURCE_PMU BIT(2)
#define IOMUX_UNROUTED BIT(3)
#define IOMUX_WIDTH_3BIT BIT(4)
+#define IOMUX_8WIDTH_2BIT BIT(5)
/**
* Defined some common pins constants
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 1/2] arm: rockchip: rk3308: Initialize the iomux configuration
2019-11-26 1:06 [U-Boot] [PATCH 1/2] arm: rockchip: rk3308: Initialize the iomux configuration David Wu
2019-11-26 1:06 ` [U-Boot] [PATCH 2/2] pinctrl: rockchip: Add pinctrl support for rk3308 David Wu
@ 2019-11-27 3:02 ` Kever Yang
1 sibling, 0 replies; 4+ messages in thread
From: Kever Yang @ 2019-11-27 3:02 UTC (permalink / raw)
To: u-boot
On 2019/11/26 上午9:06, David Wu wrote:
> When we want to use plus iomux feature, we need to enable
> them at spl.
>
> Signed-off-by: David Wu <david.wu@rock-chips.com>
> ---
> arch/arm/mach-rockchip/rk3308/rk3308.c | 33 ++++++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
>
> diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
> index f27f9e8c0b..bd99899094 100644
> --- a/arch/arm/mach-rockchip/rk3308/rk3308.c
> +++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
> @@ -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,26 @@ __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);
>
> +
> + rk_clrsetreg(&grf->soc_con13,
Please add a comment for this two reg write.
Thanks,
- Kever
> + 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);
> +
> + 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 |
> + GPIO3B3_SEL_SRC_CTRL_SEL_PLUS << GPIO3B2_SEL_SRC_CTRL_SHIFT);
> +
> return 0;
> }
> #endif
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/2] pinctrl: rockchip: Add pinctrl support for rk3308
2019-11-26 1:06 ` [U-Boot] [PATCH 2/2] pinctrl: rockchip: Add pinctrl support for rk3308 David Wu
@ 2019-11-27 3:14 ` Kever Yang
0 siblings, 0 replies; 4+ messages in thread
From: Kever Yang @ 2019-11-27 3:14 UTC (permalink / raw)
To: u-boot
David,
On 2019/11/26 上午9:06, David Wu wrote:
> The most pins of rk3308 are 2bits iomux, but the banks's register
> width is 0x8.
Could you make more explanation about the difference for rk3308 iomux?
It will be better
to have a simple example here.
Thanks,
- Kever
>
> Signed-off-by: David Wu <david.wu@rock-chips.com>
> ---
> drivers/pinctrl/rockchip/Makefile | 1 +
> drivers/pinctrl/rockchip/pinctrl-rk3308.c | 464 ++++++++++++++++++
> .../pinctrl/rockchip/pinctrl-rockchip-core.c | 3 +-
> drivers/pinctrl/rockchip/pinctrl-rockchip.h | 1 +
> 4 files changed, 468 insertions(+), 1 deletion(-)
> create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3308.c
>
> diff --git a/drivers/pinctrl/rockchip/Makefile b/drivers/pinctrl/rockchip/Makefile
> index 83913f668f..fcf19f877a 100644
> --- a/drivers/pinctrl/rockchip/Makefile
> +++ b/drivers/pinctrl/rockchip/Makefile
> @@ -9,6 +9,7 @@ obj-$(CONFIG_ROCKCHIP_RK3128) += pinctrl-rk3128.o
> obj-$(CONFIG_ROCKCHIP_RK3188) += pinctrl-rk3188.o
> obj-$(CONFIG_ROCKCHIP_RK322X) += pinctrl-rk322x.o
> obj-$(CONFIG_ROCKCHIP_RK3288) += pinctrl-rk3288.o
> +obj-$(CONFIG_ROCKCHIP_RK3308) += pinctrl-rk3308.o
> obj-$(CONFIG_ROCKCHIP_RK3328) += pinctrl-rk3328.o
> obj-$(CONFIG_ROCKCHIP_RK3368) += pinctrl-rk3368.o
> obj-$(CONFIG_ROCKCHIP_RK3399) += pinctrl-rk3399.o
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
> new file mode 100644
> index 0000000000..abd57e54a5
> --- /dev/null
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
> @@ -0,0 +1,464 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * (C) Copyright 2019 Rockchip Electronics Co., Ltd
> + */
> +
> +#include <common.h>
> +#include <dm.h>
> +#include <dm/pinctrl.h>
> +#include <regmap.h>
> +#include <syscon.h>
> +
> +#include "pinctrl-rockchip.h"
> +
> +static struct rockchip_mux_recalced_data rk3308_mux_recalced_data[] = {
> + {
> + .num = 1,
> + .pin = 14,
> + .reg = 0x28,
> + .bit = 12,
> + .mask = 0xf
> + }, {
> + .num = 1,
> + .pin = 15,
> + .reg = 0x2c,
> + .bit = 0,
> + .mask = 0x3
> + }, {
> + .num = 1,
> + .pin = 18,
> + .reg = 0x30,
> + .bit = 4,
> + .mask = 0xf
> + }, {
> + .num = 1,
> + .pin = 19,
> + .reg = 0x30,
> + .bit = 8,
> + .mask = 0xf
> + }, {
> + .num = 1,
> + .pin = 20,
> + .reg = 0x30,
> + .bit = 12,
> + .mask = 0xf
> + }, {
> + .num = 1,
> + .pin = 21,
> + .reg = 0x34,
> + .bit = 0,
> + .mask = 0xf
> + }, {
> + .num = 1,
> + .pin = 22,
> + .reg = 0x34,
> + .bit = 4,
> + .mask = 0xf
> + }, {
> + .num = 1,
> + .pin = 23,
> + .reg = 0x34,
> + .bit = 8,
> + .mask = 0xf
> + }, {
> + .num = 3,
> + .pin = 12,
> + .reg = 0x68,
> + .bit = 8,
> + .mask = 0xf
> + }, {
> + .num = 3,
> + .pin = 13,
> + .reg = 0x68,
> + .bit = 12,
> + .mask = 0xf
> + }, {
> + .num = 2,
> + .pin = 2,
> + .reg = 0x608,
> + .bit = 0,
> + .mask = 0x7
> + }, {
> + .num = 2,
> + .pin = 3,
> + .reg = 0x608,
> + .bit = 4,
> + .mask = 0x7
> + }, {
> + .num = 2,
> + .pin = 16,
> + .reg = 0x610,
> + .bit = 8,
> + .mask = 0x7
> + }, {
> + .num = 3,
> + .pin = 10,
> + .reg = 0x610,
> + .bit = 0,
> + .mask = 0x7
> + }, {
> + .num = 3,
> + .pin = 11,
> + .reg = 0x610,
> + .bit = 4,
> + .mask = 0x7
> + },
> +};
> +
> +static struct rockchip_mux_route_data rk3308_mux_route_data[] = {
> + {
> + /* rtc_clk */
> + .bank_num = 0,
> + .pin = 19,
> + .func = 1,
> + .route_offset = 0x314,
> + .route_val = BIT(16 + 0) | BIT(0),
> + }, {
> + /* uart2_rxm0 */
> + .bank_num = 1,
> + .pin = 22,
> + .func = 2,
> + .route_offset = 0x314,
> + .route_val = BIT(16 + 2) | BIT(16 + 3),
> + }, {
> + /* uart2_rxm1 */
> + .bank_num = 4,
> + .pin = 26,
> + .func = 2,
> + .route_offset = 0x314,
> + .route_val = BIT(16 + 2) | BIT(16 + 3) | BIT(2),
> + }, {
> + /* i2c3_sdam0 */
> + .bank_num = 0,
> + .pin = 15,
> + .func = 2,
> + .route_offset = 0x608,
> + .route_val = BIT(16 + 8) | BIT(16 + 9),
> + }, {
> + /* i2c3_sdam1 */
> + .bank_num = 3,
> + .pin = 12,
> + .func = 2,
> + .route_offset = 0x608,
> + .route_val = BIT(16 + 8) | BIT(16 + 9) | BIT(8),
> + }, {
> + /* i2c3_sdam2 */
> + .bank_num = 2,
> + .pin = 0,
> + .func = 3,
> + .route_offset = 0x608,
> + .route_val = BIT(16 + 8) | BIT(16 + 9) | BIT(9),
> + }, {
> + /* i2s-8ch-1-sclktxm0 */
> + .bank_num = 1,
> + .pin = 3,
> + .func = 2,
> + .route_offset = 0x308,
> + .route_val = BIT(16 + 3),
> + }, {
> + /* i2s-8ch-1-sclkrxm0 */
> + .bank_num = 1,
> + .pin = 4,
> + .func = 2,
> + .route_offset = 0x308,
> + .route_val = BIT(16 + 3),
> + }, {
> + /* i2s-8ch-1-sclktxm1 */
> + .bank_num = 1,
> + .pin = 13,
> + .func = 2,
> + .route_offset = 0x308,
> + .route_val = BIT(16 + 3) | BIT(3),
> + }, {
> + /* i2s-8ch-1-sclkrxm1 */
> + .bank_num = 1,
> + .pin = 14,
> + .func = 2,
> + .route_offset = 0x308,
> + .route_val = BIT(16 + 3) | BIT(3),
> + }, {
> + /* pdm-clkm0 */
> + .bank_num = 1,
> + .pin = 4,
> + .func = 3,
> + .route_offset = 0x308,
> + .route_val = BIT(16 + 12) | BIT(16 + 13),
> + }, {
> + /* pdm-clkm1 */
> + .bank_num = 1,
> + .pin = 14,
> + .func = 4,
> + .route_offset = 0x308,
> + .route_val = BIT(16 + 12) | BIT(16 + 13) | BIT(12),
> + }, {
> + /* pdm-clkm2 */
> + .bank_num = 2,
> + .pin = 6,
> + .func = 2,
> + .route_offset = 0x308,
> + .route_val = BIT(16 + 12) | BIT(16 + 13) | BIT(13),
> + }, {
> + /* pdm-clkm-m2 */
> + .bank_num = 2,
> + .pin = 4,
> + .func = 3,
> + .route_offset = 0x600,
> + .route_val = BIT(16 + 2) | BIT(2),
> + }, {
> + /* spi1_miso */
> + .bank_num = 3,
> + .pin = 10,
> + .func = 3,
> + .route_offset = 0x314,
> + .route_val = BIT(16 + 9),
> + }, {
> + /* spi1_miso_m1 */
> + .bank_num = 2,
> + .pin = 4,
> + .func = 2,
> + .route_offset = 0x314,
> + .route_val = BIT(16 + 9) | BIT(9),
> + }, {
> + /* mac_rxd0_m0 */
> + .bank_num = 1,
> + .pin = 20,
> + .func = 3,
> + .route_offset = 0x314,
> + .route_val = BIT(16 + 14),
> + }, {
> + /* mac_rxd0_m1 */
> + .bank_num = 4,
> + .pin = 2,
> + .func = 2,
> + .route_offset = 0x314,
> + .route_val = BIT(16 + 14) | BIT(14),
> + }, {
> + /* uart3_rx */
> + .bank_num = 3,
> + .pin = 12,
> + .func = 4,
> + .route_offset = 0x314,
> + .route_val = BIT(16 + 15),
> + }, {
> + /* uart3_rx_m1 */
> + .bank_num = 0,
> + .pin = 17,
> + .func = 3,
> + .route_offset = 0x314,
> + .route_val = BIT(16 + 15) | BIT(15),
> + },
> +};
> +
> +static int rk3308_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)
> +{
> + struct rockchip_pinctrl_priv *priv = bank->priv;
> + int iomux_num = (pin / 8);
> + struct regmap *regmap;
> + int reg, ret, mask, mux_type;
> + u8 bit;
> + u32 data, route_reg, route_val;
> +
> + regmap = (bank->iomux[iomux_num].type & IOMUX_SOURCE_PMU)
> + ? priv->regmap_pmu : priv->regmap_base;
> +
> + /* get basic quadrupel of mux registers and the correct reg inside */
> + mux_type = bank->iomux[iomux_num].type;
> + reg = bank->iomux[iomux_num].offset;
> + reg += rockchip_get_mux_data(mux_type, pin, &bit, &mask);
> +
> + if (bank->recalced_mask & BIT(pin))
> + rockchip_get_recalced_mux(bank, pin, ®, &bit, &mask);
> +
> + if (bank->route_mask & BIT(pin)) {
> + if (rockchip_get_mux_route(bank, pin, mux, &route_reg,
> + &route_val)) {
> + ret = regmap_write(regmap, route_reg, route_val);
> + if (ret)
> + return ret;
> + }
> + }
> +
> + data = (mask << (bit + 16));
> + data |= (mux & mask) << bit;
> + ret = regmap_write(regmap, reg, data);
> +
> + return ret;
> +}
> +
> +#define RK3308_PULL_OFFSET 0xa0
> +
> +static void rk3308_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
> + int pin_num, struct regmap **regmap,
> + int *reg, u8 *bit)
> +{
> + struct rockchip_pinctrl_priv *priv = bank->priv;
> +
> + *regmap = priv->regmap_base;
> + *reg = RK3308_PULL_OFFSET;
> + *reg += bank->bank_num * ROCKCHIP_PULL_BANK_STRIDE;
> + *reg += ((pin_num / ROCKCHIP_PULL_PINS_PER_REG) * 4);
> +
> + *bit = (pin_num % ROCKCHIP_PULL_PINS_PER_REG);
> + *bit *= ROCKCHIP_PULL_BITS_PER_PIN;
> +}
> +
> +static int rk3308_set_pull(struct rockchip_pin_bank *bank,
> + int pin_num, int pull)
> +{
> + struct regmap *regmap;
> + int reg, ret;
> + u8 bit, type;
> + u32 data;
> +
> + if (pull == PIN_CONFIG_BIAS_PULL_PIN_DEFAULT)
> + return -ENOTSUPP;
> +
> + rk3308_calc_pull_reg_and_bit(bank, pin_num, ®map, ®, &bit);
> + type = bank->pull_type[pin_num / 8];
> + ret = rockchip_translate_pull_value(type, pull);
> + if (ret < 0) {
> + debug("unsupported pull setting %d\n", pull);
> + return ret;
> + }
> +
> + /* enable the write to the equivalent lower bits */
> + data = ((1 << ROCKCHIP_PULL_BITS_PER_PIN) - 1) << (bit + 16);
> + data |= (ret << bit);
> +
> + ret = regmap_write(regmap, reg, data);
> +
> + return ret;
> +}
> +
> +#define RK3308_DRV_GRF_OFFSET 0x100
> +
> +static void rk3308_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
> + int pin_num, struct regmap **regmap,
> + int *reg, u8 *bit)
> +{
> + struct rockchip_pinctrl_priv *priv = bank->priv;
> +
> + *regmap = priv->regmap_base;
> + *reg = RK3308_DRV_GRF_OFFSET;
> + *reg += bank->bank_num * ROCKCHIP_DRV_BANK_STRIDE;
> + *reg += ((pin_num / ROCKCHIP_DRV_PINS_PER_REG) * 4);
> +
> + *bit = (pin_num % ROCKCHIP_DRV_PINS_PER_REG);
> + *bit *= ROCKCHIP_DRV_BITS_PER_PIN;
> +}
> +
> +static int rk3308_set_drive(struct rockchip_pin_bank *bank,
> + int pin_num, int strength)
> +{
> + struct regmap *regmap;
> + int reg, ret;
> + u32 data;
> + u8 bit;
> + int type = bank->drv[pin_num / 8].drv_type;
> +
> + rk3308_calc_drv_reg_and_bit(bank, pin_num, ®map, ®, &bit);
> + ret = rockchip_translate_drive_value(type, strength);
> + if (ret < 0) {
> + debug("unsupported driver strength %d\n", strength);
> + return ret;
> + }
> +
> + /* enable the write to the equivalent lower bits */
> + data = ((1 << ROCKCHIP_DRV_BITS_PER_PIN) - 1) << (bit + 16);
> + data |= (ret << bit);
> + ret = regmap_write(regmap, reg, data);
> + return ret;
> +}
> +
> +#define RK3308_SCHMITT_PINS_PER_REG 8
> +#define RK3308_SCHMITT_BANK_STRIDE 16
> +#define RK3308_SCHMITT_GRF_OFFSET 0x1a0
> +
> +static int rk3308_calc_schmitt_reg_and_bit(struct rockchip_pin_bank *bank,
> + int pin_num,
> + struct regmap **regmap,
> + int *reg, u8 *bit)
> +{
> + struct rockchip_pinctrl_priv *priv = bank->priv;
> +
> + *regmap = priv->regmap_base;
> + *reg = RK3308_SCHMITT_GRF_OFFSET;
> +
> + *reg += bank->bank_num * RK3308_SCHMITT_BANK_STRIDE;
> + *reg += ((pin_num / RK3308_SCHMITT_PINS_PER_REG) * 4);
> + *bit = pin_num % RK3308_SCHMITT_PINS_PER_REG;
> +
> + return 0;
> +}
> +
> +static int rk3308_set_schmitt(struct rockchip_pin_bank *bank,
> + int pin_num, int enable)
> +{
> + struct regmap *regmap;
> + int reg;
> + u8 bit;
> + u32 data;
> +
> + rk3308_calc_schmitt_reg_and_bit(bank, pin_num, ®map, ®, &bit);
> + /* enable the write to the equivalent lower bits */
> + data = BIT(bit + 16) | (enable << bit);
> +
> + return regmap_write(regmap, reg, data);
> +}
> +
> +static struct rockchip_pin_bank rk3308_pin_banks[] = {
> + PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT),
> + PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT),
> + PIN_BANK_IOMUX_FLAGS(2, 32, "gpio2", IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT),
> + PIN_BANK_IOMUX_FLAGS(3, 32, "gpio3", IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT),
> + PIN_BANK_IOMUX_FLAGS(4, 32, "gpio4", IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT,
> + IOMUX_8WIDTH_2BIT),
> +};
> +
> +static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
> + .pin_banks = rk3308_pin_banks,
> + .nr_banks = ARRAY_SIZE(rk3308_pin_banks),
> + .grf_mux_offset = 0x0,
> + .iomux_recalced = rk3308_mux_recalced_data,
> + .niomux_recalced = ARRAY_SIZE(rk3308_mux_recalced_data),
> + .iomux_routes = rk3308_mux_route_data,
> + .niomux_routes = ARRAY_SIZE(rk3308_mux_route_data),
> + .set_mux = rk3308_set_mux,
> + .set_drive = rk3308_set_drive,
> + .set_pull = rk3308_set_pull,
> + .set_schmitt = rk3308_set_schmitt,
> +};
> +
> +static const struct udevice_id rk3308_pinctrl_ids[] = {
> + {
> + .compatible = "rockchip,rk3308-pinctrl",
> + .data = (ulong)&rk3308_pin_ctrl
> + },
> + { }
> +};
> +
> +U_BOOT_DRIVER(pinctrl_rk3308) = {
> + .name = "rockchip_rk3308_pinctrl",
> + .id = UCLASS_PINCTRL,
> + .of_match = rk3308_pinctrl_ids,
> + .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
> + .ops = &rockchip_pinctrl_ops,
> +#if !CONFIG_IS_ENABLED(OF_PLATDATA)
> + .bind = dm_scan_fdt_dev,
> +#endif
> + .probe = rockchip_pinctrl_probe,
> +};
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
> index 80dc431d20..0fd0416b18 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
> @@ -539,7 +539,8 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data(struct udevice *d
> * 4bit iomux'es are spread over two registers.
> */
> inc = (iom->type & (IOMUX_WIDTH_4BIT |
> - IOMUX_WIDTH_3BIT)) ? 8 : 4;
> + IOMUX_WIDTH_3BIT |
> + IOMUX_8WIDTH_2BIT)) ? 8 : 4;
> if (iom->type & IOMUX_SOURCE_PMU)
> pmu_offs += inc;
> else
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip.h b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
> index 9651e9c7a6..5edc7cbd74 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rockchip.h
> +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
> @@ -16,6 +16,7 @@
> #define IOMUX_SOURCE_PMU BIT(2)
> #define IOMUX_UNROUTED BIT(3)
> #define IOMUX_WIDTH_3BIT BIT(4)
> +#define IOMUX_8WIDTH_2BIT BIT(5)
>
> /**
> * Defined some common pins constants
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-11-27 3:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-26 1:06 [U-Boot] [PATCH 1/2] arm: rockchip: rk3308: Initialize the iomux configuration David Wu
2019-11-26 1:06 ` [U-Boot] [PATCH 2/2] pinctrl: rockchip: Add pinctrl support for rk3308 David Wu
2019-11-27 3:14 ` Kever Yang
2019-11-27 3:02 ` [U-Boot] [PATCH 1/2] arm: rockchip: rk3308: Initialize the iomux configuration Kever Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox