Commit c715a38b authored by Alan Cox's avatar Alan Cox Committed by Matthew Garrett
Browse files

rar: Move the RAR driver into the right place as its now clean 



We exit staging rar! rar! rar!...

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 97ba0af0

drivers/platform/x86/Kconfig

+22 −0
Original line number Diff line number Diff line
@@ -539,6 +539,28 @@ config INTEL_SCU_IPC 
	  some embedded Intel x86 platforms. This is not needed for PC-type

	  machines.



config RAR_REGISTER

	bool "Restricted Access Region Register Driver"

	depends on PCI && X86_MRST

	default n

	---help---

	  This driver allows other kernel drivers access to the

	  contents of the restricted access region control registers.



	  The restricted access region control registers

	  (rar_registers) are used to pass address and

	  locking information on restricted access regions

	  to other drivers that use restricted access regions.



	  The restricted access regions are regions of memory

	  on the Intel MID Platform that are not accessible to

	  the x86 processor, but are accessible to dedicated

	  processors on board peripheral devices.



	  The purpose of the restricted access regions is to

	  protect sensitive data from compromise by unauthorized

	  programs running on the x86 processor.



config INTEL_IPS

	tristate "Intel Intelligent Power Sharing"

	depends on ACPI

drivers/platform/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o 
obj-$(CONFIG_ACPI_TOSHIBA)	+= toshiba_acpi.o

obj-$(CONFIG_TOSHIBA_BT_RFKILL)	+= toshiba_bluetooth.o

obj-$(CONFIG_INTEL_SCU_IPC)	+= intel_scu_ipc.o

obj-$(CONFIG_RAR_REGISTER)	+= intel_rar_register.o

obj-$(CONFIG_INTEL_IPS)		+= intel_ips.o

drivers/staging/rar_register/rar_register.c→drivers/platform/x86/intel_rar_register.c

+2 −6
Original line number Diff line number Diff line
@@ -40,15 +40,12 @@ 
 *      Initial publish

 */



#define DEBUG 1



#include "rar_register.h"



#include <linux/module.h>

#include <linux/pci.h>

#include <linux/spinlock.h>

#include <linux/device.h>

#include <linux/kernel.h>

#include <linux/rar_register.h>



/* === Lincroft Message Bus Interface === */

#define LNC_MCR_OFFSET		0xD0	/* Message Control Register */
@@ -155,7 +152,6 @@ static struct rar_device *_rar_to_device(int rar, int *off) 
	return NULL;

}





/**

 *	rar_to_device		-	return the device handling this RAR

 *	@rar: RAR number
@@ -496,7 +492,7 @@ EXPORT_SYMBOL(rar_lock); 
 *	a driver that do require a valid RAR address. One of those

 *	steps would be to call rar_get_address()

 *

 *	This function return 0 on success an error code on failure.

 *	This function return 0 on success or an error code on failure.

 */

int register_rar(int num, int (*callback)(unsigned long data),

							unsigned long data)

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ source "drivers/staging/hv/Kconfig" 


source "drivers/staging/vme/Kconfig"



source "drivers/staging/rar_register/Kconfig"



source "drivers/staging/memrar/Kconfig"



source "drivers/staging/sep/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ obj-$(CONFIG_VT6656) += vt6656/ 
obj-$(CONFIG_FB_UDL)		+= udlfb/

obj-$(CONFIG_HYPERV)		+= hv/

obj-$(CONFIG_VME_BUS)		+= vme/

obj-$(CONFIG_RAR_REGISTER)	+= rar_register/

obj-$(CONFIG_MRST_RAR_HANDLER)	+= memrar/

obj-$(CONFIG_DX_SEP)		+= sep/

obj-$(CONFIG_IIO)		+= iio/