treewide: replace with error() with pr_err()

[u-boot.git] / board / samsung / goni / goni.c

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index eb0f9bffae0e4a3b925b570af2ab4f1337aa2f60..debc4c57ffa068c14b3f2f2b7047942895b10f63 100644 (file)
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -7,15 +7,17 @@
  */
 
 #include <common.h>
-#include <asm/arch/gpio.h>
+#include <asm/gpio.h>
 #include <asm/arch/mmc.h>
+#include <dm.h>
 #include <power/pmic.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <asm/arch/cpu.h>
 #include <power/max8998_pmic.h>
 #include <samsung/misc.h>
 #include <usb.h>
 #include <usb_mass_storage.h>
+#include <asm/mach-types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -33,20 +35,15 @@ int board_init(void)
        return 0;
 }
 
-int power_init_board(void)
+#ifdef CONFIG_SYS_I2C_INIT_BOARD
+void i2c_init_board(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;
-
-       return 0;
+       gpio_request(S5PC110_GPIO_J43, "i2c_clk");
+       gpio_request(S5PC110_GPIO_J40, "i2c_data");
+       gpio_direction_output(S5PC110_GPIO_J43, 1);
+       gpio_direction_output(S5PC110_GPIO_J40, 1);
 }
+#endif
 
 int dram_init(void)
 {
@@ -56,7 +53,7 @@ int dram_init(void)
        return 0;
 }
 
-void dram_init_banksize(void)
+int dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
@@ -64,6 +61,8 @@ void dram_init_banksize(void)
        gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
        gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
        gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE;
+
+       return 0;
 }
 
 #ifdef CONFIG_DISPLAY_BOARDINFO
@@ -74,12 +73,13 @@ int checkboard(void)
 }
 #endif
 
-#ifdef CONFIG_GENERIC_MMC
+#ifdef CONFIG_MMC
 int board_mmc_init(bd_t *bis)
 {
        int i, ret, ret_sd = 0;
 
        /* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */
+       gpio_request(S5PC110_GPIO_J27, "massmemory_en");
        gpio_direction_output(S5PC110_GPIO_J27, 1);
 
        /*
@@ -102,12 +102,13 @@ int board_mmc_init(bd_t *bis)
 
        ret = s5p_mmc_init(0, 4);
        if (ret)
-               error("MMC: Failed to init MMC:0.\n");
+               pr_err("MMC: Failed to init MMC:0.\n");
 
        /*
         * SD card (T_FLASH) detect and init
         * T_FLASH_DETECT: EINT28: GPH3[4] input mode
         */
+       gpio_request(S5PC110_GPIO_H34, "t_flash_detect");
        gpio_cfg_pin(S5PC110_GPIO_H34, S5P_GPIO_INPUT);
        gpio_set_pull(S5PC110_GPIO_H34, S5P_GPIO_PULL_UP);
 
@@ -126,7 +127,7 @@ int board_mmc_init(bd_t *bis)
 
                ret_sd = s5p_mmc_init(2, 4);
                if (ret_sd)
-                       error("MMC: Failed to init SD card (MMC:2).\n");
+                       pr_err("MMC: Failed to init SD card (MMC:2).\n");
        }
 
        return ret & ret_sd;
@@ -136,42 +137,54 @@ int board_mmc_init(bd_t *bis)
 #ifdef CONFIG_USB_GADGET
 static int s5pc1xx_phy_control(int on)
 {
-       int ret;
+       struct udevice *dev;
        static int status;
-       struct pmic *p = pmic_get("MAX8998_PMIC");
-       if (!p)
-               return -ENODEV;
+       int reg, ret;
 
-       if (pmic_probe(p))
-               return -1;
+       ret = pmic_get("max8998-pmic", &dev);
+       if (ret)
+               return ret;
 
        if (on && !status) {
-               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_ONOFF1);
+               reg |= MAX8998_LDO3;
+               ret = pmic_reg_write(dev, MAX8998_REG_ONOFF1, reg);
                if (ret) {
                        puts("MAX8998 LDO setting error!\n");
-                       return -1;
+                       return -EINVAL;
+               }
+
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF2);
+               reg |= MAX8998_LDO8;
+               ret = pmic_reg_write(dev, MAX8998_REG_ONOFF2, reg);
+               if (ret) {
+                       puts("MAX8998 LDO setting error!\n");
+                       return -EINVAL;
                }
                status = 1;
        } else if (!on && status) {
-               ret = pmic_set_output(p, MAX8998_REG_ONOFF1,
-                                     MAX8998_LDO3, LDO_OFF);
-               ret = pmic_set_output(p, MAX8998_REG_ONOFF2,
-                                     MAX8998_LDO8, LDO_OFF);
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF1);
+               reg &= ~MAX8998_LDO3;
+               ret = pmic_reg_write(dev, MAX8998_REG_ONOFF1, reg);
+               if (ret) {
+                       puts("MAX8998 LDO setting error!\n");
+                       return -EINVAL;
+               }
+
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF2);
+               reg &= ~MAX8998_LDO8;
+               ret = pmic_reg_write(dev, MAX8998_REG_ONOFF2, reg);
                if (ret) {
                        puts("MAX8998 LDO setting error!\n");
-                       return -1;
+                       return -EINVAL;
                }
                status = 0;
        }
        udelay(10000);
-
        return 0;
 }
 
-struct s3c_plat_otg_data s5pc110_otg_data = {
+struct dwc2_plat_otg_data s5pc110_otg_data = {
        .phy_control = s5pc1xx_phy_control,
        .regs_phy = S5PC110_PHY_BASE,
        .regs_otg = S5PC110_OTG_BASE,
@@ -181,7 +194,7 @@ struct s3c_plat_otg_data s5pc110_otg_data = {
 int board_usb_init(int index, enum usb_init_type init)
 {
        debug("USB_udc_probe\n");
-       return s3c_udc_probe(&s5pc110_otg_data);
+       return dwc2_udc_probe(&s5pc110_otg_data);
 }
 #endif
 
@@ -194,3 +207,8 @@ int misc_init_r(void)
        return 0;
 }
 #endif
+
+int board_usb_cleanup(int index, enum usb_init_type init)
+{
+       return 0;
+}