diff options
author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2019-01-12 07:59:13 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2019-01-14 03:30:14 -0500 |
commit | 6daae00243e622dd3feec7965bfe421ad6dd317e (patch) | |
tree | 886cc9d231f2d9f7a0c2197bbfacad8a95f1a4ea /drivers/pinctrl/meson | |
parent | 48c67f1fc663d86bbd486a2c664ba130e7c70790 (diff) |
pinctrl: meson: meson8b: add the eth_rxd2 and eth_rxd3 pins
Gigabit Ethernet requires the Ethernet TXD0..3 and RXD0..3 data lines.
Add the missing eth_rxd2 and eth_rxd3 definitions so we don't have to
rely on the bootloader to set them up correctly.
The vendor u-boot sources for Odroid-C1 use the following Ethernet
pinmux configuration:
SET_CBUS_REG_MASK(PERIPHS_PIN_MUX_6, 0x3f4f);
SET_CBUS_REG_MASK(PERIPHS_PIN_MUX_7, 0xf00000);
This translates to the following pin groups in the mainline kernel:
- register 6 bit 0: eth_rxd1 (DIF_0_P)
- register 6 bit 1: eth_rxd0 (DIF_0_N)
- register 6 bit 2: eth_rx_dv (DIF_1_P)
- register 6 bit 3: eth_rx_clk (DIF_1_N)
- register 6 bit 6: eth_tx_en (DIF_3_P)
- register 6 bit 8: eth_ref_clk (DIF_3_N)
- register 6 bit 9: eth_mdc (DIF_4_P)
- register 6 bit 10: eth_mdio_en (DIF_4_N)
- register 6 bit 11: eth_tx_clk (GPIOH_9)
- register 6 bit 12: eth_txd2 (GPIOH_8)
- register 6 bit 13: eth_txd3 (GPIOH_7)
- register 7 bit 20: eth_txd0_0 (GPIOH_6)
- register 7 bit 21: eth_txd1_0 (GPIOH_5)
- register 7 bit 22: eth_rxd3 (DIF_2_P)
- register 7 bit 23: eth_rxd2 (DIF_2_N)
All functions except eth_rxd2 and eth_rxd3 are already supported by the
pinctrl-meson8b driver.
Suggested-by: Jianxin Pan <jianxin.pan@amlogic.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Tested-by: Emiliano Ingrassia <ingrassia@epigenesys.com>
Reviewed-by: Emiliano Ingrassia <ingrassia@epigenesys.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/meson')
-rw-r--r-- | drivers/pinctrl/meson/pinctrl-meson8b.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c index c69ca95b1ad5..84938bd73ac2 100644 --- a/drivers/pinctrl/meson/pinctrl-meson8b.c +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c | |||
@@ -346,6 +346,8 @@ static const unsigned int eth_rx_dv_pins[] = { DIF_1_P }; | |||
346 | static const unsigned int eth_rx_clk_pins[] = { DIF_1_N }; | 346 | static const unsigned int eth_rx_clk_pins[] = { DIF_1_N }; |
347 | static const unsigned int eth_txd0_1_pins[] = { DIF_2_P }; | 347 | static const unsigned int eth_txd0_1_pins[] = { DIF_2_P }; |
348 | static const unsigned int eth_txd1_1_pins[] = { DIF_2_N }; | 348 | static const unsigned int eth_txd1_1_pins[] = { DIF_2_N }; |
349 | static const unsigned int eth_rxd3_pins[] = { DIF_2_P }; | ||
350 | static const unsigned int eth_rxd2_pins[] = { DIF_2_N }; | ||
349 | static const unsigned int eth_tx_en_pins[] = { DIF_3_P }; | 351 | static const unsigned int eth_tx_en_pins[] = { DIF_3_P }; |
350 | static const unsigned int eth_ref_clk_pins[] = { DIF_3_N }; | 352 | static const unsigned int eth_ref_clk_pins[] = { DIF_3_N }; |
351 | static const unsigned int eth_mdc_pins[] = { DIF_4_P }; | 353 | static const unsigned int eth_mdc_pins[] = { DIF_4_P }; |
@@ -599,6 +601,8 @@ static struct meson_pmx_group meson8b_cbus_groups[] = { | |||
599 | GROUP(eth_ref_clk, 6, 8), | 601 | GROUP(eth_ref_clk, 6, 8), |
600 | GROUP(eth_mdc, 6, 9), | 602 | GROUP(eth_mdc, 6, 9), |
601 | GROUP(eth_mdio_en, 6, 10), | 603 | GROUP(eth_mdio_en, 6, 10), |
604 | GROUP(eth_rxd3, 7, 22), | ||
605 | GROUP(eth_rxd2, 7, 23), | ||
602 | }; | 606 | }; |
603 | 607 | ||
604 | static struct meson_pmx_group meson8b_aobus_groups[] = { | 608 | static struct meson_pmx_group meson8b_aobus_groups[] = { |
@@ -748,7 +752,7 @@ static const char * const ethernet_groups[] = { | |||
748 | "eth_tx_clk", "eth_tx_en", "eth_txd1_0", "eth_txd1_1", | 752 | "eth_tx_clk", "eth_tx_en", "eth_txd1_0", "eth_txd1_1", |
749 | "eth_txd0_0", "eth_txd0_1", "eth_rx_clk", "eth_rx_dv", | 753 | "eth_txd0_0", "eth_txd0_1", "eth_rx_clk", "eth_rx_dv", |
750 | "eth_rxd1", "eth_rxd0", "eth_mdio_en", "eth_mdc", "eth_ref_clk", | 754 | "eth_rxd1", "eth_rxd0", "eth_mdio_en", "eth_mdc", "eth_ref_clk", |
751 | "eth_txd2", "eth_txd3" | 755 | "eth_txd2", "eth_txd3", "eth_rxd3", "eth_rxd2" |
752 | }; | 756 | }; |
753 | 757 | ||
754 | static const char * const i2c_a_groups[] = { | 758 | static const char * const i2c_a_groups[] = { |