From patchwork Thu Dec 17 02:39:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 7868441 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5155E9F54F for ; Thu, 17 Dec 2015 02:39:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 911A6203EC for ; Thu, 17 Dec 2015 02:39:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9CE8203E6 for ; Thu, 17 Dec 2015 02:39:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754834AbbLQCjR (ORCPT ); Wed, 16 Dec 2015 21:39:17 -0500 Received: from mail-io0-f177.google.com ([209.85.223.177]:36782 "EHLO mail-io0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752898AbbLQCjQ (ORCPT ); Wed, 16 Dec 2015 21:39:16 -0500 Received: by mail-io0-f177.google.com with SMTP id o67so40836294iof.3 for ; Wed, 16 Dec 2015 18:39:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=sw7RYUV+G4oNup+nRVasF/PxxLO3qcHqqRq5Slk9oHE=; b=S1v3prrD044mmIl0uAVSLM8WB8P9F6zUT77XL6ZS+MDfNFPUaOtwlnivepozjEHWg9 w4EvqbjgONnLbZLY1ATajqmOkxbe8KGi6iYC23lu8k5/3mPLhopcd84E9nDL52RmzPiO A9iDIpA8FBADMVfXRq6xJM+SgdX5y6vcnqueI1f/k1AoRtG/QAwJr07lpTT2s2aAoa3j kzgY/bqi3HU4klZs9oEOqx3oIACwck2b5XJrQEtvs0u6oT/P5pcYML+FRiaD9+E2mDCU Fk0vDHHBEEkoesOLYXRRj0qks/UrbicvIDyv98pUATtjpjDETQq8InL7w6LGDzgghyUj f+2g== X-Received: by 10.107.164.161 with SMTP id d33mr2807387ioj.148.1450319955835; Wed, 16 Dec 2015 18:39:15 -0800 (PST) Received: from localhost.localdomain (c-76-113-128-183.hsd1.mn.comcast.net. [76.113.128.183]) by smtp.gmail.com with ESMTPSA id m189sm3900997ioa.22.2015.12.16.18.39.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 18:39:15 -0800 (PST) From: Adam Ford To: linux-omap@vger.kernel.org Cc: adam.ford@logicpd.com, tony@atomide.com, Adam Ford Subject: [PATCH] ARM: OMAP2+: LogicPD Torpedo + Wireless: Revert duplicative DTS entries Date: Wed, 16 Dec 2015 20:39:06 -0600 Message-Id: <1450319946-20968-1-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Revert commit 6f0f6c40b66 ("ARM: dts: Set VAUX1 and VAUX4 on Logic PD Torpedo") because it It was already done and it's just a duplicate. See: commit 2d11961f3e55 ("ARM: dts: Set VAUX1 and VAUX4 to 3.0V and 1.8V respectively") --- arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts index b017871..b07d1d9 100644 --- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts @@ -83,16 +83,6 @@ regulator-max-microvolt = <1800000>; }; -&vaux1 { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; -}; - -&vaux4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; -}; - &mcbsp2 { status = "okay"; };