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