powerpc/machdep: Move sys_ctrler_t definition into pmac_feature.h
sys_ctrler_t definitions are tied to pmac. Move it into pmac_feature.h Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> [mpe: Move to pmac_feature.h to fix some build errors] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/7dd5ead4bbca749e2da089ff6fe2b1878d6bf40e.1630667612.git.christophe.leroy@csgroup.eu
This commit is contained in:
parent
d6a6c725a2
commit
e6d03ac156
|
@ -230,21 +230,6 @@ extern struct machdep_calls *machine_id;
|
||||||
machine_id == &mach_##name; \
|
machine_id == &mach_##name; \
|
||||||
})
|
})
|
||||||
|
|
||||||
#ifdef CONFIG_PPC_PMAC
|
|
||||||
/*
|
|
||||||
* Power macintoshes have either a CUDA, PMU or SMU controlling
|
|
||||||
* system reset, power, NVRAM, RTC.
|
|
||||||
*/
|
|
||||||
typedef enum sys_ctrler_kind {
|
|
||||||
SYS_CTRLER_UNKNOWN = 0,
|
|
||||||
SYS_CTRLER_CUDA = 1,
|
|
||||||
SYS_CTRLER_PMU = 2,
|
|
||||||
SYS_CTRLER_SMU = 3,
|
|
||||||
} sys_ctrler_t;
|
|
||||||
extern sys_ctrler_t sys_ctrler;
|
|
||||||
|
|
||||||
#endif /* CONFIG_PPC_PMAC */
|
|
||||||
|
|
||||||
static inline void log_error(char *buf, unsigned int err_type, int fatal)
|
static inline void log_error(char *buf, unsigned int err_type, int fatal)
|
||||||
{
|
{
|
||||||
if (ppc_md.log_error)
|
if (ppc_md.log_error)
|
||||||
|
|
|
@ -401,5 +401,17 @@ extern u32 __iomem *uninorth_base;
|
||||||
*/
|
*/
|
||||||
extern int pmac_get_uninorth_variant(void);
|
extern int pmac_get_uninorth_variant(void);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Power macintoshes have either a CUDA, PMU or SMU controlling
|
||||||
|
* system reset, power, NVRAM, RTC.
|
||||||
|
*/
|
||||||
|
typedef enum sys_ctrler_kind {
|
||||||
|
SYS_CTRLER_UNKNOWN = 0,
|
||||||
|
SYS_CTRLER_CUDA = 1,
|
||||||
|
SYS_CTRLER_PMU = 2,
|
||||||
|
SYS_CTRLER_SMU = 3,
|
||||||
|
} sys_ctrler_t;
|
||||||
|
extern sys_ctrler_t sys_ctrler;
|
||||||
|
|
||||||
#endif /* __ASM_POWERPC_PMAC_FEATURE_H */
|
#endif /* __ASM_POWERPC_PMAC_FEATURE_H */
|
||||||
#endif /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
#include <linux/irq.h>
|
#include <linux/irq.h>
|
||||||
|
|
||||||
|
#include <asm/pmac_feature.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Declaration for the various functions exported by the
|
* Declaration for the various functions exported by the
|
||||||
* pmac_* files. Mostly for use by pmac_setup
|
* pmac_* files. Mostly for use by pmac_setup
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#ifdef CONFIG_PPC
|
#ifdef CONFIG_PPC
|
||||||
#include <asm/prom.h>
|
#include <asm/prom.h>
|
||||||
#include <asm/machdep.h>
|
#include <asm/machdep.h>
|
||||||
|
#include <asm/pmac_feature.h>
|
||||||
#else
|
#else
|
||||||
#include <asm/macintosh.h>
|
#include <asm/macintosh.h>
|
||||||
#include <asm/macints.h>
|
#include <asm/macints.h>
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include <asm/dbdma.h>
|
#include <asm/dbdma.h>
|
||||||
#include <asm/prom.h>
|
#include <asm/prom.h>
|
||||||
#include <asm/machdep.h>
|
#include <asm/machdep.h>
|
||||||
|
#include <asm/pmac_feature.h>
|
||||||
|
|
||||||
/* maximum number of fragments */
|
/* maximum number of fragments */
|
||||||
#define PMAC_MAX_FRAGS 32
|
#define PMAC_MAX_FRAGS 32
|
||||||
|
|
Loading…
Reference in New Issue