From patchwork Mon Feb 4 11:54:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14511 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 D449323F96 for ; Mon, 4 Feb 2013 11:57:53 +0000 (UTC) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by fiordland.canonical.com (Postfix) with ESMTP id 8F078A1877A for ; Mon, 4 Feb 2013 11:57:53 +0000 (UTC) Received: by mail-ve0-f176.google.com with SMTP id cz10so1395630veb.21 for ; Mon, 04 Feb 2013 03:57:53 -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=V72qyKi/jAVCJ8tQxX9J7dMfmUUQgAkGsopaC1YZWfY=; b=AOiZkh6U114in0F3RPMhRoWqqf0TSD9003uCgVuAMXxZq/a+NFeNeTHmd17htXSK5V dCw/0ExXe4Q+64CH5EiiISyfr+5vX3cBD6qmFnN5jxglB8+n3F31s/xbvb8KDm9GLM7b hlf6AHKfeQy02oiLK6R/1Hxr8L7if8N9MaXMnFE3QbXo5PwEYHHx7hd/J7/7SpbpLAc9 6V4zGxG/2rfdAJld4dRccJmFUlpJZEZJpoQ2b5O2LwXs3gn7nzzpmhLhWex1gCEiRmZI sxTqA+VZE1rmNkxxo/k9kOg5e2tXwccRtrGDLE0BfcpTb8u8uzkpsrQJbiT4URIgnsOT bBSA== X-Received: by 10.52.27.50 with SMTP id q18mr19335918vdg.20.1359979073118; Mon, 04 Feb 2013 03:57:53 -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 zo8csp83129vec; Mon, 4 Feb 2013 03:57:52 -0800 (PST) X-Received: by 10.194.19.170 with SMTP id g10mr34615973wje.56.1359979072213; Mon, 04 Feb 2013 03:57:52 -0800 (PST) Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by mx.google.com with ESMTPS id fx6si3474742wib.67.2013.02.04.03.57.51 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:57:52 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.171 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.171 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-f171.google.com with SMTP id hn17so1495313wib.10 for ; Mon, 04 Feb 2013 03:57:51 -0800 (PST) X-Received: by 10.180.99.227 with SMTP id et3mr9956221wib.6.1359979071715; Mon, 04 Feb 2013 03:57:51 -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.57.49 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:57:50 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Zhenhua HUANG , Lee Jones Subject: [PATCH 62/73] regulator: ab8500: Remove vusb from AB8540 regulator framework Date: Mon, 4 Feb 2013 11:54:17 +0000 Message-Id: <1359978868-28736-63-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: ALoCoQkrioVdDTzjC7HokZxcdYTPmRVt9LHa/lPnGpUO8XvogtxXvgyVwkryqDQgnFxGw37AjskW From: Zhenhua HUANG This LDO is managed by accessory module with direct register accesses. Signed-off-by: Zhenhua HUANG Signed-off-by: Lee Jones Reviewed-by: Philippe LANGLAIS Tested-by: Maxime COQUELIN --- drivers/regulator/ab8500.c | 17 ----------------- include/linux/regulator/ab8500.h | 1 - 2 files changed, 18 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index fd8af4b..7d64d2e 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -1463,23 +1463,6 @@ static struct ab8500_regulator_info .update_val_idle = 0x82, .update_val_normal = 0x02, }, - [AB8540_LDO_USB] = { - .desc = { - .name = "LDO-USB", - .ops = &ab8500_regulator_ops, - .type = REGULATOR_VOLTAGE, - .id = AB8540_LDO_USB, - .owner = THIS_MODULE, - .n_voltages = 1, - }, - .fixed_uV = 3300000, - .update_bank = 0x03, - .update_reg = 0x82, - .update_mask = 0x03, - .update_val = 0x01, - .update_val_idle = 0x03, - .update_val_normal = 0x01, - }, [AB8540_LDO_AUDIO] = { .desc = { .name = "LDO-AUDIO", diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 5977c47..bb0140c 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -76,7 +76,6 @@ enum ab8540_regulator_id { AB8540_LDO_AUX4, AB8540_LDO_INTCORE, AB8540_LDO_TVOUT, - AB8540_LDO_USB, AB8540_LDO_AUDIO, AB8540_LDO_ANAMIC1, AB8540_LDO_ANAMIC2,