aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts12
-rw-r--r--arch/mips/cavium-octeon/octeon-platform.c7
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts b/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
index fa33115bde33..9c48e0586ba7 100644
--- a/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
+++ b/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
@@ -587,4 +587,16 @@
587 usbn = &usbn; 587 usbn = &usbn;
588 led0 = &led0; 588 led0 = &led0;
589 }; 589 };
590
591 dsr1000n-leds {
592 compatible = "gpio-leds";
593 usb1 {
594 label = "usb1";
595 gpios = <&gpio 9 1>; /* Active low */
596 };
597 usb2 {
598 label = "usb2";
599 gpios = <&gpio 10 1>; /* Active low */
600 };
601 };
590 }; 602 };
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
index 12410a2788d8..e1d56f32f784 100644
--- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -958,6 +958,13 @@ end_led:
958 } 958 }
959 } 959 }
960 960
961 if (octeon_bootinfo->board_type != CVMX_BOARD_TYPE_CUST_DSR1000N) {
962 int dsr1000n_leds = fdt_path_offset(initial_boot_params,
963 "/dsr1000n-leds");
964 if (dsr1000n_leds >= 0)
965 fdt_nop_node(initial_boot_params, dsr1000n_leds);
966 }
967
961 return 0; 968 return 0;
962} 969}
963 970