From patchwork Wed Feb 6 10:53:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14595 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 957E02423C for ; Wed, 6 Feb 2013 10:55:16 +0000 (UTC) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by fiordland.canonical.com (Postfix) with ESMTP id 53847A18BDC for ; Wed, 6 Feb 2013 10:55:16 +0000 (UTC) Received: by mail-vc0-f173.google.com with SMTP id fy7so750710vcb.32 for ; Wed, 06 Feb 2013 02:55:15 -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=Kz5sEaX0MDuI2ts+7K+zH/P5JsnIaw9ffJTJ5ZwIUdA=; b=cYddEYWSVNlT7AGCuaP/eWR1MvnAZ0pTygwhAj8FQ1T301bPFQM6eTkVR+0UzET21h Lis1Ns+IqGuRs0IqvZtzFBRDWkE/4cTmNW20waspDm5HIZl8F2nB7iaN/ocIcZh69A/n cbOf7WFgLMUTmpEVoysI+QivsTq2uYcM16WtoeEGNHAExh5hQqLs6smgt2EoFskwp4tG BazHcPP3UiU0PxaJTUadzf4AQ0v8m8PxUtmcfOLS4dXNWuTVo0uLXFcVfwJgXfQPwMGQ v7OGPl7t+f/yRBZHPHS8r891y3++A/gN0Ywpb41KriKz11tGQy2iKq8uzQb1DTe/8rTG iuKw== X-Received: by 10.52.24.98 with SMTP id t2mr24788996vdf.69.1360148115853; Wed, 06 Feb 2013 02:55:15 -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 zo8csp12956vec; Wed, 6 Feb 2013 02:55:15 -0800 (PST) X-Received: by 10.180.105.232 with SMTP id gp8mr3978281wib.33.1360148095502; Wed, 06 Feb 2013 02:54:55 -0800 (PST) Received: from mail-we0-x229.google.com ([2a00:1450:400c:c03::229]) by mx.google.com with ESMTPS id y7si519246wix.4.2013.02.06.02.54.55 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:54:55 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::229 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::229; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::229 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-f169.google.com with SMTP id t11so1078479wey.28 for ; Wed, 06 Feb 2013 02:54:54 -0800 (PST) X-Received: by 10.194.57.206 with SMTP id k14mr48800121wjq.26.1360148091179; Wed, 06 Feb 2013 02:54: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 be1sm2406649wib.10.2013.02.06.02.54.50 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:54:50 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: broonie@opensource.wolfsonmicro.com, linus.walleij@linaro.org, Bengt Jonsson , Lee Jones Subject: [PATCH 13/49] regulator: ab8500: Remove USB regulator Date: Wed, 6 Feb 2013 10:53:35 +0000 Message-Id: <1360148051-7560-14-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> References: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQl1iKpWdy4Jqc3c+e7bO7tgtrQRMbib0Rd8PslPd9kmeUCQzU0IuWaEPvjHsYEycWivFy6+ From: Bengt Jonsson The USB regulator is controlled by hardware. The software support was only needed for early hardware (ED) which is no longer supported. Signed-off-by: Bengt Jonsson Signed-off-by: Lee Jones --- drivers/regulator/ab8500.c | 20 -------------------- include/linux/regulator/ab8500.h | 1 - 2 files changed, 21 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 1d73067..48dd0ed 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -494,25 +494,6 @@ static struct ab8500_regulator_info .update_val_idle = 0x82, .update_val_normal = 0x02, }, - [AB8500_LDO_USB] = { - .desc = { - .name = "LDO-USB", - .ops = &ab8500_regulator_fixed_ops, - .type = REGULATOR_VOLTAGE, - .id = AB8500_LDO_USB, - .owner = THIS_MODULE, - .n_voltages = 1, - .min_uV = 3300000, - }, - .update_bank = 0x03, - .update_reg = 0x82, - .update_mask = 0x03, - .update_val_enable = 0x01, - }, - - /* - * Regulators with fixed voltage and normal mode - */ [AB8500_LDO_AUDIO] = { .desc = { .name = "LDO-AUDIO", @@ -913,7 +894,6 @@ static struct of_regulator_match ab8500_regulator_matches[] = { { .name = "ab8500_ldo_aux3", .driver_data = (void *) AB8500_LDO_AUX3, }, { .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, }, { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, }, - { .name = "ab8500_ldo_usb", .driver_data = (void *) AB8500_LDO_USB, }, { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, }, { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 0a58db2..9a2da6a 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -19,7 +19,6 @@ enum ab8500_regulator_id { AB8500_LDO_AUX3, AB8500_LDO_INTCORE, AB8500_LDO_TVOUT, - AB8500_LDO_USB, AB8500_LDO_AUDIO, AB8500_LDO_ANAMIC1, AB8500_LDO_ANAMIC2,