target/linux/kirkwood/patches-4.14/105-ea4500.patch

   1 --- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
   2 +++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
   3 @@ -69,9 +69,18 @@
   4                 };
   5         };
   6
   7 -       dsa {
   8 -               status = "disabled";
   9 +       mvsw61xx {
  10 +               compatible = "marvell,88e6171";
  11 +               status = "okay";
  12 +               reg = <0x10>;
  13 +
  14 +               mii-bus = <&mdio>;
  15 +               cpu-port-0 = <5>;
  16 +               cpu-port-1 = <6>;
  17 +               is-indirect;
  18 +       };
  19
  20 +       dsa {
  21                 compatible = "marvell,dsa";
  22                 #address-cells = <2>;
  23                 #size-cells = <0>;
  24 @@ -163,22 +172,22 @@
  25                 };
  26
  27                 partition@200000 {
  28 -                       label = "kernel";
  29 +                       label = "kernel1";
  30                         reg = <0x200000 0x2A0000>;
  31                 };
  32
  33                 partition@4A0000 {
  34 -                       label = "rootfs";
  35 +                       label = "rootfs1";
  36                         reg = <0x4A0000 0x1760000>;
  37                 };
  38
  39                 partition@1C00000 {
  40 -                       label = "alt_kernel";
  41 +                       label = "kernel2";
  42                         reg = <0x1C00000 0x2A0000>;
  43                 };
  44
  45                 partition@1EA0000 {
  46 -                       label = "alt_rootfs";
  47 +                       label = "rootfs2";
  48                         reg = <0x1EA0000 0x1760000>;
  49                 };
  50
  51 @@ -209,53 +218,6 @@
  52
  53  &mdio {
  54         status = "okay";
  55 -
  56 -       switch@10 {
  57 -               compatible = "marvell,mv88e6085";
  58 -               #address-cells = <1>;
  59 -               #size-cells = <0>;
  60 -               reg = <16>;
  61 -
  62 -               ports {
  63 -                       #address-cells = <1>;
  64 -                       #size-cells = <0>;
  65 -
  66 -                       port@0 {
  67 -                               reg = <0>;
  68 -                               label = "ethernet1";
  69 -                       };
  70 -
  71 -                       port@1 {
  72 -                               reg = <1>;
  73 -                               label = "ethernet2";
  74 -                       };
  75 -
  76 -                       port@2 {
  77 -                               reg = <2>;
  78 -                               label = "ethernet3";
  79 -                       };
  80 -
  81 -                       port@3 {
  82 -                               reg = <3>;
  83 -                               label = "ethernet4";
  84 -                       };
  85 -
  86 -                       port@4 {
  87 -                               reg = <4>;
  88 -                               label = "internet";
  89 -                       };
  90 -
  91 -                       port@5 {
  92 -                               reg = <5>;
  93 -                               label = "cpu";
  94 -                               ethernet = <&eth0port>;
  95 -                               fixed-link {
  96 -                                       speed = <1000>;
  97 -                                       full-duplex;
  98 -                               };
  99 -                       };
 100 -               };
 101 -       };
 102  };
 103
 104  &uart0 {
 105 @@ -274,10 +236,14 @@
 106  };
 107
 108  /* eth1 is connected to the switch at port 6. However DSA only supports a
 109 - * single CPU port. So leave this port disabled to avoid confusion.
 110 + * single CPU port. Upstream uses DSA so they disable this port to avoid confusion.
 111   */
 112  &eth1 {
 113 -       status = "disabled";
 114 +       status = "okay";
 115 +       ethernet1-port@0 {
 116 +               speed = <1000>;
 117 +               duplex = <1>;
 118 +       };
 119  };
 120
 121  /* There is no battery on the board, so the RTC does not keep