From patchwork Mon Feb 4 11:53:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14452 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 E65BA23F96 for ; Mon, 4 Feb 2013 11:55:55 +0000 (UTC) Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by fiordland.canonical.com (Postfix) with ESMTP id 8DAD8A18477 for ; Mon, 4 Feb 2013 11:55:55 +0000 (UTC) Received: by mail-vb0-f53.google.com with SMTP id fj18so3824019vbb.12 for ; Mon, 04 Feb 2013 03:55:55 -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=WOZSjT63ZLOlZ3Vb51B4D6LsDPv+OodYCMlLavYXbVs=; b=QQaCNlLsOLGPXHXtLRJx0hW+6ELkC/puGHuyvm/zb6t4l9igk2IosMZeMwh34mquW/ oW43qDu+XyESShio2U1XJTQnbkHskM646HKxQvEil9keCoUjTGBMvtkTtBxKPby9+7qO PyxCQmrc30V9tvD9R/YzNrsr0d80SyaxuY10VOtRMyggIz0AuTSiJ8wkpiXmE9yyDEgL CLZR8/FtcgEMAB3nfKmt64K/V1/hnKuDiqjwgpaSrDkjlCde6DhghVTYMHk7R7IhOIkS XTK7qQFTqABUd27wf1+FTd97RhXL5i1UEYm6iR8WIt+QdMLR3GC/9ViaUEz8rUryz4Di kTYw== X-Received: by 10.52.27.50 with SMTP id q18mr19330176vdg.20.1359978955066; Mon, 04 Feb 2013 03:55:55 -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 zo8csp83013vec; Mon, 4 Feb 2013 03:55:54 -0800 (PST) X-Received: by 10.180.84.162 with SMTP id a2mr9813150wiz.14.1359978954218; Mon, 04 Feb 2013 03:55:54 -0800 (PST) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by mx.google.com with ESMTPS id y18si5706988wjr.254.2013.02.04.03.55.53 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:55:54 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.180 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.180; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.180 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-f180.google.com with SMTP id hi8so2287318wib.7 for ; Mon, 04 Feb 2013 03:55:53 -0800 (PST) X-Received: by 10.195.13.11 with SMTP id eu11mr34706180wjd.39.1359978953737; Mon, 04 Feb 2013 03:55:53 -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.51 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:55:52 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Martin Persson , Lee Jones Subject: [PATCH 03/73] regulator: ab8500: Add init values for vsmps1/2 Date: Mon, 4 Feb 2013 11:53:18 +0000 Message-Id: <1359978868-28736-4-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: ALoCoQmvLFyd9IqWzNMwcukFYgzgnhOeJMXIujelMYymU00XZQjk63NTAy6fwVO07mbrCko0+HpI From: Martin Persson Signed-off-by: Martin Persson Signed-off-by: Lee Jones Reviewed-by: Emeric VIGIER Reviewed-by: Bengt JONSSON --- arch/arm/mach-ux500/board-mop500-regulators.c | 14 +++++++++++++- drivers/regulator/ab8500.c | 14 +++++++++++++- include/linux/regulator/ab8500.h | 2 ++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index ba379f7..42eef80 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -146,8 +146,10 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { * Vaux1SysClkReq1HPValid = disabled * Vaux2SysClkReq1HPValid = disabled * Vaux3SysClkReq1HPValid = disabled + * Vsmps2SysClkReq1HPValid = enabled + * Vsmps1SysClkReq1HPValid = enabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x00), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03), /* * VextSupply1SysClkReq1HPValid = disabled * VextSupply2SysClkReq1HPValid = disabled @@ -252,6 +254,16 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { */ INIT_REGULATOR_REGISTER(AB8500_VBBSEL2, 0x00), /* + * Vsmps1SelCtrl = Vsmps1 voltage defined by Vsmsp1Sel2 + * Vsmps1Regu = HW control + */ + INIT_REGULATOR_REGISTER(AB8500_VSMPS1REGU, 0x06), + /* + * Vsmps2SelCtrl = Vsmps2 voltage defined by Vsmsp2Sel2 + * Vsmps2Regu = HW control + */ + INIT_REGULATOR_REGISTER(AB8500_VSMPS2REGU, 0x06), + /* * VPll = Hw controlled * VanaRegu = force off */ diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index b369411..84cd11c 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -494,12 +494,14 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_REGUREQUESTCTRL4, 0x03, 0x06, 0x07), /* + * 0x01, Vsmps1SysClkReq1HPValid + * 0x02, Vsmps2SysClkReq1HPValid * 0x08, VanaSysClkReq1HPValid * 0x20, Vaux1SysClkReq1HPValid * 0x40, Vaux2SysClkReq1HPValid * 0x80, Vaux3SysClkReq1HPValid */ - REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xe8), + REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xeb), /* * 0x10, VextSupply1SysClkReq1HPValid * 0x20, VextSupply2SysClkReq1HPValid @@ -596,6 +598,16 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_VBBSEL2, 0x04, 0x12, 0x0f), /* + * 0x0c, Vsmps1SelCtrl + * 0x03, Vsmps1Regu + */ + REG_INIT(AB8500_VSMPS1REGU, 0x04, 0x03, 0x0f), + /* + * 0x0c, Vsmps2SelCtrl + * 0x03, Vsmps2Regu + */ + REG_INIT(AB8500_VSMPS2REGU, 0x04, 0x04, 0x0f), + /* * 0x0c, VanaRegu * 0x03, VpllRegu */ diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index d61adb9..e54c8af 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -89,6 +89,8 @@ enum ab8500_regulator_reg { AB8500_ARMREGU2, /* NOTE! PRCMU register */ AB8500_VBBSEL1, /* NOTE! PRCMU register */ AB8500_VBBSEL2, /* NOTE! PRCMU register */ + AB8500_VSMPS1REGU, + AB8500_VSMPS2REGU, AB8500_VSMPS1SEL1, AB8500_NUM_REGULATOR_REGISTERS, };