mtd: spi: Correct parameters for s25fs512s flash

[u-boot] / drivers / video / atmel_lcdfb.c

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 39cd7caff16dbf25c3ff9e1f89bb95b032a71bf8..bd2e9c0c9bf5a569c1023ab258258937ed717c50 100644 (file)
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for AT91/AT32 LCD Controller
  *
  * Copyright (C) 2007 Atmel Corporation
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -150,11 +149,7 @@ static void atmel_fb_init(ulong addr, struct display_timing *timing, int bpix,
                            value << ATMEL_LCDC_CLKVAL_OFFSET);
 
        /* Initialize control register 2 */
-#ifdef CONFIG_AVR32
-       value = ATMEL_LCDC_MEMOR_BIG | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE;
-#else
        value = ATMEL_LCDC_MEMOR_LITTLE | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE;
-#endif
        if (tft)
                value |= ATMEL_LCDC_DISTYPE_TFT;
 
@@ -276,7 +271,7 @@ static int atmel_fb_ofdata_to_platdata(struct udevice *dev)
        struct display_timing *timing = &priv->timing;
        const void *blob = gd->fdt_blob;
 
-       if (fdtdec_decode_display_timing(blob, dev->of_offset,
+       if (fdtdec_decode_display_timing(blob, dev_of_offset(dev),
                                         plat->timing_index, timing)) {
                debug("%s: Failed to decode display timing\n", __func__);
                return -EINVAL;