Fix several warnings of dtbs_check in the socfpga.dtsi and
socfpga_arria10.dtsi.
Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
---
arch/arm/boot/dts/intel/socfpga/socfpga.dtsi | 6 +++---
arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi | 10 ++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/intel/socfpga/socfpga.dtsi b/arch/arm/boot/dts/intel/socfpga/socfpga.dtsi
index 35be14150..1562669b3 100644
--- a/arch/arm/boot/dts/intel/socfpga/socfpga.dtsi
+++ b/arch/arm/boot/dts/intel/socfpga/socfpga.dtsi
@@ -62,13 +62,13 @@ soc {
interrupt-parent = <&intc>;
ranges;
- amba {
+ bus {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
- pdma: pdma@ffe01000 {
+ pdma: dma-controller@ffe01000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0xffe01000 0x1000>;
interrupts = <0 104 4>,
@@ -87,7 +87,7 @@ pdma: pdma@ffe01000 {
};
};
- base_fpga_region {
+ fpga-region {
compatible = "fpga-region";
fpga-mgr = <&fpgamgr0>;
diff --git a/arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi b/arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi
index 6b6e77596..32464e3d1 100644
--- a/arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi
+++ b/arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi
@@ -54,13 +54,13 @@ soc {
interrupt-parent = <&intc>;
ranges;
- amba {
+ bus {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
- pdma: pdma@ffda1000 {
+ pdma: dma-controller@ffda1000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0xffda1000 0x1000>;
interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>,
@@ -80,7 +80,7 @@ pdma: pdma@ffda1000 {
};
};
- base_fpga_region {
+ fpga-region {
#address-cells = <0x1>;
#size-cells = <0x1>;
@@ -88,7 +88,7 @@ base_fpga_region {
fpga-mgr = <&fpga_mgr>;
};
- clkmgr@ffd04000 {
+ clkmgr: clkmgr@ffd04000 {
compatible = "altr,clk-mgr";
reg = <0xffd04000 0x1000>;
@@ -685,6 +685,8 @@ nand: nand-controller@ffb90000 {
ocram: sram@ffe00000 {
compatible = "mmio-sram";
+ #address-cells = <1>;
+ #size-cells = <1>;
reg = <0xffe00000 0x40000>;
};
--
2.25.1