From patchwork Mon Feb 4 11:53:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14453 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 416D823F96 for ; Mon, 4 Feb 2013 11:55:58 +0000 (UTC) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) by fiordland.canonical.com (Postfix) with ESMTP id D835FA18610 for ; Mon, 4 Feb 2013 11:55:57 +0000 (UTC) Received: by mail-vb0-f47.google.com with SMTP id e21so3809133vbm.34 for ; Mon, 04 Feb 2013 03:55:57 -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-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=5FDW3ks1TetJcbPt0lyGPhTgp3b1pYdKMF+FRhCKjm8=; b=lMOGN63edbbKjv42LhwQkqvL5O7c2nUnyBbwVt+6GwXuxwewoECphXtERXMHqIW8zp t+uCSJNfU4MHaOR0vGfmmlWqJb9nZyORQArPoeaH9DbjnK8f80DDf5byFNWM21uIwZri CKbbKtnAeJpSRhSkFk5SxVQBHRdaaora7I59H9N9rtZy1NkTqjKyutGB3KNExNxeR9XV xRKUzfb/DIirEsdVJkyJkNIRlcYIbn/HpUbOQg5jnD1NKsSAZf3ikETqUSTTuf0prxG6 09M0qTP4bkotPwM0I+Ya+lImzZhNmWJhiZ8CgYL9y6w9DfcOgENGD6v7bf/d5IvU9eNN /mMA== X-Received: by 10.58.48.231 with SMTP id p7mr18049751ven.11.1359978957375; Mon, 04 Feb 2013 03:55:57 -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.252.8 with SMTP id zo8csp83014vec; Mon, 4 Feb 2013 03:55:56 -0800 (PST) X-Received: by 10.194.235.225 with SMTP id up1mr34798129wjc.11.1359978956199; Mon, 04 Feb 2013 03:55:56 -0800 (PST) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by mx.google.com with ESMTPS id m17si1078193wiv.49.2013.02.04.03.55.55 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:55:56 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.175 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.175; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.175 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wi0-f175.google.com with SMTP id l13so2252237wie.8 for ; Mon, 04 Feb 2013 03:55:55 -0800 (PST) X-Received: by 10.180.82.9 with SMTP id e9mr10132821wiy.1.1359978955764; Mon, 04 Feb 2013 03:55:55 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id j9sm12937128wia.5.2013.02.04.03.55.53 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:55:54 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Bengt Jonsson , Lee Jones Subject: [PATCH 04/73] regulator: ab8500: Added SysClkReq1 control of Vpll Date: Mon, 4 Feb 2013 11:53:19 +0000 Message-Id: <1359978868-28736-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> References: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQluJukRRhVsjjRk32EuxsOjUlOChAbZedBh2vJYPh8b5vdAMKw7DDl90cIwNM1ZAq+BH/gb From: Bengt Jonsson Signed-off-by: Bengt Jonsson Signed-off-by: Lee Jones Reviewed-by: Martin PERSSON Tested-by: David PARIS --- arch/arm/mach-ux500/board-mop500-regulators.c | 4 +++- drivers/regulator/ab8500.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 42eef80..ae0695b 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -126,6 +126,7 @@ struct ab8500_regulator_reg_init ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { /* * VanaRequestCtrl = HP/LP depending on VxRequest + * VpllRequestCtrl = HP/LP depending on VxRequest * VextSupply1RequestCtrl = HP/LP depending on VxRequest */ INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL2, 0x00), @@ -143,13 +144,14 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL4, 0x00), /* * VanaSysClkReq1HPValid = disabled + * VpllSysClkReq1HPValid = enabled * Vaux1SysClkReq1HPValid = disabled * Vaux2SysClkReq1HPValid = disabled * Vaux3SysClkReq1HPValid = disabled * Vsmps2SysClkReq1HPValid = enabled * Vsmps1SysClkReq1HPValid = enabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x13), /* * VextSupply1SysClkReq1HPValid = disabled * VextSupply2SysClkReq1HPValid = disabled diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 84cd11c..8edc413 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -477,7 +477,7 @@ struct ab8500_reg_init { static struct ab8500_reg_init ab8500_reg_init[] = { /* * 0x30, VanaRequestCtrl - * 0x0C, VpllRequestCtrl + * 0x0c, VpllRequestCtrl * 0xc0, VextSupply1RequestCtrl */ REG_INIT(AB8500_REGUREQUESTCTRL2, 0x03, 0x04, 0xfc), @@ -497,11 +497,12 @@ static struct ab8500_reg_init ab8500_reg_init[] = { * 0x01, Vsmps1SysClkReq1HPValid * 0x02, Vsmps2SysClkReq1HPValid * 0x08, VanaSysClkReq1HPValid + * 0x10, VpllSysClkReq1HPValid * 0x20, Vaux1SysClkReq1HPValid * 0x40, Vaux2SysClkReq1HPValid * 0x80, Vaux3SysClkReq1HPValid */ - REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xeb), + REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xfb), /* * 0x10, VextSupply1SysClkReq1HPValid * 0x20, VextSupply2SysClkReq1HPValid