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

Commit 9338316c authored by Natalie.Protasevich@unisys.com's avatar Natalie.Protasevich@unisys.com Committed by Linus Torvalds
Browse files

[PATCH] ES7000 platform update 



This is platform code update for ES7000: disables IRQ overrides for the
recent ES7000 (Rascal/Zorro), cleans up the compile warning.  The patch
only affects the ES7000 subarch.

Signed-off-by: default avatar <Natalie.Protasevich@unisys.com>
Acked-by: default avatarZwane Mwaikambo <zwane@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 30037f66

arch/i386/mach-es7000/es7000.h

+10 −1
Original line number Diff line number Diff line
@@ -24,6 +24,15 @@ 
 * http://www.unisys.com

 */



/*

 * ES7000 chipsets

 */



#define NON_UNISYS		0

#define ES7000_CLASSIC		1

#define ES7000_ZORRO		2





#define	MIP_REG			1

#define	MIP_PSAI_REG		4
@@ -106,6 +115,6 @@ struct mip_reg { 


extern int parse_unisys_oem (char *oemptr);

extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);

extern void setup_unisys ();

extern void setup_unisys(void);

extern int es7000_start_cpu(int cpu, unsigned long eip);

extern void es7000_sw_apic(void);

arch/i386/mach-es7000/es7000plat.c

+7 −4
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ static unsigned int base; 
static int

es7000_rename_gsi(int ioapic, int gsi)

{

	if (es7000_plat == ES7000_ZORRO)

		return gsi;



	if (!base) {

		int i;

		for (i = 0; i < nr_ioapics; i++)
@@ -76,7 +79,7 @@ es7000_rename_gsi(int ioapic, int gsi) 
#endif	/* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */



void __init

setup_unisys ()

setup_unisys(void)

{

	/*

	 * Determine the generation of the ES7000 currently running.
@@ -86,9 +89,9 @@ setup_unisys () 
	 *

	 */

	if (!(boot_cpu_data.x86 <= 15 && boot_cpu_data.x86_model <= 2))

		es7000_plat = 2;

		es7000_plat = ES7000_ZORRO;

	else

		es7000_plat = 1;

		es7000_plat = ES7000_CLASSIC;

	ioapic_renumber_irq = es7000_rename_gsi;

}
@@ -151,7 +154,7 @@ parse_unisys_oem (char *oemptr) 
	}



	if (success < 2) {

		es7000_plat = 0;

		es7000_plat = NON_UNISYS;

	} else

		setup_unisys();

	return es7000_plat;

include/asm-i386/mach-es7000/mach_mpparse.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static inline void mpc_oem_pci_bus(struct mpc_config_bus *m, 


extern int parse_unisys_oem (char *oemptr);

extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);

extern void setup_unisys();

extern void setup_unisys(void);



static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,

		char *productid)