Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
9601000c
Commit
9601000c
authored
May 14, 2018
by
Rob Herring
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'devicetree-fixes-for-4.17' into dt/next to pick-up fixes
parents
2ff0e41a
f1303070
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
42 additions
and
18 deletions
+42
-18
Documentation/devicetree/bindings/display/panel/panel-common.txt
...tation/devicetree/bindings/display/panel/panel-common.txt
+1
-1
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
+1
-0
Documentation/devicetree/bindings/net/renesas,ravb.txt
Documentation/devicetree/bindings/net/renesas,ravb.txt
+1
-0
Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
...n/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
+3
-3
Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt
...ntation/devicetree/bindings/serial/amlogic,meson-uart.txt
+1
-1
Documentation/devicetree/bindings/serial/mvebu-uart.txt
Documentation/devicetree/bindings/serial/mvebu-uart.txt
+1
-1
Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
...ntation/devicetree/bindings/serial/renesas,sci-serial.txt
+2
-0
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
+1
-0
Documentation/devicetree/overlay-notes.txt
Documentation/devicetree/overlay-notes.txt
+8
-0
drivers/of/overlay.c
drivers/of/overlay.c
+21
-9
scripts/dtc/checks.c
scripts/dtc/checks.c
+2
-3
No files found.
Documentation/devicetree/bindings/display/panel/panel-common.txt
View file @
9601000c
...
...
@@ -38,7 +38,7 @@ Display Timings
require specific display timings. The panel-timing subnode expresses those
timings as specified in the timing subnode section of the display timing
bindings defined in
Documentation/devicetree/bindings/display/display-timing.txt.
Documentation/devicetree/bindings/display/
panel/
display-timing.txt.
Connectivity
...
...
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
View file @
9601000c
...
...
@@ -26,6 +26,7 @@ Required Properties:
- "renesas,dmac-r8a7794" (R-Car E2)
- "renesas,dmac-r8a7795" (R-Car H3)
- "renesas,dmac-r8a7796" (R-Car M3-W)
- "renesas,dmac-r8a77965" (R-Car M3-N)
- "renesas,dmac-r8a77970" (R-Car V3M)
- "renesas,dmac-r8a77980" (R-Car V3H)
...
...
Documentation/devicetree/bindings/net/renesas,ravb.txt
View file @
9601000c
...
...
@@ -18,6 +18,7 @@ Required properties:
- "renesas,etheravb-r8a7795" for the R8A7795 SoC.
- "renesas,etheravb-r8a7796" for the R8A7796 SoC.
- "renesas,etheravb-r8a77965" for the R8A77965 SoC.
- "renesas,etheravb-r8a77970" for the R8A77970 SoC.
- "renesas,etheravb-r8a77980" for the R8A77980 SoC.
- "renesas,etheravb-r8a77995" for the R8A77995 SoC.
...
...
Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
View file @
9601000c
...
...
@@ -56,9 +56,9 @@ pins it needs, and how they should be configured, with regard to muxer
configuration, drive strength and pullups. If one of these options is
not set, its actual value will be unspecified.
This driver supports the generic pin multiplexing and configuration
bindings. For details on each properties, you can refer to
./pinctrl-bindings.txt.
Allwinner A1X Pin Controller supports the generic pin multiplexing and
configuration
bindings. For details on each properties, you can refer to
./pinctrl-bindings.txt.
Required sub-node properties:
- pins
...
...
Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt
View file @
9601000c
...
...
@@ -21,7 +21,7 @@ Required properties:
- interrupts : identifier to the device interrupt
- clocks : a list of phandle + clock-specifier pairs, one for each
entry in clock names.
- clock
s
-names :
- clock-names :
* "xtal" for external xtal clock identifier
* "pclk" for the bus core clock, either the clk81 clock or the gate clock
* "baud" for the source of the baudrate generator, can be either the xtal
...
...
Documentation/devicetree/bindings/serial/mvebu-uart.txt
View file @
9601000c
...
...
@@ -24,7 +24,7 @@ Required properties:
- Must contain two elements for the extended variant of the IP
(marvell,armada-3700-uart-ext): "uart-tx" and "uart-rx",
respectively the UART TX interrupt and the UART RX interrupt. A
corresponding interrupt
s
-names property must be defined.
corresponding interrupt-names property must be defined.
- For backward compatibility reasons, a single element interrupts
property is also supported for the standard variant of the IP,
containing only the UART sum interrupt. This form is deprecated
...
...
Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
View file @
9601000c
...
...
@@ -41,6 +41,8 @@ Required properties:
- "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART.
- "renesas,scif-r8a7796" for R8A7796 (R-Car M3-W) SCIF compatible UART.
- "renesas,hscif-r8a7796" for R8A7796 (R-Car M3-W) HSCIF compatible UART.
- "renesas,scif-r8a77965" for R8A77965 (R-Car M3-N) SCIF compatible UART.
- "renesas,hscif-r8a77965" for R8A77965 (R-Car M3-N) HSCIF compatible UART.
- "renesas,scif-r8a77970" for R8A77970 (R-Car V3M) SCIF compatible UART.
- "renesas,hscif-r8a77970" for R8A77970 (R-Car V3M) HSCIF compatible UART.
- "renesas,scif-r8a77980" for R8A77980 (R-Car V3H) SCIF compatible UART.
...
...
Documentation/devicetree/bindings/vendor-prefixes.txt
View file @
9601000c
...
...
@@ -183,6 +183,7 @@ karo Ka-Ro electronics GmbH
keithkoep Keith & Koep GmbH
keymile Keymile GmbH
khadas Khadas
kiebackpeter Kieback & Peter GmbH
kinetic Kinetic Technologies
kingnovel Kingnovel Technology Co., Ltd.
koe Kaohsiung Opto-Electronics Inc.
...
...
Documentation/devicetree/overlay-notes.txt
View file @
9601000c
...
...
@@ -98,6 +98,14 @@ Finally, if you need to remove all overlays in one-go, just call
of_overlay_remove_all() which will remove every single one in the correct
order.
In addition, there is the option to register notifiers that get called on
overlay operations. See of_overlay_notifier_register/unregister and
enum of_overlay_notify_action for details.
Note that a notifier callback is not supposed to store pointers to a device
tree node or its content beyond OF_OVERLAY_POST_REMOVE corresponding to the
respective node it received.
Overlay DTS Format
------------------
...
...
drivers/of/overlay.c
View file @
9601000c
...
...
@@ -102,12 +102,28 @@ static DEFINE_IDR(ovcs_idr);
static
BLOCKING_NOTIFIER_HEAD
(
overlay_notify_chain
);
/**
* of_overlay_notifier_register() - Register notifier for overlay operations
* @nb: Notifier block to register
*
* Register for notification on overlay operations on device tree nodes. The
* reported actions definied by @of_reconfig_change. The notifier callback
* furthermore receives a pointer to the affected device tree node.
*
* Note that a notifier callback is not supposed to store pointers to a device
* tree node or its content beyond @OF_OVERLAY_POST_REMOVE corresponding to the
* respective node it received.
*/
int
of_overlay_notifier_register
(
struct
notifier_block
*
nb
)
{
return
blocking_notifier_chain_register
(
&
overlay_notify_chain
,
nb
);
}
EXPORT_SYMBOL_GPL
(
of_overlay_notifier_register
);
/**
* of_overlay_notifier_register() - Unregister notifier for overlay operations
* @nb: Notifier block to unregister
*/
int
of_overlay_notifier_unregister
(
struct
notifier_block
*
nb
)
{
return
blocking_notifier_chain_unregister
(
&
overlay_notify_chain
,
nb
);
...
...
@@ -671,17 +687,13 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs)
of_node_put
(
ovcs
->
fragments
[
i
].
overlay
);
}
kfree
(
ovcs
->
fragments
);
/*
* TODO
*
* would like to: kfree(ovcs->overlay_tree);
* but can not since drivers may have pointers into this data
*
* would like to: kfree(ovcs->fdt);
* but can not since drivers may have pointers into this data
* There should be no live pointers into ovcs->overlay_tree and
* ovcs->fdt due to the policy that overlay notifiers are not allowed
* to retain pointers into the overlay devicetree.
*/
kfree
(
ovcs
->
overlay_tree
);
kfree
(
ovcs
->
fdt
);
kfree
(
ovcs
);
}
...
...
scripts/dtc/checks.c
View file @
9601000c
...
...
@@ -787,10 +787,9 @@ static void check_pci_bridge(struct check *c, struct dt_info *dti, struct node *
FAIL
(
c
,
dti
,
node
,
"incorrect #size-cells for PCI bridge"
);
prop
=
get_property
(
node
,
"bus-range"
);
if
(
!
prop
)
{
FAIL
(
c
,
dti
,
node
,
"missing bus-range for PCI bridge"
);
if
(
!
prop
)
return
;
}
if
(
prop
->
val
.
len
!=
(
sizeof
(
cell_t
)
*
2
))
{
FAIL_PROP
(
c
,
dti
,
node
,
prop
,
"value must be 2 cells"
);
return
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment