From patchwork Mon Feb 4 11:53:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14480 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 472B623F96 for ; Mon, 4 Feb 2013 11:56:46 +0000 (UTC) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by fiordland.canonical.com (Postfix) with ESMTP id F256DA18477 for ; Mon, 4 Feb 2013 11:56:45 +0000 (UTC) Received: by mail-ve0-f175.google.com with SMTP id cy12so2062690veb.34 for ; Mon, 04 Feb 2013 03:56:45 -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=Mrwo5zJAQi3B/yUi2cLh7zTN/JngZ8XA5VSh1h5tdk8=; b=HbDxz2kY3nxAtKnVu1hfhuidrslv5VoQNma69x5fD0WycKvAU3XOmI6kWq5P3DgXN5 7aoWyG7j09/49TPKbqBwQAgoi1UVLCZoY2YR/VdrSzCwob+sFEB3F4NYWE+pW/2gbbbL 6c9V0/j2PjQ0RWEw6l7wAa7FMYSRHCkLbeCK9X6hLUKP+vy9FQR13zlckOTNuDzP2j5b CitCDE4KLB1dBHFTqeG3Gguie1bsBcdRMmR0gnVACo6xGVydcikDAr93TNBt5eGOTaJc WXJRIlEAV9cQ+tGHSV/ipy6Ni59b+xfuDIumAChnMe0HX2H67RRtTMFUE/OONwedN6aJ 3NOg== X-Received: by 10.52.66.168 with SMTP id g8mr19458943vdt.27.1359979005518; Mon, 04 Feb 2013 03:56:45 -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 zo8csp83068vec; Mon, 4 Feb 2013 03:56:44 -0800 (PST) X-Received: by 10.180.80.35 with SMTP id o3mr10016173wix.9.1359979004442; Mon, 04 Feb 2013 03:56:44 -0800 (PST) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id r13si5479979wju.130.2013.02.04.03.56.44 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:44 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.178 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-f178.google.com with SMTP id o1so2779367wic.11 for ; Mon, 04 Feb 2013 03:56:44 -0800 (PST) X-Received: by 10.194.88.202 with SMTP id bi10mr34625891wjb.5.1359979004057; Mon, 04 Feb 2013 03:56:44 -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.56.42 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:43 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Bengt Jonsson , Lee Jones Subject: [PATCH 31/73] regulator: ab8500: Remove Vsafe settings Date: Mon, 4 Feb 2013 11:53:46 +0000 Message-Id: <1359978868-28736-32-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: ALoCoQnp3WQV9UYZiufy+Twy1KaQOBARVkAaUwuAyJ9H49VeNChrF+yGS38VyApnayVvd5ZmxW/F From: Bengt Jonsson The Vsafe regulator should not be handled by kernel, it should be setup before the kernel starts. This patch removes the setting of Vsmsp3Regu. Signed-off-by: Bengt Jonsson Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-regulators.c | 6 ------ drivers/regulator/ab8500.c | 6 ------ include/linux/regulator/ab8500.h | 1 - 3 files changed, 13 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index f9f3fc3..7c36734 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -265,12 +265,6 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = { */ INIT_REGULATOR_REGISTER(AB8500_VSMPS2REGU, 0x0f, 0x06), /* - * Vsmps3Regu = HW control - * Vsmps3SelCtrl = Vsmps3 voltage defined by Vsmps3Sel2 - * NOTE! PRCMU register - */ - INIT_REGULATOR_REGISTER(AB8500_VSMPS3REGU, 0x0f, 0x06), - /* * VPll = Hw controlled * VanaRegu = force off */ diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 3f5db96..a9841133 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -744,12 +744,6 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_VSMPS2REGU, 0x04, 0x04, 0x3f), /* - * 0x03, Vsmps3Regu - * 0x0c, Vsmps3SelCtrl - * NOTE! PRCMU register - */ - REG_INIT(AB8500_VSMPS3REGU, 0x04, 0x05, 0x0f), - /* * 0x03, VpllRegu * 0x0c, VanaRegu */ diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 74955db..d158dcf 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -81,7 +81,6 @@ enum ab8500_regulator_reg { AB8500_REGUCTRL1VAMIC, AB8500_VSMPS1REGU, AB8500_VSMPS2REGU, - AB8500_VSMPS3REGU, /* NOTE! PRCMU register */ AB8500_VPLLVANAREGU, AB8500_VREFDDR, AB8500_EXTSUPPLYREGU,