move bootph to common file and remove duplicated properties of node.
Signed-off-by: Udit Kumar u-kumar1@ti.com --- arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi | 7 ------- arch/arm/dts/k3-j7200-r5-common-proc-board.dts | 8 ++------ 2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi index 6ac68720ed..e5ae8f44ed 100644 --- a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +++ b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi @@ -137,13 +137,6 @@ bootph-pre-ram; };
-&hbmc { - bootph-pre-ram; - - flash@0,0 { - bootph-pre-ram; - }; -};
&hbmc_mux { bootph-pre-ram; diff --git a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts index 30fb359489..f852df00e9 100644 --- a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts +++ b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts @@ -157,16 +157,12 @@
&hbmc { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&mcu_fss0_hpb0_pins_default>; - reg = <0x0 0x47040000 0x0 0x100>, - <0x0 0x50000000 0x0 0x8000000>; + bootph-pre-ram; ranges = <0x0 0x0 0x0 0x50000000 0x4000000>, /* 64MB Flash on CS0 */ <0x1 0x0 0x0 0x54000000 0x800000>; /* 8MB flash on CS1 */
flash@0,0 { - compatible = "cypress,hyperflash", "cfi-flash"; - reg = <0x0 0x0 0x4000000>; + bootph-pre-ram; }; };