From patchwork Thu Jan 3 01:44:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 154705 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp167305ljp; Wed, 2 Jan 2019 17:50:16 -0800 (PST) X-Google-Smtp-Source: AFSGD/XrLUaRdVgAhUHOfeeQsZJI87qycBqbnJ+rQnRjBDeCflqwbb0ZloCXW98+4oIBjRu5VWkD X-Received: by 2002:a50:9784:: with SMTP id e4mr40823757edb.165.1546480216926; Wed, 02 Jan 2019 17:50:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546480216; cv=none; d=google.com; s=arc-20160816; b=fP7/dTOELZwCfMpd7tXZnq4B1UOipIR//WocZQcWKhXMC1SVvJecMgvfBjTv5f0ube UOnh/Ib6F6XUP7VuWMpTj8oSKdZcxn0NXVpHnTwFFpjZAjXKNWA3NKnNEtICNdbtCJcz ZSzad/W4AXnFPKpZmm+ATGpUTX2TrjyZTievYs29iDK2feGyN4y5XuGFABjH4u4GXXwq b1g3ktbS5Yo9J1GO+ZEs9We79WQyaWZ1RxUWBELBpqGSQQ16qJs3Yr/hW+piWpfU3ZNT Sj8tU9QmTvkYJk8FuAUR6IIIR0UQJp2YHV0ixGJSqlXeeLjcN+ZQbCMv64deqrEXFAxo bu6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=C43zxckgxg7F7+s8lcQZj8FZMPyaYJ41vZcIAcv1cLM=; b=xcNDpgMoatLZ4Awno/rUl0R+9jHohPPylb6be2QFuLLp7ro72Jz+MI1nClRukDFEaK UY4zX4yQrcH6NDS9nwA6PqYv8PESPnrXHtRPEPelf3eXQdGpSqUbZ3vHbNEgr9EJ3yzJ ZjfBVwabjVOLCThkc8l0FuPul9Zf5aTey1S6AlKRebOgXtzHSNqY6BrSUMFsDDiZAviO BFoR+9wQIwzaHR34/+xunWTnyQmuhv3eHMb6/3+Vv4DFyxvtDTIXg1+qUnJfD5CpBVlc JTnEL2TDXE3z4WyadX/jmzbR1+wfrFOcD9ZDTVOT3ZmR5QVb/7O8vUsTpDiX0Fk8zfBO bIoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=JJNGJ48c; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id k10-v6si12212788ejh.260.2019.01.02.17.50.16; Wed, 02 Jan 2019 17:50:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=JJNGJ48c; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 866ACC21DFB; Thu, 3 Jan 2019 01:47:26 +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=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 4E96EC21DB5; Thu, 3 Jan 2019 01:45:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E43CEC21E0B; Thu, 3 Jan 2019 01:45:07 +0000 (UTC) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by lists.denx.de (Postfix) with ESMTPS id 38F68C21DFF for ; Thu, 3 Jan 2019 01:45:04 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id d39so27682792edb.12 for ; Wed, 02 Jan 2019 17:45:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qg78QmrKPW/gXXeHPbR//d8zHcQoBDh7cp2fUK4WluM=; b=JJNGJ48cxkQkQps9TMCUOu8EJK7pGCaOuz8AcIHojbV3WmWIYz3s40sIIO/lxRWkyp KmRHTxuK6Pbst79y4D9X0F6qFY5QLS72q5hsahAztVB9gte55DILwh9N74x62+aKbEwI mmWsIcSapn4HkYjCsiNfVJwPuS3TbencRhfic= 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:mime-version:content-transfer-encoding; bh=Qg78QmrKPW/gXXeHPbR//d8zHcQoBDh7cp2fUK4WluM=; b=nOKeidfnXB9vPlw/MWjphXISA3I78F8PsnYlL+VJ4k9XN0lNDltSG7Rhd8FoU15sbN UI/W3jviSsROnLkQ2Iwh/7cX8tibueJG11va1ssYLOTOCKUOMGspnvFXLaVOjyXFu1NU 9nSCnkzkoTF3odFWoM1HgA587Xazz4pXFiRf5LZjJb5+25xBptutV/wH3tJS52RxSpMG C0+NGkqosl2ZjAalA0/nSowQ/IIzefay3+ewvDn7gUoF+FDdScZVbKjBtF7Wee4kEr9j 78cqRSEyDiqPOrNHGnr3n4HbXZ9jHm9MPIIuJYf1JaqZjq3h7wqS/voqOGVAR0k/Mtx3 5qEw== X-Gm-Message-State: AA+aEWY2KvtsCX+W1PGr5x9jVppso7x8uCRxGkLl0eZYnjHuDen7mF+8 EMZ6w9KbMonhv+S8swniv6Zt+FQBOxSKyg== X-Received: by 2002:a50:87a7:: with SMTP id a36mr41279300eda.96.1546479903522; Wed, 02 Jan 2019 17:45:03 -0800 (PST) Received: from localhost.localdomain (D4CCACC7.cm-2.dynamic.ziggo.nl. [212.204.172.199]) by smtp.gmail.com with ESMTPSA id g5-v6sm13036720ejm.15.2019.01.02.17.45.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 17:45:02 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Thu, 3 Jan 2019 01:44:44 +0000 Message-Id: <20190103014444.11134-9-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190103014444.11134-1-bryan.odonoghue@linaro.org> References: <20190103014444.11134-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [PATCH 8/8] arm: imx7s-warp: 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch converts the warp7 and warp7_bl33 board ports over to using the DM PMIC model. Signed-off-by: Bryan O'Donoghue Cc: Peng Fan Cc: Fabio Estevam Cc: Stefano Babic Reviewed-by: Peng Fan --- board/warp7/warp7.c | 27 +++++++++++---------------- configs/warp7_bl33_defconfig | 6 ++++++ configs/warp7_defconfig | 6 ++++++ include/configs/warp7.h | 6 ------ 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 19f0df4d09..6ebeb08e33 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -64,29 +64,24 @@ int board_early_init_f(void) return 0; } -#ifdef CONFIG_POWER -#define I2C_PMIC 0 -static struct pmic *pfuze; +#ifdef CONFIG_DM_PMIC int power_init_board(void) { - int ret; - unsigned int reg, rev_id; + struct udevice *dev; + int ret, dev_id, rev_id; - ret = power_pfuze3000_init(I2C_PMIC); - if (ret) + ret = pmic_get("pfuze3000", &dev); + if (ret == -ENODEV) + return 0; + if (ret != 0) return ret; - pfuze = pmic_get("PFUZE3000"); - ret = pmic_probe(pfuze); - if (ret) - return ret; - - pmic_reg_read(pfuze, PFUZE3000_DEVICEID, ®); - pmic_reg_read(pfuze, 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_write(pfuze, PFUZE3000_LDOGCTL, 0x1); + pmic_clrsetbits(dev, PFUZE3000_LDOGCTL, 0, 1); return 0; } diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index 2e80011cbc..7b40bfbd6d 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -45,3 +45,9 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=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 diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 9f7dc73a11..d1c8e403a7 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -58,3 +58,9 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=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 diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 41eb8d7e1d..043f2861b6 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -129,12 +129,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 - /* environment organization */ #define CONFIG_ENV_SIZE SZ_8K