diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-03-28 10:56:32 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-03-28 10:58:28 +0100 |
commit | cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb (patch) | |
tree | 52591d7b53600d5d39369525a356ccb81e22fcd9 /arch/arc/boot/dts/axc001.dtsi | |
parent | db779ef67ffeadbb44e9e818eb64dbe528e2f48f (diff) | |
parent | 8c2ffd9174779014c3fe1f96d9dc3641d9175f00 (diff) | |
download | linux-0-day-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.tar.gz linux-0-day-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.tar.xz |
Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
Conflicts:
include/linux/kcore.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc/boot/dts/axc001.dtsi')
-rw-r--r-- | arch/arc/boot/dts/axc001.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arc/boot/dts/axc001.dtsi b/arch/arc/boot/dts/axc001.dtsi index fdc266504ada2..37be3bf03ad63 100644 --- a/arch/arc/boot/dts/axc001.dtsi +++ b/arch/arc/boot/dts/axc001.dtsi @@ -41,7 +41,7 @@ * this GPIO block ORs all interrupts on CPU card (creg,..) * to uplink only 1 IRQ to ARC core intc */ - dw-apb-gpio@0x2000 { + dw-apb-gpio@2000 { compatible = "snps,dw-apb-gpio"; reg = < 0x2000 0x80 >; #address-cells = <1>; @@ -60,7 +60,7 @@ }; }; - debug_uart: dw-apb-uart@0x5000 { + debug_uart: dw-apb-uart@5000 { compatible = "snps,dw-apb-uart"; reg = <0x5000 0x100>; clock-frequency = <33333000>; @@ -88,7 +88,7 @@ * avoid duplicating the MB dtsi file given that IRQ from * this intc to cpu intc are different for axs101 and axs103 */ - mb_intc: dw-apb-ictl@0xe0012000 { + mb_intc: dw-apb-ictl@e0012000 { #interrupt-cells = <1>; compatible = "snps,dw-apb-ictl"; reg = < 0x0 0xe0012000 0x0 0x200 >; |