diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mci/imx-esdhc-pbl.c | 2 | ||||
| -rw-r--r-- | drivers/mci/imx-esdhc.c | 9 | ||||
| -rw-r--r-- | drivers/of/base.c | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/mci/imx-esdhc-pbl.c b/drivers/mci/imx-esdhc-pbl.c index c37ebe0141..f7f8c3348d 100644 --- a/drivers/mci/imx-esdhc-pbl.c +++ b/drivers/mci/imx-esdhc-pbl.c @@ -367,6 +367,7 @@ int imx6_esdhc_start_image(int instance) return -EINVAL; } + esdhc.is_be = 0; esdhc.is_mx6 = 1; return esdhc_start_image(&esdhc, 0x10000000, 0x10000000, 0); @@ -399,6 +400,7 @@ int imx8_esdhc_start_image(int instance) return -EINVAL; } + esdhc.is_be = 0; esdhc.is_mx6 = 1; return esdhc_start_image(&esdhc, MX8MQ_DDR_CSD1_BASE_ADDR, diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c index 84c65d5d61..f71ca539ed 100644 --- a/drivers/mci/imx-esdhc.c +++ b/drivers/mci/imx-esdhc.c @@ -67,10 +67,6 @@ #define ESDHC_FLAG_STD_TUNING BIT(5) /* The IP has SDHCI_CAPABILITIES_1 register */ #define ESDHC_FLAG_HAVE_CAP1 BIT(6) -/* Need to access registers in bigendian mode */ -#define ESDHC_FLAG_BIGENDIAN BIT(7) -/* Enable cache snooping */ -#define ESDHC_FLAG_CACHE_SNOOPING BIT(8) /* * The IP has errata ERR004536 @@ -83,6 +79,11 @@ /* The IP supports HS400 mode */ #define ESDHC_FLAG_HS400 BIT(9) +/* Need to access registers in bigendian mode */ +#define ESDHC_FLAG_BIGENDIAN BIT(10) +/* Enable cache snooping */ +#define ESDHC_FLAG_CACHE_SNOOPING BIT(11) + struct esdhc_soc_data { u32 flags; const char *clkidx; diff --git a/drivers/of/base.c b/drivers/of/base.c index b082f0c656..318ba72cb0 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2274,6 +2274,8 @@ char *of_get_reproducible_name(struct device_node *node) return basprintf("[0x%llx]", addr); } + na = of_n_addr_cells(node); + /* * Special workaround for the of partition binding. In the old binding * the partitions are directly under the hardware devicenode whereas in @@ -2286,8 +2288,6 @@ char *of_get_reproducible_name(struct device_node *node) node = node->parent; } - na = of_n_addr_cells(node); - offset = of_read_number(reg, na); str = of_get_reproducible_name(node->parent); |