Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
kernel_linux
提交
d20ced23
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看板
提交
d20ced23
编写于
9月 14, 2016
作者:
A
Arnd Bergmann
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dt/irq-fix' into fixes
* dt/irq-fix: arm64: dts: Fix broken architected timer interrupt trigger
上级
7ccb8e63
f2a89d3b
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
44 addition
and
44 deletion
+44
-44
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+4
-4
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+4
-4
arch/arm64/boot/dts/apm/apm-storm.dtsi
arch/arm64/boot/dts/apm/apm-storm.dtsi
+4
-4
arch/arm64/boot/dts/broadcom/ns2.dtsi
arch/arm64/boot/dts/broadcom/ns2.dtsi
+4
-4
arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
+4
-4
arch/arm64/boot/dts/exynos/exynos7.dtsi
arch/arm64/boot/dts/exynos/exynos7.dtsi
+4
-4
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+4
-4
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
+4
-4
arch/arm64/boot/dts/marvell/armada-ap806.dtsi
arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+4
-4
arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
+4
-4
arch/arm64/boot/dts/xilinx/zynqmp.dtsi
arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+4
-4
未找到文件。
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
浏览文件 @
d20ced23
...
@@ -255,10 +255,10 @@
...
@@ -255,10 +255,10 @@
/* Local timer */
/* Local timer */
timer {
timer {
compatible = "arm,armv8-timer";
compatible = "arm,armv8-timer";
interrupts = <1 13 0xf0
1
>,
interrupts = <1 13 0xf0
8
>,
<1 14 0xf0
1
>,
<1 14 0xf0
8
>,
<1 11 0xf0
1
>,
<1 11 0xf0
8
>,
<1 10 0xf0
1
>;
<1 10 0xf0
8
>;
};
};
timer0: timer0@ffc03000 {
timer0: timer0@ffc03000 {
...
...
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
浏览文件 @
d20ced23
...
@@ -102,13 +102,13 @@
...
@@ -102,13 +102,13 @@
timer {
timer {
compatible = "arm,armv8-timer";
compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13
interrupts = <GIC_PPI 13
(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_
EDGE_RISING
)>,
(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_
LEVEL_LOW
)>,
<GIC_PPI 14
<GIC_PPI 14
(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_
EDGE_RISING
)>,
(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_
LEVEL_LOW
)>,
<GIC_PPI 11
<GIC_PPI 11
(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_
EDGE_RISING
)>,
(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_
LEVEL_LOW
)>,
<GIC_PPI 10
<GIC_PPI 10
(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_
EDGE_RISING
)>;
(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_
LEVEL_LOW
)>;
};
};
xtal: xtal-clk {
xtal: xtal-clk {
...
...
arch/arm64/boot/dts/apm/apm-storm.dtsi
浏览文件 @
d20ced23
...
@@ -110,10 +110,10 @@
...
@@ -110,10 +110,10 @@
timer {
timer {
compatible = "arm,armv8-timer";
compatible = "arm,armv8-timer";
interrupts = <1 0 0xff0
1
>, /* Secure Phys IRQ */
interrupts = <1 0 0xff0
8
>, /* Secure Phys IRQ */
<1 13 0xff0
1
>, /* Non-secure Phys IRQ */
<1 13 0xff0
8
>, /* Non-secure Phys IRQ */
<1 14 0xff0
1
>, /* Virt IRQ */
<1 14 0xff0
8
>, /* Virt IRQ */
<1 15 0xff0
1
>; /* Hyp IRQ */
<1 15 0xff0
8
>; /* Hyp IRQ */
clock-frequency = <50000000>;
clock-frequency = <50000000>;
};
};
...
...
arch/arm64/boot/dts/broadcom/ns2.dtsi
浏览文件 @
d20ced23
...
@@ -88,13 +88,13 @@
...
@@ -88,13 +88,13 @@
timer {
timer {
compatible = "arm,armv8-timer";
compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(0xff) |
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(0xff) |
IRQ_TYPE_
EDGE_RISING
)>,
IRQ_TYPE_
LEVEL_LOW
)>,
<GIC_PPI 14 (GIC_CPU_MASK_RAW(0xff) |
<GIC_PPI 14 (GIC_CPU_MASK_RAW(0xff) |
IRQ_TYPE_
EDGE_RISING
)>,
IRQ_TYPE_
LEVEL_LOW
)>,
<GIC_PPI 11 (GIC_CPU_MASK_RAW(0xff) |
<GIC_PPI 11 (GIC_CPU_MASK_RAW(0xff) |
IRQ_TYPE_
EDGE_RISING
)>,
IRQ_TYPE_
LEVEL_LOW
)>,
<GIC_PPI 10 (GIC_CPU_MASK_RAW(0xff) |
<GIC_PPI 10 (GIC_CPU_MASK_RAW(0xff) |
IRQ_TYPE_
EDGE_RISING
)>;
IRQ_TYPE_
LEVEL_LOW
)>;
};
};
pmu {
pmu {
...
...
arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
浏览文件 @
d20ced23
...
@@ -354,10 +354,10 @@
...
@@ -354,10 +354,10 @@
timer {
timer {
compatible = "arm,armv8-timer";
compatible = "arm,armv8-timer";
interrupts = <1 13
0xff01
>,
interrupts = <1 13
4
>,
<1 14
0xff01
>,
<1 14
4
>,
<1 11
0xff01
>,
<1 11
4
>,
<1 10
0xff01
>;
<1 10
4
>;
};
};
pmu {
pmu {
...
...
arch/arm64/boot/dts/exynos/exynos7.dtsi
浏览文件 @
d20ced23
...
@@ -473,10 +473,10 @@
...
@@ -473,10 +473,10 @@
timer {
timer {
compatible = "arm,armv8-timer";
compatible = "arm,armv8-timer";
interrupts = <1 13 0xff0
1
>,
interrupts = <1 13 0xff0
8
>,
<1 14 0xff0
1
>,
<1 14 0xff0
8
>,
<1 11 0xff0
1
>,
<1 11 0xff0
8
>,
<1 10 0xff0
1
>;
<1 10 0xff0
8
>;
};
};
pmu_system_controller: system-controller@105c0000 {
pmu_system_controller: system-controller@105c0000 {
...
...
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
浏览文件 @
d20ced23
...
@@ -119,10 +119,10 @@
...
@@ -119,10 +119,10 @@
timer {
timer {
compatible = "arm,armv8-timer";
compatible = "arm,armv8-timer";
interrupts = <1 13 0x
1
>, /* Physical Secure PPI */
interrupts = <1 13 0x
f08
>, /* Physical Secure PPI */
<1 14 0x
1
>, /* Physical Non-Secure PPI */
<1 14 0x
f08
>, /* Physical Non-Secure PPI */
<1 11 0x
1
>, /* Virtual PPI */
<1 11 0x
f08
>, /* Virtual PPI */
<1 10 0x
1
>; /* Hypervisor PPI */
<1 10 0x
f08
>; /* Hypervisor PPI */
};
};
pmu {
pmu {
...
...
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
浏览文件 @
d20ced23
...
@@ -191,10 +191,10 @@
...
@@ -191,10 +191,10 @@
timer {
timer {
compatible = "arm,armv8-timer";
compatible = "arm,armv8-timer";
interrupts = <1 13
0x8
>, /* Physical Secure PPI, active-low */
interrupts = <1 13
4
>, /* Physical Secure PPI, active-low */
<1 14
0x8
>, /* Physical Non-Secure PPI, active-low */
<1 14
4
>, /* Physical Non-Secure PPI, active-low */
<1 11
0x8
>, /* Virtual PPI, active-low */
<1 11
4
>, /* Virtual PPI, active-low */
<1 10
0x8
>; /* Hypervisor PPI, active-low */
<1 10
4
>; /* Hypervisor PPI, active-low */
};
};
pmu {
pmu {
...
...
arch/arm64/boot/dts/marvell/armada-ap806.dtsi
浏览文件 @
d20ced23
...
@@ -122,10 +122,10 @@
...
@@ -122,10 +122,10 @@
timer
{
timer
{
compatible
=
"arm,armv8-timer"
;
compatible
=
"arm,armv8-timer"
;
interrupts
=
<
GIC_PPI
13
(
GIC_CPU_MASK_SIMPLE
(
4
)
|
IRQ_TYPE_
EDGE_RISING
)>,
interrupts
=
<
GIC_PPI
13
(
GIC_CPU_MASK_SIMPLE
(
4
)
|
IRQ_TYPE_
LEVEL_LOW
)>,
<
GIC_PPI
14
(
GIC_CPU_MASK_SIMPLE
(
4
)
|
IRQ_TYPE_
EDGE_RISING
)>,
<
GIC_PPI
14
(
GIC_CPU_MASK_SIMPLE
(
4
)
|
IRQ_TYPE_
LEVEL_LOW
)>,
<
GIC_PPI
11
(
GIC_CPU_MASK_SIMPLE
(
4
)
|
IRQ_TYPE_
EDGE_RISING
)>,
<
GIC_PPI
11
(
GIC_CPU_MASK_SIMPLE
(
4
)
|
IRQ_TYPE_
LEVEL_LOW
)>,
<
GIC_PPI
10
(
GIC_CPU_MASK_SIMPLE
(
4
)
|
IRQ_TYPE_
EDGE_RISING
)>;
<
GIC_PPI
10
(
GIC_CPU_MASK_SIMPLE
(
4
)
|
IRQ_TYPE_
LEVEL_LOW
)>;
};
};
odmi
:
odmi
@
300000
{
odmi
:
odmi
@
300000
{
...
...
arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
浏览文件 @
d20ced23
...
@@ -129,10 +129,10 @@
...
@@ -129,10 +129,10 @@
timer {
timer {
compatible = "arm,armv8-timer";
compatible = "arm,armv8-timer";
interrupts = <1 13
0xf01
>,
interrupts = <1 13
4
>,
<1 14
0xf01
>,
<1 14
4
>,
<1 11
0xf01
>,
<1 11
4
>,
<1 10
0xf01
>;
<1 10
4
>;
};
};
soc {
soc {
...
...
arch/arm64/boot/dts/xilinx/zynqmp.dtsi
浏览文件 @
d20ced23
...
@@ -65,10 +65,10 @@
...
@@ -65,10 +65,10 @@
timer {
timer {
compatible = "arm,armv8-timer";
compatible = "arm,armv8-timer";
interrupt-parent = <&gic>;
interrupt-parent = <&gic>;
interrupts = <1 13 0xf0
1
>,
interrupts = <1 13 0xf0
8
>,
<1 14 0xf0
1
>,
<1 14 0xf0
8
>,
<1 11 0xf0
1
>,
<1 11 0xf0
8
>,
<1 10 0xf0
1
>;
<1 10 0xf0
8
>;
};
};
amba_apu {
amba_apu {
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录