From patchwork Thu Mar 21 15:59:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15485 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 E5BA723E14 for ; Thu, 21 Mar 2013 16:00:22 +0000 (UTC) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by fiordland.canonical.com (Postfix) with ESMTP id A5614A19D47 for ; Thu, 21 Mar 2013 16:00:22 +0000 (UTC) Received: by mail-vc0-f174.google.com with SMTP id hx10so2432300vcb.33 for ; Thu, 21 Mar 2013 09:00:22 -0700 (PDT) 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=dMgNg9hfBWZTZ05SuATv6wyo3Z+MQhHb24oj8oM7cTI=; b=J0dirOKA3brYjtdawPnIwUBhB8xaeGOnMBa6orsI6nxEwveSIDhP0fMMUs9L7sHHCC HRhFV4XEDpOuXm0r1TUX0gLPka7ihcYUf6DuF/NnTA0eJ0cpcYU4CkmIGmkWRFZ8W/GO /vbrbmbBAwv4KMgcLkBNHWYOaq8YnU4T3O6xUzMBfEXLazc0wuEAvd+MgtVZYwqFS1FI FE1QVr5HVkBc8C11qHMRqcxyw5qREJVP3nQjmohqBYHWJsX+RBRFVRgBQ7Dx6Fc8Qbx9 uR+vNqs0lhKy8vg7QwkT7UmFzEWaaGnPZQlBowCafCMGzGD+RSK45f/hw1TFTSXG4O99 azRA== X-Received: by 10.59.3.9 with SMTP id bs9mr14194337ved.38.1363881622204; Thu, 21 Mar 2013 09:00:22 -0700 (PDT) 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.233.198 with SMTP id ty6csp66763vec; Thu, 21 Mar 2013 09:00:21 -0700 (PDT) X-Received: by 10.194.93.68 with SMTP id cs4mr3469320wjb.17.1363881621179; Thu, 21 Mar 2013 09:00:21 -0700 (PDT) Received: from mail-we0-x235.google.com ([2a00:1450:400c:c03::235]) by mx.google.com with ESMTPS id ew8si1432228wid.51.2013.03.21.09.00.20 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:00:21 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::235 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::235; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::235 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-f181.google.com with SMTP id p43so2477397wea.40 for ; Thu, 21 Mar 2013 09:00:20 -0700 (PDT) X-Received: by 10.194.77.110 with SMTP id r14mr17936338wjw.2.1363881620769; Thu, 21 Mar 2013 09:00:20 -0700 (PDT) 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 h10sm6110847wic.8.2013.03.21.09.00.18 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:00:19 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones , Bengt Jonsson Subject: [PATCH 11/46] regulator: ab8500: Remove USB regulator Date: Thu, 21 Mar 2013 15:59:08 +0000 Message-Id: <1363881583-15234-12-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363881583-15234-1-git-send-email-lee.jones@linaro.org> References: <1363881583-15234-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQk+1r+iQs3qLszAlV6te0SFCzzwI/E/PQ1SYYb0sVYvB5W+9q/6FOfA5QQQTX0Zsd2IVH5c 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 | 19 ------------------- include/linux/regulator/ab8500.h | 1 - 2 files changed, 20 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 7d4006e..dfe191c 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -494,24 +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, - }, - - /* - * Regulators with fixed voltage and normal mode - */ [AB8500_LDO_AUDIO] = { .desc = { .name = "LDO-AUDIO", @@ -912,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,