diff --git a/src/arm/am335x-boneblack-roboticscape.dts b/src/arm/am335x-boneblack-roboticscape.dts index 2431c403ad91c3e91792a44691c97b7d970aeeb1..4a37ccf9968cb55882e435aa7798289424402fe7 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 5d2f3594e99a850f8f0186f4642b17a6c8c27086..0856e16693a0bcff7a8414ba541a885a8b4f8591 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 7b531cf75e21c79e06513befde2e714a67f35782..f43988f276f06a51f1e3f1abcef25a203ebdc005 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 f6f5957f28d598a0607c67b6a51c1a647418f9c9..b8e3f7c2a9898f6f67a7eb63d599d802c6f56fb2 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 5f5b25f7a400a47e373e65331089798c99b87846..728d70a937c8e3e89e8eb6f419195d628d77107a 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 2237b676bd231787f1524e1861392f78ec3de8ef..1480e3a2ce53c018025a1579192d103debe72c8a 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 03959bd60f664f588dd7ca93ffb4f5b86b861336..c143b1aeca747945181792590028c7d1979fd27b 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 9561e4748e5cdd72f5bf7c6b7c13e2ec5386b49a..0413828828d2a7cff7fab8da4bb5417d1cb5c2b7 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 {