common: Drop linux/delay.h from common header
[oweals/u-boot.git] / board / samsung / universal_c210 / universal.c
index 22b08497cb57c1091b1eb82aeed7b58b73c18857..f50da6be724575b33441a85bd3f17f03f7d46e5c 100644 (file)
@@ -1,12 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  Copyright (C) 2010 Samsung Electronics
  *  Minkyu Kang <mk7.kang@samsung.com>
  *  Kyungmin Park <kyungmin.park@samsung.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <env.h>
+#include <log.h>
 #include <spi.h>
 #include <lcd.h>
 #include <asm/io.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/watchdog.h>
 #include <ld9040.h>
+#include <linux/delay.h>
 #include <power/pmic.h>
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <asm/arch/cpu.h>
 #include <power/max8998_pmic.h>
 #include <libtizen.h>
 #include <samsung/misc.h>
 #include <usb_mass_storage.h>
+#include <asm/mach-types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 unsigned int board_rev;
+static int init_pmic_lcd(void);
 
 u32 get_board_rev(void)
 {
        return board_rev;
 }
 
-static int get_hwrev(void)
+int exynos_power_init(void)
 {
-       return board_rev & 0xFF;
+       return init_pmic_lcd();
 }
 
-static void init_pmic_lcd(void);
-
-int exynos_power_init(void)
+static int get_hwrev(void)
 {
-       int ret;
-
-       /*
-        * For PMIC the I2C bus is named as I2C5, but it is connected
-        * to logical I2C adapter 0
-        */
-       ret = pmic_init(I2C_0);
-       if (ret)
-               return ret;
-
-       init_pmic_lcd();
-
-       return 0;
+       return board_rev & 0xFF;
 }
 
 static unsigned short get_adc_value(int channel)
@@ -84,19 +74,29 @@ static unsigned short get_adc_value(int channel)
 
 static int adc_power_control(int on)
 {
+       struct udevice *dev;
        int ret;
-       struct pmic *p = pmic_get("MAX8998_PMIC");
-       if (!p)
-               return -ENODEV;
+       u8 reg;
 
-       if (pmic_probe(p))
-               return -1;
+       ret = pmic_get("max8998-pmic", &dev);
+       if (ret) {
+               puts("Failed to get MAX8998!\n");
+               return ret;
+       }
 
-       ret = pmic_set_output(p,
-                             MAX8998_REG_ONOFF1,
-                             MAX8998_LDO4, !!on);
+       reg = pmic_reg_read(dev, MAX8998_REG_ONOFF1);
+       if (on)
+               reg |= MAX8998_LDO4;
+       else
+               reg &= ~MAX8998_LDO4;
 
-       return ret;
+       ret = pmic_reg_write(dev, MAX8998_REG_ONOFF1, reg);
+       if (ret) {
+               puts("MAX8998 LDO setting error\n");
+               return -EINVAL;
+       }
+
+       return 0;
 }
 
 static unsigned int get_hw_revision(void)
@@ -144,42 +144,54 @@ static void check_hw_revision(void)
 #ifdef CONFIG_USB_GADGET
 static int s5pc210_phy_control(int on)
 {
-       int ret = 0;
-       struct pmic *p = pmic_get("MAX8998_PMIC");
-       if (!p)
-               return -ENODEV;
+       struct udevice *dev;
+       int ret;
+       u8 reg;
 
-       if (pmic_probe(p))
-               return -1;
+       ret = pmic_get("max8998-pmic", &dev);
+       if (ret) {
+               puts("Failed to get MAX8998!\n");
+               return ret;
+       }
 
        if (on) {
-               ret |= pmic_set_output(p,
-                                      MAX8998_REG_BUCK_ACTIVE_DISCHARGE3,
-                                      MAX8998_SAFEOUT1, LDO_ON);
-               ret |= pmic_set_output(p, MAX8998_REG_ONOFF1,
-                                     MAX8998_LDO3, LDO_ON);
-               ret |= pmic_set_output(p, MAX8998_REG_ONOFF2,
-                                     MAX8998_LDO8, LDO_ON);
+               reg = pmic_reg_read(dev, MAX8998_REG_BUCK_ACTIVE_DISCHARGE3);
+               reg |= MAX8998_SAFEOUT1;
+               ret |= pmic_reg_write(dev,
+                       MAX8998_REG_BUCK_ACTIVE_DISCHARGE3, reg);
+
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF1);
+               reg |= MAX8998_LDO3;
+               ret |= pmic_reg_write(dev, MAX8998_REG_ONOFF1, reg);
+
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF2);
+               reg |= MAX8998_LDO8;
+               ret |= pmic_reg_write(dev, MAX8998_REG_ONOFF2, reg);
 
        } else {
-               ret |= pmic_set_output(p, MAX8998_REG_ONOFF2,
-                                     MAX8998_LDO8, LDO_OFF);
-               ret |= pmic_set_output(p, MAX8998_REG_ONOFF1,
-                                     MAX8998_LDO3, LDO_OFF);
-               ret |= pmic_set_output(p,
-                                      MAX8998_REG_BUCK_ACTIVE_DISCHARGE3,
-                                      MAX8998_SAFEOUT1, LDO_OFF);
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF2);
+               reg &= ~MAX8998_LDO8;
+               ret |= pmic_reg_write(dev, MAX8998_REG_ONOFF2, reg);
+
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF1);
+               reg &= ~MAX8998_LDO3;
+               ret |= pmic_reg_write(dev, MAX8998_REG_ONOFF1, reg);
+
+               reg = pmic_reg_read(dev, MAX8998_REG_BUCK_ACTIVE_DISCHARGE3);
+               reg &= ~MAX8998_SAFEOUT1;
+               ret |= pmic_reg_write(dev,
+                       MAX8998_REG_BUCK_ACTIVE_DISCHARGE3, reg);
        }
 
        if (ret) {
                puts("MAX8998 LDO setting error!\n");
-               return -1;
+               return -EINVAL;
        }
 
        return 0;
 }
 
