From: Tony Lindgren <tony@atomide.com>
Date: Wed, 19 Aug 2020 07:52:00 +0000 (+0300)
Subject: Merge branch 'fixes' into omap-for-v5.10/dt
X-Git-Tag: v5.15~2574^2~9^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=513f8297f6b14a76346cd049956f1c9a2a48d7aa;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'fixes' into omap-for-v5.10/dt
---

513f8297f6b14a76346cd049956f1c9a2a48d7aa
diff --cc arch/arm/boot/dts/omap5.dtsi
index ab05527,a82c962..2bf2e58
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@@ -680,6 -676,6 +676,12 @@@
  		#reset-cells = <1>;
  	};
  
++	prm_abe: prm@500 {
++		compatible = "ti,omap5-prm-inst", "ti,omap-prm-inst";
++		reg = <0x500 0x100>;
++		#power-domain-cells = <0>;
++	};
++
  	prm_core: prm@700 {
  		compatible = "ti,omap5-prm-inst", "ti,omap-prm-inst";
  		reg = <0x700 0x100>;