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

Commit bd5f47ec authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

Move ams driver to macintosh 



The ams driver isn't a hardware monitoring driver, so it shouldn't
live under driver/hwmon. drivers/macintosh seems much more
appropriate, as the driver is only useful on PowerBooks and iBooks.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Stelian Pop <stelian@popies.net>
Cc: Michael Hanselmann <linux-kernel@hansmi.ch>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
parent 6dfee853

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -432,7 +432,7 @@ AMS (Apple Motion Sensor) DRIVER 
M:	Stelian Pop <stelian@popies.net>

M:	Stelian Pop <stelian@popies.net>

M:	Michael Hanselmann <linux-kernel@hansmi.ch>

M:	Michael Hanselmann <linux-kernel@hansmi.ch>

S:	Supported

S:	Supported

F:	drivers/hwmon/ams/

F:	drivers/macintosh/ams/





AMSO1100 RNIC DRIVER

AMSO1100 RNIC DRIVER

M:	Tom Tucker <tom@opengridcomputing.com>

M:	Tom Tucker <tom@opengridcomputing.com>

drivers/hwmon/Kconfig

+0 −26
Original line number Original line Diff line number Diff line
@@ -249,32 +249,6 @@ config SENSORS_K10TEMP 
	  This driver can also be built as a module.  If so, the module

	  This driver can also be built as a module.  If so, the module

	  will be called k10temp.

	  will be called k10temp.





config SENSORS_AMS

	tristate "Apple Motion Sensor driver"

	depends on PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL

	select INPUT_POLLDEV

	help

	  Support for the motion sensor included in PowerBooks. Includes

	  implementations for PMU and I2C.



	  This driver can also be built as a module. If so, the module

	  will be called ams.



config SENSORS_AMS_PMU

	bool "PMU variant"

	depends on SENSORS_AMS && ADB_PMU

	default y

	help

	  PMU variant of motion sensor, found in late 2005 PowerBooks.



config SENSORS_AMS_I2C

	bool "I2C variant"

	depends on SENSORS_AMS && I2C

	default y

	help

	  I2C variant of motion sensor, found in early 2005 PowerBooks and

	  iBooks.



config SENSORS_ASB100

config SENSORS_ASB100

	tristate "Asus ASB100 Bach"

	tristate "Asus ASB100 Bach"

	depends on X86 && I2C && EXPERIMENTAL

	depends on X86 && I2C && EXPERIMENTAL

drivers/hwmon/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ obj-$(CONFIG_SENSORS_ADT7462) += adt7462.o 
obj-$(CONFIG_SENSORS_ADT7470)	+= adt7470.o

obj-$(CONFIG_SENSORS_ADT7470)	+= adt7470.o

obj-$(CONFIG_SENSORS_ADT7475)	+= adt7475.o

obj-$(CONFIG_SENSORS_ADT7475)	+= adt7475.o

obj-$(CONFIG_SENSORS_APPLESMC)	+= applesmc.o

obj-$(CONFIG_SENSORS_APPLESMC)	+= applesmc.o

obj-$(CONFIG_SENSORS_AMS)	+= ams/

obj-$(CONFIG_SENSORS_ASC7621)	+= asc7621.o

obj-$(CONFIG_SENSORS_ASC7621)	+= asc7621.o

obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o

obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o

obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o

obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o

drivers/macintosh/Kconfig

+26 −0
Original line number Original line Diff line number Diff line
@@ -256,4 +256,30 @@ config PMAC_RACKMETER 
	  This driver provides some support to control the front panel

	  This driver provides some support to control the front panel

          blue LEDs "vu-meter" of the XServer macs.

          blue LEDs "vu-meter" of the XServer macs.





config SENSORS_AMS

	tristate "Apple Motion Sensor driver"

	depends on PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL

	select INPUT_POLLDEV

	help

	  Support for the motion sensor included in PowerBooks. Includes

	  implementations for PMU and I2C.



	  This driver can also be built as a module. If so, the module

	  will be called ams.



config SENSORS_AMS_PMU

	bool "PMU variant"

	depends on SENSORS_AMS && ADB_PMU

	default y

	help

	  PMU variant of motion sensor, found in late 2005 PowerBooks.



config SENSORS_AMS_I2C

	bool "I2C variant"

	depends on SENSORS_AMS && I2C

	default y

	help

	  I2C variant of motion sensor, found in early 2005 PowerBooks and

	  iBooks.



endif # MACINTOSH_DRIVERS
 
endif # MACINTOSH_DRIVERS

drivers/macintosh/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -48,3 +48,5 @@ obj-$(CONFIG_WINDFARM_PM121) += windfarm_pm121.o windfarm_smu_sat.o \ 
				   windfarm_max6690_sensor.o \

				   windfarm_max6690_sensor.o \

				   windfarm_lm75_sensor.o windfarm_pid.o

				   windfarm_lm75_sensor.o windfarm_pid.o

obj-$(CONFIG_PMAC_RACKMETER)	+= rack-meter.o

obj-$(CONFIG_PMAC_RACKMETER)	+= rack-meter.o



obj-$(CONFIG_SENSORS_AMS)	+= ams/