From patchwork Wed Jan 25 21:43:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 137868 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3F2EAB6EF7 for ; Thu, 26 Jan 2012 08:43:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752666Ab2AYVnf (ORCPT ); Wed, 25 Jan 2012 16:43:35 -0500 Received: from hqemgate03.nvidia.com ([216.228.121.140]:15980 "EHLO hqemgate03.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752295Ab2AYVnf (ORCPT ); Wed, 25 Jan 2012 16:43:35 -0500 Received: from hqnvupgp06.nvidia.com (Not Verified[216.228.121.13]) by hqemgate03.nvidia.com id ; Wed, 25 Jan 2012 13:57:43 -0800 Received: from hqnvemgw01.nvidia.com ([172.17.108.22]) by hqnvupgp06.nvidia.com (PGP Universal service); Wed, 25 Jan 2012 13:43:35 -0800 X-PGP-Universal: processed; by hqnvupgp06.nvidia.com on Wed, 25 Jan 2012 13:43:35 -0800 Received: from thelma.nvidia.com (Not Verified[172.16.212.77]) by hqnvemgw01.nvidia.com with MailMarshal (v6, 7, 2, 8378) id ; Wed, 25 Jan 2012 13:43:34 -0800 Received: from localhost.localdomain (swarren-lx1.nvidia.com [10.20.204.51]) by thelma.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id q0PLhVj1028453; Wed, 25 Jan 2012 13:43:34 -0800 (PST) From: Stephen Warren To: Olof Johansson , Colin Cross , Grant Likely , Rob Herring Cc: devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, Stephen Warren Subject: [PATCH 3/3] ARM: tegra: Remove duplicate PMU interrupt inversion code Date: Wed, 25 Jan 2012 14:43:29 -0700 Message-Id: <1327527809-10179-3-git-send-email-swarren@nvidia.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1327527809-10179-1-git-send-email-swarren@nvidia.com> References: <1327527809-10179-1-git-send-email-swarren@nvidia.com> X-NVConfidentiality: public Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org The new PMC driver now configures the PMU interrupt inversion, so board files don't need to poke the PMC registers directly to achieve this. Signed-off-by: Stephen Warren --- arch/arm/mach-tegra/board-harmony-power.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-tegra/board-harmony-power.c b/arch/arm/mach-tegra/board-harmony-power.c index 21d1285..976edfb 100644 --- a/arch/arm/mach-tegra/board-harmony-power.c +++ b/arch/arm/mach-tegra/board-harmony-power.c @@ -18,18 +18,13 @@ #include #include #include -#include #include #include -#include #include #include "board-harmony.h" -#define PMC_CTRL 0x0 -#define PMC_CTRL_INTR_LOW (1 << 17) - static struct regulator_consumer_supply tps658621_ldo0_supply[] = { REGULATOR_SUPPLY("pex_clk", NULL), }; @@ -114,16 +109,6 @@ static struct i2c_board_info __initdata harmony_regulators[] = { int __init harmony_regulator_init(void) { - void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE); - u32 pmc_ctrl; - - /* - * Configure the power management controller to trigger PMU - * interrupts when low - */ - pmc_ctrl = readl(pmc + PMC_CTRL); - writel(pmc_ctrl | PMC_CTRL_INTR_LOW, pmc + PMC_CTRL); - i2c_register_board_info(3, harmony_regulators, 1); return 0;