51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
From e9c44d56904f321427d93e30314790e561cf7b6e Mon Sep 17 00:00:00 2001
|
|
From: Ziyuan Xu <xzy.xu@rock-chips.com>
|
|
Date: Thu, 21 Mar 2019 11:32:02 +0800
|
|
Subject: [PATCH 92/97] arm64: dts: rockchip: replace cpuinfo device node to
|
|
rk3399.dtsi
|
|
|
|
Change-Id: I5776fb36be90bd67b2f2efee17d06f037b7a1665
|
|
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3399-android.dtsi | 6 ------
|
|
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 ++++++
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
|
|
index b9f5ad1857b6..9618ca1d0a93 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
|
|
@@ -51,12 +51,6 @@
|
|
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1";
|
|
};
|
|
|
|
- cpuinfo {
|
|
- compatible = "rockchip,cpuinfo";
|
|
- nvmem-cells = <&cpu_id>;
|
|
- nvmem-cell-names = "id";
|
|
- };
|
|
-
|
|
ramoops_mem: ramoops_mem {
|
|
reg = <0x0 0x110000 0x0 0xf0000>;
|
|
reg-names = "ramoops_mem";
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
index 815a8c131239..83450560913d 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
@@ -195,6 +195,12 @@
|
|
};
|
|
};
|
|
|
|
+ cpuinfo {
|
|
+ compatible = "rockchip,cpuinfo";
|
|
+ nvmem-cells = <&cpu_id>;
|
|
+ nvmem-cell-names = "id";
|
|
+ };
|
|
+
|
|
pmu_a53 {
|
|
compatible = "arm,cortex-a53-pmu";
|
|
interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &ppi_cluster0>;
|
|
--
|
|
2.25.1
|
|
|