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

Commit 8ab84ef6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 core platform updates from Ingo Molnar:
 "Intel Quark and Geode SoC platform updates"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/intel/quark: Drop IMR lock bit support
  x86/platform/intel/mid: Remove dead code
  x86/platform: Make platform/geode/net5501.c explicitly non-modular
  x86/platform: Make platform/geode/alix.c explicitly non-modular
  x86/platform: Make platform/geode/geos.c explicitly non-modular
  x86/platform: Make platform/intel-quark/imr_selftest.c explicitly non-modular
  x86/platform: Make platform/intel-quark/imr.c explicitly non-modular
parents 13c76ad8 c637fa52

arch/x86/include/asm/imr.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#define IMR_MASK		(IMR_ALIGN - 1)



int imr_add_range(phys_addr_t base, size_t size,

		  unsigned int rmask, unsigned int wmask, bool lock);

		  unsigned int rmask, unsigned int wmask);



int imr_remove_range(phys_addr_t base, size_t size);

arch/x86/platform/geode/alix.c

+7 −7
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/init.h>

#include <linux/io.h>

#include <linux/string.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/leds.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>
@@ -35,6 +35,11 @@ 
#define BIOS_SIGNATURE_COREBOOT		0x500

#define BIOS_REGION_SIZE		0x10000



/*

 * This driver is not modular, but to keep back compatibility

 * with existing use cases, continuing with module_param is

 * the easiest way forward.

 */

static bool force = 0;

module_param(force, bool, 0444);

/* FIXME: Award bios is not automatically detected as Alix platform */
@@ -192,9 +197,4 @@ static int __init alix_init(void) 


	return 0;

}



module_init(alix_init);



MODULE_AUTHOR("Ed Wildgoose <kernel@wildgooses.com>");

MODULE_DESCRIPTION("PCEngines ALIX System Setup");

MODULE_LICENSE("GPL");
 
device_initcall(alix_init);

arch/x86/platform/geode/geos.c

+1 −7
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/init.h>

#include <linux/io.h>

#include <linux/string.h>

#include <linux/module.h>

#include <linux/leds.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>
@@ -120,9 +119,4 @@ static int __init geos_init(void) 


	return 0;

}



module_init(geos_init);



MODULE_AUTHOR("Philip Prindeville <philipp@redfish-solutions.com>");

MODULE_DESCRIPTION("Traverse Technologies Geos System Setup");

MODULE_LICENSE("GPL");
 
device_initcall(geos_init);

arch/x86/platform/geode/net5501.c

+1 −7
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/init.h>

#include <linux/io.h>

#include <linux/string.h>

#include <linux/module.h>

#include <linux/leds.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>
@@ -146,9 +145,4 @@ static int __init net5501_init(void) 


	return 0;

}



module_init(net5501_init);



MODULE_AUTHOR("Philip Prindeville <philipp@redfish-solutions.com>");

MODULE_DESCRIPTION("Soekris net5501 System Setup");

MODULE_LICENSE("GPL");
 
device_initcall(net5501_init);

arch/x86/platform/intel-mid/mfld.c

+1 −4
Original line number Diff line number Diff line
@@ -52,10 +52,7 @@ static unsigned long __init mfld_calibrate_tsc(void) 
	/* mark tsc clocksource as reliable */

	set_cpu_cap(&boot_cpu_data, X86_FEATURE_TSC_RELIABLE);



	if (fast_calibrate)

	return fast_calibrate;



	return 0;

}



static void __init penwell_arch_setup(void)