From patchwork Mon Feb 4 11:53:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14450 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 7F24523F96 for ; Mon, 4 Feb 2013 11:55:52 +0000 (UTC) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by fiordland.canonical.com (Postfix) with ESMTP id 222AAA18F62 for ; Mon, 4 Feb 2013 11:55:52 +0000 (UTC) Received: by mail-vb0-f52.google.com with SMTP id fa15so3839088vbb.11 for ; Mon, 04 Feb 2013 03:55:51 -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=q+M0hSXtuI1k6Z8d5cEou21dIVQ8PLrz8gjx499eHHE=; b=JhePV7QwVuMOj7OsFd0yFfulyG2lsjFvTwUSkT/O5iKT7zOu8qNZ4Mku0yDmjz073c QFq8CWAgrO4uES3JR3Jjpe2apA1KzQIxJAZI+0BsXOHrhR3iD2Y9PsEzlMfbnL830bgq S6yrCSvv4cWBkVXMx2gJ25IaVnZzef4xhjgaIs1L0yxxJjqtyq6B40QWIa2WK+KCLgfl eanwdsNBgzTzJDqMe7o3V3Wr/TiwQhjqiDUkSc8mye3zmhHTMBV5g1FrWgyg9TotvWb2 CVB36QmqyzQSaLciIe+WhT5lUYgv+HU+6kPn64cHpiuh7neuZjYxiPe2x517A8mrrVhN e58A== X-Received: by 10.58.231.196 with SMTP id ti4mr17920342vec.25.1359978951601; Mon, 04 Feb 2013 03:55:51 -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 zo8csp83007vec; Mon, 4 Feb 2013 03:55:50 -0800 (PST) X-Received: by 10.194.24.42 with SMTP id r10mr34797307wjf.2.1359978949873; Mon, 04 Feb 2013 03:55:49 -0800 (PST) Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]) by mx.google.com with ESMTPS id ce2si3480709wib.6.2013.02.04.03.55.49 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:55:49 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::22e is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::22e; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::22e 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-we0-f174.google.com with SMTP id r6so4736846wey.19 for ; Mon, 04 Feb 2013 03:55:49 -0800 (PST) X-Received: by 10.180.79.201 with SMTP id l9mr7114431wix.20.1359978949453; Mon, 04 Feb 2013 03:55:49 -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.47 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:55:48 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Lee Jones , Martin Persson Subject: [PATCH 01/73] regulator: ab8500: Remove VBB from suspend force Date: Mon, 4 Feb 2013 11:53:16 +0000 Message-Id: <1359978868-28736-2-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: ALoCoQm/eDc3QjPzp8E/b+8evtbYIv4T9aQ83utUjDPpeoSimSqZDNrcAi4DkgoE2HDe2M0PSRWZ Remove VBB from suspend force and add correct init values Signed-off-by: Lee Jones Signed-off-by: Martin Persson Reviewed-by: Bengt JONSSON --- arch/arm/mach-ux500/board-mop500-regulators.c | 18 ++++++++++++++++++ drivers/regulator/ab8500.c | 18 ++++++++++++++++++ include/linux/regulator/ab8500.h | 3 +++ 3 files changed, 39 insertions(+) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 2a17bc5..0cc9edc 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -234,6 +234,24 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { */ INIT_REGULATOR_REGISTER(AB8500_REGUCTRL1VAMIC, 0x00), /* + * VBBN = force OFF + * VBBP = force OFF + * NOTE! PRCMU register + */ + INIT_REGULATOR_REGISTER(AB8500_ARMREGU2, 0x00), + /* + * VBBNSel1 = VBBP = VBBPFB + * VBBPSel1 = 0 V + * NOTE! PRCMU register + */ + INIT_REGULATOR_REGISTER(AB8500_VBBSEL1, 0x00), + /* + * VBBNSel2 = VBBP = VBBPFB + * VBBPSel2 = 0 V + * NOTE! PRCMU register + */ + INIT_REGULATOR_REGISTER(AB8500_VBBSEL2, 0x00), + /* * VPll = Hw controlled * VanaRegu = force off */ diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 09014f3..ac07fc8 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -578,6 +578,24 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_REGUCTRL1VAMIC, 0x03, 0x84, 0x03), /* + * 0x0c, VBBNRegu + * 0x03, VBBPRegu + * NOTE! PRCMU register + */ + REG_INIT(AB8500_ARMREGU2, 0x04, 0x01, 0x0f), + /* + * 0x0c, VBBPSel1 + * 0x03, VBBNSel1 + * NOTE! PRCMU register + */ + REG_INIT(AB8500_VBBSEL1, 0x04, 0x11, 0x0f), + /* + * 0x0c, VBBNSel2 + * 0x03, VBBPSel2 + * NOTE! PRCMU register + */ + REG_INIT(AB8500_VBBSEL2, 0x04, 0x12, 0x0f), + /* * 0x0c, VanaRegu * 0x03, VpllRegu */ diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 7bd73bb..d61adb9 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -86,6 +86,9 @@ enum ab8500_regulator_reg { AB8500_REGUCTRL2SPARE, AB8500_REGUCTRLDISCH, AB8500_REGUCTRLDISCH2, + AB8500_ARMREGU2, /* NOTE! PRCMU register */ + AB8500_VBBSEL1, /* NOTE! PRCMU register */ + AB8500_VBBSEL2, /* NOTE! PRCMU register */ AB8500_VSMPS1SEL1, AB8500_NUM_REGULATOR_REGISTERS, };