From patchwork Wed Jul 29 12:27:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 51662 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id 88D1022DB5 for ; Wed, 29 Jul 2015 12:29:45 +0000 (UTC) Received: by lahh5 with SMTP id h5sf1630196lah.0 for ; Wed, 29 Jul 2015 05:29:44 -0700 (PDT) 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 :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:cc:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=5fNcki7OD+n0Cql7oMB+eFM7Ekcd6mkrCQCE6gTSWqc=; b=GvLmPbplWwrKLK6UUwd7lw33JthLnzzE/8qiS5fIg7jp5Zm7K2ZU7JlgTsHOVrN6D9 p5oDXijKcPLAzBmr0SgUehOz4jFFZqGJIm//wDX9vElH0D7BkgzMZvSuChVjZa8Dx8Lx 9Ml/3+7oWMR/qbY/Eca8rzm4Nt5iHcjZwbKEuFyZm0tliu6PRiwEhHrD3vg+glnEN9kP Na+yf4X/9LqVsw1Ieh9LOegFxbHW0h41p11iyRB+28nHqKK3kiOM0EX45Fx3c2LgoVVY C12kLx9N7qo/NZd75zqka1nnYiGFbAfduwbVHGtFZhpAmbYlSG/hWx6Uez8iS5syML1M N7kw== X-Gm-Message-State: ALoCoQk0Qq9zFZ/K3CjeZw4Z43vUg+8Ch+7Ravr5NdF6BoQAFDx0KByZ7Ft1wOlM6SEqsgbqXmZb X-Received: by 10.180.186.36 with SMTP id fh4mr3088790wic.7.1438172984382; Wed, 29 Jul 2015 05:29:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.129 with SMTP id rc1ls35196lac.25.gmail; Wed, 29 Jul 2015 05:29:44 -0700 (PDT) X-Received: by 10.112.198.100 with SMTP id jb4mr37991265lbc.97.1438172984084; Wed, 29 Jul 2015 05:29:44 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id zs5si21404938lbb.37.2015.07.29.05.29.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jul 2015 05:29:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by lahh5 with SMTP id h5so5216807lah.2 for ; Wed, 29 Jul 2015 05:29:44 -0700 (PDT) X-Received: by 10.152.120.135 with SMTP id lc7mr37623598lab.41.1438172983933; Wed, 29 Jul 2015 05:29:43 -0700 (PDT) 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.112.7.198 with SMTP id l6csp2725673lba; Wed, 29 Jul 2015 05:29:42 -0700 (PDT) X-Received: by 10.70.102.11 with SMTP id fk11mr92421070pdb.144.1438172982121; Wed, 29 Jul 2015 05:29:42 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id bk7si61491492pdb.11.2015.07.29.05.29.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jul 2015 05:29:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZKQT8-0007CI-C3; Wed, 29 Jul 2015 12:28:22 +0000 Received: from mail-la0-f50.google.com ([209.85.215.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZKQT5-000771-PM for linux-arm-kernel@lists.infradead.org; Wed, 29 Jul 2015 12:28:20 +0000 Received: by lafd3 with SMTP id d3so5219977laf.1 for ; Wed, 29 Jul 2015 05:27:57 -0700 (PDT) X-Received: by 10.112.40.200 with SMTP id z8mr598488lbk.96.1438172877793; Wed, 29 Jul 2015 05:27:57 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by smtp.gmail.com with ESMTPSA id s2sm981617lae.28.2015.07.29.05.27.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jul 2015 05:27:56 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: integrator: unexport IM-PD1 external interface Date: Wed, 29 Jul 2015 14:27:49 +0200 Message-Id: <1438172869-11518-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150729_052820_019075_04AD3869 X-CRM114-Status: GOOD ( 14.14 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.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 [209.85.215.50 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.50 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: Linus Walleij 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) 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 Make this IM/PD1 driver fully self-contained. No external driver uses this symbol so unexport it, move all definitons into the driver and remove the header file. Signed-off-by: Linus Walleij --- arch/arm/mach-integrator/impd1.c | 14 +++++++++++--- arch/arm/mach-integrator/impd1.h | 14 -------------- 2 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 arch/arm/mach-integrator/impd1.h diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index f164643b7c59..a03e9a1a32f4 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c @@ -31,7 +31,17 @@ #include #include "lm.h" -#include "impd1.h" + +#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) static int module_id; @@ -53,8 +63,6 @@ void impd1_tweak_control(struct device *dev, u32 mask, u32 val) writel(cur | val, impd1->base + IMPD1_CTRL); } -EXPORT_SYMBOL(impd1_tweak_control); - /* * MMC support */ diff --git a/arch/arm/mach-integrator/impd1.h b/arch/arm/mach-integrator/impd1.h deleted file mode 100644 index 76de4dc9bee4..000000000000 --- a/arch/arm/mach-integrator/impd1.h +++ /dev/null @@ -1,14 +0,0 @@ -#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);