From: Len Brown <len.brown@intel.com>
Date: Sat, 3 Feb 2007 06:14:35 +0000 (-0500)
Subject: Pull sysfs into test branch
X-Git-Tag: v2.6.21-rc1~92^2~32^2^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1

Pull sysfs into test branch

Conflicts:

	Documentation/feature-removal-schedule.txt
	include/acpi/acpi_drivers.h

Signed-off-by: Len Brown <len.brown@intel.com>
---

975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1
diff --cc Documentation/feature-removal-schedule.txt
index 0ba6af02cdaf,9bc37529f4cd..b3d1ce7e3ba0
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -274,54 -257,11 +274,62 @@@ Who:	Venkatesh Pallipadi <venkatesh.pal
  
  ---------------------------
  
++<<<<<<< test:Documentation/feature-removal-schedule.txt
 +What:	ACPI hotkey driver (CONFIG_ACPI_HOTKEY)
 +When:	2.6.21
 +Why:	hotkey.c was an attempt to consolidate multiple drivers that use
 +	ACPI to implement hotkeys.  However, hotkeys are not documented
 +	in the ACPI specification, so the drivers used undocumented
 +	vendor-specific hooks and turned out to be more different than
 +	the same.
 +
 +	Further, the keys and the features supplied by each platform
 +	are different, so there will always be a need for
 +	platform-specific drivers.
 +
 +	So the new plan is to delete hotkey.c and instead, work on the
 +	platform specific drivers to try to make them look the same
 +	to the user when they supply the same features.
 +
 +	hotkey.c has always depended on CONFIG_EXPERIMENTAL
 +
 +Who:	Len Brown <len.brown@intel.com>
 +
 +---------------------------
 +
 +What:	/sys/firmware/acpi/namespace
 +When:	2.6.21
 +Why:	The ACPI namespace is effectively the symbol list for
 +	the BIOS.  The device names are completely arbitrary
 +	and have no place being exposed to user-space.
 +
 +	For those interested in the BIOS ACPI namespace,
 +	the BIOS can be extracted and disassembled with acpidump
 +	and iasl as documented in the pmtools package here:
 +	http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils
- 
 +Who:	Len Brown <len.brown@intel.com>
 +
 +---------------------------
 +
+ What:	ACPI procfs interface
+ When:	July 2007
+ Why:	After ACPI sysfs conversion, ACPI attributes will be duplicated
+ 	in sysfs and the ACPI procfs interface should be removed.
+ Who:	Zhang Rui <rui.zhang@intel.com>
+ 
+ ---------------------------
+ 
 +What:	/proc/acpi/button
 +When:	August 2007
 +Why:	/proc/acpi/button has been replaced by events to the input layer
 +	since 2.6.20.
 +Who:	Len Brown <len.brown@intel.com>
 +
 +---------------------------
 +
 +What:	JFFS (version 1)
 +When:	2.6.21
 +Why:	Unmaintained for years, superceded by JFFS2 for years.
 +Who:	Jeff Garzik <jeff@garzik.org>
 +
 +---------------------------
diff --cc drivers/acpi/scan.c
index 0de458664642,4139e65d0ff5..5049230ccf49
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1333,20 -1368,18 +1367,18 @@@ static int acpi_bus_scan_fixed(struct a
  	/*
  	 * Enumerate all fixed-feature devices.
  	 */
 -	if (acpi_fadt.pwr_button == 0) {
 +	if ((acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON) == 0) {
  		result = acpi_add_single_object(&device, acpi_root,
  						NULL,
- 						ACPI_BUS_TYPE_POWER_BUTTON);
- 		if (!result)
- 			result = acpi_start_single_object(device);
+ 						ACPI_BUS_TYPE_POWER_BUTTON,
+ 						&ops);
  	}
  
 -	if (acpi_fadt.sleep_button == 0) {
 +	if ((acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON) == 0) {
  		result = acpi_add_single_object(&device, acpi_root,
  						NULL,
- 						ACPI_BUS_TYPE_SLEEP_BUTTON);
- 		if (!result)
- 			result = acpi_start_single_object(device);
+ 						ACPI_BUS_TYPE_SLEEP_BUTTON,
+ 						&ops);
  	}
  
  	return result;
diff --cc drivers/acpi/system.c
index 2d425d845821,407b0e0281db..7147b0bdab0a
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@@ -39,7 -44,21 +44,20 @@@ ACPI_MODULE_NAME("acpi_system"
  #define ACPI_SYSTEM_FILE_EVENT		"event"
  #define ACPI_SYSTEM_FILE_DSDT		"dsdt"
  #define ACPI_SYSTEM_FILE_FADT		"fadt"
 -extern struct fadt_descriptor acpi_fadt;
  
+ /*
+  * Make ACPICA version work as module param
+  */
+ static int param_get_acpica_version(char *buffer, struct kernel_param *kp) {
+ 	int result;
+ 
+ 	result = sprintf(buffer, "%x", ACPI_CA_VERSION);
+ 
+ 	return result;
+ }
+ 
+ module_param_call(acpica_version, NULL, param_get_acpica_version, NULL, 0444);
+ 
  /* --------------------------------------------------------------------------
                                FS Interface (/proc)
     -------------------------------------------------------------------------- */
diff --cc include/acpi/acpi_drivers.h
index baaa734b1098,1b18c36da789..4dc8a5043ef0
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@@ -36,13 -36,14 +36,14 @@@
  
  /* _HID definitions */
  
- #define ACPI_POWER_HID			"ACPI_PWR"
+ #define ACPI_POWER_HID			"power_resource"
 -#define ACPI_PROCESSOR_HID		"processor"
 +#define ACPI_PROCESSOR_HID		"ACPI0007"
- #define ACPI_SYSTEM_HID			"ACPI_SYS"
- #define ACPI_THERMAL_HID		"ACPI_THM"
- #define ACPI_BUTTON_HID_POWERF		"ACPI_FPB"
- #define ACPI_BUTTON_HID_SLEEPF		"ACPI_FSB"
- 
+ #define ACPI_SYSTEM_HID			"acpi_system"
+ #define ACPI_THERMAL_HID		"thermal"
+ #define ACPI_BUTTON_HID_POWERF		"button_power"
+ #define ACPI_BUTTON_HID_SLEEPF		"button_sleep"
+ #define ACPI_VIDEO_HID			"video"
+ #define ACPI_BAY_HID			"bay"
  /* --------------------------------------------------------------------------
                                         PCI
     -------------------------------------------------------------------------- */