From 79b00cf8c705ba137595e79164f4d9bf67559dcc Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 16 Mar 2021 11:45:41 -0500
Subject: [PATCH] sync cleanups
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
src/arm/am335x-boneblack-roboticscape.dts | 5 +++++
src/arm/am335x-boneblack-wireless-roboticscape.dts | 7 ++++++-
src/arm/am33xx.dtsi | 4 ++--
src/arm/am5729-beagleboneai.dts | 4 ++--
src/arm/am57xx-beagle-x15-common.dtsi | 8 ++++----
src/arm/dra7xx-clocks.dtsi | 1 +
src/arm/omap5.dtsi | 2 +-
src/arm/omap54xx-clocks.dtsi | 1 +
8 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/arm/am335x-boneblack-roboticscape.dts b/src/arm/am335x-boneblack-roboticscape.dts
index 2431c40..4a37ccf 100644
--- a/src/arm/am335x-boneblack-roboticscape.dts
+++ b/src/arm/am335x-boneblack-roboticscape.dts
@@ -6,6 +6,10 @@
#include "am33xx.dtsi"
#include "am335x-bone-common-no-capemgr.dtsi"
+/* #include "am335x-boneblack-common.dtsi" */
+/* #include "am335x-bone-jtag.dtsi" */
+
+/* RoboticsCape */
#include "am335x-bone-common-universal-pins.dtsi"
#include "am335x-roboticscape.dtsi"
@@ -14,6 +18,7 @@
compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
};
+/* needed from: am335x-boneblack-common.dtsi */
&ldo3_reg {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
diff --git a/src/arm/am335x-boneblack-wireless-roboticscape.dts b/src/arm/am335x-boneblack-wireless-roboticscape.dts
index 5d2f359..0856e16 100644
--- a/src/arm/am335x-boneblack-wireless-roboticscape.dts
+++ b/src/arm/am335x-boneblack-wireless-roboticscape.dts
@@ -6,13 +6,18 @@
#include "am33xx.dtsi"
#include "am335x-bone-common-no-capemgr.dtsi"
+/* #include "am335x-boneblack-common.dtsi" */
+/* #include "am335x-bone-jtag.dtsi" */
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/* RoboticsCape */
#include "am335x-bone-common-universal-pins.dtsi"
#include "am335x-boneblack-wl1835.dtsi"
#include "am335x-roboticscape.dtsi"
/ {
model = "TI AM335x BeagleBone Black Wireless RoboticsCape";
- compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+ compatible = "ti,am335x-bone-black-wireless", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
};
&ldo3_reg {
diff --git a/src/arm/am33xx.dtsi b/src/arm/am33xx.dtsi
index 7b531cf..f43988f 100644
--- a/src/arm/am33xx.dtsi
+++ b/src/arm/am33xx.dtsi
@@ -647,7 +647,7 @@
status = "disabled";
};
- mailbox: mailbox@480C8000 {
+ mailbox: mailbox@480c8000 {
compatible = "ti,omap4-mailbox";
reg = <0x480C8000 0x200>;
interrupts = <77>;
@@ -1268,7 +1268,7 @@
dma-names = "tx", "rx";
};
- mcasp1: mcasp@4803C000 {
+ mcasp1: mcasp@4803c000 {
compatible = "ti,am33xx-mcasp-audio";
ti,hwmods = "mcasp1";
reg = <0x4803C000 0x2000>,
diff --git a/src/arm/am5729-beagleboneai.dts b/src/arm/am5729-beagleboneai.dts
index f6f5957..b8e3f7c 100644
--- a/src/arm/am5729-beagleboneai.dts
+++ b/src/arm/am5729-beagleboneai.dts
@@ -223,8 +223,8 @@
compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&brcmf_pwrseq_pins_default>;
- reset-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>, // BT-REG-ON
- <&gpio3 18 GPIO_ACTIVE_LOW>; // WL-REG-ON
+ reset-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>, /* BT-REG-ON */
+ <&gpio3 18 GPIO_ACTIVE_LOW>; /* WL-REG-ON */
};
unused_pins: unused_pins {
diff --git a/src/arm/am57xx-beagle-x15-common.dtsi b/src/arm/am57xx-beagle-x15-common.dtsi
index 5f5b25f..728d70a 100644
--- a/src/arm/am57xx-beagle-x15-common.dtsi
+++ b/src/arm/am57xx-beagle-x15-common.dtsi
@@ -584,11 +584,11 @@
};
&gpu {
- status = "ok";
+ status = "okay";
};
&dss {
- status = "ok";
+ status = "okay";
vdda_video-supply = <&ldoln_reg>;
};
@@ -602,7 +602,7 @@
};
&hdmi {
- status = "ok";
+ status = "okay";
vdda-supply = <&ldo4_reg>;
port {
@@ -613,7 +613,7 @@
};
&pcie1_rc {
- status = "ok";
+ status = "okay";
gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
};
diff --git a/src/arm/dra7xx-clocks.dtsi b/src/arm/dra7xx-clocks.dtsi
index 2237b67..1480e3a 100644
--- a/src/arm/dra7xx-clocks.dtsi
+++ b/src/arm/dra7xx-clocks.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Device Tree Source for DRA7xx clock data
*
diff --git a/src/arm/omap5.dtsi b/src/arm/omap5.dtsi
index 03959bd..c143b1a 100644
--- a/src/arm/omap5.dtsi
+++ b/src/arm/omap5.dtsi
@@ -280,7 +280,7 @@
};
};
- ocmcram: ocmcram@40300000 {
+ ocmcram: sram@40300000 {
compatible = "mmio-sram";
reg = <0x40300000 0x20000>; /* 128k */
};
diff --git a/src/arm/omap54xx-clocks.dtsi b/src/arm/omap54xx-clocks.dtsi
index 9561e47..0413828 100644
--- a/src/arm/omap54xx-clocks.dtsi
+++ b/src/arm/omap54xx-clocks.dtsi
@@ -617,6 +617,7 @@
reg = <0x1940>;
};
};
+
&cm_core_clocks {
dpll_per_byp_mux: dpll_per_byp_mux@14c {
--
GitLab