target/linux/brcm2708/patches-3.18/0110-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch

   1 From 5f1c4a04606c2fb2d0203bdbe364a6054b3bb0b7 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Fri, 6 Feb 2015 13:50:57 +0000
   4 Subject: [PATCH 110/114] BCM270x_DT: Add pwr_led, and the required "input"
   5  trigger
   6
   7 The "input" trigger makes the associated GPIO an input.  This is to support
   8 the Raspberry Pi PWR LED, which is driven by external hardware in normal use.
   9
  10 N.B. pwr_led is not available on Model A or B boards.
  11 ---
  12  arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 18 ++++++++-
  13  arch/arm/boot/dts/bcm2708-rpi-b.dts      |  8 +++-
  14  arch/arm/boot/dts/bcm2708.dtsi           |  5 ---
  15  arch/arm/boot/dts/bcm2709-rpi-2-b.dts    | 18 ++++++++-
  16  arch/arm/boot/dts/bcm2709.dtsi           |  5 ---
  17  arch/arm/configs/bcm2709_defconfig       |  1 +
  18  arch/arm/configs/bcmrpi_defconfig        |  1 +
  19  drivers/leds/trigger/Kconfig             |  7 ++++
  20  drivers/leds/trigger/Makefile            |  1 +
  21  drivers/leds/trigger/ledtrig-input.c     | 65 ++++++++++++++++++++++++++++++++
  22  10 files changed, 113 insertions(+), 16 deletions(-)
  23  create mode 100644 drivers/leds/trigger/ledtrig-input.c
  24
  25 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  26 index 6b9512b..7f84473 100644
  27 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  28 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  29 @@ -83,8 +83,18 @@
  30         pinctrl-0 = <&i2s_pins>;
  31  };
  32
  33 -&act_led {
  34 -       gpios = <&gpio 47 0>;
  35 +&leds {
  36 +       act_led: act {
  37 +               label = "led0";
  38 +               linux,default-trigger = "mmc0";
  39 +               gpios = <&gpio 47 0>;
  40 +       };
  41 +
  42 +       pwr_led: pwr {
  43 +               label = "led1";
  44 +               linux,default-trigger = "input";
  45 +               gpios = <&gpio 35 0>;
  46 +       };
  47  };
  48
  49  / {
  50 @@ -99,5 +109,9 @@
  51                 act_led_gpio = <&act_led>,"gpios:4";
  52                 act_led_activelow = <&act_led>,"gpios:8";
  53                 act_led_trigger = <&act_led>,"linux,default-trigger";
  54 +
  55 +               pwr_led_gpio = <&pwr_led>,"gpios:4";
  56 +               pwr_led_activelow = <&pwr_led>,"gpios:8";
  57 +               pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
  58         };
  59  };
  60 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
  61 index b8520b55..a39562f 100644
  62 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
  63 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
  64 @@ -83,8 +83,12 @@
  65         pinctrl-0 = <&i2s_pins>;
  66  };
  67
  68 -&act_led {
  69 -       gpios = <&gpio 16 1>;
  70 +&leds {
  71 +       act_led: act {
  72 +               label = "led0";
  73 +               linux,default-trigger = "mmc0";
  74 +               gpios = <&gpio 16 1>;
  75 +       };
  76  };
  77
  78  / {
  79 diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
  80 index af6b1d9..aeeabae 100644
  81 --- a/arch/arm/boot/dts/bcm2708.dtsi
  82 +++ b/arch/arm/boot/dts/bcm2708.dtsi
  83 @@ -79,11 +79,6 @@
  84
  85                 leds: leds {
  86                         compatible = "gpio-leds";
  87 -
  88 -                       act_led: act {
  89 -                               label = "led0";
  90 -                               linux,default-trigger = "mmc0";
  91 -                       };
  92                 };
  93         };
  94
  95 diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
  96 index 63d3da4..75c222f 100644
  97 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
  98 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
  99 @@ -83,8 +83,18 @@
 100         pinctrl-0 = <&i2s_pins>;
 101  };
 102
 103 -&act_led {
 104 -       gpios = <&gpio 47 0>;
 105 +&leds {
 106 +       act_led: act {
 107 +               label = "led0";
 108 +               linux,default-trigger = "mmc0";
 109 +               gpios = <&gpio 47 0>;
 110 +       };
 111 +
 112 +       pwr_led: pwr {
 113 +               label = "led1";
 114 +               linux,default-trigger = "input";
 115 +               gpios = <&gpio 35 0>;
 116 +       };
 117  };
 118
 119  / {
 120 @@ -99,5 +109,9 @@
 121                 act_led_gpio = <&act_led>,"gpios:4";
 122                 act_led_activelow = <&act_led>,"gpios:8";
 123                 act_led_trigger = <&act_led>,"linux,default-trigger";
 124 +
 125 +               pwr_led_gpio = <&pwr_led>,"gpios:4";
 126 +               pwr_led_activelow = <&pwr_led>,"gpios:8";
 127 +               pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
 128         };
 129  };
 130 diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi
 131 index fee2053..6986455 100644
 132 --- a/arch/arm/boot/dts/bcm2709.dtsi
 133 +++ b/arch/arm/boot/dts/bcm2709.dtsi
 134 @@ -79,11 +79,6 @@
 135
 136                 leds: leds {
 137                         compatible = "gpio-leds";
 138 -
 139 -                       act_led: act {
 140 -                               label = "led0";
 141 -                               linux,default-trigger = "mmc0";
 142 -                       };
 143                 };
 144         };
 145
 146 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
 147 index b5bf4cb..7bb9de6 100644
 148 --- a/arch/arm/configs/bcm2709_defconfig
 149 +++ b/arch/arm/configs/bcm2709_defconfig
 150 @@ -959,6 +959,7 @@ CONFIG_LEDS_TRIGGER_GPIO=y
 151  CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 152  CONFIG_LEDS_TRIGGER_TRANSIENT=m
 153  CONFIG_LEDS_TRIGGER_CAMERA=m
 154 +CONFIG_LEDS_TRIGGER_INPUT=y
 155  CONFIG_RTC_CLASS=y
 156  # CONFIG_RTC_HCTOSYS is not set
 157  CONFIG_RTC_DRV_DS1307=m
 158 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
 159 index 81c4387..3b09de9 100644
 160 --- a/arch/arm/configs/bcmrpi_defconfig
 161 +++ b/arch/arm/configs/bcmrpi_defconfig
 162 @@ -952,6 +952,7 @@ CONFIG_LEDS_TRIGGER_GPIO=y
 163  CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 164  CONFIG_LEDS_TRIGGER_TRANSIENT=m
 165  CONFIG_LEDS_TRIGGER_CAMERA=m
 166 +CONFIG_LEDS_TRIGGER_INPUT=y
 167  CONFIG_RTC_CLASS=y
 168  # CONFIG_RTC_HCTOSYS is not set
 169  CONFIG_RTC_DRV_DS1307=m
 170 diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
 171 index 49794b4..640756b 100644
 172 --- a/drivers/leds/trigger/Kconfig
 173 +++ b/drivers/leds/trigger/Kconfig
 174 @@ -108,4 +108,11 @@ config LEDS_TRIGGER_CAMERA
 175           This enables direct flash/torch on/off by the driver, kernel space.
 176           If unsure, say Y.
 177
 178 +config LEDS_TRIGGER_INPUT
 179 +       tristate "LED Input Trigger"
 180 +       depends on LEDS_TRIGGERS
 181 +       help
 182 +         This allows the GPIOs assigned to be LEDs to be initialised to inputs.
 183 +         If unsure, say Y.
 184 +
 185  endif # LEDS_TRIGGERS
 186 diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
 187 index 1abf48d..c03afdc 100644
 188 --- a/drivers/leds/trigger/Makefile
 189 +++ b/drivers/leds/trigger/Makefile
 190 @@ -8,3 +8,4 @@ obj-$(CONFIG_LEDS_TRIGGER_CPU)          += ledtrig-cpu.o
 191  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)  += ledtrig-default-on.o
 192  obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)   += ledtrig-transient.o
 193  obj-$(CONFIG_LEDS_TRIGGER_CAMERA)      += ledtrig-camera.o
 194 +obj-$(CONFIG_LEDS_TRIGGER_INPUT)       += ledtrig-input.o
 195 diff --git a/drivers/leds/trigger/ledtrig-input.c b/drivers/leds/trigger/ledtrig-input.c
 196 new file mode 100644
 197 index 0000000..2ca2b98
 198 --- /dev/null
 199 +++ b/drivers/leds/trigger/ledtrig-input.c
 200 @@ -0,0 +1,65 @@
 201 +/*
 202 + * Set LED GPIO to Input "Trigger"
 203 + *
 204 + * Copyright 2015 Phil Elwell <phil@raspberrypi.org>
 205 + *
 206 + * Based on Nick Forbes's ledtrig-default-on.c.
 207 + *
 208 + * This program is free software; you can redistribute it and/or modify
 209 + * it under the terms of the GNU General Public License version 2 as
 210 + * published by the Free Software Foundation.
 211 + *
 212 + */
 213 +
 214 +#include <linux/module.h>
 215 +#include <linux/kernel.h>
 216 +#include <linux/init.h>
 217 +#include <linux/leds.h>
 218 +#include <linux/gpio.h>
 219 +#include "../leds.h"
 220 +
 221 +/* This is a hack to get at the private 'gpio' member */
 222 +
 223 +struct gpio_led_data {
 224 +       struct led_classdev cdev;
 225 +       unsigned gpio;
 226 +};
 227 +
 228 +static void input_trig_activate(struct led_classdev *led_cdev)
 229 +{
 230 +       struct gpio_led_data *led_dat =
 231 +               container_of(led_cdev, struct gpio_led_data, cdev);
 232 +       if (gpio_is_valid(led_dat->gpio))
 233 +               gpio_direction_input(led_dat->gpio);
 234 +}
 235 +
 236 +static void input_trig_deactivate(struct led_classdev *led_cdev)
 237 +{
 238 +       struct gpio_led_data *led_dat =
 239 +               container_of(led_cdev, struct gpio_led_data, cdev);
 240 +       if (gpio_is_valid(led_dat->gpio))
 241 +               gpio_direction_output(led_dat->gpio, 0);
 242 +}
 243 +
 244 +static struct led_trigger input_led_trigger = {
 245 +       .name     = "input",
 246 +       .activate = input_trig_activate,
 247 +       .deactivate = input_trig_deactivate,
 248 +};
 249 +
 250 +static int __init input_trig_init(void)
 251 +{
 252 +       return led_trigger_register(&input_led_trigger);
 253 +}
 254 +
 255 +static void __exit input_trig_exit(void)
 256 +{
 257 +       led_trigger_unregister(&input_led_trigger);
 258 +}
 259 +
 260 +module_init(input_trig_init);
 261 +module_exit(input_trig_exit);
 262 +
 263 +MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.org>");
 264 +MODULE_DESCRIPTION("Set LED GPIO to Input \"trigger\"");
 265 +MODULE_LICENSE("GPL");
 266 --
 267 1.8.3.2
 268