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