From patchwork Sun Jan 20 21:18:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joris OFFOUGA X-Patchwork-Id: 1028229 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oew2vcWz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43jTTl085Dz9s9G for ; Mon, 21 Jan 2019 09:13:30 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A93CAC21E70; Sun, 20 Jan 2019 22:13:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D5E9CC21ED5; Sun, 20 Jan 2019 21:21:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D0E29C21E36; Sun, 20 Jan 2019 21:21:15 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id 360B0C21E4E for ; Sun, 20 Jan 2019 21:19:11 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id u4so21091178wrp.3 for ; Sun, 20 Jan 2019 13:19:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LROhZf7Ca4U4/GhOYr+bZdyrlBeLKKJbk8uAm/fuJ9s=; b=oew2vcWzMHKwTMiTvSjNyRniXRkCjY1JxMtgnJy/Z0mEetYiwMr5uXqYJrb1W6y8h4 KslRenv5noCJgB/fln5S4zvlScSRSOT6P0yDxYtHTCDCCdouh4afjpBRsxPnrgPjODMk YW+2p2iOBgLCyvvwxHOMiRtnfqwD+aqonPXlBYBJNdKP/qiVTCT2My8arBwPYDwRb9lb 4A0VPtIKEjQE+P6e93a841N18eAQZvoV8zc79A6LIYQTbjFtauWo1y5mwCqq8ycfd0Ch f/TiFABpAsgY8tK13I6eoNi79sLan1Jyc1VqS4L+9iH8rEQl+NTG3VAnKLbhnqJaF177 zEhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LROhZf7Ca4U4/GhOYr+bZdyrlBeLKKJbk8uAm/fuJ9s=; b=F2IfDSFkT3Eeoxlftdz8LXqUSVN4AiB7WSZYbgaHTXzR7jKzLpEZPecuBsBPJoekpU kPs06jTGzt/wU7+jBk/pUcMotFOsFKb1OVLDbeB95tSSdtEIbkMiOonVDjmSjcvq4CmS aCbyeaIMncUD8nsFo4ifR0sL6NkaV/hYOVufdfIZSJY3fG38t6YmeKDaFYkCOWInaq11 /GTohZg/Y5yDE0yw+QrSAhHptMuxq9JuNvtFyIbzRIPqfJlxra1ttqgo3Nc0/Iu1YojR l4zBeXlC7KfBpWkekVBPs66puiAKdUqhroMVZ9dcMqaBUgDBXRcyg7nmsb3wYcO49b/z T28Q== X-Gm-Message-State: AJcUuke4kbOLUBYbC+AetitRWNxdmEI7N8c3bXD9rNxsYC/sCnQQxgDU RaWS2Av4J9G59b+rINp8OnZuXD9u X-Google-Smtp-Source: ALg8bN5KDePYniKiZqtDvY3UZg4/Uf71fIE3aGAczrINbyr73BxtOyP5zqW/OBkRedisJiZEXKnSOw== X-Received: by 2002:a5d:418b:: with SMTP id m11mr23280749wrp.8.1548019150547; Sun, 20 Jan 2019 13:19:10 -0800 (PST) Received: from furher.home ([2a01:cb19:16b:9900:ff0c:8549:c9c0:534a]) by smtp.gmail.com with ESMTPSA id a1sm78857967wrw.76.2019.01.20.13.19.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 20 Jan 2019 13:19:10 -0800 (PST) From: Joris Offouga To: u-boot@lists.denx.de Date: Sun, 20 Jan 2019 22:18:56 +0100 Message-Id: <1548019138-11133-8-git-send-email-offougajoris@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548019138-11133-1-git-send-email-offougajoris@gmail.com> References: <1548019138-11133-1-git-send-email-offougajoris@gmail.com> Subject: [U-Boot] [RFC 7/9] pico-imx7d: Convert to DM PMIC X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch converts the pico-pi-imx7d to use the DM PMIC model. Signed-off-by: Joris Offouga --- board/technexion/pico-imx7d/pico-imx7d.c | 44 ++++++++++++-------------------- configs/pico-pi-imx7d_defconfig | 6 +++++ include/configs/pico-imx7d.h | 6 ----- 3 files changed, 23 insertions(+), 33 deletions(-) diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c index cd7d5b1..095242d 100644 --- a/board/technexion/pico-imx7d/pico-imx7d.c +++ b/board/technexion/pico-imx7d/pico-imx7d.c @@ -40,47 +40,37 @@ int dram_init(void) return 0; } -#ifdef CONFIG_POWER -#define I2C_PMIC 3 +#ifdef CONFIG_DM_PMIC int power_init_board(void) { - struct pmic *p; - int ret; - unsigned int reg, rev_id; + struct udevice *dev; + int ret=0, dev_id=0, rev_id=0, reg=0; - ret = power_pfuze3000_init(I2C_PMIC); - if (ret) - return ret; + ret = pmic_get("pfuze3000", &dev); + if (ret == -ENODEV) + return 0; + if (ret != 0) - p = pmic_get("PFUZE3000"); - ret = pmic_probe(p); - if (ret) - return ret; - - pmic_reg_read(p, PFUZE3000_DEVICEID, ®); - pmic_reg_read(p, PFUZE3000_REVID, &rev_id); - printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", reg, rev_id); + dev_id = pmic_reg_read(dev, PFUZE3000_DEVICEID); + rev_id = pmic_reg_read(dev, PFUZE3000_REVID); + printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", dev_id, rev_id); /* disable Low Power Mode during standby mode */ - pmic_reg_read(p, PFUZE3000_LDOGCTL, ®); - reg |= 0x1; - pmic_reg_write(p, PFUZE3000_LDOGCTL, reg); + pmic_clrsetbits(dev, PFUZE3000_LDOGCTL, 0, 1); /* SW1A/1B mode set to APS/APS */ - reg = 0x8; - pmic_reg_write(p, PFUZE3000_SW1AMODE, reg); - pmic_reg_write(p, PFUZE3000_SW1BMODE, reg); + pmic_reg_write(dev, PFUZE3000_SW1AMODE, 0x8); + pmic_reg_write(dev, PFUZE3000_SW1BMODE, 0x8); /* SW1A/1B standby voltage set to 1.025V */ - reg = 0xd; - pmic_reg_write(p, PFUZE3000_SW1ASTBY, reg); - pmic_reg_write(p, PFUZE3000_SW1BSTBY, reg); + pmic_reg_write(dev, PFUZE3000_SW1ASTBY, 0xd); + pmic_reg_write(dev, PFUZE3000_SW1BSTBY, 0xd); /* decrease SW1B normal voltage to 0.975V */ - pmic_reg_read(p, PFUZE3000_SW1BVOLT, ®); + reg = pmic_reg_read(dev, PFUZE3000_SW1BVOLT); reg &= ~0x1f; reg |= PFUZE3000_SW1AB_SETP(975); - pmic_reg_write(p, PFUZE3000_SW1BVOLT, reg); + pmic_reg_write(dev, PFUZE3000_SW1BVOLT, reg); return 0; } diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig index 868abb0..24467bd 100644 --- a/configs/pico-pi-imx7d_defconfig +++ b/configs/pico-pi-imx7d_defconfig @@ -29,6 +29,12 @@ CONFIG_PINCTRL_IMX7=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_SERIAL=y +CONFIG_DM_PMIC=y +CONFIG_DM_PMIC_PFUZE100=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_PFUZE100=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y # CONFIG_CMD_BOOTD is not set CONFIG_CMD_BOOTMENU=y # CONFIG_CMD_IMI is not set diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 82c105b..577cd13 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -120,12 +120,6 @@ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 -/* PMIC */ -#define CONFIG_POWER -#define CONFIG_POWER_I2C -#define CONFIG_POWER_PFUZE3000 -#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 - /* FLASH and environment organization */ #define CONFIG_ENV_SIZE SZ_8K