提交 02d98f61 编写于 作者: S Sebastian Reichel 提交者: Zheng Zengkai

ARM: dts: ux500: Fix interrupt cells

stable inclusion
from stable-5.10.53
commit 985947c53555bfbba4a66c18826186398c9e1361
bugzilla: 175574 https://gitee.com/openeuler/kernel/issues/I4DTUX

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=985947c53555bfbba4a66c18826186398c9e1361

--------------------------------

[ Upstream commit e4ff0112 ]

Fix interrupt cells in DT AB8500/AB8505 source files. The
compiled DTB files will stay the same.
Signed-off-by: NSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 b4cbf4fe
...@@ -42,15 +42,15 @@ ...@@ -42,15 +42,15 @@
ab8500-rtc { ab8500-rtc {
compatible = "stericsson,ab8500-rtc"; compatible = "stericsson,ab8500-rtc";
interrupts = <17 IRQ_TYPE_LEVEL_HIGH interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,
18 IRQ_TYPE_LEVEL_HIGH>; <18 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "60S", "ALARM"; interrupt-names = "60S", "ALARM";
}; };
gpadc: ab8500-gpadc { gpadc: ab8500-gpadc {
compatible = "stericsson,ab8500-gpadc"; compatible = "stericsson,ab8500-gpadc";
interrupts = <32 IRQ_TYPE_LEVEL_HIGH interrupts = <32 IRQ_TYPE_LEVEL_HIGH>,
39 IRQ_TYPE_LEVEL_HIGH>; <39 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "HW_CONV_END", "SW_CONV_END"; interrupt-names = "HW_CONV_END", "SW_CONV_END";
vddadc-supply = <&ab8500_ldo_tvout_reg>; vddadc-supply = <&ab8500_ldo_tvout_reg>;
#address-cells = <1>; #address-cells = <1>;
...@@ -169,13 +169,13 @@ ...@@ -169,13 +169,13 @@
ab8500_usb { ab8500_usb {
compatible = "stericsson,ab8500-usb"; compatible = "stericsson,ab8500-usb";
interrupts = < 90 IRQ_TYPE_LEVEL_HIGH interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,
96 IRQ_TYPE_LEVEL_HIGH <96 IRQ_TYPE_LEVEL_HIGH>,
14 IRQ_TYPE_LEVEL_HIGH <14 IRQ_TYPE_LEVEL_HIGH>,
15 IRQ_TYPE_LEVEL_HIGH <15 IRQ_TYPE_LEVEL_HIGH>,
79 IRQ_TYPE_LEVEL_HIGH <79 IRQ_TYPE_LEVEL_HIGH>,
74 IRQ_TYPE_LEVEL_HIGH <74 IRQ_TYPE_LEVEL_HIGH>,
75 IRQ_TYPE_LEVEL_HIGH>; <75 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ID_WAKEUP_R", interrupt-names = "ID_WAKEUP_R",
"ID_WAKEUP_F", "ID_WAKEUP_F",
"VBUS_DET_F", "VBUS_DET_F",
...@@ -192,8 +192,8 @@ ...@@ -192,8 +192,8 @@
ab8500-ponkey { ab8500-ponkey {
compatible = "stericsson,ab8500-poweron-key"; compatible = "stericsson,ab8500-poweron-key";
interrupts = <6 IRQ_TYPE_LEVEL_HIGH interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,
7 IRQ_TYPE_LEVEL_HIGH>; <7 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
}; };
......
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
ab8500-rtc { ab8500-rtc {
compatible = "stericsson,ab8500-rtc"; compatible = "stericsson,ab8500-rtc";
interrupts = <17 IRQ_TYPE_LEVEL_HIGH interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,
18 IRQ_TYPE_LEVEL_HIGH>; <18 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "60S", "ALARM"; interrupt-names = "60S", "ALARM";
}; };
...@@ -131,13 +131,13 @@ ...@@ -131,13 +131,13 @@
ab8500_usb: ab8500_usb { ab8500_usb: ab8500_usb {
compatible = "stericsson,ab8500-usb"; compatible = "stericsson,ab8500-usb";
interrupts = < 90 IRQ_TYPE_LEVEL_HIGH interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,
96 IRQ_TYPE_LEVEL_HIGH <96 IRQ_TYPE_LEVEL_HIGH>,
14 IRQ_TYPE_LEVEL_HIGH <14 IRQ_TYPE_LEVEL_HIGH>,
15 IRQ_TYPE_LEVEL_HIGH <15 IRQ_TYPE_LEVEL_HIGH>,
79 IRQ_TYPE_LEVEL_HIGH <79 IRQ_TYPE_LEVEL_HIGH>,
74 IRQ_TYPE_LEVEL_HIGH <74 IRQ_TYPE_LEVEL_HIGH>,
75 IRQ_TYPE_LEVEL_HIGH>; <75 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ID_WAKEUP_R", interrupt-names = "ID_WAKEUP_R",
"ID_WAKEUP_F", "ID_WAKEUP_F",
"VBUS_DET_F", "VBUS_DET_F",
...@@ -154,8 +154,8 @@ ...@@ -154,8 +154,8 @@
ab8500-ponkey { ab8500-ponkey {
compatible = "stericsson,ab8500-poweron-key"; compatible = "stericsson,ab8500-poweron-key";
interrupts = <6 IRQ_TYPE_LEVEL_HIGH interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,
7 IRQ_TYPE_LEVEL_HIGH>; <7 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册