Merge tag '2019.01-next' of https://github.com/mbgg/u-boot

[oweals/u-boot.git] / board / samsung / common / exynos5-dt.c

diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index ae2a6e6bfa637a82d8aa80b2de3b6b56edf97cdf..87eb381345d387d91e26d22affdc099eb8ce9ac2 100644 (file)
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 Samsung Electronics
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -35,37 +34,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static void board_enable_audio_codec(void)
-{
-       int node, ret;
-       struct gpio_desc en_gpio;
-
-       node = fdtdec_next_compatible(gd->fdt_blob, 0,
-               COMPAT_SAMSUNG_EXYNOS5_SOUND);
-       if (node <= 0)
-               return;
-
-       ret = gpio_request_by_name_nodev(offset_to_ofnode(node),
-                                        "codec-enable-gpio", 0, &en_gpio,
-                                        GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
-       if (ret == -FDT_ERR_NOTFOUND)
-               return;
-
-       /* Turn on the GPIO which connects to the codec's "enable" line. */
-       gpio_set_pull(gpio_get_number(&en_gpio), S5P_GPIO_PULL_NONE);
-
-#ifdef CONFIG_SOUND_MAX98095
-       /* Enable MAX98095 Codec */
-       gpio_request(EXYNOS5_GPIO_X17, "max98095_enable");
-       gpio_direction_output(EXYNOS5_GPIO_X17, 1);
-       gpio_set_pull(EXYNOS5_GPIO_X17, S5P_GPIO_PULL_NONE);
-#endif
-}
-
 int exynos_init(void)
 {
-       board_enable_audio_codec();
-
        return 0;
 }
 
@@ -93,6 +63,9 @@ int exynos_power_init(void)
        struct udevice *dev;
        int ret;
 
+#ifdef CONFIG_PMIC_S2MPS11
+       ret = pmic_get("s2mps11_pmic", &dev);
+#else
        ret = pmic_get("max77686", &dev);
        if (!ret) {
                /* TODO(sjg@chromium.org): Move into the clock/pmic API */
@@ -112,6 +85,7 @@ int exynos_power_init(void)
                        s5m8767_enable_32khz_cp(dev);
 #endif
        }
+#endif /* CONFIG_PMIC_S2MPS11 */
        if (ret == -ENODEV)
                return 0;
 
@@ -161,7 +135,7 @@ int board_usb_init(int index, enum usb_init_type init)
                samsung_get_base_usb3_phy();
 
        if (!phy) {
-               error("usb3 phy not supported");
+               pr_err("usb3 phy not supported\n");
                return -ENODEV;
        }
 
@@ -176,7 +150,7 @@ char *get_dfu_alt_system(char *interface, char *devstr)
 {
        char *info = "Not supported!";
 
-       if (board_is_odroidxu4())
+       if (board_is_odroidxu4() || board_is_odroidhc1() || board_is_odroidhc2())
                return info;
 
        return env_get("dfu_alt_system");
@@ -189,7 +163,7 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
        char *alt_boot;
        int dev_num;
 
-       if (board_is_odroidxu4())
+       if (board_is_odroidxu4() || board_is_odroidhc1() || board_is_odroidhc2())
                return info;
 
        dev_num = simple_strtoul(devstr, NULL, 10);