From patchwork Tue Jan 15 10:25:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Shinde X-Patchwork-Id: 14042 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D2D2B23F88 for ; Tue, 15 Jan 2013 10:18:29 +0000 (UTC) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by fiordland.canonical.com (Postfix) with ESMTP id 73DE0A18525 for ; Tue, 15 Jan 2013 10:18:29 +0000 (UTC) Received: by mail-vc0-f176.google.com with SMTP id fo13so4475979vcb.21 for ; Tue, 15 Jan 2013 02:18:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-auditid:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:dlp-filter:x-mtr:x-brightmail-tracker :x-brightmail-tracker:x-cfilter-loop:x-gm-message-state; bh=9VtJ8ulPwVPxk90YwsvdzpXEjxnHOwV6xdB/H0at3LQ=; b=Qwi8FC4uZmIDQHlL1ivCRarrZoNKgSUD2FYU7UYGXL1USxVlUUqPuiOyH6bmCX5FYZ eNBUa8eT87KYGb+ujfyThn8bxMuID7Iin+QfoEFEyMrlCFrmmKiA5nItkd4jCL+o6hrO jGdA9+lCGIWFUIJuv8lrn+6OKpEK9GGBAYATxf9/TfSFA56V5DPITstM9kj0tPtifhIE j8jLl+hiyzbU8Y9K2YMyeSYGmE7TuF4J+7TSUg9m2jZLVxrpWVRbNAQCyiD6JY7+uDs9 ZoUddd+iWbU7T+Eq4U7ksaPHhJZeX/RDNE/KrNuaTWqs7QU5svDyfp5m9m30AUeIBFFB xEFw== X-Received: by 10.52.18.207 with SMTP id y15mr90861206vdd.8.1358245108913; Tue, 15 Jan 2013 02:18:28 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp104117veb; Tue, 15 Jan 2013 02:18:28 -0800 (PST) X-Received: by 10.68.209.170 with SMTP id mn10mr264700245pbc.11.1358245105059; Tue, 15 Jan 2013 02:18:25 -0800 (PST) Received: from mailout1.samsung.com (mailout1.samsung.com. [203.254.224.24]) by mx.google.com with ESMTP id pu7si17117667pbc.157.2013.01.15.02.18.24; Tue, 15 Jan 2013 02:18:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of rajeshwari.s@samsung.com designates 203.254.224.24 as permitted sender) client-ip=203.254.224.24; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of rajeshwari.s@samsung.com designates 203.254.224.24 as permitted sender) smtp.mail=rajeshwari.s@samsung.com Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MGN005MGWMADUR0@mailout1.samsung.com>; Tue, 15 Jan 2013 19:18:24 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 01.61.12699.0FC25F05; Tue, 15 Jan 2013 19:18:24 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-ea-50f52cf0d980 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B0.61.12699.0FC25F05; Tue, 15 Jan 2013 19:18:24 +0900 (KST) Received: from rajeshwari-linux.sisodomain.com ([107.108.215.115]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MGN000VMWMF3V70@mmp2.samsung.com>; Tue, 15 Jan 2013 19:18:24 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Cc: patches@linaro.org, sjg@chromium.org, mk7.kang@samsung.com, chander.kashyap@linaro.org Subject: [PATCH 2/2] SMDK5250: Add PMIC voltage settings Date: Tue, 15 Jan 2013 15:55:46 +0530 Message-id: <1358245546-10035-3-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1358245546-10035-1-git-send-email-rajeshwari.s@samsung.com> References: <1358245546-10035-1-git-send-email-rajeshwari.s@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRmVeSWpSXmKPExsWyRsSkTveDztcAg4lvxC0err/JYjHl8BcW ByaPO9f2sAUwRnHZpKTmZJalFunbJXBlvNn1iK1gn3rF938LGBsYJyh0MXJySAiYSMw4uJwR whaTuHBvPVsXIxeHkMBSRolpr9YzwhTNbdnDBGILCUxnlNiykQeiaCKTxNdfH9lBEmwCRhJb T04DaxARkJD41X8VzGYWiJF4vf8HG4gtLGAhcebZPxYQm0VAVeLYo6lgNbwCHhJ7+w6zQyxT kDg29SsriM0p4Ckxb8NjdojFHhIPe+6wQfQKSHybfAhoDgdQvazEpgPMIPdICNxmk/j2+A4T xBxJiYMrbrBMYBRewMiwilE0tSC5oDgpPddIrzgxt7g0L10vOT93EyMwHE//eya9g3FVg8Uh RgEORiUe3pu6XwKEWBPLiitzDzFKcDArifD6vAMK8aYkVlalFuXHF5XmpBYfYvQBumQis5Ro cj4wVvJK4g2NTcxNjU0tjYzMTE1xCCuJ8zKeehIgJJCeWJKanZpakFoEM46Jg1OqgXHzETdl 7aQ5jKbrlMKtFasXvWSfmevB5ea5febax5O+B9lYntJ6oKPOcf3/IuPfBqHuVcdOyNTczPEX zz4jzDbLUii3WM384yftpgid7w8O6nNzXxAU8GD+vzcrK7Lq1s59/gvidN+YPFqbc8DCVm/z o/N2X7+m3rQK+mK/Nn39Yk0LuR1tV5RYijMSDbWYi4oTAYBP67Z0AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsVy+t9jQd0POl8DDFa0c1s8XH+TxWLK4S8s Dkwed67tYQtgjGpgtMlITUxJLVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLx CdB1y8wBmq2kUJaYUwoUCkgsLlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxhzHiz6xFbwT71 iu//FjA2ME5Q6GLk5JAQMJGY27KHCcIWk7hwbz0biC0kMJ1RYstGni5GLiB7IpPE118f2UES bAJGEltPTmMEsUUEJCR+9V8Fs5kFYiRe7/8B1iwsYCFx5tk/FhCbRUBV4tijqWA1vAIeEnv7 DrNDLFOQODb1KyuIzSngKTFvw2N2iMUeEg977rBNYORdwMiwilE0tSC5oDgpPddIrzgxt7g0 L10vOT93EyM42J9J72Bc1WBxiFGAg1GJh/em7pcAIdbEsuLK3EOMEhzMSiK8Pu+AQrwpiZVV qUX58UWlOanFhxh9gK6ayCwlmpwPjMS8knhDYxNzU2NTSxMLEzNLHMJK4ryMp54ECAmkJ5ak ZqemFqQWwYxj4uCUamCsiuWze/j83fl7rq3u3HXTbS0Zdz3ttTNd+opjsZe+a9DXyrOb05/E bPffanmzYubpeYsT5u1+ps8as6hMYMmMPu0MztmHpdbOPvCIQeR6rtiiSfUNVtssbZ44hD88 8HjOBt4dF5oyp53Q3K02o/VXButs2RuLZe9L6tw64XFoy8y0pv0sr8+0KLEUZyQaajEXFScC AJ995u6jAgAA X-CFilter-Loop: Reflected X-Gm-Message-State: ALoCoQn8Nx0k7Z9NlTFWR+FNKTM3Jjl8SEJuLrUbaHOFagh2VCVKqvezqt6ymW3Hph8LZlmAER0G This patch adds required pmic voltage settings for SMDK5250. Signed-off-by: Rajeshwari Shinde Acked-by: Simon Glass --- board/samsung/smdk5250/smdk5250.c | 113 ++++++++++++++++++++++++++++++++++++- include/power/max77686_pmic.h | 30 ++++++++++ 2 files changed, 141 insertions(+), 2 deletions(-) diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index 7a5f132..12cc03e 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -80,12 +82,119 @@ int dram_init(void) } #if defined(CONFIG_POWER) +static int pmic_reg_update(struct pmic *p, int reg, uint regval) +{ + u32 val; + int ret = 0; + + ret = pmic_reg_read(p, reg, &val); + if (ret) { + debug("%s: PMIC %d register read failed\n", __func__, reg); + return -1; + } + val |= regval; + ret = pmic_reg_write(p, reg, val); + if (ret) { + debug("%s: PMIC %d register write failed\n", __func__, reg); + return -1; + } + return 0; +} + int power_init_board(void) { + struct pmic *p; + + power_ps_hold_setup(); + + i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); + if (pmic_init(I2C_PMIC)) return -1; - else - return 0; + + p = pmic_get("MAX77686_PMIC"); + if (!p) + return -ENODEV; + + if (pmic_probe(p)) + return -1; + + if (pmic_reg_update(p, MAX77686_REG_PMIC_32KHZ, MAX77686_32KHCP_EN)) + return -1; + + if (pmic_reg_update(p, MAX77686_REG_PMIC_BBAT, + MAX77686_BBCHOSTEN | MAX77686_BBCVS_3_5V)) + return -1; + + /* VDD_MIF */ + if (pmic_reg_write(p, MAX77686_REG_PMIC_BUCK1OUT, + MAX77686_BUCK1OUT_1V)) { + debug("%s: PMIC %d register write failed\n", __func__, + MAX77686_REG_PMIC_BUCK1OUT); + return -1; + } + + if (pmic_reg_update(p, MAX77686_REG_PMIC_BUCK1CRTL, + MAX77686_BUCK1CTRL_EN)) + return -1; + + /* VDD_ARM */ + if (pmic_reg_write(p, MAX77686_REG_PMIC_BUCK2DVS1, + MAX77686_BUCK2DVS1_1_3V)) { + debug("%s: PMIC %d register write failed\n", __func__, + MAX77686_REG_PMIC_BUCK2DVS1); + return -1; + } + + if (pmic_reg_update(p, MAX77686_REG_PMIC_BUCK2CTRL1, + MAX77686_BUCK2CTRL_ON)) + return -1; + + /* VDD_INT */ + if (pmic_reg_write(p, MAX77686_REG_PMIC_BUCK3DVS1, + MAX77686_BUCK3DVS1_1_0125V)) { + debug("%s: PMIC %d register write failed\n", __func__, + MAX77686_REG_PMIC_BUCK3DVS1); + return -1; + } + + if (pmic_reg_update(p, MAX77686_REG_PMIC_BUCK3CTRL, + MAX77686_BUCK3CTRL_ON)) + return -1; + + /* VDD_G3D */ + if (pmic_reg_write(p, MAX77686_REG_PMIC_BUCK4DVS1, + MAX77686_BUCK4DVS1_1_2V)) { + debug("%s: PMIC %d register write failed\n", __func__, + MAX77686_REG_PMIC_BUCK4DVS1); + return -1; + } + + if (pmic_reg_update(p, MAX77686_REG_PMIC_BUCK4CTRL1, + MAX77686_BUCK3CTRL_ON)) + return -1; + + /* VDD_LDO2 */ + if (pmic_reg_update(p, MAX77686_REG_PMIC_LDO2CTRL1, + MAX77686_LD02CTRL1_1_5V | EN_LDO)) + return -1; + + /* VDD_LDO3 */ + if (pmic_reg_update(p, MAX77686_REG_PMIC_LDO3CTRL1, + MAX77686_LD03CTRL1_1_8V | EN_LDO)) + return -1; + + /* VDD_LDO5 */ + if (pmic_reg_update(p, MAX77686_REG_PMIC_LDO5CTRL1, + MAX77686_LD05CTRL1_1_8V | EN_LDO)) + return -1; + + /* VDD_LDO10 */ + if (pmic_reg_update(p, MAX77686_REG_PMIC_LDO10CTRL1, + MAX77686_LD10CTRL1_1_8V | EN_LDO)) + return -1; + + return 0; } #endif diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h index d949ace..5b7b6ce 100644 --- a/include/power/max77686_pmic.h +++ b/include/power/max77686_pmic.h @@ -155,4 +155,34 @@ enum { EN_LDO = (0x3 << 6), }; +/* Buck1 1 volt value */ +#define MAX77686_BUCK1OUT_1V 0x5 +#define MAX77686_BUCK1CTRL_EN (3 << 0) +/* Buck2 1.3 volt value */ +#define MAX77686_BUCK2DVS1_1_3V 0x38 +#define MAX77686_BUCK2CTRL_ON (1 << 4) +/* Buck3 1.0125 volt value */ +#define MAX77686_BUCK3DVS1_1_0125V 0x21 +#define MAX77686_BUCK3CTRL_ON (1 << 4) +/* Buck4 1.2 volt value */ +#define MAX77686_BUCK4DVS1_1_2V 0x30 +#define MAX77686_BUCK4CTRL_ON (1 << 4) +/* LDO2 1.5 volt value */ +#define MAX77686_LD02CTRL1_1_5V 0x1c +/* LDO3 1.8 volt value */ +#define MAX77686_LD03CTRL1_1_8V 0x14 +/* LDO5 1.8 volt value */ +#define MAX77686_LD05CTRL1_1_8V 0x14 +/* LDO10 1.8 volt value */ +#define MAX77686_LD10CTRL1_1_8V 0x14 +/* MAX77686_REG_PMIC_32KHZ set to 32KH CP + * output is activated + */ +#define MAX77686_32KHCP_EN (1 << 1) +/* MAX77686_REG_PMIC_BBAT set to + * Back up batery charger on and + * limit voltage setting to 3.5v + */ +#define MAX77686_BBCHOSTEN (1 << 0) +#define MAX77686_BBCVS_3_5V (3 << 3) #endif /* __MAX77686_PMIC_H_ */