Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/drivers/video/exynos_dp_lowlevel.c b/drivers/video/exynos_dp_lowlevel.c
index 748d9b8b3731dc78f1bd7a7d5ddbdd81d068ddd7..e9b461a99a935775c8b59e19e8f4a63c49d1e3e5 100644 (file)
--- a/drivers/video/exynos_dp_lowlevel.c
+++ b/drivers/video/exynos_dp_lowlevel.c
@@ -3,20 +3,7 @@
  *
  * Author: Donghwa Lee <dh09.lee@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
@@ -35,7 +22,7 @@ struct exynos_dp *dp_regs;
 
 void exynos_dp_set_base_addr(void)
 {
-#ifdef CONFIG_OF_CONTROL
+#if CONFIG_IS_ENABLED(OF_CONTROL)
        unsigned int node = fdtdec_next_compatible(gd->fdt_blob,
                                        0, COMPAT_SAMSUNG_EXYNOS5_DP);
        if (node <= 0)
@@ -836,7 +823,7 @@ int exynos_dp_read_bytes_from_i2c(unsigned int device_addr,
                        reg = readl(&dp_regs->aux_rx_comm);
                        if (reg == AUX_RX_COMM_AUX_DEFER ||
                                reg == AUX_RX_COMM_I2C_DEFER) {
-                               printf("DP Defer: %d\n\n", reg);
+                               printf("DP Defer: %d\n", reg);
                                defer = 1;
                        }
                }