Skip to content

Commit 3b7b496

Browse files
authored
Merge pull request #8 from frank-w/4.16-main
4.16 main
2 parents 50b4545 + d094bf3 commit 3b7b496

File tree

409 files changed

+4181
-2271
lines changed

Some content is hidden

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

409 files changed

+4181
-2271
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,8 @@ all.config
131131
#Automatically generated by ASN.1 compiler
132132
net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c
133133
net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h
134+
135+
#own
136+
arch/arm/boot/zImage-dtb
137+
uImage
138+
uboot/

Documentation/devicetree/bindings/display/panel/panel-common.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Display Timings
3838
require specific display timings. The panel-timing subnode expresses those
3939
timings as specified in the timing subnode section of the display timing
4040
bindings defined in
41-
Documentation/devicetree/bindings/display/display-timing.txt.
41+
Documentation/devicetree/bindings/display/panel/display-timing.txt.
4242

4343

4444
Connectivity

Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Required Properties:
2525
- "renesas,dmac-r8a7794" (R-Car E2)
2626
- "renesas,dmac-r8a7795" (R-Car H3)
2727
- "renesas,dmac-r8a7796" (R-Car M3-W)
28+
- "renesas,dmac-r8a77965" (R-Car M3-N)
2829
- "renesas,dmac-r8a77970" (R-Car V3M)
2930

3031
- reg: base address and length of the registers block for the DMAC

Documentation/devicetree/bindings/net/renesas,ravb.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Required properties:
1717

1818
- "renesas,etheravb-r8a7795" for the R8A7795 SoC.
1919
- "renesas,etheravb-r8a7796" for the R8A7796 SoC.
20+
- "renesas,etheravb-r8a77965" for the R8A77965 SoC.
2021
- "renesas,etheravb-r8a77970" for the R8A77970 SoC.
2122
- "renesas,etheravb-r8a77980" for the R8A77980 SoC.
2223
- "renesas,etheravb-r8a77995" for the R8A77995 SoC.

Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ pins it needs, and how they should be configured, with regard to muxer
5555
configuration, drive strength and pullups. If one of these options is
5656
not set, its actual value will be unspecified.
5757

58-
This driver supports the generic pin multiplexing and configuration
59-
bindings. For details on each properties, you can refer to
60-
./pinctrl-bindings.txt.
58+
Allwinner A1X Pin Controller supports the generic pin multiplexing and
59+
configuration bindings. For details on each properties, you can refer to
60+
./pinctrl-bindings.txt.
6161

6262
Required sub-node properties:
6363
- pins

Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Required properties:
2121
- interrupts : identifier to the device interrupt
2222
- clocks : a list of phandle + clock-specifier pairs, one for each
2323
entry in clock names.
24-
- clocks-names :
24+
- clock-names :
2525
* "xtal" for external xtal clock identifier
2626
* "pclk" for the bus core clock, either the clk81 clock or the gate clock
2727
* "baud" for the source of the baudrate generator, can be either the xtal

Documentation/devicetree/bindings/serial/mvebu-uart.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Required properties:
2424
- Must contain two elements for the extended variant of the IP
2525
(marvell,armada-3700-uart-ext): "uart-tx" and "uart-rx",
2626
respectively the UART TX interrupt and the UART RX interrupt. A
27-
corresponding interrupts-names property must be defined.
27+
corresponding interrupt-names property must be defined.
2828
- For backward compatibility reasons, a single element interrupts
2929
property is also supported for the standard variant of the IP,
3030
containing only the UART sum interrupt. This form is deprecated

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ Required properties:
4141
- "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART.
4242
- "renesas,scif-r8a7796" for R8A7796 (R-Car M3-W) SCIF compatible UART.
4343
- "renesas,hscif-r8a7796" for R8A7796 (R-Car M3-W) HSCIF compatible UART.
44+
- "renesas,scif-r8a77965" for R8A77965 (R-Car M3-N) SCIF compatible UART.
45+
- "renesas,hscif-r8a77965" for R8A77965 (R-Car M3-N) HSCIF compatible UART.
4446
- "renesas,scif-r8a77970" for R8A77970 (R-Car V3M) SCIF compatible UART.
4547
- "renesas,hscif-r8a77970" for R8A77970 (R-Car V3M) HSCIF compatible UART.
4648
- "renesas,scif-r8a77995" for R8A77995 (R-Car D3) SCIF compatible UART.

Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ karo Ka-Ro electronics GmbH
181181
keithkoep Keith & Koep GmbH
182182
keymile Keymile GmbH
183183
khadas Khadas
184+
kiebackpeter Kieback & Peter GmbH
184185
kinetic Kinetic Technologies
185186
kingnovel Kingnovel Technology Co., Ltd.
186187
kosagi Sutajio Ko-Usagi PTE Ltd.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 16
4-
SUBLEVEL = 15
4+
SUBLEVEL = 18
55
EXTRAVERSION =
66
NAME = Fearless Coyote
77

0 commit comments

Comments
 (0)