From patchwork Wed Jan 2 22:23:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 842C0DF230 for ; Wed, 2 Jan 2013 22:28:44 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWkj-00013Z-F7; Wed, 02 Jan 2013 22:25:37 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWjt-0000qz-T3 for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:24:47 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MG000LLVRKZPW30@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 07:24:42 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 61.F0.12699.AA3B4E05; Thu, 03 Jan 2013 07:24:42 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-8a-50e4b3aad7d8 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 41.F0.12699.AA3B4E05; Thu, 03 Jan 2013 07:24:42 +0900 (KST) Received: from localhost.localdomain ([105.128.18.183]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MG00028PRKVD920@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 07:24:42 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 06/26] ARM: S5PV210: move regs-sys.h into setup-usb-phy.c file Date: Wed, 02 Jan 2013 14:23:43 -0800 Message-id: <1357165443-3716-7-git-send-email-kgene.kim@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com> References: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsVy+t8zfd1Vm58EGDQ+VbbY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZnz7xFFzlq5hx9SpLA+Nuni5GTg4JAROJex+uMEPYYhIX7q1n 62Lk4hASWMYo8eD2NDaYonnLtzJCJKYzSjz5080KkhAS2MAksWiKJojNJqAhcfj9M/YuRg4O EQFvieXXFEHCzAJqEjcOvQVbICzgJ9H99zeYzSKgKtGwcQaYzSvgIvHs40uoIxQlup9NANvL KeAq0bfxChvEKheJ+WdeQvUKSHybfIgFZJWEgKzEpgPMIKdJCFxmk9i04AYLxBxJiYMrbrBM YBRewMiwilE0tSC5oDgpPddIrzgxt7g0L10vOT93EyMk/KR3MK5qsDjEKMDBqMTDy1j/JECI NbGsuDL3EKMEB7OSCO/1HKAQb0piZVVqUX58UWlOavEhRh+gSyYyS4km5wNjI68k3tDY2MTM xNTE3NLU3BSHsJI4b7NHSoCQQHpiSWp2ampBahHMOCYOTqkGxjXfS6K7I+TunXJS3SOYvVM3 4xlLj4ZIhXpT0KYMpna+dacfyz8vF3zpWX/+bWZvbubt65k3rp39vspjS7HcvFdadVJcpytz I3VyCiOPfek60nFxNc/s9omnZkUpMqtV7Js37af+rlMq088wzvxb9HVf4fp0q55jx9IqT89t qr6auHaRnFNDsxJLcUaioRZzUXEiALIL/gVsAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeLIzCtJLcpLzFFi42I5/e+xoO6qzU8CDBa/lrfY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhHWMGZ8+8RRc5auYcfUqSwPj bp4uRk4OCQETiXnLtzJC2GISF+6tZ+ti5OIQEpjOKPHkTzcrSEJIYAOTxKIpmiA2m4CGxOH3 z9i7GDk4RAS8JZZfUwQJMwuoSdw49JYZxBYW8JPo/vsbzGYRUJVo2DgDzOYVcJF49vElM8Qu RYnuZxPYQGxOAVeJvo1X2CBWuUjMP/OSeQIj7wJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5 uZsYwcH9THoH46oGi0OMAhyMSjy8jPVPAoRYE8uKK3MPMUpwMCuJ8F7PAQrxpiRWVqUW5ccX leakFh9i9AG6aiKzlGhyPjDy8kriDY1NzIwsjcwsjEzMzXEIK4nzNnukBAgJpCeWpGanphak FsGMY+LglGpgTDzP+tt4h/fdFf1XlD5925qaPf3VIuOVea9LlNYlyd89Wy41M5zr/ln3u3pL QmPNlK3SLky0v3OARfnJYq51G+6Z9MlX8Cgu+qS74f+/rtf225yEZsxXeXRQ5fc7sQeaE7ZO uL2p8ct5mTruFLZXtjuCV+xP8iv1yu+VDtVcH6TlK7Iz9NY5VyWW4oxEQy3mouJEANgStNub AgAA X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172446_299796_4BCBBFFC X-CRM114-Status: GOOD ( 12.50 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kukjin Kim X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The can be moved into mach-s5pv210/setup-usb-phy.c file. Signed-off-by: Kukjin Kim --- arch/arm/mach-s5pv210/include/mach/regs-sys.h | 15 --------------- arch/arm/mach-s5pv210/setup-usb-phy.c | 7 ++++++- 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 arch/arm/mach-s5pv210/include/mach/regs-sys.h diff --git a/arch/arm/mach-s5pv210/include/mach/regs-sys.h b/arch/arm/mach-s5pv210/include/mach/regs-sys.h deleted file mode 100644 index cccb1ed..0000000 --- a/arch/arm/mach-s5pv210/include/mach/regs-sys.h +++ /dev/null @@ -1,15 +0,0 @@ -/* arch/arm/mach-s5pv210/include/mach/regs-sys.h - * - * Copyright (c) 2010 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * S5PV210 - System registers definitions - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#define S5PV210_USB_PHY_CON (S3C_VA_SYS + 0xE80C) -#define S5PV210_USB_PHY0_EN (1 << 0) -#define S5PV210_USB_PHY1_EN (1 << 1) diff --git a/arch/arm/mach-s5pv210/setup-usb-phy.c b/arch/arm/mach-s5pv210/setup-usb-phy.c index be39cf4..356a090 100644 --- a/arch/arm/mach-s5pv210/setup-usb-phy.c +++ b/arch/arm/mach-s5pv210/setup-usb-phy.c @@ -12,12 +12,17 @@ #include #include #include + #include -#include + #include #include #include +#define S5PV210_USB_PHY_CON (S3C_VA_SYS + 0xE80C) +#define S5PV210_USB_PHY0_EN (1 << 0) +#define S5PV210_USB_PHY1_EN (1 << 1) + static int s5pv210_usb_otgphy_init(struct platform_device *pdev) { struct clk *xusbxti;