MIPS: Octeon: Delete built-in DTB pruning code for D-Link DSR-1000N.

Users will get more complete functionality by using the appended DTB,
so delete the legacy booting support for this board.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13464/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts b/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
index de61f02d3ef6105b90d1b790d6ea3b3ccd832da7..ca6b4467bcd374a69c891d455ccd81183ccff829 100644 (file)
--- a/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
+++ b/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
@@ -388,16 +388,4 @@
                usbn = &usbn;
                led0 = &led0;
        };
-
-       dsr1000n-leds {
-               compatible = "gpio-leds";
-               usb1 {
-                       label = "usb1";
-                       gpios = <&gpio 9 1>; /* Active low */
-               };
-               usb2 {
-                       label = "usb2";
-                       gpios = <&gpio 10 1>; /* Active low */
-               };
-       };
  };

diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
index 36e30d65ba05bc4237a656670c18eea447f1232a..ff49fc04500c7e993aef5cd618e8bfd1e7ef8e39 100644 (file)
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
@@ -186,15 +186,6 @@ int cvmx_helper_board_get_mii_address(int ipd_port)
                        return 7 - ipd_port;
                else
                        return -1;
-       case CVMX_BOARD_TYPE_CUST_DSR1000N:
-               /*
-                * Port 2 connects to Broadcom PHY (B5081). Other ports (0-1)
-                * connect to a switch (BCM53115).
-                */
-               if (ipd_port == 2)
-                       return 8;
-               else
-                       return -1;
        case CVMX_BOARD_TYPE_KONTRON_S1901:
                if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT)
                        return 1;
@@ -289,18 +280,6 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port)
                        return result;
                }
                break;
-       case CVMX_BOARD_TYPE_CUST_DSR1000N:
-               if (ipd_port == 0 || ipd_port == 1) {
-                       /* Ports 0 and 1 connect to a switch (BCM53115). */
-                       result.s.link_up = 1;
-                       result.s.full_duplex = 1;
-                       result.s.speed = 1000;
-                       return result;
-               } else {
-                       /* Port 2 uses a Broadcom PHY (B5081). */
-                       is_broadcom_phy = 1;
-               }
-               break;
        }
 
        phy_addr = cvmx_helper_board_get_mii_address(ipd_port);
@@ -765,7 +744,6 @@ enum cvmx_helper_board_usb_clock_types __cvmx_helper_board_usb_get_clock_type(vo
        case CVMX_BOARD_TYPE_LANAI2_G:
        case CVMX_BOARD_TYPE_NIC10E_66:
        case CVMX_BOARD_TYPE_UBNT_E100:
-       case CVMX_BOARD_TYPE_CUST_DSR1000N:
                return USB_CLOCK_TYPE_CRYSTAL_12;
        case CVMX_BOARD_TYPE_NIC10E:
                return USB_CLOCK_TYPE_REF_12;

diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
index eeda3739f55f59c515fd2424825551629988a213..b31fbc9d6eae23ea37e07591f5c664e3f9346903 100644 (file)
--- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -705,6 +705,10 @@ int __init octeon_prune_device_tree(void)
        if (fdt_check_header(initial_boot_params))
                panic("Corrupt Device Tree.");
 
+       WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_CUST_DSR1000N,
+            "Built-in DTB booting is deprecated on %s. Please switch to use appended DTB.",
+            cvmx_board_type_to_string(octeon_bootinfo->board_type));
+
        aliases = fdt_path_offset(initial_boot_params, "/aliases");
        if (aliases < 0) {
                pr_err("Error: No /aliases node in device tree.");
@@ -1048,13 +1052,6 @@ end_led:
                }
        }
 
-       if (octeon_bootinfo->board_type != CVMX_BOARD_TYPE_CUST_DSR1000N) {
-               int dsr1000n_leds = fdt_path_offset(initial_boot_params,
-                                                   "/dsr1000n-leds");
-               if (dsr1000n_leds >= 0)
-                       fdt_nop_node(initial_boot_params, dsr1000n_leds);
-       }
-
        return 0;
 }