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

Commit 0c9a66ec authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

parents c2c4be28 9ca250a5

Documentation/cpu-freq/index.txt

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ cpufreq-stats.txt - General description of sysfs cpufreq stats. 


index.txt	-	File index, Mailing list and Links (this document)



intel-pstate.txt -	Intel pstate cpufreq driver specific file.



pcc-cpufreq.txt -	PCC cpufreq driver specific file.

Documentation/devicetree/bindings/clock/st,stm32h7-rcc.txt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Example: 
		compatible = "st,stm32h743-rcc", "st,stm32-rcc";

		reg = <0x58024400 0x400>;

		#reset-cells = <1>;

		#clock-cells = <2>;

		#clock-cells = <1>;

		clocks = <&clk_hse>, <&clk_lse>, <&clk_i2s_ckin>;



		st,syscfg = <&pwrcfg>;

Documentation/devicetree/bindings/i2c/i2c-altera.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
* Altera I2C Controller

* This is Altera's synthesizable logic block I2C Controller for use

* in Altera's FPGAs.



Required properties :

 - compatible : should be "altr,softip-i2c-v1.0"

 - reg        : Offset and length of the register set for the device

 - interrupts : <IRQ> where IRQ is the interrupt number.

 - clocks     : phandle to input clock.

 - #address-cells = <1>;

 - #size-cells = <0>;



Recommended properties :

 - clock-frequency : desired I2C bus clock frequency in Hz.



Optional properties :

 - fifo-size : Size of the RX and TX FIFOs in bytes.

 - Child nodes conforming to i2c bus binding



Example :



	i2c@100080000 {

		compatible = "altr,softip-i2c-v1.0";

		reg = <0x00000001 0x00080000 0x00000040>;

		interrupt-parent = <&intc>;

		interrupts = <0 43 4>;

		clocks = <&clk_0>;

		clock-frequency = <100000>;

		#address-cells = <1>;

		#size-cells = <0>;

		fifo-size = <4>;



		eeprom@51 {

			compatible = "atmel,24c32";

			reg = <0x51>;

			pagesize = <32>;

		};

	};

Documentation/devicetree/bindings/i2c/i2c-stm32.txt

+26 −3
Original line number Diff line number Diff line 
* I2C controller embedded in STMicroelectronics STM32 I2C platform



Required properties :

- compatible : Must be "st,stm32f4-i2c"

- compatible : Must be one of the following

  - "st,stm32f4-i2c"

  - "st,stm32f7-i2c"

- reg : Offset and length of the register set for the device

- interrupts : Must contain the interrupt id for I2C event and then the

  interrupt id for I2C error.
@@ -14,8 +16,16 @@ Required properties : 


Optional properties :

- clock-frequency : Desired I2C bus clock frequency in Hz. If not specified,

  the default 100 kHz frequency will be used. As only Normal and Fast modes

  are supported, possible values are 100000 and 400000.

  the default 100 kHz frequency will be used.

  For STM32F4 SoC Standard-mode and Fast-mode are supported, possible values are

  100000 and 400000.

  For STM32F7 SoC, Standard-mode, Fast-mode and Fast-mode Plus are supported,

  possible values are 100000, 400000 and 1000000.

- i2c-scl-rising-time-ns : Only for STM32F7, I2C SCL Rising time for the board

  (default: 25)

- i2c-scl-falling-time-ns : Only for STM32F7, I2C SCL Falling time for the board

  (default: 10)

  I2C Timings are derived from these 2 values



Example :
@@ -31,3 +41,16 @@ Example : 
		pinctrl-0 = <&i2c1_sda_pin>, <&i2c1_scl_pin>;

		pinctrl-names = "default";

	};



	i2c@40005400 {

		compatible = "st,stm32f7-i2c";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x40005400 0x400>;

		interrupts = <31>,

			     <32>;

		resets = <&rcc STM32F7_APB1_RESET(I2C1)>;

		clocks = <&rcc 1 CLK_I2C1>;

		pinctrl-0 = <&i2c1_sda_pin>, <&i2c1_scl_pin>;

		pinctrl-names = "default";

	};

Documentation/devicetree/bindings/input/pwm-vibrator.txt

0 → 100644
+66 −0
Original line number Diff line number Diff line 
* PWM vibrator device tree bindings



Registers a PWM device as vibrator. It is expected, that the vibrator's

strength increases based on the duty cycle of the enable PWM channel

(100% duty cycle meaning strongest vibration, 0% meaning no vibration).



The binding supports an optional direction PWM channel, that can be

driven at fixed duty cycle. If available this is can be used to increase

the vibration effect of some devices.



Required properties:

- compatible: should contain "pwm-vibrator"

- pwm-names: Should contain "enable" and optionally "direction"

- pwms: Should contain a PWM handle for each entry in pwm-names



Optional properties:

- vcc-supply: Phandle for the regulator supplying power

- direction-duty-cycle-ns: Duty cycle of the direction PWM channel in

                           nanoseconds, defaults to 50% of the channel's

			   period.



Example from Motorola Droid 4:



&omap4_pmx_core {

	vibrator_direction_pin: pinmux_vibrator_direction_pin {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x1ce, PIN_OUTPUT | MUX_MODE1) /* dmtimer8_pwm_evt (gpio_27) */

		>;

	};



	vibrator_enable_pin: pinmux_vibrator_enable_pin {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0X1d0, PIN_OUTPUT | MUX_MODE1) /* dmtimer9_pwm_evt (gpio_28) */

		>;

	};

};



/ {

	pwm8: dmtimer-pwm {

		pinctrl-names = "default";

		pinctrl-0 = <&vibrator_direction_pin>;



		compatible = "ti,omap-dmtimer-pwm";

		#pwm-cells = <3>;

		ti,timers = <&timer8>;

		ti,clock-source = <0x01>;

	};



	pwm9: dmtimer-pwm {

		pinctrl-names = "default";

		pinctrl-0 = <&vibrator_enable_pin>;



		compatible = "ti,omap-dmtimer-pwm";

		#pwm-cells = <3>;

		ti,timers = <&timer9>;

		ti,clock-source = <0x01>;

	};



	vibrator {

		compatible = "pwm-vibrator";

		pwms = <&pwm8 0 1000000000 0>,

		       <&pwm9 0 1000000000 0>;

		pwm-names = "enable", "direction";

		direction-duty-cycle-ns = <1000000000>;

	};

};