target/linux/brcm2708/patches-4.14/950-0206-overlays-Allow-multiple-instances-of-gpio-ir-tx.patch

   1 From 00267dfa96c9ac658c0bf7be980f2b72ba774921 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Thu, 15 Feb 2018 09:36:52 +0000
   4 Subject: [PATCH 206/454] overlays: Allow multiple instances of gpio-ir[-tx]
   5
   6 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
   7 ---
   8  arch/arm/boot/dts/overlays/gpio-ir-overlay.dts    | 10 ++++++----
   9  arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts | 10 ++++++----
  10  2 files changed, 12 insertions(+), 8 deletions(-)
  11
  12 --- a/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
  13 +++ b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
  14 @@ -8,7 +8,7 @@
  15          fragment@0 {
  16                  target-path = "/";
  17                  __overlay__ {
  18 -                        gpio_ir: ir-receiver {
  19 +                        gpio_ir: ir-receiver@12 {
  20                                  compatible = "gpio-ir-receiver";
  21
  22                                  // pin number, high or low
  23 @@ -25,7 +25,7 @@
  24          fragment@1 {
  25                  target = <&gpio>;
  26                  __overlay__ {
  27 -                        gpio_ir_pins: gpio_ir_pins {
  28 +                        gpio_ir_pins: gpio_ir_pins@12 {
  29                                  brcm,pins = <18>;                       // pin 18
  30                                  brcm,function = <0>;                    // in
  31                                  brcm,pull = <1>;                        // down
  32 @@ -35,8 +35,10 @@
  33
  34          __overrides__ {
  35                  // parameters
  36 -                gpio_pin =      <&gpio_ir>,"gpios:4",
  37 -                                        <&gpio_ir_pins>,"brcm,pins:0";  // pin number
  38 +                gpio_pin =      <&gpio_ir>,"gpios:4",           // pin number
  39 +                                <&gpio_ir>,"reg:0",
  40 +                                <&gpio_ir_pins>,"brcm,pins:0",
  41 +                                <&gpio_ir_pins>,"reg:0";
  42                  gpio_pull = <&gpio_ir_pins>,"brcm,pull:0";              // pull-up/down state
  43
  44                  rc-map-name = <&gpio_ir>,"linux,rc-map-name";           // default rc map
  45 --- a/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts
  46 +++ b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts
  47 @@ -7,7 +7,7 @@
  48         fragment@0 {
  49                 target = <&gpio>;
  50                 __overlay__ {
  51 -                       gpio_ir_tx_pins: gpio_ir_tx_pins {
  52 +                       gpio_ir_tx_pins: gpio_ir_tx_pins@12 {
  53                                 brcm,pins = <18>;
  54                                 brcm,function = <1>;    // out
  55                         };
  56 @@ -17,7 +17,7 @@
  57         fragment@1 {
  58                 target-path = "/";
  59                 __overlay__ {
  60 -                       gpio_ir_tx: gpio-ir-transmitter {
  61 +                       gpio_ir_tx: gpio-ir-transmitter@12 {
  62                                 compatible = "gpio-ir-tx";
  63                                 pinctrl-names = "default";
  64                                 pinctrl-0 = <&gpio_ir_tx_pins>;
  65 @@ -27,8 +27,10 @@
  66         };
  67
  68         __overrides__ {
  69 -               gpio_pin = <&gpio_ir_tx>, "gpios:4",
  70 -                          <&gpio_ir_tx_pins>, "brcm,pins:0";   // pin number
  71 +               gpio_pin = <&gpio_ir_tx>, "gpios:4",            // pin number
  72 +                          <&gpio_ir_tx>, "reg:0",
  73 +                          <&gpio_ir_tx_pins>, "brcm,pins:0",
  74 +                          <&gpio_ir_tx_pins>, "reg:0";
  75                 invert = <&gpio_ir_tx>, "gpios:8";              // 1 = active low
  76         };
  77  };