diff options
author | 2017-08-10 12:02:26 +0200 | |
---|---|---|
committer | 2017-08-10 12:02:26 +0200 | |
commit | 1ccb2f4e8e435a53bb378e8b092087f091754aa6 (patch) | |
tree | ba120509947138915e06ad39cca5f065bd99f42f /arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | |
parent | Merge tag 'perf-core-for-mingo-4.14-20170728' of git://git.kernel.org/pub/scm... (diff) | |
parent | perf/core: Fix time on IOC_ENABLE (diff) | |
download | linux-1ccb2f4e8e435a53bb378e8b092087f091754aa6.tar.gz linux-1ccb2f4e8e435a53bb378e8b092087f091754aa6.tar.bz2 linux-1ccb2f4e8e435a53bb378e8b092087f091754aa6.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 9d00622ce845..bd0f33b77f57 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -452,7 +452,7 @@ emac: ethernet@1c30000 { compatible = "allwinner,sun50i-a64-emac"; syscon = <&syscon>; - reg = <0x01c30000 0x100>; + reg = <0x01c30000 0x10000>; interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "macirq"; resets = <&ccu RST_BUS_EMAC>; |