From: Palani <palaniappan.ramanat...@intel.com> Updated the device-tree for the RapidIO to be uniform across the AXM platform.
Signed-off-by: Palani <palaniappan.ramanat...@intel.com> --- .../bindings/rapidio/intel,axxia-rapidio.txt | 28 ++++++++++++++++++++++ arch/arm/boot/dts/axm55xx.dtsi | 4 ++-- arch/arm64/boot/dts/intel/axm56xx.dtsi | 4 ++-- drivers/rapidio/devices/lsi/axxia-rio.c | 2 +- 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/rapidio/intel,axxia-rapidio.txt diff --git a/Documentation/devicetree/bindings/rapidio/intel,axxia-rapidio.txt b/Documentation/devicetree/bindings/rapidio/intel,axxia-rapidio.txt new file mode 100644 index 0000000..9e329a3 --- /dev/null +++ b/Documentation/devicetree/bindings/rapidio/intel,axxia-rapidio.txt @@ -0,0 +1,28 @@ +* Intel Axxia Designware Serial RapidIO interface + +Required properties: +- compatible: should contain "intel,axxia-rapidio" to identify the core. +- reg: Should contain the sRIO Register address space. +- #address-cells: set to <2> +- #size-cells: set to <2> +- device_type: set to "rapidio" +- ranges: ranges for the SRIO config, outbound memory and I/O regions +- #interrupt-cells: set to <1> +- num-lanes: number of lanes to use + +Example: + rio0: rapidio@0xb000000000 { + index = <0>; + compatible = "intel,axxia-rapidio"; + device_type = "rapidio"; + reg = <0xa0 0x00020000 0 0x00001000>; + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x0 0x0 0x00b0 0x00000000 0x0 0x40000000>; + linkdown-reset = <0x0200 0x100 0x00a0 0x10000000 + 0x0 0x000010000>; + interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>; + outb-dmes = <2 0x00000003 1 0x00000000>; + enable_ds = <1>; + status = "disabled"; + }; diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi index 21deffd..c2379b1 100644 --- a/arch/arm/boot/dts/axm55xx.dtsi +++ b/arch/arm/boot/dts/axm55xx.dtsi @@ -246,7 +246,7 @@ index = <0>; #address-cells = <2>; #size-cells = <2>; - compatible = "axxia,rapidio-delta"; + compatible = "intel,axxia-rapidio"; device_type = "rapidio"; reg = <0x0020 0x20142000 0x0 0x1000>; /* SRIO Conf 0 region */ ranges = <0x0 0x0 0x0031 0x00000000 0x0 0x40000000>; @@ -261,7 +261,7 @@ index = <1>; #address-cells = <2>; #size-cells = <2>; - compatible = "axxia,rapidio-delta"; + compatible = "intel,axxia-rapidio"; device_type = "rapidio"; reg = <0x0020 0x20143000 0x0 0x1000>; /* SRIO Conf 1 region */ ranges = <0x0 0x0 0x0031 0x40000000 0x0 0x40000000>; diff --git a/arch/arm64/boot/dts/intel/axm56xx.dtsi b/arch/arm64/boot/dts/intel/axm56xx.dtsi index 4080429..5ac6c36 100644 --- a/arch/arm64/boot/dts/intel/axm56xx.dtsi +++ b/arch/arm64/boot/dts/intel/axm56xx.dtsi @@ -305,7 +305,7 @@ rio0: rapidio@0xb000000000 { index = <0>; - compatible = "intel, axxia-rapidio"; + compatible = "intel,axxia-rapidio"; device_type = "rapidio"; reg = <0xa0 0x00020000 0 0x00001000>; #address-cells = <2>; @@ -321,7 +321,7 @@ rio1: rapidio@0xb800000000 { index = <1>; - compatible = "intel, axxia-rapidio"; + compatible = "intel,axxia-rapidio"; device_type = "rapidio"; reg = <0xa0 0x00030000 0 0x00001000>; #address-cells = <2>; diff --git a/drivers/rapidio/devices/lsi/axxia-rio.c b/drivers/rapidio/devices/lsi/axxia-rio.c index 70614e6..417d66c 100644 --- a/drivers/rapidio/devices/lsi/axxia-rio.c +++ b/drivers/rapidio/devices/lsi/axxia-rio.c @@ -1860,7 +1860,7 @@ static int axxia_of_rio_rpn_probe(struct platform_device *dev) static const struct of_device_id axxia_of_rio_rpn_ids[] = { { .compatible = "axxia, rapidio-delta", }, - { .compatible = "intel, axxia-rapidio", }, + { .compatible = "intel,axxia-rapidio", }, { .compatible = "acp, rapidio-delta", }, {}, }; -- 2.7.4 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto