Skip to content

Commit 11c5615

Browse files
author
Alex Shi
committed
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
2 parents cda2b94 + c030c36 commit 11c5615

115 files changed

Lines changed: 829 additions & 365 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
THS8135 Video DAC
2+
-----------------
3+
4+
This is the binding for Texas Instruments THS8135 Video DAC bridge.
5+
6+
Required properties:
7+
8+
- compatible: Must be "ti,ths8135"
9+
10+
Required nodes:
11+
12+
This device has two video ports. Their connections are modelled using the OF
13+
graph bindings specified in Documentation/devicetree/bindings/graph.txt.
14+
15+
- Video port 0 for RGB input
16+
- Video port 1 for VGA output
17+
18+
Example
19+
-------
20+
21+
vga-bridge {
22+
compatible = "ti,ths8135";
23+
#address-cells = <1>;
24+
#size-cells = <0>;
25+
26+
ports {
27+
#address-cells = <1>;
28+
#size-cells = <0>;
29+
30+
port@0 {
31+
reg = <0>;
32+
33+
vga_bridge_in: endpoint {
34+
remote-endpoint = <&lcdc_out_vga>;
35+
};
36+
};
37+
38+
port@1 {
39+
reg = <1>;
40+
41+
vga_bridge_out: endpoint {
42+
remote-endpoint = <&vga_con_in>;
43+
};
44+
};
45+
};
46+
};

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
* AVIA HX711 ADC chip for weight cells
2+
Bit-banging driver
3+
4+
Required properties:
5+
- compatible: Should be "avia,hx711"
6+
- sck-gpios: Definition of the GPIO for the clock
7+
- dout-gpios: Definition of the GPIO for data-out
8+
See Documentation/devicetree/bindings/gpio/gpio.txt
9+
- avdd-supply: Definition of the regulator used as analog supply
10+
11+
Example:
12+
weight@0 {
13+
compatible = "avia,hx711";
14+
sck-gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>;
15+
dout-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
16+
avdd-suppy = <&avdd>;
17+
};
18+

‎Documentation/devicetree/bindings/vendor-prefixes.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ asahi-kasei Asahi Kasei Corp.
3131
atmel Atmel Corporation
3232
auo AU Optronics Corporation
3333
avago Avago Technologies
34+
avia avia semiconductor
3435
avic Shanghai AVIC Optoelectronics Co., Ltd.
3536
axis Axis Communications AB
3637
bosch Bosch Sensortec GmbH

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 4
3-
SUBLEVEL = 89
3+
SUBLEVEL = 91
44
EXTRAVERSION =
55
NAME = Blurry Fish Butt
66

‎arch/arm/Kconfig-nommu‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ config PROCESSOR_ID
3434
used instead of the auto-probing which utilizes the register.
3535

3636
config REMAP_VECTORS_TO_RAM
37-
bool 'Install vectors to the beginning of RAM' if DRAM_BASE
38-
depends on DRAM_BASE
37+
bool 'Install vectors to the beginning of RAM'
3938
help
4039
The kernel needs to change the hardware exception vectors.
4140
In nommu mode, the hardware exception vectors are normally

‎arch/arm/boot/dts/pxa27x.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
interrupts = <25>;
1414
#dma-channels = <32>;
1515
#dma-cells = <2>;
16+
#dma-requests = <75>;
1617
status = "okay";
1718
};
1819

‎arch/arm/boot/dts/pxa3xx.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
interrupts = <25>;
1313
#dma-channels = <32>;
1414
#dma-cells = <2>;
15+
#dma-requests = <100>;
1516
status = "okay";
1617
};
1718

‎arch/arm/boot/dts/r8a7790.dtsi‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,8 @@
14091409
};
14101410

14111411
msiof0: spi@e6e20000 {
1412-
compatible = "renesas,msiof-r8a7790";
1412+
compatible = "renesas,msiof-r8a7790",
1413+
"renesas,rcar-gen2-msiof";
14131414
reg = <0 0xe6e20000 0 0x0064>;
14141415
interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
14151416
clocks = <&mstp0_clks R8A7790_CLK_MSIOF0>;
@@ -1422,7 +1423,8 @@
14221423
};
14231424

14241425
msiof1: spi@e6e10000 {
1425-
compatible = "renesas,msiof-r8a7790";
1426+
compatible = "renesas,msiof-r8a7790",
1427+
"renesas,rcar-gen2-msiof";
14261428
reg = <0 0xe6e10000 0 0x0064>;
14271429
interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>;
14281430
clocks = <&mstp2_clks R8A7790_CLK_MSIOF1>;
@@ -1435,7 +1437,8 @@
14351437
};
14361438

14371439
msiof2: spi@e6e00000 {
1438-
compatible = "renesas,msiof-r8a7790";
1440+
compatible = "renesas,msiof-r8a7790",
1441+
"renesas,rcar-gen2-msiof";
14391442
reg = <0 0xe6e00000 0 0x0064>;
14401443
interrupts = <0 158 IRQ_TYPE_LEVEL_HIGH>;
14411444
clocks = <&mstp2_clks R8A7790_CLK_MSIOF2>;
@@ -1448,7 +1451,8 @@
14481451
};
14491452

14501453
msiof3: spi@e6c90000 {
1451-
compatible = "renesas,msiof-r8a7790";
1454+
compatible = "renesas,msiof-r8a7790",
1455+
"renesas,rcar-gen2-msiof";
14521456
reg = <0 0xe6c90000 0 0x0064>;
14531457
interrupts = <0 159 IRQ_TYPE_LEVEL_HIGH>;
14541458
clocks = <&mstp2_clks R8A7790_CLK_MSIOF3>;

‎arch/arm/mach-at91/pm.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ static void at91sam9_sdram_standby(void)
332332
at91_ramc_write(1, AT91_SDRAMC_LPR, saved_lpr1);
333333
}
334334

335-
static const struct of_device_id const ramc_ids[] __initconst = {
335+
static const struct of_device_id ramc_ids[] __initconst = {
336336
{ .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },
337337
{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },
338338
{ .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },

‎arch/arm/mach-bcm/bcm_kona_smc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct bcm_kona_smc_data {
3333
unsigned result;
3434
};
3535

36-
static const struct of_device_id const bcm_kona_smc_ids[] __initconst = {
36+
static const struct of_device_id bcm_kona_smc_ids[] __initconst = {
3737
{.compatible = "brcm,kona-smc"},
3838
{.compatible = "bcm,kona-smc"}, /* deprecated name */
3939
{},

0 commit comments

Comments
 (0)