From patchwork Fri Feb 14 10:29:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24617 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 84D7D203C4 for ; Fri, 14 Feb 2014 10:34:20 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md12sf26103783pbc.0 for ; Fri, 14 Feb 2014 02:34:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=02WTwWdoy6Zoq3dheLRE4mujiP8+xEoXYt/dnqUc/Tw=; b=cJPO704ydKF4gJEtw8GZ7vuk/Fe/5bMshTbVdYTIyS5wopfM5Ug4UcVMlhrzOqc7hJ iZuOcLtJbeKl4KkxjAC/iGcPCna/NQMcPvlhPUiiLncwA/yDCrfQyHvWQlRKzIWMdpQ/ qUCs4BrkdBsS7FOqzEOPAOPBqMrFf/5dV4/BNiSpPeSmPSyjy/jLJNmW5IXa0OVpc4Fj rW8dZfFYU28rwq09LTkUR04qrOPYd41Ci5mdsYpuyPe1yMuMemOT/g0y6GBz5W/o8yNj VA9t6fXYgpmOsAd8FDxJqRQrML9RtDRgwjw/jUgYE1gUJN0bF2Nd8HlH3mhxbJPZycS/ gliw== X-Gm-Message-State: ALoCoQnj6iQCZ5yFNYFul7ID0Ho4OBy0lv4aM0TxEtb+J0cDaz0IWcPeOWr97FGOkRvOjesaYJt1 X-Received: by 10.66.65.202 with SMTP id z10mr1754685pas.45.1392374059761; Fri, 14 Feb 2014 02:34:19 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.80.149 with SMTP id c21ls32486qgd.52.gmail; Fri, 14 Feb 2014 02:34:19 -0800 (PST) X-Received: by 10.52.121.113 with SMTP id lj17mr4134031vdb.21.1392374059639; Fri, 14 Feb 2014 02:34:19 -0800 (PST) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id z15si1766309vce.147.2014.02.14.02.34.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Feb 2014 02:34:19 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.169 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.169; Received: by mail-vc0-f169.google.com with SMTP id hq11so9200392vcb.14 for ; Fri, 14 Feb 2014 02:34:19 -0800 (PST) X-Received: by 10.220.192.71 with SMTP id dp7mr121292vcb.45.1392374059379; Fri, 14 Feb 2014 02:34:19 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp98072vcz; Fri, 14 Feb 2014 02:34:18 -0800 (PST) X-Received: by 10.194.57.239 with SMTP id l15mr1267993wjq.40.1392374058001; Fri, 14 Feb 2014 02:34:18 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id du3si773086wib.66.2014.02.14.02.34.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Feb 2014 02:34:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WEG2w-0007gf-MB; Fri, 14 Feb 2014 10:31:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WEG2j-0004gw-Fz; Fri, 14 Feb 2014 10:30:49 +0000 Received: from mail-wg0-f52.google.com ([74.125.82.52]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WEG2H-0004ay-Qk for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2014 10:30:23 +0000 Received: by mail-wg0-f52.google.com with SMTP id b13so247549wgh.7 for ; Fri, 14 Feb 2014 02:30:00 -0800 (PST) X-Received: by 10.194.47.144 with SMTP id d16mr5404631wjn.2.1392373798663; Fri, 14 Feb 2014 02:29:58 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id t6sm3227388wix.4.2014.02.14.02.29.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Feb 2014 02:29:57 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Will Deacon , Jonathan Austin Subject: [PATCH 2/6] ARM: integrator: localize the impd1.h header Date: Fri, 14 Feb 2014 11:29:27 +0100 Message-Id: <1392373771-17303-3-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392373771-17303-1-git-send-email-linus.walleij@linaro.org> References: <1392373771-17303-1-git-send-email-linus.walleij@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140214_053022_032404_AD129AD9 X-CRM114-Status: GOOD ( 14.77 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.52 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Mike Turquette , Linus Walleij , Russell King , Arnd Bergmann 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+patch=linaro.org@lists.infradead.org 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.169 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 As we move toward multiplatform support for the Integrator family we need to localize all headers. This moves the impd1.h header down to the machine folder, copying the the three defines only used by the clock driver down into the clock driver. Cc: Will Deacon Cc: Jonathan Austin Cc: Russell King Cc: Mike Turquette Signed-off-by: Linus Walleij --- Hi Mike, looking for an ACK on this patch. --- arch/arm/mach-integrator/impd1.c | 2 +- arch/arm/mach-integrator/impd1.h | 14 ++++++++++++++ arch/arm/mach-integrator/include/mach/impd1.h | 18 ------------------ drivers/clk/versatile/clk-impd1.c | 6 ++++-- 4 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 arch/arm/mach-integrator/impd1.h delete mode 100644 arch/arm/mach-integrator/include/mach/impd1.h diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index a90e83fe8776..0e870ea818c4 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c @@ -25,9 +25,9 @@ #include #include -#include #include #include "lm.h" +#include "impd1.h" static int module_id; diff --git a/arch/arm/mach-integrator/impd1.h b/arch/arm/mach-integrator/impd1.h new file mode 100644 index 000000000000..76de4dc9bee4 --- /dev/null +++ b/arch/arm/mach-integrator/impd1.h @@ -0,0 +1,14 @@ +#define IMPD1_LEDS 0x0c +#define IMPD1_INT 0x10 +#define IMPD1_SW 0x14 +#define IMPD1_CTRL 0x18 + +#define IMPD1_CTRL_DISP_LCD (0 << 0) +#define IMPD1_CTRL_DISP_VGA (1 << 0) +#define IMPD1_CTRL_DISP_LCD1 (2 << 0) +#define IMPD1_CTRL_DISP_ENABLE (1 << 2) +#define IMPD1_CTRL_DISP_MASK (7 << 0) + +struct device; + +void impd1_tweak_control(struct device *dev, u32 mask, u32 val); diff --git a/arch/arm/mach-integrator/include/mach/impd1.h b/arch/arm/mach-integrator/include/mach/impd1.h deleted file mode 100644 index d75de4b14237..000000000000 --- a/arch/arm/mach-integrator/include/mach/impd1.h +++ /dev/null @@ -1,18 +0,0 @@ -#define IMPD1_OSC1 0x00 -#define IMPD1_OSC2 0x04 -#define IMPD1_LOCK 0x08 -#define IMPD1_LEDS 0x0c -#define IMPD1_INT 0x10 -#define IMPD1_SW 0x14 -#define IMPD1_CTRL 0x18 - -#define IMPD1_CTRL_DISP_LCD (0 << 0) -#define IMPD1_CTRL_DISP_VGA (1 << 0) -#define IMPD1_CTRL_DISP_LCD1 (2 << 0) -#define IMPD1_CTRL_DISP_ENABLE (1 << 2) -#define IMPD1_CTRL_DISP_MASK (7 << 0) - -struct device; - -void impd1_tweak_control(struct device *dev, u32 mask, u32 val); - diff --git a/drivers/clk/versatile/clk-impd1.c b/drivers/clk/versatile/clk-impd1.c index 6d8b8e1a080a..31b44f025f9e 100644 --- a/drivers/clk/versatile/clk-impd1.c +++ b/drivers/clk/versatile/clk-impd1.c @@ -13,10 +13,12 @@ #include #include -#include - #include "clk-icst.h" +#define IMPD1_OSC1 0x00 +#define IMPD1_OSC2 0x04 +#define IMPD1_LOCK 0x08 + struct impd1_clk { char *vco1name; struct clk *vco1clk;