mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
bb1eb5e8e6
1. Add support for Marvell CN9130 SoC
2. Add support for CP115,and create an armada-cp11x.dtsi file which will be used to instantiate both CP110 and CP115
3. Add support for AP807/AP807-quad,AP807 is a major component of CN9130 SoC series
4. Drop PCIe I/O ranges from CP11x file and externalize PCIe macros from CP11x file
Signed-off-by: Ian Chang <ianchang@ieiworld.com>
(cherry picked from commit c98ddf0f01)
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From 4f267f2a806b556678b84c4d80c2f4bff8d000d9 Mon Sep 17 00:00:00 2001
|
|
From: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
Date: Fri, 4 Oct 2019 16:27:23 +0200
|
|
Subject: [PATCH] arm64: dts: marvell: Move clocks to AP806 specific file
|
|
|
|
Regular clocks and CPU clocks are specific to AP806, move them out of
|
|
the generic AP80x file so that AP807 can use its own clocks.
|
|
|
|
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
---
|
|
arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 16 ++++++++++++++++
|
|
arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 12 ------------
|
|
2 files changed, 16 insertions(+), 12 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
|
|
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
|
|
@@ -12,3 +12,19 @@
|
|
model = "Marvell Armada AP806";
|
|
compatible = "marvell,armada-ap806";
|
|
};
|
|
+
|
|
+&ap_syscon0 {
|
|
+ ap_clk: clock {
|
|
+ compatible = "marvell,ap806-clock";
|
|
+ #clock-cells = <1>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&ap_syscon1 {
|
|
+ cpu_clk: clock-cpu@278 {
|
|
+ compatible = "marvell,ap806-cpu-clock";
|
|
+ clocks = <&ap_clk 0>, <&ap_clk 1>;
|
|
+ #clock-cells = <1>;
|
|
+ reg = <0x278 0xa30>;
|
|
+ };
|
|
+};
|
|
--- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
|
|
+++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
|
|
@@ -248,11 +248,6 @@
|
|
compatible = "syscon", "simple-mfd";
|
|
reg = <0x6f4000 0x2000>;
|
|
|
|
- ap_clk: clock {
|
|
- compatible = "marvell,ap806-clock";
|
|
- #clock-cells = <1>;
|
|
- };
|
|
-
|
|
ap_pinctrl: pinctrl {
|
|
compatible = "marvell,ap806-pinctrl";
|
|
|
|
@@ -278,13 +273,6 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
|
|
- cpu_clk: clock-cpu@278 {
|
|
- compatible = "marvell,ap806-cpu-clock";
|
|
- clocks = <&ap_clk 0>, <&ap_clk 1>;
|
|
- #clock-cells = <1>;
|
|
- reg = <0x278 0xa30>;
|
|
- };
|
|
-
|
|
ap_thermal: thermal-sensor@80 {
|
|
compatible = "marvell,armada-ap806-thermal";
|
|
reg = <0x80 0x10>;
|