target/linux/brcm2708/patches-3.18/0069-Fix-the-activity-LED-in-DT-mode.patch

   1 From 31b85ba13aa394c98f2d6955b55f3f9a0623c14d Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Tue, 6 Jan 2015 12:06:55 +0000
   4 Subject: [PATCH 069/114] Fix the activity LED in DT mode
   5
   6 Add a "leds" node to the base DTBs, and a subnode for the activity
   7 LED. You can change the LED function like this:
   8
   9   dtparam=act_led_trigger=heartbeat
  10
  11 Add aliases for the other main nodes (soc, intc).
  12
  13 Issue: linux #757
  14 ---
  15  arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 18 ++++++++++++++----
  16  arch/arm/boot/dts/bcm2708-rpi-b.dts      | 18 ++++++++++++++----
  17  arch/arm/boot/dts/bcm2708.dtsi           | 11 ++++++++++-
  18  3 files changed, 38 insertions(+), 9 deletions(-)
  19
  20 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  21 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  22 @@ -7,11 +7,14 @@
  23         model = "Raspberry Pi Model B+";
  24
  25         aliases {
  26 +               soc = &soc;
  27                 spi0 = &spi0;
  28                 i2c0 = &i2c0;
  29                 i2c1 = &i2c1;
  30                 i2s  = &i2s;
  31                 gpio = &gpio;
  32 +               intc = &intc;
  33 +               leds = &leds;
  34                 sound = &sound;
  35         };
  36
  37 @@ -80,12 +83,19 @@
  38         pinctrl-0 = <&i2s_pins>;
  39  };
  40
  41 +&act_led {
  42 +       gpios = <&gpio 47 0>;
  43 +};
  44
  45  / {
  46         __overrides__ {
  47 -                   i2s = <&i2s>,"status";
  48 -                   spi = <&spi0>,"status";
  49 -                   i2c0 = <&i2c0>,"status";
  50 -                   i2c1 = <&i2c1>,"status";
  51 +               i2s = <&i2s>,"status";
  52 +               spi = <&spi0>,"status";
  53 +               i2c0 = <&i2c0>,"status";
  54 +               i2c1 = <&i2c1>,"status";
  55 +
  56 +               act_led_gpio = <&act_led>,"gpios:4";
  57 +               act_led_activelow = <&act_led>,"gpios:8";
  58 +               act_led_trigger = <&act_led>,"linux,default-trigger";
  59         };
  60  };
  61 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
  62 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
  63 @@ -7,11 +7,14 @@
  64         model = "Raspberry Pi Model B";
  65
  66         aliases {
  67 +               soc = &soc;
  68                 spi0 = &spi0;
  69                 i2c0 = &i2c0;
  70                 i2c1 = &i2c1;
  71                 i2s  = &i2s;
  72                 gpio = &gpio;
  73 +               intc = &intc;
  74 +               leds = &leds;
  75                 sound = &sound;
  76         };
  77
  78 @@ -80,12 +83,19 @@
  79         pinctrl-0 = <&i2s_pins>;
  80  };
  81
  82 +&act_led {
  83 +       gpios = <&gpio 16 1>;
  84 +};
  85
  86  / {
  87         __overrides__ {
  88 -                   i2s = <&i2s>,"status";
  89 -                   spi = <&spi0>,"status";
  90 -                   i2c0 = <&i2c0>,"status";
  91 -                   i2c1 = <&i2c1>,"status";
  92 +               i2s = <&i2s>,"status";
  93 +               spi = <&spi0>,"status";
  94 +               i2c0 = <&i2c0>,"status";
  95 +               i2c1 = <&i2c1>,"status";
  96 +
  97 +               act_led_gpio = <&act_led>,"gpios:4";
  98 +               act_led_activelow = <&act_led>,"gpios:8";
  99 +               act_led_trigger = <&act_led>,"linux,default-trigger";
 100         };
 101  };
 102 --- a/arch/arm/boot/dts/bcm2708.dtsi
 103 +++ b/arch/arm/boot/dts/bcm2708.dtsi
 104 @@ -11,7 +11,7 @@
 105                 bootargs = "";
 106         };
 107
 108 -       soc {
 109 +       soc: soc {
 110                 compatible = "simple-bus";
 111                 #address-cells = <1>;
 112                 #size-cells = <1>;
 113 @@ -76,6 +76,15 @@
 114                         #size-cells = <0>;
 115                         status = "disabled";
 116                 };
 117 +
 118 +               leds: leds {
 119 +                       compatible = "gpio-leds";
 120 +
 121 +                       act_led: act {
 122 +                               label = "ACT";
 123 +                               linux,default-trigger = "mmc0";
 124 +                       };
 125 +               };
 126         };
 127
 128         clocks {