Merge tag 'hwmon-for-linus-v4.12' of... (cdbfbba9) · Commits · 戴 / test

Documentation/devicetree/bindings/hwmon/ads7828.txt

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		ads7828 properties

		Required properties:
		- compatible: Should be one of
		ti,ads7828
		ti,ads7830
		- reg: I2C address

		Optional properties:

		- ti,differential-input
		Set to use the device in differential mode.
		- vref-supply
		The external reference on the device is set to this regulators output. If it
		does not exists the internal reference will be used and output by the ads78xx
		on the "external vref" pin.

		Example ADS7828 node:

		ads7828: ads@48 {
		comatible = "ti,ads7828";
		reg = <0x48>;
		vref-supply = <&vref>;
		ti,differential-input;
		};

Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt

0 → 100644

+68 −0

Original line number	Diff line number	Diff line
		ASPEED AST2400/AST2500 PWM and Fan Tacho controller device driver

		The ASPEED PWM controller can support upto 8 PWM outputs. The ASPEED Fan Tacho
		controller can support upto 16 Fan tachometer inputs.

		There can be upto 8 fans supported. Each fan can have one PWM output and
		one/two Fan tach inputs.

		Required properties for pwm-tacho node:
		- #address-cells : should be 1.

		- #size-cells : should be 1.

		- reg : address and length of the register set for the device.

		- pinctrl-names : a pinctrl state named "default" must be defined.

		- pinctrl-0 : phandle referencing pin configuration of the PWM ports.

		- compatible : should be "aspeed,ast2400-pwm-tacho" for AST2400 and
		"aspeed,ast2500-pwm-tacho" for AST2500.

		- clocks : a fixed clock providing input clock frequency(PWM
		and Fan Tach clock)

		fan subnode format:
		===================
		Under fan subnode there can upto 8 child nodes, with each child node
		representing a fan. If there are 8 fans each fan can have one PWM port and
		one/two Fan tach inputs.

		Required properties for each child node:
		- reg : should specify PWM source port.
		integer value in the range 0 to 7 with 0 indicating PWM port A and
		7 indicating PWM port H.

		- aspeed,fan-tach-ch : should specify the Fan tach input channel.
		integer value in the range 0 through 15, with 0 indicating
		Fan tach channel 0 and 15 indicating Fan tach channel 15.
		Atleast one Fan tach input channel is required.

		Examples:

		pwm_tacho_fixed_clk: fixedclk {
		compatible = "fixed-clock";
		#clock-cells = <0>;
		clock-frequency = <24000000>;
		};

		pwm_tacho: pwmtachocontroller@1e786000 {
		#address-cells = <1>;
		#size-cells = <1>;
		reg = <0x1E786000 0x1000>;
		compatible = "aspeed,ast2500-pwm-tacho";
		clocks = <&pwm_tacho_fixed_clk>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default>;

		fan@0 {
		reg = <0x00>;
		aspeed,fan-tach-ch = /bits/ 8 <0x00>;
		};

		fan@1 {
		reg = <0x01>;
		aspeed,fan-tach-ch = /bits/ 8 <0x01 0x02>;
		};
		};

Documentation/devicetree/bindings/hwmon/lm87.txt

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		*LM87 hwmon sensor.

		Required properties:
		- compatible: Should be
		"ti,lm87"

		- reg: I2C address

		optional properties:
		- has-temp3: This configures pins 18 and 19 to be used as a second
		remote temperature sensing channel. By default the pins
		are configured as voltage input pins in0 and in5.

		- has-in6: When set, pin 5 is configured to be used as voltage input
		in6. Otherwise the pin is set as FAN1 input.

		- has-in7: When set, pin 6 is configured to be used as voltage input
		in7. Otherwise the pin is set as FAN2 input.

		- vcc-supply: a Phandle for the regulator supplying power, can be
		cofigured to measure 5.0V power supply. Default is 3.3V.

		Example:

		lm87@2e {
		compatible = "ti,lm87";
		reg = <0x2e>;
		has-temp3;
		vcc-supply = <&reg_5v0>;
		};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,7 @@ sbs Smart Battery System
		schindler Schindler
		seagate Seagate Technology PLC
		semtech Semtech Corporation
		sensirion Sensirion AG
		sgx SGX Sensortech
		sharp Sharp Corporation
		si-en Si-En Technology Ltd.

Documentation/hwmon/aspeed-pwm-tacho

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		Kernel driver aspeed-pwm-tacho
		==============================

		Supported chips:
		ASPEED AST2400/2500

		Authors:
		<jaghu@google.com>

		Description:
		------------
		This driver implements support for ASPEED AST2400/2500 PWM and Fan Tacho
		controller. The PWM controller supports upto 8 PWM outputs. The Fan tacho
		controller supports up to 16 tachometer inputs.

		The driver provides the following sensor accesses in sysfs:

		fanX_input ro provide current fan rotation value in RPM as reported
		by the fan to the device.

		pwmX rw get or set PWM fan control value. This is an integer
		value between 0(off) and 255(full speed).

Admin message