Re: [PATCH 6/6] DT: MIPS: ralink: add MT7620 dts files

[Gabor Juhos <juhosg@openwrt.org>]

2013.04.13. 10:50 keltezéssel, John Crispin írta:
> Add a dtsi file for MT7620 SoC and a sample dts file.
> 
> Signed-off-by: John Crispin <blogic@openwrt.org>
> ---
>  arch/mips/ralink/Kconfig             |    4 +++
>  arch/mips/ralink/dts/Makefile        |    1 +
>  arch/mips/ralink/dts/mt7620.dtsi     |   58 ++++++++++++++++++++++++++++++++++
>  arch/mips/ralink/dts/mt7620_eval.dts |   18 +++++++++++
>  4 files changed, 81 insertions(+)
>  create mode 100644 arch/mips/ralink/dts/mt7620.dtsi
>  create mode 100644 arch/mips/ralink/dts/mt7620_eval.dts
> 
> diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
> index 493411f..8254502 100644
> --- a/arch/mips/ralink/Kconfig
> +++ b/arch/mips/ralink/Kconfig
> @@ -46,6 +46,10 @@ choice
>  		bool "RT3883 eval kit"
>  		depends on SOC_RT3883
>  
> +	config DTB_MT7620_EVAL
> +		bool "MT7620 eval kit"

To be precise, this is a MT7620A based evaluation board. Both the config symbol
and the prompt should reflect that IMO.

> +		depends on SOC_MT7620
> +
>  endchoice
>  
>  endif
> diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
> index 040a986..036603a 100644
> --- a/arch/mips/ralink/dts/Makefile
> +++ b/arch/mips/ralink/dts/Makefile
> @@ -1,3 +1,4 @@
>  obj-$(CONFIG_DTB_RT2880_EVAL) := rt2880_eval.dtb.o
>  obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
>  obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o
> +obj-$(CONFIG_DTB_MT7620_EVAL) := mt7620_eval.dtb.o
> diff --git a/arch/mips/ralink/dts/mt7620.dtsi b/arch/mips/ralink/dts/mt7620.dtsi
> new file mode 100644
> index 0000000..5087c57
> --- /dev/null
> +++ b/arch/mips/ralink/dts/mt7620.dtsi
> @@ -0,0 +1,58 @@
> +/ {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +	compatible = "ralink,mtk7620n-soc", "ralink,mt7620-soc";

This does not match with the actual MT7620 code. That uses "ralink,mt7620n-soc"
and "ralink,mt7620a-soc" values. Ideally, we should have separate dtsi files for
the two SoCs. Additionally, the compatible property of the root node will be
overwritten in the board specific dts files so adding that to the dtsi file
seems superfluous.

> +
> +	cpus {
> +		cpu@0 {
> +			compatible = "mips,mips24KEc";
> +		};
> +	};
> +
> +	cpuintc: cpuintc@0 {
> +		#address-cells = <0>;
> +		#interrupt-cells = <1>;
> +		interrupt-controller;
> +		compatible = "mti,cpu-interrupt-controller";
> +	};
> +
> +	palmbus@10000000 {
> +		compatible = "palmbus";
> +		reg = <0x10000000 0x200000>;
> +                ranges = <0x0 0x10000000 0x1FFFFF>;
> +
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +
> +		sysc@0 {
> +			compatible = "ralink,mt7620-sysc", "ralink,mt7620n-sysc";

The 'mt7620-' prefix is a wildcard, either 'mt7620n-' or 'mt7620a-' should be
used instead. This applies to the following nodes as well.

> +			reg = <0x0 0x100>;
> +		};
> +
> +		intc: intc@200 {
> +			compatible = "ralink,mt7620-intc", "ralink,rt2880-intc";
> +			reg = <0x200 0x100>;
> +
> +			interrupt-controller;
> +			#interrupt-cells = <1>;
> +
> +			interrupt-parent = <&cpuintc>;
> +			interrupts = <2>;
> +		};
> +
> +		memc@300 {
> +			compatible = "ralink,mt7620-memc", "ralink,rt3050-memc";
> +			reg = <0x300 0x100>;
> +		};
> +
> +		uartlite@c00 {
> +			compatible = "ralink,mt7620-uart", "ralink,rt2880-uart", "ns16550a";
> +			reg = <0xc00 0x100>;
> +
> +			interrupt-parent = <&intc>;
> +			interrupts = <12>;
> +
> +			reg-shift = <2>;
> +		};
> +	};
> +};
> diff --git a/arch/mips/ralink/dts/mt7620_eval.dts b/arch/mips/ralink/dts/mt7620_eval.dts
> new file mode 100644
> index 0000000..72dec59
> --- /dev/null
> +++ b/arch/mips/ralink/dts/mt7620_eval.dts

The DTS file describes an evaluation board with a MT7620A SoC, the file name
should be changed to reflect that. It would help to avoid confusion if we want
to add another DTS file for a MT7620N based evaluation board later.

> @@ -0,0 +1,18 @@
> +/dts-v1/;
> +
> +/include/ "mt7620.dtsi"
> +
> +/ {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +	compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
> +	model = "Ralink MT7620 evaluation board";

s/MT7620/MT7620A/

> +
> +	memory@0 {
> +		reg = <0x0 0x4000000>;
> +	};
> +
> +	chosen {
> +		bootargs = "console=ttyS0,57600";
> +	};
> +};
> 

-Gabor