From patchwork Thu May 2 16:16:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16604 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 ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 35117238EC for ; Thu, 2 May 2013 16:18:17 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id fq13sf1128444lab.7 for ; Thu, 02 May 2013 09:18:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=pNXOYPTX5YDC4C1+DdGWWNG8G2nnA5Whx4eJT7qvcWo=; b=HU4dreEA794HYu9nZHPi8jCocXR3n2uhd/w1pIPujNaP8s21lxg0nypMMHZJetZfLA 4XWFfvPd2cPeC8OirbpdnWx3pMCRnan0EkLKu+f9nLRRi2OjOy3mNkfAfswORBiLgN5u n2IYU3gEoflGHi+JzSDpvjmJ/c6GC5I26ZmJ6/Mzc6chOzBsQGTiOuwsIXDJ6JvTwsh9 y5ie5oir2G1BoPw5lpJbibcRFiwEUBV1bYJNEIcZsRt4vDpyrBO2HdTEtulXqWnkbejf aKSs32eDZkAWZYbv+zxVDyj+zPiLFi0uRhLmrU4HRA+yKKZG3vewveQD8OBMYW2B2vUG mixg== X-Received: by 10.180.212.113 with SMTP id nj17mr8487440wic.7.1367511488147; Thu, 02 May 2013 09:18:08 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.19.131 with SMTP id f3ls881469wie.32.gmail; Thu, 02 May 2013 09:18:07 -0700 (PDT) X-Received: by 10.194.92.176 with SMTP id cn16mr8988455wjb.51.1367511487960; Thu, 02 May 2013 09:18:07 -0700 (PDT) Received: from mail-ve0-x236.google.com (mail-ve0-x236.google.com [2607:f8b0:400c:c01::236]) by mx.google.com with ESMTPS id u12si2200891wjq.159.2013.05.02.09.18.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 09:18:07 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::236 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::236; Received: by mail-ve0-f182.google.com with SMTP id jx10so681179veb.13 for ; Thu, 02 May 2013 09:18:06 -0700 (PDT) X-Received: by 10.220.189.9 with SMTP id dc9mr2411752vcb.8.1367511486875; Thu, 02 May 2013 09:18:06 -0700 (PDT) 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.58.127.98 with SMTP id nf2csp209682veb; Thu, 2 May 2013 09:18:06 -0700 (PDT) X-Received: by 10.15.98.66 with SMTP id bi42mr21006287eeb.39.1367511485430; Thu, 02 May 2013 09:18:05 -0700 (PDT) Received: from eu1sys200aog101.obsmtp.com (eu1sys200aog101.obsmtp.com [207.126.144.111]) by mx.google.com with SMTP id h8si7994762eeo.90.2013.05.02.09.17.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 02 May 2013 09:18:05 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.111 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.111; Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob101.postini.com ([207.126.147.11]) with SMTP ID DSNKUYKRo/nIFvubIBbG4s1u3NQy2lIGFEcr@postini.com; Thu, 02 May 2013 16:18:05 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id B1A0755; Thu, 2 May 2013 16:16:28 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 58BA350; Thu, 2 May 2013 09:17:58 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 7511DA8065; Thu, 2 May 2013 18:17:17 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.279.5; Thu, 2 May 2013 18:17:23 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH 5/7] ARM: u300: localize Date: Thu, 2 May 2013 18:16:53 +0200 Message-ID: <1367511416-4312-6-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1367511416-4312-1-git-send-email-linus.walleij@stericsson.com> References: <1367511416-4312-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlJ9kRJ6MLCdspJIZd5lyVWNXOJ3y8Od7CuWwnhMnCdy4AFrOuoZ0iylCIwQ4aERV9L9WiN X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::236 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: , From: Linus Walleij This register base file is now only used in the machine itself so move it down into mach-u300. Signed-off-by: Linus Walleij --- arch/arm/mach-u300/core.c | 3 +-- arch/arm/mach-u300/regulator.c | 2 +- arch/arm/mach-u300/{include/mach => }/u300-regs.h | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename arch/arm/mach-u300/{include/mach => }/u300-regs.h (100%) diff --git a/arch/arm/mach-u300/include/mach/u300-regs.h b/arch/arm/mach-u300/u300-regs.h similarity index 100% rename from arch/arm/mach-u300/include/mach/u300-regs.h rename to arch/arm/mach-u300/u300-regs.h diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 9a46426..87fdadb 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -25,9 +25,8 @@ #include #include -#include - #include "timer.h" +#include "u300-regs.h" /* * SYSCON addresses applicable to the core machine. diff --git a/arch/arm/mach-u300/regulator.c b/arch/arm/mach-u300/regulator.c index ab7d7a5..1cbe88c 100644 --- a/arch/arm/mach-u300/regulator.c +++ b/arch/arm/mach-u300/regulator.c @@ -17,7 +17,7 @@ #include /* Those are just for writing in syscon */ #include -#include +#include "u300-regs.h" /* Power Management Control 16bit (R/W) */ #define U300_SYSCON_PMCR (0x50)