From mboxrd@z Thu Jan 1 00:00:00 1970 From: Przemyslaw Marczak Date: Thu, 23 Apr 2015 13:33:42 +0200 Subject: [U-Boot] [PATCH v4 14/16] odroid: board: add support to dm pmic api In-Reply-To: References: <1427229051-20170-1-git-send-email-p.marczak@samsung.com> <1429553273-6453-1-git-send-email-p.marczak@samsung.com> <1429553273-6453-15-git-send-email-p.marczak@samsung.com> Message-ID: <5538D896.6030707@samsung.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Simon, On 04/22/2015 06:31 PM, Simon Glass wrote: > Hi Przemyslaw, > > On 20 April 2015 at 12:07, Przemyslaw Marczak wrote: >> This commit change the old pmic framework calls to the new ones. >> >> Signed-off-by: Przemyslaw Marczak >> --- >> Changes v2: >> - remove board_init_i2c() call >> - update regulator calls >> - update headers >> - samsung/misc.c: include required header >> >> Changes v3: >> - adjust regulator calls to new api >> >> Changes V4: >> - use regulator_list_autoset() for mmc regulators >> >> --- >> board/samsung/common/misc.c | 1 + >> board/samsung/odroid/odroid.c | 77 +++++++++++++++++++++++++------------------ >> 2 files changed, 46 insertions(+), 32 deletions(-) > > Acked-by: Simon Glass > >> >> diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c >> index 1a77c82..f0d69d4 100644 >> --- a/board/samsung/common/misc.c >> +++ b/board/samsung/common/misc.c >> @@ -16,6 +16,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> >> diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c >> index ae41c29..29de325 100644 >> --- a/board/samsung/odroid/odroid.c >> +++ b/board/samsung/odroid/odroid.c >> @@ -12,7 +12,9 @@ >> #include >> #include >> #include >> +#include >> #include >> +#include >> #include >> #include >> #include >> @@ -31,6 +33,12 @@ enum { >> ODROID_TYPES, >> }; >> >> +static const char *mmc_regulators[] = { >> + "VDDQ_EMMC_1.8V", >> + "VDDQ_EMMC_2.8V", >> + "TFLASH_2.8V", > > I wonder if it would be better to terminate with NULL instead of > requiring an ARRAY_SIZE? > Yes, I should do this, will fix. >> +}; >> + >> void set_board_type(void) >> { >> /* Set GPA1 pin 1 to HI - enable XCL205 output */ >> @@ -403,21 +411,6 @@ static void board_gpio_init(void) >> #endif >> } >> >> -static int pmic_init_max77686(void) >> -{ >> - struct pmic *p = pmic_get("MAX77686_PMIC"); >> - >> - if (pmic_probe(p)) >> - return -ENODEV; >> - >> - /* Set LDO Voltage */ >> - max77686_set_ldo_voltage(p, 20, 1800000); /* LDO20 eMMC */ >> - max77686_set_ldo_voltage(p, 21, 2800000); /* LDO21 SD */ >> - max77686_set_ldo_voltage(p, 22, 2800000); /* LDO22 eMMC */ >> - >> - return 0; >> -} >> - >> int exynos_early_init_f(void) >> { >> board_clock_init(); >> @@ -434,8 +427,10 @@ int exynos_init(void) >> >> int exynos_power_init(void) >> { >> - pmic_init(0); >> - pmic_init_max77686(); >> + int list_count = ARRAY_SIZE(mmc_regulators); >> + >> + if (regulator_list_autoset(mmc_regulators, list_count, NULL, true)) >> + error("Unable to init all mmc regulators"); >> >> return 0; >> } >> @@ -443,19 +438,20 @@ int exynos_power_init(void) >> #ifdef CONFIG_USB_GADGET >> static int s5pc210_phy_control(int on) >> { >> - struct pmic *p_pmic; >> + struct udevice *dev; >> + int ret; >> >> - p_pmic = pmic_get("MAX77686_PMIC"); >> - if (!p_pmic) >> - return -ENODEV; >> - >> - if (pmic_probe(p_pmic)) >> - return -1; >> + ret = regulator_by_platname("VDD_UOTG_3.0V", &dev); >> + if (ret) { >> + error("Regulator get error: %d", ret); >> + return ret; >> + } >> >> if (on) >> - return max77686_set_ldo_mode(p_pmic, 12, OPMODE_ON); >> + return regulator_set_mode(dev, OPMODE_ON); >> else >> - return max77686_set_ldo_mode(p_pmic, 12, OPMODE_LPM); >> + return regulator_set_mode(dev, OPMODE_LPM); >> + >> } >> >> struct s3c_plat_otg_data s5pc210_otg_data = { >> @@ -472,7 +468,8 @@ struct s3c_plat_otg_data s5pc210_otg_data = { >> int board_usb_init(int index, enum usb_init_type init) >> { >> #ifdef CONFIG_CMD_USB >> - struct pmic *p_pmic; >> + struct udevice *dev; >> + int ret; >> >> /* Set Ref freq 0 => 24MHz, 1 => 26MHz*/ >> /* Odroid Us have it at 24MHz, Odroid Xs at 26MHz */ >> @@ -490,14 +487,30 @@ int board_usb_init(int index, enum usb_init_type init) >> /* Power off and on BUCK8 for LAN9730 */ >> debug("LAN9730 - Turning power buck 8 OFF and ON.\n"); >> >> - p_pmic = pmic_get("MAX77686_PMIC"); >> - if (p_pmic && !pmic_probe(p_pmic)) { >> - max77686_set_buck_voltage(p_pmic, 8, 750000); >> - max77686_set_buck_voltage(p_pmic, 8, 3300000); >> + ret = regulator_by_platname("VCC_P3V3_2.85V", &dev); >> + if (ret) { >> + error("Regulator get error: %d", ret); >> + return ret; >> } >> >> -#endif >> + ret = regulator_set_enable(dev, true); >> + if (ret) { >> + error("Regulator %s enable setting error: %d", dev->name, ret); >> + return ret; >> + } >> >> + ret = regulator_set_value(dev, 750000); >> + if (ret) { >> + error("Regulator %s value setting error: %d", dev->name, ret); >> + return ret; >> + } >> + >> + ret = regulator_set_value(dev, 3300000); >> + if (ret) { >> + error("Regulator %s value setting error: %d", dev->name, ret); >> + return ret; >> + } >> +#endif >> debug("USB_udc_probe\n"); >> return s3c_udc_probe(&s5pc210_otg_data); >> } >> -- >> 1.9.1 >> > > Regards, > Simon > Best regards, -- Przemyslaw Marczak Samsung R&D Institute Poland Samsung Electronics p.marczak at samsung.com