Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b399db0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup-header' of... 

Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

From Kukjin Kim:
AS I commented, this makes <mach/*.h> local so that they could be removed.

* 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

: (26 commits)
  ARM: S3C64XX: Fix missing header error with CONFIG_CPU_IDLE enabled
  ARM: S3C64XX: make regs-syscon-power.h local
  ARM: S3C64XX: make regs-sys.h local
  ARM: S3C64XX: make regs-srom.h local
  ARM: S3C64XX: make regs-modem.h local
  ARM: S3C64XX: make regs-gpio-memport.h local
  ARM: S3C64XX: make crag6410.h local
  ARM: S3C24XX: remove dsc.c and make regs-dsc.h local
  ARM: S3C24XX: remove idle.h
  ARM: S3C2412: cleanup regs-s3c2412.h
  ARM: S3C2416: remove regs-s3c2416-mem.h and regs-s3c2416.h
  ARM: S3C24XX: make vr1000-cpld.h, vr1000-irq.h and vr1000-map.h local
  ARM: S3C24XX: make otom-map.h local
  ARM: S3C24XX: make osiris-cpld.h and osiris-map.h local
  ARM: S3C24XX: make h1940.h and h1940-latch.h local
  ARM: S3C24XX: make gta02.h local
  ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local
  ARM: S3C24XX: make anubis-cpld, anubis-irq and anubis-map local
  ARM: SAMSUNG: cleanup mach/gpio-fns.h gpio-track.h and gpio-nrs.h
  ARM: SAMSUNG: cleanup mach/regs-audss.h file
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e1d7ef1c 3a71c5c3

arch/arm/mach-exynos/common.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <mach/regs-irq.h>

#include <mach/regs-pmu.h>

#include <mach/regs-gpio.h>

#include <mach/pmu.h>



#include <plat/cpu.h>

#include <plat/clock.h>

arch/arm/mach-exynos/common.h

+20 −0
Original line number Diff line number Diff line
@@ -64,4 +64,24 @@ extern struct smp_operations exynos_smp_ops; 


extern void exynos_cpu_die(unsigned int cpu);



/* PMU(Power Management Unit) support */



#define PMU_TABLE_END	NULL



enum sys_powerdown {

	SYS_AFTR,

	SYS_LPA,

	SYS_SLEEP,

	NUM_SYS_POWERDOWN,

};



extern unsigned long l2x0_regs_phys;

struct exynos_pmu_conf {

	void __iomem *reg;

	unsigned int val[NUM_SYS_POWERDOWN];

};



extern void exynos_sys_powerdown_conf(enum sys_powerdown mode);

extern void s3c_cpu_resume(void);



#endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */

arch/arm/mach-exynos/cpuidle.c

+2 −1
Original line number Diff line number Diff line
@@ -23,10 +23,11 @@ 
#include <asm/cpuidle.h>

#include <mach/regs-clock.h>

#include <mach/regs-pmu.h>

#include <mach/pmu.h>



#include <plat/cpu.h>



#include "common.h"



#define REG_DIRECTGO_ADDR	(samsung_rev() == EXYNOS4210_REV_1_1 ? \

			S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \

			(S5P_VA_SYSRAM + 0x24) : S5P_INFORM0))

arch/arm/mach-exynos/dev-audio.c

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
#include <mach/map.h>

#include <mach/dma.h>

#include <mach/irqs.h>

#include <mach/regs-audss.h>



#define EXYNOS4_AUDSS_INT_MEM	(0x03000000)



static int exynos4_cfg_i2s(struct platform_device *pdev)

{

arch/arm/mach-exynos/include/mach/pmu.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-exynos4/include/mach/pmu.h

 *

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *

 * EXYNOS4210 - PMU(Power Management Unit) support

 *

 * 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 __ASM_ARCH_PMU_H

#define __ASM_ARCH_PMU_H __FILE__



#define PMU_TABLE_END	NULL



enum sys_powerdown {

	SYS_AFTR,

	SYS_LPA,

	SYS_SLEEP,

	NUM_SYS_POWERDOWN,

};



extern unsigned long l2x0_regs_phys;

struct exynos_pmu_conf {

	void __iomem *reg;

	unsigned int val[NUM_SYS_POWERDOWN];

};



extern void exynos_sys_powerdown_conf(enum sys_powerdown mode);

extern void s3c_cpu_resume(void);



#endif /* __ASM_ARCH_PMU_H */