From patchwork Tue Nov 19 21:28:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21638 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f69.google.com (mail-pb0-f69.google.com [209.85.160.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2F7D623FB4 for ; Tue, 19 Nov 2013 21:28:29 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md12sf4333210pbc.4 for ; Tue, 19 Nov 2013 13:28:28 -0800 (PST) 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=XWMX8NLEEFfZB3iGNDD6bNieAlCH5WXD7RTbch011HA=; b=B1+I5i/NeowZUtRSPO/eGgBTyQooBq2LOmNmcucwWNF0vfSp3XbHj7JigZ2A7+pov8 f/FFdDEFkWT5L+cN/+Usp7RFHVGZLaicB8BAHMkSeQ/SONQRRnTXUT1OThtYExYkZzLe z7aymBzVYWThObTiE4VxZp5t2cbkkqPNqJixVb8C4iKINcz8k5SDHN0FG8BUWq6wuFsP wzJ8KuP5/jclJLhvZR0yOkqhhD085rmG+a/zCy0YXcGN3TBm+ED6GqyEWFa/l3MZ2hl9 0ljPk7Ghs3j+RXal9MxuG4z2OnWmPB8aKEZJjHVS3LePHooaeGcNIY6rGLmewkBd6k9h scwQ== X-Gm-Message-State: ALoCoQm13FmIABQiPYYtOj7Uyv/fPGOkXzo/sFnq1RYslajaXStjv3DN+cN+JHQhPo4ZqLgGNg76 X-Received: by 10.66.220.163 with SMTP id px3mr3739474pac.38.1384896508337; Tue, 19 Nov 2013 13:28:28 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.37.72 with SMTP id w8ls3290872qej.59.gmail; Tue, 19 Nov 2013 13:28:28 -0800 (PST) X-Received: by 10.220.123.6 with SMTP id n6mr2147059vcr.28.1384896508219; Tue, 19 Nov 2013 13:28:28 -0800 (PST) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id fe2si8456110vcb.16.2013.11.19.13.28.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 13:28:28 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id jz11so3165463veb.11 for ; Tue, 19 Nov 2013 13:28:28 -0800 (PST) X-Received: by 10.220.184.70 with SMTP id cj6mr3065404vcb.23.1384896508112; Tue, 19 Nov 2013 13:28:28 -0800 (PST) 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 u4csp308108vcz; Tue, 19 Nov 2013 13:28:27 -0800 (PST) X-Received: by 10.194.143.66 with SMTP id sc2mr3185539wjb.45.1384896507176; Tue, 19 Nov 2013 13:28:27 -0800 (PST) Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by mx.google.com with ESMTPS id fk1si1665798wib.39.2013.11.19.13.28.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 13:28:27 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.171 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.212.171; Received: by mail-wi0-f171.google.com with SMTP id hj6so2937637wib.10 for ; Tue, 19 Nov 2013 13:28:26 -0800 (PST) X-Received: by 10.180.78.165 with SMTP id c5mr22896915wix.3.1384896506742; Tue, 19 Nov 2013 13:28:26 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id pi6sm38347596wic.3.2013.11.19.13.28.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Nov 2013 13:28:26 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Lee Jones , Thomas Gleixner , Daniel Lezcano Cc: devicetree@vger.kernel.org, Linus Walleij Subject: [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path Date: Tue, 19 Nov 2013 22:28:19 +0100 Message-Id: <1384896499-9428-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.128.180 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: , Both platforms using the MTU (Nomadik and Ux500) have now been converted to use device tree exclusively, thus let us delete this platform data header and make this driver a fully self-contained DT-only driver. Cc: Daniel Lezcano Cc: Thomas Gleixner Cc: Lee Jones Signed-off-by: Linus Walleij --- Daniel/tglx: seeking an ACK from either of you guys to take this in the ux500-devicetree branch where the last user is deleted. --- drivers/clocksource/nomadik-mtu.c | 23 +++++----------------- .../linux/platform_data/clocksource-nomadik-mtu.h | 9 --------- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 include/linux/platform_data/clocksource-nomadik-mtu.h diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index ed7b73b508e0..f00b5c9ce8b6 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -103,7 +102,7 @@ static int nmdk_clkevt_next(unsigned long evt, struct clock_event_device *ev) return 0; } -void nmdk_clkevt_reset(void) +static void nmdk_clkevt_reset(void) { if (clkevt_periodic) { /* Timer: configure load and background-load, and fire it up */ @@ -144,7 +143,7 @@ static void nmdk_clkevt_mode(enum clock_event_mode mode, } } -void nmdk_clksrc_reset(void) +static void nmdk_clksrc_reset(void) { /* Disable */ writel(0, mtu_base + MTU_CR(0)); @@ -192,8 +191,8 @@ static struct irqaction nmdk_timer_irq = { .dev_id = &nmdk_clkevt, }; -static void __init __nmdk_timer_init(void __iomem *base, int irq, - struct clk *pclk, struct clk *clk) +static void __init nmdk_timer_init(void __iomem *base, int irq, + struct clk *pclk, struct clk *clk) { unsigned long rate; @@ -245,18 +244,6 @@ static void __init __nmdk_timer_init(void __iomem *base, int irq, register_current_timer_delay(&mtu_delay_timer); } -void __init nmdk_timer_init(void __iomem *base, int irq) -{ - struct clk *clk0, *pclk0; - - pclk0 = clk_get_sys("mtu0", "apb_pclk"); - BUG_ON(IS_ERR(pclk0)); - clk0 = clk_get_sys("mtu0", NULL); - BUG_ON(IS_ERR(clk0)); - - __nmdk_timer_init(base, irq, pclk0, clk0); -} - static void __init nmdk_timer_of_init(struct device_node *node) { struct clk *pclk; @@ -280,7 +267,7 @@ static void __init nmdk_timer_of_init(struct device_node *node) if (irq <= 0) panic("Can't parse IRQ"); - __nmdk_timer_init(base, irq, pclk, clk); + nmdk_timer_init(base, irq, pclk, clk); } CLOCKSOURCE_OF_DECLARE(nomadik_mtu, "st,nomadik-mtu", nmdk_timer_of_init); diff --git a/include/linux/platform_data/clocksource-nomadik-mtu.h b/include/linux/platform_data/clocksource-nomadik-mtu.h deleted file mode 100644 index 80088973b734..000000000000 --- a/include/linux/platform_data/clocksource-nomadik-mtu.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __PLAT_MTU_H -#define __PLAT_MTU_H - -void nmdk_timer_init(void __iomem *base, int irq); -void nmdk_clkevt_reset(void); -void nmdk_clksrc_reset(void); - -#endif /* __PLAT_MTU_H */ -