From patchwork Mon Aug 5 04:09:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 2838520 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5F7819F485 for ; Mon, 5 Aug 2013 04:24:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93DAC2016A for ; Mon, 5 Aug 2013 04:23:59 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3440320165 for ; Mon, 5 Aug 2013 04:23:58 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6CKb-0006M8-SR; Mon, 05 Aug 2013 04:23:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6CKU-0000rT-TP; Mon, 05 Aug 2013 04:23:34 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6CKK-0000ox-F3 for linux-arm-kernel@lists.infradead.org; Mon, 05 Aug 2013 04:23:25 +0000 Received: by mail-pb0-f49.google.com with SMTP id xb4so2831692pbc.8 for ; Sun, 04 Aug 2013 21:23:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=wHFFlCTRp9fOaR4r7PD/U5xDvMAOod6X+VvcOIP9ErM=; b=m1yRqPgpFnkch2juZuwu/kHHnYwKYdRHmhmL17zW+d3WdtVGqlXaIQbd8Te8YLjgsm Px5+ZM6HVAEA8cerQy36G/3cNQQ25sJRAsvfyAOws7qaj8T6ae7N3BQcnUE6a8Lctgxe UQ+7TfVFj9WDlXsSBEtUCbk5/tPe/bAEFXxeb7xzSybAyp2IcBPRm9m/5PrRLX4y06H2 ltjs0lQNNVp46hZlG2ctl+qHYM17/JZ7YmHuH65qWr5kO3Mjz9uf6KV4fB7YIusDAIJK UigDwbTUlse0qxRkZjyqJi7a21mdXAqxN3LeOthvQIcNx1QkVvijPQ0EApzi/o1M5VmQ QbBQ== X-Received: by 10.68.241.198 with SMTP id wk6mr20102838pbc.165.1375676583270; Sun, 04 Aug 2013 21:23:03 -0700 (PDT) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id ys4sm21383042pbb.9.2013.08.04.21.23.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 04 Aug 2013 21:23:02 -0700 (PDT) From: Olof Johansson To: Pawel Moll Subject: [PATCH 2/3] ARM: vexpress: make spc code TC2-only Date: Sun, 4 Aug 2013 21:09:52 -0700 Message-Id: <1375675793-16492-3-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.8.1.192.gc4361b8 In-Reply-To: <1375675793-16492-1-git-send-email-olof@lixom.net> References: <1375675793-16492-1-git-send-email-olof@lixom.net> X-Gm-Message-State: ALoCoQkIQbtpO4hss39R+3+LFCGQOpPLR7mIl1OHafLSlTOCrKjR197XAMwd0aNdssqPczewtgme X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130805_002324_578864_0FA71512 X-CRM114-Status: GOOD ( 13.90 ) X-Spam-Score: -2.6 (--) Cc: Olof Johansson , Lorenzo Pieralisi , linux-arm-kernel@lists.infradead.org, nico@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 It doesn't make sense to match this to the generic compatible value, since the code is quite specific to TC2 as it is. Signed-off-by: Olof Johansson --- arch/arm/mach-vexpress/spc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c index 34e4bf4..30cfa9f 100644 --- a/arch/arm/mach-vexpress/spc.c +++ b/arch/arm/mach-vexpress/spc.c @@ -187,18 +187,14 @@ void ve_spc_powerdown(u32 cluster, bool enable) writel_relaxed(enable, info->baseaddr + pwdrn_reg); } -static const struct of_device_id ve_spc_ids[] __initconst = { - { .compatible = "arm,vexpress-spc,v2p-ca15_a7" }, - { .compatible = "arm,vexpress-spc" }, - {}, -}; - static int __init ve_spc_probe(void) { int ret; - struct device_node *node = of_find_matching_node(NULL, ve_spc_ids); + struct device_node *dn; + + dn = of_find_compatible_node(NULL, "arm,vexpress-spc,v2p-ca15_a7"); - if (!node) + if (!dn) return -ENODEV; info = kzalloc(sizeof(*info), GFP_KERNEL); @@ -207,7 +203,7 @@ static int __init ve_spc_probe(void) return -ENOMEM; } - info->baseaddr = of_iomap(node, 0); + info->baseaddr = of_iomap(dn, 0); if (!info->baseaddr) { pr_err(SPCLOG "unable to ioremap memory\n"); ret = -ENXIO;