2013.04.12. 9:27 keltezéssel, John Crispin írta:
> Add some additional properties to the dtsi file for ethernet and wifi.
Apart from the changes described here, you are doing various other changes as
well. See below.
>
> Signed-off-by: John Crispin <blogic@xxxxxxxxxxx>
> ---
> arch/mips/ralink/dts/rt3050.dtsi | 96 ++++++++++++++++++++++++++++------
> arch/mips/ralink/dts/rt3052_eval.dts | 2 +-
> 2 files changed, 82 insertions(+), 16 deletions(-)
>
> diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi
> index 069d066..5aede8d 100644
> --- a/arch/mips/ralink/dts/rt3050.dtsi
> +++ b/arch/mips/ralink/dts/rt3050.dtsi
> @@ -1,7 +1,7 @@
> / {
> #address-cells = <1>;
> #size-cells = <1>;
> - compatible = "ralink,rt3050-soc", "ralink,rt3052-soc";
> + compatible = "ralink,rt3050-soc", "ralink,rt3052-soc", "ralink,rt3350-soc";
This adds a new compatible property but the binding documentation is missing.
>
> cpus {
> cpu@0 {
> @@ -23,7 +23,7 @@
> palmbus@10000000 {
> compatible = "palmbus";
> reg = <0x10000000 0x200000>;
> - ranges = <0x0 0x10000000 0x1FFFFF>;
> + ranges = <0x0 0x10000000 0x1FFFFF>;
This is a whitespace change.
>
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -34,8 +34,18 @@
> };
>
> timer@100 {
> + compatible = "ralink,rt3052-timer", "ralink,rt2880-timer";
Another compatible properties without documentation, and we don't even have
driver for this. You should add this only when the driver and the binding
documentation is ready.
Additionally, the hunk is not related to ethernet and wifi at all.
> + reg = <0x100 0x20>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <1>;
> +
> + status = "disabled";
> + };
> +
> + watchdog@120 {
> compatible = "ralink,rt3052-wdt", "ralink,rt2880-wdt";
> - reg = <0x100 0x100>;
> + reg = <0x120 0x10>;
> };
>
> intc: intc@200 {
> @@ -61,10 +71,12 @@
> gpio-controller;
> #gpio-cells = <2>;
>
> - ralink,ngpio = <24>;
> - ralink,regs = [ 00 04 08 0c
> - 20 24 28 2c
> - 30 34 ];
> + ralink,num-gpios = <24>;
> + ralink,register-map = [ 00 04 08 0c
> + 20 24 28 2c
> + 30 34 ];
> +
You are lucky here because we don't not have binding documentation for these
properties. Otherwise it would not be allowed to blindly change the names. And
again, this is not related to the subject. Fix the property names once the GPIO
driver is accepted, or fix it in the GPIO driver patch itself.
> + status = "disabled";
> };
>
> gpio1: gpio@638 {
> @@ -74,10 +86,12 @@
> gpio-controller;
> #gpio-cells = <2>;
>
> - ralink,ngpio = <16>;
> - ralink,regs = [ 00 04 08 0c
> - 10 14 18 1c
> - 20 24 ];
> + ralink,num-gpios = <16>;
> + ralink,register-map = [ 00 04 08 0c
> + 10 14 18 1c
> + 20 24 ];
> +
> + status = "disabled";
> };
>
> gpio2: gpio@660 {
> @@ -87,10 +101,21 @@
> gpio-controller;
> #gpio-cells = <2>;
>
> - ralink,ngpio = <12>;
> - ralink,regs = [ 00 04 08 0c
> - 10 14 18 1c
> - 20 24 ];
> + ralink,num-gpios = <12>;
> + ralink,register-map = [ 00 04 08 0c
> + 10 14 18 1c
> + 20 24 ];
> +
> + status = "disabled";
> + };
> +
> + spi@b00 {
> + compatible = "ralink,rt3050-spi", "ralink,rt2880-spi";
-ENODOCUMENTATION & -ENODRIVER.
> + reg = <0xb00 0x100>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + status = "disabled";
> };
>
> uartlite@c00 {
> @@ -102,5 +127,46 @@
>
> reg-shift = <2>;
> };
> +
> + };
> +
> + ethernet@10100000 {
> + compatible = "ralink,rt3050-eth";
-ENODOCUMENTATION & -ENODRIVER.
> + reg = <0x10100000 10000>;
> +
> + interrupt-parent = <&cpuintc>;
> + interrupts = <5>;
> +
> + status = "disabled";
> + };
> +
> + esw@10110000 {
> + compatible = "ralink,rt3050-esw";
-ENODOCUMENTATION & -ENODRIVER.
> + reg = <0x10110000 8000>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <17>;
> +
> + status = "disabled";
> + };
> +
> + wmac@10180000 {
> + compatible = "ralink,rt3050-wmac", "ralink,rt2880-wmac";
-ENODOCUMENTATION & -ENODRIVER.
> + reg = <0x10180000 40000>;
> +
> + interrupt-parent = <&cpuintc>;
> + interrupts = <6>;
> +
> + status = "disabled";
> + };
> +
> + otg@101c0000 {
> + compatible = "ralink,rt3050-otg";
-ENODOCUMENTATION & -ENODRIVER.
> + reg = <0x101c0000 40000>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <18>;
> +
> + status = "disabled";
> };
> };
> diff --git a/arch/mips/ralink/dts/rt3052_eval.dts b/arch/mips/ralink/dts/rt3052_eval.dts
> index 148a590..dc56e58 100644
> --- a/arch/mips/ralink/dts/rt3052_eval.dts
> +++ b/arch/mips/ralink/dts/rt3052_eval.dts
> @@ -14,7 +14,7 @@
>
> palmbus@10000000 {
> sysc@0 {
> - ralink,pinmmux = "uartlite", "spi";
> + ralink,pinmux = "uartlite", "spi";
This fixes a typo. Additionally, this change is not related to the RT3050.dtsi
file at all.
> ralink,uartmux = "gpio";
> ralink,wdtmux = <0>;
> };
>
And a final note, the devicetree-discuss list should be added to CC in case of
any DT specific patch.
-Gabor
