mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits) arm: fix up some samsung merge sysdev conversion problems firmware: Fix an oops on reading fw_priv->fw in sysfs loading file Drivers:hv: Fix a bug in vmbus_driver_unregister() driver core: remove __must_check from device_create_file debugfs: add missing #ifdef HAS_IOMEM arm: time.h: remove device.h #include driver-core: remove sysdev.h usage. clockevents: remove sysdev.h arm: convert sysdev_class to a regular subsystem arm: leds: convert sysdev_class to a regular subsystem kobject: remove kset_find_obj_hinted() m86k: gpio - convert sysdev_class to a regular subsystem mips: txx9_sram - convert sysdev_class to a regular subsystem mips: 7segled - convert sysdev_class to a regular subsystem sh: dma - convert sysdev_class to a regular subsystem sh: intc - convert sysdev_class to a regular subsystem power: suspend - convert sysdev_class to a regular subsystem power: qe_ic - convert sysdev_class to a regular subsystem power: cmm - convert sysdev_class to a regular subsystem s390: time - convert sysdev_class to a regular subsystem ... Fix up conflicts with 'struct sysdev' removal from various platform drivers that got changed: - arch/arm/mach-exynos/cpu.c - arch/arm/mach-exynos/irq-eint.c - arch/arm/mach-s3c64xx/common.c - arch/arm/mach-s3c64xx/cpu.c - arch/arm/mach-s5p64x0/cpu.c - arch/arm/mach-s5pv210/common.c - arch/arm/plat-samsung/include/plat/cpu.h - arch/powerpc/kernel/sysfs.c and fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h
56 lines
1.4 KiB
C
56 lines
1.4 KiB
C
/*
|
|
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
|
|
* http://www.samsung.com
|
|
*
|
|
* Copyright 2008 Openmoko, Inc.
|
|
* Copyright 2008 Simtec Electronics
|
|
* Ben Dooks <ben@simtec.co.uk>
|
|
* http://armlinux.simtec.co.uk/
|
|
*
|
|
* Common Header for S3C64XX machines
|
|
*
|
|
* 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 __ARCH_ARM_MACH_S3C64XX_COMMON_H
|
|
#define __ARCH_ARM_MACH_S3C64XX_COMMON_H
|
|
|
|
void s3c64xx_init_irq(u32 vic0, u32 vic1);
|
|
void s3c64xx_init_io(struct map_desc *mach_desc, int size);
|
|
|
|
void s3c64xx_register_clocks(unsigned long xtal, unsigned armclk_limit);
|
|
void s3c64xx_setup_clocks(void);
|
|
|
|
void s3c64xx_restart(char mode, const char *cmd);
|
|
|
|
extern struct syscore_ops s3c64xx_irq_syscore_ops;
|
|
|
|
#ifdef CONFIG_CPU_S3C6400
|
|
|
|
extern int s3c6400_init(void);
|
|
extern void s3c6400_init_irq(void);
|
|
extern void s3c6400_map_io(void);
|
|
extern void s3c6400_init_clocks(int xtal);
|
|
|
|
#else
|
|
#define s3c6400_init_clocks NULL
|
|
#define s3c6400_map_io NULL
|
|
#define s3c6400_init NULL
|
|
#endif
|
|
|
|
#ifdef CONFIG_CPU_S3C6410
|
|
|
|
extern int s3c6410_init(void);
|
|
extern void s3c6410_init_irq(void);
|
|
extern void s3c6410_map_io(void);
|
|
extern void s3c6410_init_clocks(int xtal);
|
|
|
|
#else
|
|
#define s3c6410_init_clocks NULL
|
|
#define s3c6410_map_io NULL
|
|
#define s3c6410_init NULL
|
|
#endif
|
|
|
|
#endif /* __ARCH_ARM_MACH_S3C64XX_COMMON_H */
|