aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2013-05-06 09:53:50 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2013-08-05 15:45:16 -0400
commitee4f36663b2a3626a9dadb2679a0ddcff1371891 (patch)
tree1c94ff697a10522203c643aa26fa014c9afe973e
parentc85d32d56859bb01f775e12771150dc47a7b03ba (diff)
mtd: nand-gpio: Do not override GPIOs if driver uses platform_data but OF is enabled in kernel config
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/nand/gpio.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index 8f102d162126..0d26f8b7d9d0 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -151,6 +151,9 @@ static int gpio_nand_get_config_of(const struct device *dev,
151{ 151{
152 u32 val; 152 u32 val;
153 153
154 if (!dev->of_node)
155 return -ENODEV;
156
154 if (!of_property_read_u32(dev->of_node, "bank-width", &val)) { 157 if (!of_property_read_u32(dev->of_node, "bank-width", &val)) {
155 if (val == 2) { 158 if (val == 2) {
156 plat->options |= NAND_BUSWIDTH_16; 159 plat->options |= NAND_BUSWIDTH_16;