summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-01-17 11:39:43 -0500
committerTom Rini <trini@konsulko.com>2017-01-17 11:39:43 -0500
commitbfd07670a48d9fbf22646c93e07dcd8cbc8d0864 (patch)
tree3ce5c9c53c29c93bd72adfecfc0085b8a9346ad6 /drivers
parent373ae16c9282cf6dfb39cd6e1b8ad26098635ca2 (diff)
parent2cfa35c47b9c9b80c8ff084f55391a03fd575956 (diff)
downloadu-boot-imx-bfd07670a48d9fbf22646c93e07dcd8cbc8d0864.zip
u-boot-imx-bfd07670a48d9fbf22646c93e07dcd8cbc8d0864.tar.gz
u-boot-imx-bfd07670a48d9fbf22646c93e07dcd8cbc8d0864.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Enable eMMC driver for LD11/LD20 SoCs - Refactoring of SoC init code - Bug fix of pinctrl driver
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
index 4ca39e6..0c46450 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
@@ -20,7 +20,7 @@ static const int ether_rgmii_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0};
static const unsigned ether_rmii_pins[] = {30, 31, 32, 33, 34, 35, 36, 37, 39,
41, 42, 45};
-static const int ether_rmii_muxvals[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+static const int ether_rmii_muxvals[] = {0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1};
static const unsigned i2c0_pins[] = {63, 64};
static const int i2c0_muxvals[] = {0, 0};
static const unsigned i2c1_pins[] = {65, 66};