Skip to content

Commit

Permalink
ARM: S3C64XX: make regs-sys.h local
Browse files Browse the repository at this point in the history
The header file can be local in mach-s3c64xx/.

Signed-off-by: Kukjin Kim <[email protected]>
  • Loading branch information
kgene committed Jan 10, 2013
1 parent 8eba8ea commit f2bfd17
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 39 deletions.
3 changes: 2 additions & 1 deletion arch/arm/mach-s3c64xx/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <mach/hardware.h>
#include <mach/map.h>

#include <mach/regs-sys.h>
#include <mach/regs-clock.h>

#include <plat/cpu.h>
Expand All @@ -33,6 +32,8 @@
#include <plat/clock-clksrc.h>
#include <plat/pll.h>

#include "regs-sys.h"

/* fin_apll, fin_mpll and fin_epll are all the same clock, which we call
* ext_xtal_mux for want of an actual name from the manual.
*/
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-s3c64xx/cpuidle.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@

#include <mach/map.h>

#include <mach/regs-sys.h>
#include <mach/regs-syscon-power.h>

#include "regs-sys.h"

static int s3c64xx_enter_idle(struct cpuidle_device *dev,
struct cpuidle_driver *drv,
int index)
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-s3c64xx/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
#include <mach/map.h>
#include <mach/irqs.h>

#include <mach/regs-sys.h>

#include <asm/hardware/pl080.h>

#include "regs-sys.h"

/* dma channel state information */

struct s3c64xx_dmac {
Expand Down
31 changes: 0 additions & 31 deletions arch/arm/mach-s3c64xx/include/mach/regs-sys.h

This file was deleted.

2 changes: 1 addition & 1 deletion arch/arm/mach-s3c64xx/mach-crag6410.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
#include <mach/hardware.h>
#include <mach/map.h>

#include <mach/regs-sys.h>
#include <mach/regs-gpio.h>

#include <plat/regs-serial.h>
Expand All @@ -71,6 +70,7 @@
#include "crag6410.h"
#include "regs-gpio-memport.h"
#include "regs-modem.h"
#include "regs-sys.h"

/* serial port setup */

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c64xx/mach-smdk6410.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@

#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include <mach/regs-sys.h>
#include <linux/platform_data/ata-samsung_cf.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <plat/fb.h>
Expand All @@ -75,6 +74,7 @@
#include "common.h"
#include "regs-modem.h"
#include "regs-srom.h"
#include "regs-sys.h"

#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c64xx/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
#include <plat/pm.h>
#include <plat/wakeup-mask.h>

#include <mach/regs-sys.h>
#include <mach/regs-gpio.h>
#include <mach/regs-clock.h>
#include <mach/regs-syscon-power.h>

#include "regs-gpio-memport.h"
#include "regs-modem.h"
#include "regs-sys.h"

struct s3c64xx_pm_domain {
char *const name;
Expand Down
30 changes: 30 additions & 0 deletions arch/arm/mach-s3c64xx/regs-sys.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright 2008 Openmoko, Inc.
* Copyright 2008 Simtec Electronics
* Ben Dooks <[email protected]>
* http://armlinux.simtec.co.uk/
*
* S3C64XX system register 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.
*/

#ifndef __MACH_S3C64XX_REGS_SYS_H
#define __MACH_S3C64XX_REGS_SYS_H __FILE__

#define S3C_SYSREG(x) (S3C_VA_SYS + (x))

#define S3C64XX_AHB_CON0 S3C_SYSREG(0x100)
#define S3C64XX_AHB_CON1 S3C_SYSREG(0x104)
#define S3C64XX_AHB_CON2 S3C_SYSREG(0x108)

#define S3C64XX_SDMA_SEL S3C_SYSREG(0x110)

#define S3C64XX_OTHERS S3C_SYSREG(0x900)

#define S3C64XX_OTHERS_USBMASK (1 << 16)
#define S3C64XX_OTHERS_SYNCMUXSEL (1 << 6)

#endif /* __MACH_S3C64XX_REGS_SYS_H */
3 changes: 2 additions & 1 deletion arch/arm/mach-s3c64xx/setup-usb-phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
#include <linux/io.h>
#include <linux/platform_device.h>
#include <mach/map.h>
#include <mach/regs-sys.h>
#include <plat/cpu.h>
#include <plat/regs-usb-hsotg-phy.h>
#include <plat/usb-phy.h>

#include "regs-sys.h"

static int s3c_usb_otgphy_init(struct platform_device *pdev)
{
struct clk *xusbxti;
Expand Down

0 comments on commit f2bfd17

Please sign in to comment.