Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 of HEAD (a0486407) · Commits · 戴 / test

Documentation/feature-removal-schedule.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -247,3 +247,14 @@ Why: The interrupt related SA_* flags are replaced by IRQF_* to move them
		Who: Thomas Gleixner <tglx@linutronix.de>

		---------------------------

		What: i2c-ite and i2c-algo-ite drivers
		When: September 2006
		Why: These drivers never compiled since they were added to the kernel
		tree 5 years ago. This feature removal can be reevaluated if
		someone shows interest in the drivers, fixes them and takes over
		maintenance.
		http://marc.theaimsgroup.com/?l=linux-mips&m=115040510817448
		Who: Jean Delvare <khali@linux-fr.org>

		---------------------------

Documentation/hwmon/abituguru

+30 −2

Original line number	Diff line number	Diff line
		@@ -2,13 +2,36 @@ Kernel driver abituguru
		=======================

		Supported chips:
		* Abit uGuru (Hardware Monitor part only)
		* Abit uGuru revision 1-3 (Hardware Monitor part only)
		Prefix: 'abituguru'
		Addresses scanned: ISA 0x0E0
		Datasheet: Not available, this driver is based on reverse engineering.
		A "Datasheet" has been written based on the reverse engineering it
		should be available in the same dir as this file under the name
		abituguru-datasheet.
		Note:
		The uGuru is a microcontroller with onboard firmware which programs
		it to behave as a hwmon IC. There are many different revisions of the
		firmware and thus effectivly many different revisions of the uGuru.
		Below is an incomplete list with which revisions are used for which
		Motherboards:
		uGuru 1.00 ~ 1.24 (AI7, KV8-MAX3, AN7) (1)
		uGuru 2.0.0.0 ~ 2.0.4.2 (KV8-PRO)
		uGuru 2.1.0.0 ~ 2.1.2.8 (AS8, AV8, AA8, AG8, AA8XE, AX8)
		uGuru 2.2.0.0 ~ 2.2.0.6 (AA8 Fatal1ty)
		uGuru 2.3.0.0 ~ 2.3.0.9 (AN8)
		uGuru 3.0.0.0 ~ 3.0.1.2 (AW8, AL8, NI8)
		uGuru 4.xxxxx? (AT8 32X) (2)
		1) For revisions 2 and 3 uGuru's the driver can autodetect the
		sensortype (Volt or Temp) for bank1 sensors, for revision 1 uGuru's
		this doesnot always work. For these uGuru's the autodection can
		be overriden with the bank1_types module param. For all 3 known
		revison 1 motherboards the correct use of this param is:
		bank1_types=1,1,0,0,0,0,0,2,0,0,0,0,2,0,0,1
		You may also need to specify the fan_sensors option for these boards
		fan_sensors=5
		2) The current version of the abituguru driver is known to NOT work
		on these Motherboards

		Authors:
		Hans de Goede <j.w.r.degoede@hhs.nl>,
		@@ -22,6 +45,11 @@ Module Parameters
		* force: bool Force detection. Note this parameter only causes the
		detection to be skipped, if the uGuru can't be read
		the module initialization (insmod) will still fail.
		* bank1_types: int[] Bank1 sensortype autodetection override:
		-1 autodetect (default)
		0 volt sensor
		1 temp sensor
		2 not connected
		* fan_sensors: int Tell the driver how many fan speed sensors there are
		on your motherboard. Default: 0 (autodetect).
		* pwms: int Tell the driver how many fan speed controls (fan
		@@ -29,7 +57,7 @@ Module Parameters
		* verbose: int How verbose should the driver be? (0-3):
		0 normal output
		1 + verbose error reporting
		2 + sensors type probing info\n"
		2 + sensors type probing info (default)
		3 + retryable error reporting
		Default: 2 (the driver is still in the testing phase)

Documentation/i2c/busses/i2c-sis96x

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,8 +42,8 @@ I suspect that this driver could be made to work for the following SiS
		chipsets as well: 635, and 635T. If anyone owns a board with those chips
		AND is willing to risk crashing & burning an otherwise well-behaved kernel
		in the name of progress... please contact me at <mhoffman@lightlink.com> or
		via the project's mailing list: <lm-sensors@lm-sensors.org>. Please
		send bug reports and/or success stories as well.
		via the project's mailing list: <i2c@lm-sensors.org>. Please send bug
		reports and/or success stories as well.


		TO DOs

MAINTAINERS

+10 −4

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ S: Maintained
		ALI1563 I2C DRIVER
		P: Rudolf Marek
		M: r.marek@sh.cvut.cz
		L: lm-sensors@lm-sensors.org
		L: i2c@lm-sensors.org
		S: Maintained

		ALPHA PORT
		@@ -1249,7 +1249,7 @@ S: Maintained
		I2C SUBSYSTEM
		P: Jean Delvare
		M: khali@linux-fr.org
		L: lm-sensors@lm-sensors.org
		L: i2c@lm-sensors.org
		W: http://www.lm-sensors.nu/
		T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
		S: Maintained
		@@ -2093,7 +2093,7 @@ S: Maintained
		OPENCORES I2C BUS DRIVER
		P: Peter Korsgaard
		M: jacmet@sunsite.dk
		L: lm-sensors@lm-sensors.org
		L: i2c@lm-sensors.org
		S: Maintained

		ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
		@@ -3132,7 +3132,7 @@ S: Maintained
		VIAPRO SMBUS DRIVER
		P: Jean Delvare
		M: khali@linux-fr.org
		L: lm-sensors@lm-sensors.org
		L: i2c@lm-sensors.org
		S: Maintained

		UCLINUX (AND M68KNOMMU)
		@@ -3182,6 +3182,12 @@ P: Evgeniy Polyakov
		M: johnpol@2ka.mipt.ru
		S: Maintained

		W83791D HARDWARE MONITORING DRIVER
		P: Charles Spirakis
		M: bezaur@gmail.com
		L: lm-sensors@lm-sensors.org
		S: Maintained

		W83L51xD SD/MMC CARD INTERFACE DRIVER
		P: Pierre Ossman
		M: drzeus-wbsd@drzeus.cx

drivers/hwmon/abituguru.c

+19 −2

Original line number	Diff line number	Diff line
		@@ -142,6 +142,14 @@ static const u8 abituguru_pwm_max[5] = { 0, 255, 255, 75, 75 };
		static int force;
		module_param(force, bool, 0);
		MODULE_PARM_DESC(force, "Set to one to force detection.");
		static int bank1_types[ABIT_UGURU_MAX_BANK1_SENSORS] = { -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
		module_param_array(bank1_types, int, NULL, 0);
		MODULE_PARM_DESC(bank1_types, "Bank1 sensortype autodetection override:\n"
		" -1 autodetect\n"
		" 0 volt sensor\n"
		" 1 temp sensor\n"
		" 2 not connected");
		static int fan_sensors;
		module_param(fan_sensors, int, 0);
		MODULE_PARM_DESC(fan_sensors, "Number of fan sensors on the uGuru "
		@@ -397,6 +405,15 @@ abituguru_detect_bank1_sensor_type(struct abituguru_data *data,
		u8 val, buf[3];
		int ret = ABIT_UGURU_NC;

		/* If overriden by the user return the user selected type */
		if (bank1_types[sensor_addr] >= ABIT_UGURU_IN_SENSOR &&
		bank1_types[sensor_addr] <= ABIT_UGURU_NC) {
		ABIT_UGURU_DEBUG(2, "assuming sensor type %d for bank1 sensor "
		"%d because of \"bank1_types\" module param\n",
		bank1_types[sensor_addr], (int)sensor_addr);
		return bank1_types[sensor_addr];
		}

		/* First read the sensor and the current settings */
		if (abituguru_read(data, ABIT_UGURU_SENSOR_BANK1, sensor_addr, &val,
		1, ABIT_UGURU_MAX_RETRIES) != 1)
		@@ -514,7 +531,7 @@ abituguru_detect_no_bank2_sensors(struct abituguru_data *data)
		{
		int i;

		if (fan_sensors) {
		if (fan_sensors > 0 && fan_sensors <= ABIT_UGURU_MAX_BANK2_SENSORS) {
		data->bank2_sensors = fan_sensors;
		ABIT_UGURU_DEBUG(2, "assuming %d fan sensors because of "
		"\"fan_sensors\" module param\n",
		@@ -568,7 +585,7 @@ abituguru_detect_no_pwms(struct abituguru_data *data)
		{
		int i, j;

		if (pwms) {
		if (pwms > 0 && pwms <= ABIT_UGURU_MAX_PWMS) {
		data->pwms = pwms;
		ABIT_UGURU_DEBUG(2, "assuming %d PWM outputs because of "
		"\"pwms\" module param\n", (int)data->pwms);

Admin message