From patchwork Fri May 31 09:19:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 17345 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f70.google.com (mail-qe0-f70.google.com [209.85.128.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 65EAD25CAB for ; Fri, 31 May 2013 09:21:38 +0000 (UTC) Received: by mail-qe0-f70.google.com with SMTP id 2sf1654496qea.9 for ; Fri, 31 May 2013 02:21:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to: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=CZixNeCpeZB+gwKShFoQHrR8ku+vWiGptWgSqvcu21k=; b=eiUW1L2ofBQXjimD3vazFPd9PXOITzHmybXtLONKgOJDRKctlRCCfPkkYEGiWrGSpX wcMXSGnGkLlk0ByWd5FjuDeB8sgfjtyIJlGoe8HEhySGCHAiW7xLEDQhxgsZWNbImkUD Vc2vCLZ3VmKQpsP1PAY/F4jeppx3v2ev6wwOK/+7TLlnCTqArJuFbbdtCYXNo2wUXGBB qqFZp6D4EInJT1+ZbZgEOtImxEvM2heYrCUoDeSWT2BxIXAsdeou5WaTHMxH1HV3l/Mm Tcdcd+rcrz00eg4bg6RIaJ6DJ/g1ceTfMp/A7nRQH/b7MgEulOghgNpyodh8ojbNc57o C74A== X-Received: by 10.224.59.205 with SMTP id m13mr6287665qah.7.1369992098271; Fri, 31 May 2013 02:21:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.60.38 with SMTP id e6ls852860qer.45.gmail; Fri, 31 May 2013 02:21:38 -0700 (PDT) X-Received: by 10.220.192.138 with SMTP id dq10mr9431648vcb.23.1369992098102; Fri, 31 May 2013 02:21:38 -0700 (PDT) Received: from mail-ve0-x22c.google.com (mail-ve0-x22c.google.com [2607:f8b0:400c:c01::22c]) by mx.google.com with ESMTPS id gr7si27827718vdc.51.2013.05.31.02.21.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:38 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22c 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::22c; Received: by mail-ve0-f172.google.com with SMTP id jz10so950163veb.17 for ; Fri, 31 May 2013 02:21:38 -0700 (PDT) X-Received: by 10.220.192.3 with SMTP id do3mr9339941vcb.16.1369992098008; Fri, 31 May 2013 02:21:38 -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.220.229.199 with SMTP id jj7csp42450vcb; Fri, 31 May 2013 02:21:37 -0700 (PDT) X-Received: by 10.14.107.200 with SMTP id o48mr12742389eeg.35.1369992087077; Fri, 31 May 2013 02:21:27 -0700 (PDT) Received: from eu1sys200aog110.obsmtp.com (eu1sys200aog110.obsmtp.com [207.126.144.129]) by mx.google.com with SMTP id i48si30084726eem.57.2013.05.31.02.21.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:27 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.129 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.129; Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob110.postini.com ([207.126.147.11]) with SMTP ID DSNKUahrfQnpEpJRy4qmV42JIOM7LcvrHwyK@postini.com; Fri, 31 May 2013 09:21:26 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 E69E659; Fri, 31 May 2013 09:19:57 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 2F9D357; Fri, 31 May 2013 09:20:58 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 9B95024C2AB; Fri, 31 May 2013 11:20:47 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.279.5; Fri, 31 May 2013 11:20:52 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH 27/39] ARM: u300: localize Date: Fri, 31 May 2013 11:19:02 +0200 Message-ID: <1369991954-17406-28-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> References: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQna/8XZ9EKfP9SS/kx7sOYxitIiNhe3GY+ghn+TKDDI3zfHcKPkwPV65hv5uiY8l1yVNc1P X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22c 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. Acked-by: Arnd Bergmann Signed-off-by: Linus Walleij --- arch/arm/mach-u300/core.c | 2 +- arch/arm/mach-u300/regulator.c | 2 +- arch/arm/mach-u300/{include/mach => }/u300-regs.h | 0 3 files changed, 2 insertions(+), 2 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 254fe92..1fdaf81 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -21,7 +21,7 @@ #include #include -#include +#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)