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

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