From patchwork Tue Dec 27 08:33:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 708878 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3tnpzS6Z2tz9syB for ; Tue, 27 Dec 2016 19:33:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4E15AA7666; Tue, 27 Dec 2016 09:33:22 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SqEpSso-aZgE; Tue, 27 Dec 2016 09:33:21 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4E1AAA7652; Tue, 27 Dec 2016 09:33:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AAF80A7652 for ; Tue, 27 Dec 2016 09:33:17 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mopHQ8PtX3df for ; Tue, 27 Dec 2016 09:33:17 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by theia.denx.de (Postfix) with ESMTPS id 25567A75CC for ; Tue, 27 Dec 2016 09:33:13 +0100 (CET) Received: from epcas1p1.samsung.com (unknown [182.195.41.45]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OIU01X13539HJ00@mailout3.samsung.com> for u-boot@lists.denx.de; Tue, 27 Dec 2016 17:33:09 +0900 (KST) Received: from epsmges1p5.samsung.com (unknown [182.195.40.69]) by epcas1p2.samsung.com (KnoxPortal) with ESMTP id 20161227083308epcas1p246d66d51ab5ed6a60eb275d1107e1206~UD9X3PXUK2424824248epcas1p2X; Tue, 27 Dec 2016 08:33:08 +0000 (GMT) Received: from epcas1p3.samsung.com ( [182.195.41.47]) by epsmges1p5.samsung.com (Symantec Messaging Gateway) with SMTP id 34.AA.06773.44722685; Tue, 27 Dec 2016 17:33:08 +0900 (KST) Received: from epcpsbgm1new.samsung.com (u26.gpu120.samsung.co.kr [203.254.230.26]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20161227083308epcas1p3fb6f7f4759598e09f24f450a6414416d~UD9XR_XWM1537415374epcas1p3p; Tue, 27 Dec 2016 08:33:08 +0000 (GMT) X-AuditID: b6c32a39-f79256d000001a75-f5-58622744a970 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 64.0B.28252.44722685; Tue, 27 Dec 2016 17:33:08 +0900 (KST) Received: from localhost.localdomain ([10.113.62.216]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OIU006C9538FO60@mmp2.samsung.com>; Tue, 27 Dec 2016 17:33:08 +0900 (KST) From: Jaehoon Chung To: u-boot@lists.denx.de Date: Tue, 27 Dec 2016 17:33:05 +0900 Message-id: <20161227083305.13907-1-jh80.chung@samsung.com> X-Mailer: git-send-email 2.10.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLKsWRmVeSWpSXmKPExsWy7bCmvq6LelKEwb9tFhY3frWxWnQcaWG0 +LZlG6PF272d7A4sHrMbLrJ4nL2zg9Gjb8sqxgDmqFSbjNTElNQihdS85PyUzLx0WyXv4Hjn eFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKB1SgpliTmlQKGAxOJiJX07m6L80pJUhYz84hJb pWhDQyM9QwNzPSMjIz0T41grI1OgkoTUjHlzfzEVXBGraD73ia2B8atgFyMnh4SAicSR08/Z IGwxiQv31gPZXBxCAjsYJf73tzFCOO1MEqcXHWCD6Tj6aRY7RGIOo0T/grNMEM4PRolfN1+y g1SxCehIbP92nAnEFhGQkPjVf5URxGYWCJGYOX89M4gtLOAqsfDDbDCbRUBV4uLGBWAbeAWs JW6/+wG1TV5i4fkjYAskBHawSXw5cRIowQHkyEpsOsAMUeMice/LNEYIW1ji1fEt7BC2tMSq f7egersZJf592cgG4fQwStzaupoJospY4v6De8wQ1/FJvPvawwqxgFeio00IosRDYtrX46wQ tqPE/rvbwI4TEoiVmHnzAOsERukFjAyrGMVSC4pz01OLDQtM9YoTc4tL89L1kvNzNzGCk4aW 5Q7GY+d8DjEKcDAq8fD+WJ4YIcSaWFZcmXuIUYKDWUmEd65sUoQQb0piZVVqUX58UWlOavEh RlNg2ExklhJNzgcmtLySeEMTM0MTIxNDQ3MjAyMlcd7FjdYRQgLpiSWp2ampBalFMH1MHJxS DYwrZ286t0+lptLGr2KfmF20jMmfPRkLwxRy4wRlCheUm1kmKtWu/La57fKkrXXBV8q+PNhk Vj/hIdOt307i2XpJ5iIPj9w6W3s54+ZHJ9ZzEq7/xe42brVomBysvO1eiOOZaQXfOxqcWV71 128J9lB82v1FvE3s9L+eo6y7vJ0Pzds/T+/rblMlluKMREMt5qLiRABHRRCVMAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLLMWRmVeSWpSXmKPExsVy+t9jQV0X9aQIg8nPhCxu/Gpjteg40sJo 8W3LNkaLt3s72R1YPGY3XGTxOHtnB6NH35ZVjAHMUW42GamJKalFCql5yfkpmXnptkqhIW66 FkoKeYm5qbZKEbq+IUFKCmWJOaVAnpEBGnBwDnAPVtK3S3DLmDf3F1PBFbGK5nOf2BoYvwp2 MXJySAiYSBz9NIsdwhaTuHBvPVsXIxeHkMAsRonOxdMZIZwfjBIf1s5mAaliE9CR2P7tOBOI LSIgIfGr/yojiM0sECJx7MVtMFtYwFVi4YfZzCA2i4CqxMWNC9hAbF4Ba4nb736wQWyTl1h4 /gjTBEbuBYwMqxglUguSC4qT0nMN81LL9YoTc4tL89L1kvNzNzGCg+6Z1A7Gg7vcDzEKcDAq 8fD+WJ4YIcSaWFZcmXuIUYKDWUmEd65sUoQQb0piZVVqUX58UWlOavEhRlOgAyYyS4km5wMj Iq8k3tDE3MTc2MDC3NLSxEhJnLdx9rNwIYH0xJLU7NTUgtQimD4mDk6pBsYFX21qloodEpD8 K/Le+djLb8dnmisv+LBuh4H5Xhkhw6hdSSHmsyJfvzgx0fDHtb4Pm6IXajVK38h6H1zwWK8q uc0tcce5peYh/k+NFARenXlYfvW/RFOJ9PKPrJxvul+dqV59w0/oln8Mv1ygVWtH9rf7Zzbt P6l/JUrZZ6fItQ0580xKE5qVWIozEg21mIuKEwHr7NT2UAIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161227083308epcas1p3fb6f7f4759598e09f24f450a6414416d X-Msg-Generator: CA X-Sender-IP: 203.254.230.26 X-Local-Sender: =?UTF-8?B?7KCV7J6s7ZuIG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLw=?= =?UTF-8?B?7YSwKRvsgrzshLHsoITsnpAbUzUo7LGF7J6EKS/ssYXsnoQ=?= X-Global-Sender: =?UTF-8?B?SmFlaG9vbiBDaHVuZxtUaXplbiBQbGF0Zm9ybSBMYWIuG1Nh?= =?UTF-8?B?bXN1bmcgRWxlY3Ryb25pY3MbUzUvU2VuaW9yIEVuZ2luZWVy?= X-Sender-Code: =?UTF-8?B?QzEwG1NUQUYbQzEwVjgxMTE=?= CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-HopCount: 7 X-CMS-RootMailID: 20161227083308epcas1p3fb6f7f4759598e09f24f450a6414416d X-RootMTR: 20161227083308epcas1p3fb6f7f4759598e09f24f450a6414416d References: Subject: [U-Boot] [PATCH] arm: samsung: goni: use the driver model for max8998 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Remove the "ifndef CONFIG_DM_I2C". Instead, use the driver model for max8998. Signed-off-by: Jaehoon Chung --- board/samsung/goni/goni.c | 61 ++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index b066832..c1d7438 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -43,19 +44,6 @@ void i2c_init_board(void) } #endif -int power_init_board(void) -{ -#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */ - /* - * For PMIC the I2C bus is named as I2C5, but it is connected - * to logical I2C adapter 0 - */ - return pmic_init(I2C_0); -#else - return 0; -#endif -} - int dram_init(void) { gd->ram_size = PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE + @@ -146,34 +134,47 @@ int board_mmc_init(bd_t *bis) #ifdef CONFIG_USB_GADGET static int s5pc1xx_phy_control(int on) { -#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */ - int ret; +#ifdef CONFIG_DM_PMIC_MAX8998 + 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_pmix", &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; }