From patchwork Thu Sep 12 13:45:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20004 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4EABB26B56 for ; Thu, 12 Sep 2013 13:45:48 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id r5sf11760189qcx.0 for ; Thu, 12 Sep 2013 06:45:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=0COfv+s0hyXxkqjTzjAFqRrsFPvm9KxIY+b8y14JRc0=; b=bmzdleD8tMwiLI/CqYM8gidT0Ioq+2a57vzN6J4gJBjfiXyx696NoWVSpcj8KiBMiP FGQUoJMh/soQSF/prnRNMJcGHhuj762pUEh7q9T0gIwPf4LABMb/VzbEzq3W9W8XZWU9 hivtBbfhpYM0cXu8ct+FlmreEqnD1Uc9H0p/j1oskS9QxhEFivnwuc/ECPXcEvAIpAVk HTkZYJ2cieKaJKK5/P2fiqUAEtvgDECNJxZVoelr3S99qCNJEmvWJLuwzCObd2u1EhOv JpRZMvh2Eomd+r/7uWZ3qn5qCRll+itg/5zDwa2AU8o0wKjoEtAywQiaNHiWdYE/mB+J mbEg== X-Gm-Message-State: ALoCoQnQFHB8d/vQ5SZwPsGrhCXZpta+VUfhLW2uht3F7I1LhD42j3sYUwl2Us1SYogcOO5pKMAG X-Received: by 10.236.73.164 with SMTP id v24mr2793922yhd.24.1378993548108; Thu, 12 Sep 2013 06:45:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.84.1 with SMTP id u1ls692352qey.8.gmail; Thu, 12 Sep 2013 06:45:47 -0700 (PDT) X-Received: by 10.52.24.4 with SMTP id q4mr941625vdf.34.1378993547875; Thu, 12 Sep 2013 06:45:47 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id gq10si1218517vdc.134.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 06:45:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id hz10so7160489vcb.40 for ; Thu, 12 Sep 2013 06:45:47 -0700 (PDT) X-Received: by 10.52.0.108 with SMTP id 12mr43953vdd.45.1378993547757; Thu, 12 Sep 2013 06:45:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp21705vcz; Thu, 12 Sep 2013 06:45:46 -0700 (PDT) X-Received: by 10.152.45.106 with SMTP id l10mr6377927lam.12.1378993546364; Thu, 12 Sep 2013 06:45:46 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com [209.85.215.45]) by mx.google.com with ESMTPS id i8si1573882lam.117.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 06:45:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.45 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id eh20so8660855lab.18 for ; Thu, 12 Sep 2013 06:45:45 -0700 (PDT) X-Received: by 10.112.156.74 with SMTP id wc10mr1111144lbb.44.1378993545763; Thu, 12 Sep 2013 06:45:45 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id u18sm3939676lbp.4.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 12 Sep 2013 06:45:45 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Cc: Linus Walleij Subject: [PATCH 2/2] ARM: ux500: skip redefined regulator names on v60plus board Date: Thu, 12 Sep 2013 15:45:41 +0200 Message-Id: <1378993541-24403-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , These regulator rail names are already set in the ste-href.dtsi file included by this file, this is just redoing the naming for no benefit, so delete it. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-hrefv60plus.dts | 50 ----------------------------------- 1 file changed, 50 deletions(-) diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts index 0e2be7a..bb3cfc7 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus.dts @@ -74,55 +74,5 @@ status = "okay"; }; - - prcmu@80157000 { - ab8500 { - ab8500-regulators { - ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { - regulator-name = "V-DISPLAY"; - }; - - ab8500_ldo_aux2_reg: ab8500_ldo_aux2 { - regulator-name = "V-eMMC1"; - }; - - ab8500_ldo_aux3_reg: ab8500_ldo_aux3 { - regulator-name = "V-MMC-SD"; - }; - - ab8500_ldo_intcore_reg: ab8500_ldo_intcore { - regulator-name = "V-INTCORE"; - }; - - ab8500_ldo_tvout_reg: ab8500_ldo_tvout { - regulator-name = "V-TVOUT"; - }; - - ab8500_ldo_usb_reg: ab8500_ldo_usb { - regulator-name = "dummy"; - }; - - ab8500_ldo_audio_reg: ab8500_ldo_audio { - regulator-name = "V-AUD"; - }; - - ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 { - regulator-name = "V-AMIC1"; - }; - - ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 { - regulator-name = "V-AMIC2"; - }; - - ab8500_ldo_dmic_reg: ab8500_ldo_dmic { - regulator-name = "V-DMIC"; - }; - - ab8500_ldo_ana_reg: ab8500_ldo_ana { - regulator-name = "V-CSI/DSI"; - }; - }; - }; - }; }; };