-struct s3c_plat_otg_data s5pc210_otg_data = {
+struct dwc2_plat_otg_data s5pc210_otg_data = {
        .phy_control = s5pc210_phy_control,
        .regs_phy = EXYNOS4_USBPHY_BASE,
        .regs_otg = EXYNOS4_USBOTG_BASE,
@@ -191,7 +203,7 @@ struct s3c_plat_otg_data s5pc210_otg_data = {
 int board_usb_init(int index, enum usb_init_type init)
 {
        debug("USB_udc_probe\n");
-       return s3c_udc_probe(&s5pc210_otg_data);
+       return dwc2_udc_probe(&s5pc210_otg_data);
 }
 
 int exynos_early_init_f(void)
@@ -201,26 +213,25 @@ int exynos_early_init_f(void)
        return 0;
 }
 
-static void init_pmic_lcd(void)
+static int init_pmic_lcd(void)
 {
+       struct udevice *dev;
        unsigned char val;
        int ret = 0;
 
-       struct pmic *p = pmic_get("MAX8998_PMIC");
-
-       if (!p)
-               return;
-
-       if (pmic_probe(p))
-               return;
+       ret = pmic_get("max8998-pmic", &dev);
+       if (ret) {
+               puts("Failed to get MAX8998 for init_pmic_lcd()!\n");
+               return ret;
+       }
 
        /* LDO7 1.8V */
        val = 0x02; /* (1800 - 1600) / 100; */
-       ret |= pmic_reg_write(p,  MAX8998_REG_LDO7, val);
+       ret |= pmic_reg_write(dev,  MAX8998_REG_LDO7, val);
 
        /* LDO17 3.0V */
        val = 0xe; /* (3000 - 1600) / 100; */
-       ret |= pmic_reg_write(p,  MAX8998_REG_LDO17, val);
+       ret |= pmic_reg_write(dev,  MAX8998_REG_LDO17, val);
 
        /* Disable unneeded regulators */
        /*
@@ -229,24 +240,28 @@ static void init_pmic_lcd(void)
         * LDO2 ON, LDO3 OFF, LDO4 OFF, LDO5 ON
         */
        val = 0xB9;
-       ret |= pmic_reg_write(p,  MAX8998_REG_ONOFF1, val);
+       ret |= pmic_reg_write(dev,  MAX8998_REG_ONOFF1, val);
 
        /* ONOFF2
         * LDO6 OFF, LDO7 ON, LDO8 OFF, LDO9 ON,
         * LDO10 OFF, LDO11 OFF, LDO12 OFF, LDO13 OFF
         */
        val = 0x50;
-       ret |= pmic_reg_write(p,  MAX8998_REG_ONOFF2, val);
+       ret |= pmic_reg_write(dev,  MAX8998_REG_ONOFF2, val);
 
        /* ONOFF3
         * LDO14 OFF, LDO15 OFF, LGO16 OFF, LDO17 OFF
         * EPWRHOLD OFF, EBATTMON OFF, ELBCNFG2 OFF, ELBCNFG1 OFF
         */
        val = 0x00;
-       ret |= pmic_reg_write(p,  MAX8998_REG_ONOFF3, val);
+       ret |= pmic_reg_write(dev,  MAX8998_REG_ONOFF3, val);
 
-       if (ret)
+       if (ret) {
                puts("LCD pmic initialisation error!\n");
+               return -EINVAL;
+       }
+
+       return 0;
 }
 
 void exynos_cfg_lcd_gpio(void)
@@ -304,16 +319,31 @@ void exynos_reset_lcd(void)
 
 void exynos_lcd_power_on(void)
 {
-       struct pmic *p = pmic_get("MAX8998_PMIC");
+       struct udevice *dev;
+       int ret;
+       u8 reg;
 
-       if (!p)
+       ret = pmic_get("max8998-pmic", &dev);
+       if (ret) {
+               puts("Failed to get MAX8998!\n");
                return;
+       }
 
-       if (pmic_probe(p))
+       reg = pmic_reg_read(dev, MAX8998_REG_ONOFF3);
+       reg |= MAX8998_LDO17;
+       ret = pmic_reg_write(dev, MAX8998_REG_ONOFF3, reg);
+       if (ret) {
+               puts("MAX8998 LDO setting error\n");
                return;
+       }
 
-       pmic_set_output(p, MAX8998_REG_ONOFF3, MAX8998_LDO17, LDO_ON);
-       pmic_set_output(p, MAX8998_REG_ONOFF2, MAX8998_LDO7, LDO_ON);
+       reg = pmic_reg_read(dev, MAX8998_REG_ONOFF2);
+       reg |= MAX8998_LDO7;
+       ret = pmic_reg_write(dev, MAX8998_REG_ONOFF2, reg);
+       if (ret) {
+               puts("MAX8998 LDO setting error\n");
+               return;
+       }
 }
 
 void exynos_cfg_ldo(void)
@@ -358,6 +388,7 @@ int exynos_init(void)
        return 0;
 }
 
+#ifdef CONFIG_LCD
 void exynos_lcd_misc_init(vidinfo_t *vid)
 {
 #ifdef CONFIG_TIZEN
@@ -368,5 +399,6 @@ void exynos_lcd_misc_init(vidinfo_t *vid)
        vid->pclk_name = 1;     /* MPLL */
        vid->sclk_div = 1;
 
-       setenv("lcdinfo", "lcd=ld9040");
+       env_set("lcdinfo", "lcd=ld9040");
 }
+#endif