Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
kernel_linux
提交
9601000c
K
kernel_linux
项目概览
OpenHarmony
/
kernel_linux
上一次同步 4 年多
通知
15
Star
8
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kernel_linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
9601000c
编写于
5月 14, 2018
作者:
R
Rob Herring
浏览文件
操作
浏览文件
下载
差异文件
Merge tag 'devicetree-fixes-for-4.17' into dt/next to pick-up fixes
上级
2ff0e41a
f1303070
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
42 addition
and
18 deletion
+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
未找到文件。
Documentation/devicetree/bindings/display/panel/panel-common.txt
浏览文件 @
9601000c
...
@@ -38,7 +38,7 @@ Display Timings
...
@@ -38,7 +38,7 @@ Display Timings
require specific display timings. The panel-timing subnode expresses those
require specific display timings. The panel-timing subnode expresses those
timings as specified in the timing subnode section of the display timing
timings as specified in the timing subnode section of the display timing
bindings defined in
bindings defined in
Documentation/devicetree/bindings/display/display-timing.txt.
Documentation/devicetree/bindings/display/
panel/
display-timing.txt.
Connectivity
Connectivity
...
...
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
浏览文件 @
9601000c
...
@@ -26,6 +26,7 @@ Required Properties:
...
@@ -26,6 +26,7 @@ Required Properties:
- "renesas,dmac-r8a7794" (R-Car E2)
- "renesas,dmac-r8a7794" (R-Car E2)
- "renesas,dmac-r8a7795" (R-Car H3)
- "renesas,dmac-r8a7795" (R-Car H3)
- "renesas,dmac-r8a7796" (R-Car M3-W)
- "renesas,dmac-r8a7796" (R-Car M3-W)
- "renesas,dmac-r8a77965" (R-Car M3-N)
- "renesas,dmac-r8a77970" (R-Car V3M)
- "renesas,dmac-r8a77970" (R-Car V3M)
- "renesas,dmac-r8a77980" (R-Car V3H)
- "renesas,dmac-r8a77980" (R-Car V3H)
...
...
Documentation/devicetree/bindings/net/renesas,ravb.txt
浏览文件 @
9601000c
...
@@ -18,6 +18,7 @@ Required properties:
...
@@ -18,6 +18,7 @@ Required properties:
- "renesas,etheravb-r8a7795" for the R8A7795 SoC.
- "renesas,etheravb-r8a7795" for the R8A7795 SoC.
- "renesas,etheravb-r8a7796" for the R8A7796 SoC.
- "renesas,etheravb-r8a7796" for the R8A7796 SoC.
- "renesas,etheravb-r8a77965" for the R8A77965 SoC.
- "renesas,etheravb-r8a77970" for the R8A77970 SoC.
- "renesas,etheravb-r8a77970" for the R8A77970 SoC.
- "renesas,etheravb-r8a77980" for the R8A77980 SoC.
- "renesas,etheravb-r8a77980" for the R8A77980 SoC.
- "renesas,etheravb-r8a77995" for the R8A77995 SoC.
- "renesas,etheravb-r8a77995" for the R8A77995 SoC.
...
...
Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
浏览文件 @
9601000c
...
@@ -56,9 +56,9 @@ pins it needs, and how they should be configured, with regard to muxer
...
@@ -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
configuration, drive strength and pullups. If one of these options is
not set, its actual value will be unspecified.
not set, its actual value will be unspecified.
This driver supports the generic pin multiplexing and configuration
Allwinner A1X Pin Controller supports the generic pin multiplexing and
bindings. For details on each properties, you can refer to
configuration
bindings. For details on each properties, you can refer to
./pinctrl-bindings.txt.
./pinctrl-bindings.txt.
Required sub-node properties:
Required sub-node properties:
- pins
- pins
...
...
Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt
浏览文件 @
9601000c
...
@@ -21,7 +21,7 @@ Required properties:
...
@@ -21,7 +21,7 @@ Required properties:
- interrupts : identifier to the device interrupt
- interrupts : identifier to the device interrupt
- clocks : a list of phandle + clock-specifier pairs, one for each
- clocks : a list of phandle + clock-specifier pairs, one for each
entry in clock names.
entry in clock names.
- clock
s
-names :
- clock-names :
* "xtal" for external xtal clock identifier
* "xtal" for external xtal clock identifier
* "pclk" for the bus core clock, either the clk81 clock or the gate clock
* "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
* "baud" for the source of the baudrate generator, can be either the xtal
...
...
Documentation/devicetree/bindings/serial/mvebu-uart.txt
浏览文件 @
9601000c
...
@@ -24,7 +24,7 @@ Required properties:
...
@@ -24,7 +24,7 @@ Required properties:
- Must contain two elements for the extended variant of the IP
- Must contain two elements for the extended variant of the IP
(marvell,armada-3700-uart-ext): "uart-tx" and "uart-rx",
(marvell,armada-3700-uart-ext): "uart-tx" and "uart-rx",
respectively the UART TX interrupt and the UART RX interrupt. A
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
- For backward compatibility reasons, a single element interrupts
property is also supported for the standard variant of the IP,
property is also supported for the standard variant of the IP,
containing only the UART sum interrupt. This form is deprecated
containing only the UART sum interrupt. This form is deprecated
...
...
Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
浏览文件 @
9601000c
...
@@ -41,6 +41,8 @@ Required properties:
...
@@ -41,6 +41,8 @@ Required properties:
- "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART.
- "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART.
- "renesas,scif-r8a7796" for R8A7796 (R-Car M3-W) SCIF 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,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,scif-r8a77970" for R8A77970 (R-Car V3M) SCIF compatible UART.
- "renesas,hscif-r8a77970" for R8A77970 (R-Car V3M) HSCIF compatible UART.
- "renesas,hscif-r8a77970" for R8A77970 (R-Car V3M) HSCIF compatible UART.
- "renesas,scif-r8a77980" for R8A77980 (R-Car V3H) SCIF compatible UART.
- "renesas,scif-r8a77980" for R8A77980 (R-Car V3H) SCIF compatible UART.
...
...
Documentation/devicetree/bindings/vendor-prefixes.txt
浏览文件 @
9601000c
...
@@ -183,6 +183,7 @@ karo Ka-Ro electronics GmbH
...
@@ -183,6 +183,7 @@ karo Ka-Ro electronics GmbH
keithkoep Keith & Koep GmbH
keithkoep Keith & Koep GmbH
keymile Keymile GmbH
keymile Keymile GmbH
khadas Khadas
khadas Khadas
kiebackpeter Kieback & Peter GmbH
kinetic Kinetic Technologies
kinetic Kinetic Technologies
kingnovel Kingnovel Technology Co., Ltd.
kingnovel Kingnovel Technology Co., Ltd.
koe Kaohsiung Opto-Electronics Inc.
koe Kaohsiung Opto-Electronics Inc.
...
...
Documentation/devicetree/overlay-notes.txt
浏览文件 @
9601000c
...
@@ -98,6 +98,14 @@ Finally, if you need to remove all overlays in one-go, just call
...
@@ -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
of_overlay_remove_all() which will remove every single one in the correct
order.
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
Overlay DTS Format
------------------
------------------
...
...
drivers/of/overlay.c
浏览文件 @
9601000c
...
@@ -102,12 +102,28 @@ static DEFINE_IDR(ovcs_idr);
...
@@ -102,12 +102,28 @@ static DEFINE_IDR(ovcs_idr);
static
BLOCKING_NOTIFIER_HEAD
(
overlay_notify_chain
);
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
)
int
of_overlay_notifier_register
(
struct
notifier_block
*
nb
)
{
{
return
blocking_notifier_chain_register
(
&
overlay_notify_chain
,
nb
);
return
blocking_notifier_chain_register
(
&
overlay_notify_chain
,
nb
);
}
}
EXPORT_SYMBOL_GPL
(
of_overlay_notifier_register
);
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
)
int
of_overlay_notifier_unregister
(
struct
notifier_block
*
nb
)
{
{
return
blocking_notifier_chain_unregister
(
&
overlay_notify_chain
,
nb
);
return
blocking_notifier_chain_unregister
(
&
overlay_notify_chain
,
nb
);
...
@@ -671,17 +687,13 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs)
...
@@ -671,17 +687,13 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs)
of_node_put
(
ovcs
->
fragments
[
i
].
overlay
);
of_node_put
(
ovcs
->
fragments
[
i
].
overlay
);
}
}
kfree
(
ovcs
->
fragments
);
kfree
(
ovcs
->
fragments
);
/*
/*
* TODO
* There should be no live pointers into ovcs->overlay_tree and
*
* ovcs->fdt due to the policy that overlay notifiers are not allowed
* would like to: kfree(ovcs->overlay_tree);
* to retain pointers into the overlay devicetree.
* 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
*/
*/
kfree
(
ovcs
->
overlay_tree
);
kfree
(
ovcs
->
fdt
);
kfree
(
ovcs
);
kfree
(
ovcs
);
}
}
...
...
scripts/dtc/checks.c
浏览文件 @
9601000c
...
@@ -787,10 +787,9 @@ static void check_pci_bridge(struct check *c, struct dt_info *dti, struct node *
...
@@ -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"
);
FAIL
(
c
,
dti
,
node
,
"incorrect #size-cells for PCI bridge"
);
prop
=
get_property
(
node
,
"bus-range"
);
prop
=
get_property
(
node
,
"bus-range"
);
if
(
!
prop
)
{
if
(
!
prop
)
FAIL
(
c
,
dti
,
node
,
"missing bus-range for PCI bridge"
);
return
;
return
;
}
if
(
prop
->
val
.
len
!=
(
sizeof
(
cell_t
)
*
2
))
{
if
(
prop
->
val
.
len
!=
(
sizeof
(
cell_t
)
*
2
))
{
FAIL_PROP
(
c
,
dti
,
node
,
prop
,
"value must be 2 cells"
);
FAIL_PROP
(
c
,
dti
,
node
,
prop
,
"value must be 2 cells"
);
return
;
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录