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