On 06/21/2016 05:05 PM, Mark Rutland wrote:

On Thu, Jun 09, 2016 at 12:29:37AM +0200, Stephan Linz wrote:

quoted

Cc: Joseph Jezak <redacted>
Cc: Nico Macrionitis <redacted>
Cc: Jörg Sommer <redacted>
Signed-off-by: Stephan Linz <redacted>
---
  Documentation/devicetree/bindings/leds/common.txt    | 2 +-
  Documentation/devicetree/bindings/leds/leds-gpio.txt | 2 +-
  Documentation/laptops/asus-laptop.txt                | 2 +-
  Documentation/leds/leds-class.txt                    | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt
index af10678..1e97169 100644
--- a/Documentation/devicetree/bindings/leds/common.txt
+++ b/Documentation/devicetree/bindings/leds/common.txt

@@ -26,7 +26,7 @@ Optional properties for child nodes:
       "default-on" - LED will turn on (but for leds-gpio see "default-state"
  		    property in Documentation/devicetree/bindings/gpio/led.txt)
       "heartbeat" - LED "double" flashes at a load average based rate
-     "ide-disk" - LED indicates disk activity
+     "disk-activity" - LED indicates disk activity
       "timer" - LED flashes at a fixed, configurable rate

We should not break the binding.

Code must continue to support "ide-disk", though we can mark it
deprecated in the binding documentation, and update the in-kernel dts
files to use "disk-activity".

The code in the version 4 of the patchset supports also "ide-disk".

Stephan, could you send a new version of this patch, with preserved
"ide-disk" property, marked as deprecated?

-- 
Best regards,
Jacek Anaszewski