Commit 5375ded8 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y

parents e9091cf6 f37eb7b5

Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
THS8135 Video DAC

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



This is the binding for Texas Instruments THS8135 Video DAC bridge.



Required properties:



- compatible: Must be "ti,ths8135"



Required nodes:



This device has two video ports. Their connections are modelled using the OF

graph bindings specified in Documentation/devicetree/bindings/graph.txt.



- Video port 0 for RGB input

- Video port 1 for VGA output



Example

-------



vga-bridge {

	compatible = "ti,ths8135";

	#address-cells = <1>;

	#size-cells = <0>;



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;



			vga_bridge_in: endpoint {

				remote-endpoint = <&lcdc_out_vga>;

			};

		};



		port@1 {

			reg = <1>;



			vga_bridge_out: endpoint {

				remote-endpoint = <&vga_con_in>;

			};

		};

	};

};

Documentation/devicetree/bindings/iio/adc/avia-hx711.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* AVIA HX711 ADC chip for weight cells

  Bit-banging driver



Required properties:

 - compatible:	Should be "avia,hx711"

 - sck-gpios:	Definition of the GPIO for the clock

 - dout-gpios:	Definition of the GPIO for data-out

		See Documentation/devicetree/bindings/gpio/gpio.txt

 - avdd-supply:	Definition of the regulator used as analog supply



Example:

weight@0 {

	compatible = "avia,hx711";

	sck-gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>;

	dout-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;

	avdd-suppy = <&avdd>;

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ atmel Atmel Corporation 
auo	AU Optronics Corporation

auvidea Auvidea GmbH

avago	Avago Technologies

avia	avia semiconductor

avic	Shanghai AVIC Optoelectronics Co., Ltd.

axis	Axis Communications AB

blokaslabs	Vilniaus Blokas UAB

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 53

SUBLEVEL = 54

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/Kconfig-nommu

+1 −2
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ config PROCESSOR_ID 
	  used instead of the auto-probing which utilizes the register.



config REMAP_VECTORS_TO_RAM

	bool 'Install vectors to the beginning of RAM' if DRAM_BASE

	depends on DRAM_BASE

	bool 'Install vectors to the beginning of RAM'

	help

	  The kernel needs to change the hardware exception vectors.

	  In nommu mode, the hardware exception vectors are normally