Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1252673 > unrolled thread

[PATCH 00/19] devicetree: standardize/consolidate on "wakeup-source" property

Started bySudeep Holla <sudeep.holla@arm.com>
First post2015-10-21 12:20 +0200
Last post2015-10-21 12:20 +0200
Articles 20 on this page of 37 — 9 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH 00/19] devicetree: standardize/consolidate on "wakeup-source" property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 15/19] ARM: dts: omap: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 05/19] mmc: core/host: enable support for the standard "wakeup-source" property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 11/19] ARM: dts: imx: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 16/19] ARM: dts: s5pv210: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 17/19] ARM: dts: armada: replace isil,irq2-can-wakeup-machine with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
      Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy  wakeup properties Rob Herring <robh+dt@kernel.org> - 2015-10-22 00:10 +0200
        Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy  wakeup properties Sudeep Holla <sudeep.holla@arm.com> - 2015-10-28 19:30 +0100
          Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy  wakeup properties Rob Herring <robh+dt@kernel.org> - 2015-10-30 19:40 +0100
    [PATCH 08/19] ARM: dts: spear: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 04/19] rtc: isl12057: enable support for the standard "wakeup-source" property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
      Re: [PATCH 04/19] rtc: isl12057: enable support for the standard  "wakeup-source" property Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-10-28 00:00 +0100
    [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
      Re: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property  with wakeup-source Linus Walleij <linus.walleij@linaro.org> - 2015-10-27 13:40 +0100
        Re: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property  with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-27 13:50 +0100
    Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup  with wakeup-source property Geert Uytterhoeven <geert@linux-m68k.org> - 2015-10-21 12:20 +0200
      Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup  with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:30 +0200
        Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace  gpio-key,wakeup with wakeup-source property Simon Horman <horms@verge.net.au> - 2015-10-22 03:00 +0200
          Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup  with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-22 11:40 +0200
            Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace  gpio-key,wakeup with wakeup-source property Simon Horman <horms@verge.net.au> - 2015-10-23 02:20 +0200
    [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 09/19] ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 07/19] ARM: dts: rockchip: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 12/19] ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
    [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
      Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard  "wakeup-source" property Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2015-10-23 08:40 +0200
        Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard  "wakeup-source" property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-23 12:30 +0200
          Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard  "wakeup-source" property Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2015-10-26 09:40 +0100
    [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200
      Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with  wakeup-source property Nicolas Ferre <nicolas.ferre@atmel.com> - 2015-10-21 12:30 +0200
        Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with  wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:30 +0200
          Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with  wakeup-source property Ulf Hansson <ulf.hansson@linaro.org> - 2015-10-21 13:10 +0200
            Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with  wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 13:20 +0200
              Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with  wakeup-source property Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 14:50 +0200
                Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with  wakeup-source property Nicolas Ferre <nicolas.ferre@atmel.com> - 2015-10-21 17:30 +0200
    [PATCH 13/19] ARM: dts: tegra: replace legacy *,wakeup property with wakeup-source Sudeep Holla <sudeep.holla@arm.com> - 2015-10-21 12:20 +0200

Page 1 of 2  [1] 2  Next page →


#1252673 — [PATCH 00/19] devicetree: standardize/consolidate on "wakeup-source" property

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:20 +0200
Subject[PATCH 00/19] devicetree: standardize/consolidate on "wakeup-source" property
Message-ID<qlYEV-8lO-1@gated-at.bofh.it>
Hi,

This series attempts to consolidate the various existing bindings and
standardize on the widely accepted "wakeup-source" property.

Regards,
Sudeep

Sudeep Holla (19):
  Documentation: devicetree: standardize/consolidate on "wakeup-source"
    property
  Documentation: devicetree: fix reference to legacy wakeup properties
  rtc: opal: enable support for the stardard "wakeup-source" property
  rtc: isl12057: enable support for the standard "wakeup-source"
    property
  mmc: core/host: enable support for the standard "wakeup-source"
    property
  input: tegra-kbc: enable support for the standard "wakeup-source"
    property
  ARM: dts: rockchip: replace gpio-key,wakeup with wakeup-source
    property
  ARM: dts: spear: replace gpio-key,wakeup with wakeup-source property
  ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property
  ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property
  ARM: dts: imx: replace legacy *,wakeup property with wakeup-source
  ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source
  ARM: dts: tegra: replace legacy *,wakeup property with wakeup-source
  ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source
    property
  ARM: dts: omap: replace legacy *,wakeup property with wakeup-source
  ARM: dts: s5pv210: replace legacy *,wakeup property with wakeup-source
  ARM: dts: armada: replace isil,irq2-can-wakeup-machine with
    wakeup-source property
  ARM: dts: ste: replace legacy *,wakeup property with wakeup-source
  ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property

 .../devicetree/bindings/crypto/fsl-sec4.txt        |  4 +-
 .../devicetree/bindings/input/ads7846.txt          |  3 +-
 .../devicetree/bindings/input/gpio-keys-polled.txt |  1 +
 .../devicetree/bindings/input/gpio-keys.txt        |  1 +
 .../bindings/input/gpio-matrix-keypad.txt          |  1 +
 .../bindings/input/nvidia,tegra20-kbc.txt          |  3 +-
 .../bindings/input/qcom,pm8xxx-keypad.txt          |  1 +
 .../devicetree/bindings/input/samsung-keypad.txt   |  3 +-
 Documentation/devicetree/bindings/mfd/tc3589x.txt  |  1 +
 Documentation/devicetree/bindings/mmc/mmc.txt      |  5 +-
 .../devicetree/bindings/power/wakeup-source.txt    | 71 ++++++++++++++++++++++
 .../devicetree/bindings/rtc/isil,isl12057.txt      | 10 +--
 Documentation/devicetree/bindings/rtc/rtc-opal.txt |  5 +-
 arch/arm/boot/dts/am335x-evm.dts                   |  4 +-
 arch/arm/boot/dts/am335x-evmsk.dts                 |  2 +-
 arch/arm/boot/dts/am335x-pepper.dts                |  6 +-
 arch/arm/boot/dts/animeo_ip.dts                    |  6 +-
 arch/arm/boot/dts/armada-370-netgear-rn102.dts     |  2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts     |  2 +-
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts     |  2 +-
 arch/arm/boot/dts/at91-foxg20.dts                  |  2 +-
 arch/arm/boot/dts/at91-kizbox.dts                  |  4 +-
 arch/arm/boot/dts/at91-kizbox2.dts                 |  6 +-
 arch/arm/boot/dts/at91-kizboxmini.dts              |  4 +-
 arch/arm/boot/dts/at91-qil_a9260.dts               |  2 +-
 arch/arm/boot/dts/at91-sama5d3_xplained.dts        |  2 +-
 arch/arm/boot/dts/at91-sama5d4_xplained.dts        |  2 +-
 arch/arm/boot/dts/at91-sama5d4ek.dts               |  2 +-
 arch/arm/boot/dts/at91sam9261ek.dts                | 10 +--
 arch/arm/boot/dts/at91sam9263ek.dts                |  4 +-
 arch/arm/boot/dts/at91sam9g20ek_common.dtsi        |  4 +-
 arch/arm/boot/dts/at91sam9m10g45ek.dts             |  4 +-
 arch/arm/boot/dts/at91sam9n12ek.dts                |  2 +-
 arch/arm/boot/dts/at91sam9rlek.dts                 |  4 +-
 arch/arm/boot/dts/exynos3250-monk.dts              |  6 +-
 arch/arm/boot/dts/exynos3250-rinato.dts            |  6 +-
 arch/arm/boot/dts/exynos4210-origen.dts            | 10 +--
 arch/arm/boot/dts/exynos4210-smdkv310.dts          |  2 +-
 arch/arm/boot/dts/exynos4210-trats.dts             |  2 +-
 arch/arm/boot/dts/exynos4210-universal_c210.dts    |  4 +-
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |  2 +-
 arch/arm/boot/dts/exynos4412-odroidx.dts           |  2 +-
 arch/arm/boot/dts/exynos4412-origen.dts            |  2 +-
 arch/arm/boot/dts/exynos4412-smdk4412.dts          |  2 +-
 arch/arm/boot/dts/exynos4412-trats2.dts            |  4 +-
 arch/arm/boot/dts/exynos5250-arndale.dts           | 12 ++--
 arch/arm/boot/dts/exynos5250-snow.dts              |  4 +-
 arch/arm/boot/dts/exynos5250-spring.dts            |  4 +-
 arch/arm/boot/dts/exynos5420-arndale-octa.dts      |  2 +-
 arch/arm/boot/dts/exynos5420-peach-pit.dts         |  4 +-
 arch/arm/boot/dts/exynos5800-peach-pi.dts          |  4 +-
 .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts  |  2 +-
 arch/arm/boot/dts/imx28-apf28dev.dts               |  2 +-
 arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi       |  4 +-
 arch/arm/boot/dts/imx28-tx28.dts                   |  2 +-
 .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts  |  2 +-
 arch/arm/boot/dts/imx51-babbage.dts                |  2 +-
 arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi  |  2 +-
 .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  |  2 +-
 arch/arm/boot/dts/imx53-ard.dts                    |  6 +-
 arch/arm/boot/dts/imx53-qsb-common.dtsi            |  4 +-
 arch/arm/boot/dts/imx53-tx53-x03x.dts              |  2 +-
 arch/arm/boot/dts/imx53-tx53-x13x.dts              |  4 +-
 arch/arm/boot/dts/imx53-tx53.dtsi                  |  2 +-
 arch/arm/boot/dts/imx6dl-tx6u-811x.dts             |  2 +-
 arch/arm/boot/dts/imx6q-gk802.dts                  |  2 +-
 arch/arm/boot/dts/imx6q-tx6q-1110.dts              |  2 +-
 arch/arm/boot/dts/imx6qdl-apf6dev.dtsi             |  2 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |  2 +-
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           |  2 +-
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |  6 +-
 arch/arm/boot/dts/imx6qdl-tx6.dtsi                 |  6 +-
 arch/arm/boot/dts/imx6sl-warp.dts                  |  2 +-
 arch/arm/boot/dts/imx6sx-sabreauto.dts             |  2 +-
 arch/arm/boot/dts/imx6sx-sdb.dtsi                  |  4 +-
 arch/arm/boot/dts/imx6ul-14x14-evk.dts             |  4 +-
 arch/arm/boot/dts/imx7d-sdb.dts                    |  2 +-
 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts  |  8 +--
 arch/arm/boot/dts/omap3-beagle-xm.dts              |  2 +-
 arch/arm/boot/dts/omap3-beagle.dts                 |  2 +-
 arch/arm/boot/dts/omap3-cm-t3x.dtsi                |  2 +-
 arch/arm/boot/dts/omap3-devkit8000-common.dtsi     |  2 +-
 arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi |  2 +-
 arch/arm/boot/dts/omap3-gta04.dtsi                 |  2 +-
 arch/arm/boot/dts/omap3-ldp.dts                    | 18 +++---
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi            |  2 +-
 arch/arm/boot/dts/omap3-n900.dts                   | 10 +--
 arch/arm/boot/dts/omap3-overo-alto35-common.dtsi   |  2 +-
 .../boot/dts/omap3-overo-chestnut43-common.dtsi    |  4 +-
 arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi    |  2 +-
 arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi    |  2 +-
 arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi |  4 +-
 arch/arm/boot/dts/omap3-overo-palo35-common.dtsi   |  4 +-
 arch/arm/boot/dts/omap3-overo-palo43-common.dtsi   |  4 +-
 arch/arm/boot/dts/omap3-pandora-common.dtsi        | 34 +++++------
 .../boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi    |  2 +-
 arch/arm/boot/dts/omap4-duovero-parlor.dts         |  2 +-
 arch/arm/boot/dts/omap4-var-om44customboard.dtsi   |  2 +-
 arch/arm/boot/dts/omap5-cm-t54.dts                 |  2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |  2 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |  2 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |  8 +--
 arch/arm/boot/dts/r8a7791-koelsch.dts              | 22 +++----
 arch/arm/boot/dts/rk3066a-bqcurie2.dts             |  3 +-
 arch/arm/boot/dts/rk3066a-rayeager.dts             |  2 +-
 arch/arm/boot/dts/rk3188-radxarock.dts             |  2 +-
 arch/arm/boot/dts/rk3288-evb.dtsi                  |  2 +-
 arch/arm/boot/dts/rk3288-firefly.dtsi              |  2 +-
 arch/arm/boot/dts/rk3288-popmetal.dts              |  2 +-
 arch/arm/boot/dts/rk3288-r89.dts                   |  2 +-
 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi    |  2 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi               |  2 +-
 arch/arm/boot/dts/s5pv210-aquila.dts               |  4 +-
 arch/arm/boot/dts/s5pv210-goni.dts                 |  4 +-
 arch/arm/boot/dts/s5pv210-smdkv210.dts             |  2 +-
 arch/arm/boot/dts/sama5d35ek.dts                   |  2 +-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |  2 +-
 arch/arm/boot/dts/spear1310-evb.dts                |  2 +-
 arch/arm/boot/dts/spear1340-evb.dts                |  2 +-
 arch/arm/boot/dts/spear320-hmi.dts                 |  4 +-
 arch/arm/boot/dts/ste-href-tvk1281618.dtsi         |  2 +-
 arch/arm/boot/dts/ste-nomadik-s8815.dts            |  2 +-
 arch/arm/boot/dts/tegra114-dalmore.dts             |  2 +-
 arch/arm/boot/dts/tegra114-roth.dts                |  2 +-
 arch/arm/boot/dts/tegra114-tn7.dts                 |  2 +-
 arch/arm/boot/dts/tegra124-jetson-tk1.dts          |  2 +-
 arch/arm/boot/dts/tegra124-nyan.dtsi               |  4 +-
 arch/arm/boot/dts/tegra124-venice2.dts             |  2 +-
 arch/arm/boot/dts/tegra20-harmony.dts              |  2 +-
 arch/arm/boot/dts/tegra20-paz00.dts                |  2 +-
 arch/arm/boot/dts/tegra20-seaboard.dts             |  4 +-
 arch/arm/boot/dts/tegra20-trimslice.dts            |  2 +-
 arch/arm/boot/dts/tegra20-ventana.dts              |  2 +-
 arch/arm/boot/dts/tegra20-whistler.dts             |  2 +-
 arch/arm/boot/dts/tegra30-apalis-eval.dts          |  2 +-
 arch/arm/boot/dts/tegra30-cardhu.dtsi              |  2 +-
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts      |  2 +-
 arch/arm/boot/dts/usb_a9260_common.dtsi            |  2 +-
 arch/arm/boot/dts/usb_a9263.dts                    |  2 +-
 arch/arm/boot/dts/zynq-zc702.dts                   |  4 +-
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |  2 +-
 drivers/input/keyboard/tegra-kbc.c                 |  3 +-
 drivers/mmc/core/host.c                            |  3 +-
 drivers/mmc/host/sdhci-pltfm.c                     |  3 +-
 drivers/rtc/rtc-isl12057.c                         | 10 +--
 drivers/rtc/rtc-opal.c                             |  5 +-
 146 files changed, 338 insertions(+), 254 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power/wakeup-source.txt

-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1252674 — [PATCH 15/19] ARM: dts: omap: replace legacy *,wakeup property with wakeup-source

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:20 +0200
Subject[PATCH 15/19] ARM: dts: omap: replace legacy *,wakeup property with wakeup-source
Message-ID<qlYEW-8lO-17@gated-at.bofh.it>
In reply to#1252673
Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "linux,wakeup" boolean property to enable the wakeup
source, "wakeup-source" is the new standard binding.

This patch replaces all the legacy wakeup properties with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Cc: "BenoƮt Cousson" <bcousson@baylibre.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts  |  8 ++---
 arch/arm/boot/dts/omap3-beagle-xm.dts              |  2 +-
 arch/arm/boot/dts/omap3-beagle.dts                 |  2 +-
 arch/arm/boot/dts/omap3-cm-t3x.dtsi                |  2 +-
 arch/arm/boot/dts/omap3-devkit8000-common.dtsi     |  2 +-
 arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi |  2 +-
 arch/arm/boot/dts/omap3-gta04.dtsi                 |  2 +-
 arch/arm/boot/dts/omap3-ldp.dts                    | 18 ++++++------
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi            |  2 +-
 arch/arm/boot/dts/omap3-n900.dts                   | 10 +++----
 arch/arm/boot/dts/omap3-overo-alto35-common.dtsi   |  2 +-
 .../boot/dts/omap3-overo-chestnut43-common.dtsi    |  4 +--
 arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi    |  2 +-
 arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi    |  2 +-
 arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi |  4 +--
 arch/arm/boot/dts/omap3-overo-palo35-common.dtsi   |  4 +--
 arch/arm/boot/dts/omap3-overo-palo43-common.dtsi   |  4 +--
 arch/arm/boot/dts/omap3-pandora-common.dtsi        | 34 +++++++++++-----------
 .../boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi    |  2 +-
 arch/arm/boot/dts/omap4-duovero-parlor.dts         |  2 +-
 arch/arm/boot/dts/omap4-var-om44customboard.dtsi   |  2 +-
 arch/arm/boot/dts/omap5-cm-t54.dts                 |  2 +-
 22 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
index 91146c318798..caeb3b076042 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
+++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
@@ -23,28 +23,28 @@
 			label = "sysboot2";
 			gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;	/* gpio2 */
 			linux,code = <BTN_0>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		sysboot5 {
 			label = "sysboot5";
 			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;	/* gpio7 */
 			linux,code = <BTN_1>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		gpio1 {
 			label = "gpio1";
 			gpios = <&gpio6 21 GPIO_ACTIVE_LOW>;	/* gpio181 */
 			linux,code = <BTN_2>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		gpio2 {
 			label = "gpio2";
 			gpios = <&gpio6 18 GPIO_ACTIVE_LOW>;	/* gpio178 */
 			linux,code = <BTN_3>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 7c4dca122a91..f0e2cf3c9e89 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -69,7 +69,7 @@
 			label = "user";
 			gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
 			linux,code = <0x114>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 	};
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 67659a0ed13e..de5138e61ddc 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -80,7 +80,7 @@
 			label = "user";
 			gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
 			linux,code = <0x114>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 	};
diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index 4d091ca43e25..5ec6491d7933 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -238,7 +238,7 @@
 		ti,debounce-tol = /bits/ 16 <10>;
 		ti,debounce-rep = /bits/ 16 <1>;
 
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index 9ca2865a83d6..86850bb311eb 100644
--- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@ -64,7 +64,7 @@
 			label = "user";
 			gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
 			linux,code = <BTN_EXTRA>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
index e84184de2a4a..2476d3accee0 100644
--- a/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
@@ -68,6 +68,6 @@
 		ti,keep-vref-on = <1>;
 		ti,settle-delay-usec = /bits/ 16 <150>;
 
-		linux,wakeup;
+		wakeup-source;
 	};
 };
diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index 7166d8876ea8..d780ea16a0a3 100644
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -37,7 +37,7 @@
 			label = "aux";
 			linux,code = <169>;
 			gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/omap3-ldp.dts b/arch/arm/boot/dts/omap3-ldp.dts
index bd6e6769c7ce..3198dafffb7a 100644
--- a/arch/arm/boot/dts/omap3-ldp.dts
+++ b/arch/arm/boot/dts/omap3-ldp.dts
@@ -35,63 +35,63 @@
 			label = "enter";
 			gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; /* gpio101 */
 			linux,code = <KEY_ENTER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		key_f1 {
 			label = "f1";
 			gpios = <&gpio4 6 GPIO_ACTIVE_LOW>; /* gpio102 */
 			linux,code = <KEY_F1>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		key_f2 {
 			label = "f2";
 			gpios = <&gpio4 7 GPIO_ACTIVE_LOW>; /* gpio103 */
 			linux,code = <KEY_F2>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		key_f3 {
 			label = "f3";
 			gpios = <&gpio4 8 GPIO_ACTIVE_LOW>; /* gpio104 */
 			linux,code = <KEY_F3>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		key_f4 {
 			label = "f4";
 			gpios = <&gpio4 9 GPIO_ACTIVE_LOW>; /* gpio105 */
 			linux,code = <KEY_F4>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		key_left {
 			label = "left";
 			gpios = <&gpio4 10 GPIO_ACTIVE_LOW>; /* gpio106 */
 			linux,code = <KEY_LEFT>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		key_right {
 			label = "right";
 			gpios = <&gpio4 11 GPIO_ACTIVE_LOW>; /* gpio107 */
 			linux,code = <KEY_RIGHT>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		key_up {
 			label = "up";
 			gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; /* gpio108 */
 			linux,code = <KEY_UP>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		key_down {
 			label = "down";
 			gpios = <&gpio4 13 GPIO_ACTIVE_LOW>; /* gpio109 */
 			linux,code = <KEY_DOWN>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index d0dd0365bfda..f0484cedd0bc 100644
--- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -327,7 +327,7 @@
 		ti,pressure-max = /bits/ 16 <255>;
 		ti,swap-xy;
 
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 5f5e0f3d5b64..c146f42313cb 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -67,28 +67,28 @@
 			gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* 110 */
 			linux,input-type = <5>; /* EV_SW */
 			linux,code = <0x09>; /* SW_CAMERA_LENS_COVER */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		camera_focus {
 			label = "Camera Focus";
 			gpios = <&gpio3 4 GPIO_ACTIVE_LOW>; /* 68 */
 			linux,code = <0x210>; /* KEY_CAMERA_FOCUS */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		camera_capture {
 			label = "Camera Capture";
 			gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; /* 69 */
 			linux,code = <0xd4>; /* KEY_CAMERA */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		lock_button {
 			label = "Lock Button";
 			gpios = <&gpio4 17 GPIO_ACTIVE_LOW>; /* 113 */
 			linux,code = <0x98>; /* KEY_SCREENLOCK */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		keypad_slide {
@@ -96,7 +96,7 @@
 			gpios = <&gpio3 7 GPIO_ACTIVE_LOW>; /* 71 */
 			linux,input-type = <5>; /* EV_SW */
 			linux,code = <0x0a>; /* SW_KEYPAD_SLIDE */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		proximity_sensor {
diff --git a/arch/arm/boot/dts/omap3-overo-alto35-common.dtsi b/arch/arm/boot/dts/omap3-overo-alto35-common.dtsi
index 7aae8fb82c1f..3b3a75997f81 100644
--- a/arch/arm/boot/dts/omap3-overo-alto35-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-alto35-common.dtsi
@@ -48,7 +48,7 @@
 			label = "button0";
 			linux,code = <BTN_0>;
 			gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;		/* gpio_10 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi b/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
index 17b82f82638a..7df27926ead2 100644
--- a/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
@@ -41,13 +41,13 @@
 			label = "button0";
 			linux,code = <BTN_0>;
 			gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;		/* gpio_23 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 		button1@14 {
 			label = "button1";
 			linux,code = <BTN_1>;
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;		/* gpio_14 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi b/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
index 80d236ac64a5..2bbc2bd30b81 100644
--- a/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
@@ -161,6 +161,6 @@
 		ti,x-plate-ohms = /bits/ 16 <180>;
 		ti,pressure-max = /bits/ 16 <255>;
 
-		linux,wakeup;
+		wakeup-source;
 	};
 };
diff --git a/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi b/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
index 048fd216970a..d19a2f293c97 100644
--- a/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
@@ -172,7 +172,7 @@
 		ti,x-plate-ohms = /bits/ 16 <180>;
 		ti,pressure-max = /bits/ 16 <255>;
 
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
diff --git a/arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi b/arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi
index 49d2254a99b0..250cc7fe5d5e 100644
--- a/arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi
@@ -41,13 +41,13 @@
 			label = "button0";
 			linux,code = <BTN_0>;
 			gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;		/* gpio_23 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 		button1@14 {
 			label = "button1";
 			linux,code = <BTN_1>;
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;		/* gpio_14 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/omap3-overo-palo35-common.dtsi b/arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
index 680d7262399c..8df7ec35d17d 100644
--- a/arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
@@ -41,13 +41,13 @@
 			label = "button0";
 			linux,code = <BTN_0>;
 			gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;		/* gpio_23 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 		button1@14 {
 			label = "button1";
 			linux,code = <BTN_1>;
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;		/* gpio_14 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/omap3-overo-palo43-common.dtsi b/arch/arm/boot/dts/omap3-overo-palo43-common.dtsi
index 087aedf5b902..0ea2c451c809 100644
--- a/arch/arm/boot/dts/omap3-overo-palo43-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-palo43-common.dtsi
@@ -41,13 +41,13 @@
 			label = "button0";
 			linux,code = <BTN_0>;
 			gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;		/* gpio_23 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 		button1@14 {
 			label = "button1";
 			linux,code = <BTN_1>;
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;		/* gpio_14 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index f2084e6d01e7..a5827c7ba1af 100644
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -84,112 +84,112 @@
 			label = "up";
 			linux,code = <KEY_UP>;
 			gpios = <&gpio4 14 GPIO_ACTIVE_LOW>;	/* GPIO_110 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		down-button {
 			label = "down";
 			linux,code = <KEY_DOWN>;
 			gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;	/* GPIO_103 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		left-button {
 			label = "left";
 			linux,code = <KEY_LEFT>;
 			gpios = <&gpio4 0 GPIO_ACTIVE_LOW>;	/* GPIO_96 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		right-button {
 			label = "right";
 			linux,code = <KEY_RIGHT>;
 			gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;	/* GPIO_98 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		pageup-button {
 			label = "game 1";
 			linux,code = <KEY_PAGEUP>;
 			gpios = <&gpio4 13 GPIO_ACTIVE_LOW>;	/* GPIO_109 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		pagedown-button {
 			label = "game 3";
 			linux,code = <KEY_PAGEDOWN>;
 			gpios = <&gpio4 10 GPIO_ACTIVE_LOW>;	/* GPIO_106 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		home-button {
 			label = "game 4";
 			linux,code = <KEY_HOME>;
 			gpios = <&gpio4 5 GPIO_ACTIVE_LOW>;	/* GPIO_101 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		end-button {
 			label = "game 2";
 			linux,code = <KEY_END>;
 			gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;	/* GPIO_111 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		right-shift {
 			label = "l";
 			linux,code = <KEY_RIGHTSHIFT>;
 			gpios = <&gpio4 6 GPIO_ACTIVE_LOW>;	/* GPIO_102 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		kp-plus {
 			label = "l2";
 			linux,code = <KEY_KPPLUS>;
 			gpios = <&gpio4 1 GPIO_ACTIVE_LOW>;	/* GPIO_97 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		right-ctrl {
 			label = "r";
 			linux,code = <KEY_RIGHTCTRL>;
 			gpios = <&gpio4 9 GPIO_ACTIVE_LOW>;	/* GPIO_105 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		kp-minus {
 			label = "r2";
 			linux,code = <KEY_KPMINUS>;
 			gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;	/* GPIO_107 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		left-ctrl {
 			label = "ctrl";
 			linux,code = <KEY_LEFTCTRL>;
 			gpios = <&gpio4 8 GPIO_ACTIVE_LOW>;	/* GPIO_104 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		menu {
 			label = "menu";
 			linux,code = <KEY_MENU>;
 			gpios = <&gpio4 3 GPIO_ACTIVE_LOW>;	/* GPIO_99 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		hold {
 			label = "hold";
 			linux,code = <KEY_COFFEE>;
 			gpios = <&gpio6 16 GPIO_ACTIVE_LOW>;	/* GPIO_176 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		left-alt {
 			label = "alt";
 			linux,code = <KEY_LEFTALT>;
 			gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;	/* GPIO_100 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		lid {
@@ -617,7 +617,7 @@
 		ti,x-plate-ohms = /bits/ 16 <40>;
 		ti,pressure-max = /bits/ 16 <255>;
 
-		linux,wakeup;
+		wakeup-source;
 	};
 
 	lcd: lcd@1 {
diff --git a/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi b/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
index f4b1a61853e3..157345bb8e79 100644
--- a/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
+++ b/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
@@ -66,6 +66,6 @@
 		ti,x-plate-ohms = /bits/ 16 <40>;
 		ti,pressure-max = /bits/ 16 <255>;
 		ti,swap-xy;
-		linux,wakeup;
+		wakeup-source;
 	};
 };
diff --git a/arch/arm/boot/dts/omap4-duovero-parlor.dts b/arch/arm/boot/dts/omap4-duovero-parlor.dts
index 1a78f013f37a..ab17b9929250 100644
--- a/arch/arm/boot/dts/omap4-duovero-parlor.dts
+++ b/arch/arm/boot/dts/omap4-duovero-parlor.dts
@@ -36,7 +36,7 @@
 			label = "button0";
 			linux,code = <BTN_0>;
 			gpios = <&gpio4 25 GPIO_ACTIVE_LOW>;	/* gpio_121 */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi
index f2d2fdb75628..6e278d7716a5 100644
--- a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi
+++ b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi
@@ -41,7 +41,7 @@
 			label = "user";
 			gpios = <&gpio6 24 GPIO_ACTIVE_HIGH>; /* gpio 184 */
 			linux,code = <BTN_EXTRA>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts
index 61ad2ea34720..95c5523c1230 100644
--- a/arch/arm/boot/dts/omap5-cm-t54.dts
+++ b/arch/arm/boot/dts/omap5-cm-t54.dts
@@ -359,7 +359,7 @@
 		ti,debounce-tol = /bits/ 16 <10>;
 		ti,debounce-rep = /bits/ 16 <1>;
 
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1252677 — [PATCH 05/19] mmc: core/host: enable support for the standard "wakeup-source" property

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:20 +0200
Subject[PATCH 05/19] mmc: core/host: enable support for the standard "wakeup-source" property
Message-ID<qlYEW-8lO-23@gated-at.bofh.it>
In reply to#1252673
Though the mmc core driver should/will continue to support the legacy
"enable-sdio-wakeup" property to enable SDIO as the wakeup source, we
need to add support for the new standard property "wakeup-source".

This patch adds support for "wakeup-source" property in addition to the
existing "enable-sdio-wakeup" property.

Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: linux-mmc@vger.kernel.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 drivers/mmc/core/host.c        | 3 ++-
 drivers/mmc/host/sdhci-pltfm.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 5466f25f0281..85222bb56c73 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -513,7 +513,8 @@ int mmc_of_parse(struct mmc_host *host)
 		host->caps2 |= MMC_CAP2_FULL_PWR_CYCLE;
 	if (of_property_read_bool(np, "keep-power-in-suspend"))
 		host->pm_caps |= MMC_PM_KEEP_POWER;
-	if (of_property_read_bool(np, "enable-sdio-wakeup"))
+	if (of_property_read_bool(np, "wakeup-source") ||
+	    of_property_read_bool(np, "enable-sdio-wakeup")) /* legacy */
 		host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
 	if (of_property_read_bool(np, "mmc-ddr-1_8v"))
 		host->caps |= MMC_CAP_1_8V_DDR;
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index a207f5aaf62f..f00374bdafc9 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -108,7 +108,8 @@ void sdhci_get_of_property(struct platform_device *pdev)
 	if (of_find_property(np, "keep-power-in-suspend", NULL))
 		host->mmc->pm_caps |= MMC_PM_KEEP_POWER;
 
-	if (of_find_property(np, "enable-sdio-wakeup", NULL))
+	if (of_property_read_bool(np, "wakeup-source") ||
+	    of_property_read_bool(np, "enable-sdio-wakeup")) /* legacy */
 		host->mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
 }
 #else
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1252679 — [PATCH 11/19] ARM: dts: imx: replace legacy *,wakeup property with wakeup-source

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:20 +0200
Subject[PATCH 11/19] ARM: dts: imx: replace legacy *,wakeup property with wakeup-source
Message-ID<qlYEW-8lO-27@gated-at.bofh.it>
In reply to#1252673
Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "linux,wakeup" boolean property to enable the wakeup
source, "wakeup-source" is the new standard binding.

This patch replaces all the legacy wakeup properties with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 +-
 arch/arm/boot/dts/imx28-apf28dev.dts                   | 2 +-
 arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi           | 4 ++--
 arch/arm/boot/dts/imx28-tx28.dts                       | 2 +-
 arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 2 +-
 arch/arm/boot/dts/imx51-babbage.dts                    | 2 +-
 arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi      | 2 +-
 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 2 +-
 arch/arm/boot/dts/imx53-ard.dts                        | 6 +++---
 arch/arm/boot/dts/imx53-qsb-common.dtsi                | 4 ++--
 arch/arm/boot/dts/imx53-tx53-x03x.dts                  | 2 +-
 arch/arm/boot/dts/imx53-tx53-x13x.dts                  | 4 ++--
 arch/arm/boot/dts/imx53-tx53.dtsi                      | 2 +-
 arch/arm/boot/dts/imx6dl-tx6u-811x.dts                 | 2 +-
 arch/arm/boot/dts/imx6q-gk802.dts                      | 2 +-
 arch/arm/boot/dts/imx6q-tx6q-1110.dts                  | 2 +-
 arch/arm/boot/dts/imx6qdl-apf6dev.dtsi                 | 2 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi              | 2 +-
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi               | 2 +-
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi                 | 6 +++---
 arch/arm/boot/dts/imx6qdl-tx6.dtsi                     | 6 +++---
 arch/arm/boot/dts/imx6sl-warp.dts                      | 2 +-
 arch/arm/boot/dts/imx6sx-sabreauto.dts                 | 2 +-
 arch/arm/boot/dts/imx6sx-sdb.dtsi                      | 4 ++--
 arch/arm/boot/dts/imx6ul-14x14-evk.dts                 | 4 ++--
 arch/arm/boot/dts/imx7d-sdb.dts                        | 2 +-
 26 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
index ed1d0b4578ef..cda6907a27b9 100644
--- a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
+++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
@@ -30,7 +30,7 @@
 			label = "BP1";
 			gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_MISC>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/imx28-apf28dev.dts b/arch/arm/boot/dts/imx28-apf28dev.dts
index 7ac4f1af16ac..1eaa131e2d18 100644
--- a/arch/arm/boot/dts/imx28-apf28dev.dts
+++ b/arch/arm/boot/dts/imx28-apf28dev.dts
@@ -225,7 +225,7 @@
 			label = "User button";
 			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
 			linux,code = <0x100>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi b/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
index 927b391d2058..88594747f454 100644
--- a/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
+++ b/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
@@ -36,7 +36,7 @@
 			label = "SW3";
 			gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_MISC>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
@@ -49,7 +49,7 @@
 			label = "SW4";
 			gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_MISC>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index a5b27c85a91c..3e5ecb506b55 100644
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -201,7 +201,7 @@
 			0x02020049 /* row 2, col 2, KEY_KP9 */
 		>;
 		gpio-activelow;
-		linux,wakeup;
+		wakeup-source;
 		debounce-delay-ms = <100>;
 		col-scan-delay-us = <5000>;
 		linux,no-autorepeat;
diff --git a/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts b/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
index 75b036700d31..4727bbb804e1 100644
--- a/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
+++ b/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
@@ -30,7 +30,7 @@
 			label = "BP1";
 			gpios = <&gpio3 25 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_MISC>;
-			gpio-key,wakeup;
+			wakeup-source;
 			linux,input-type = <1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 649befeb2cf9..018d24eb9965 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -107,7 +107,7 @@
 			label = "Power Button";
 			gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
index 321662f53e33..16fc69c69ab2 100644
--- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
+++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
@@ -156,7 +156,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_esdhc2>;
 	cap-sdio-irq;
-	enable-sdio-wakeup;
+	wakeup-source;
 	keep-power-in-suspend;
 	max-frequency = <50000000>;
 	no-1-8-v;
diff --git a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
index 34599c547459..d270df3e5891 100644
--- a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
+++ b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
@@ -41,7 +41,7 @@
 			label = "BP1";
 			gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
 			linux,code = <256>;
-			gpio-key,wakeup;
+			wakeup-source;
 			linux,input-type = <1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
index 3bc18835fb4b..4486bc47d140 100644
--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@@ -69,21 +69,21 @@
 			label = "Home";
 			gpios = <&gpio5 10 0>;
 			linux,code = <102>; /* KEY_HOME */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		back {
 			label = "Back";
 			gpios = <&gpio5 11 0>;
 			linux,code = <158>; /* KEY_BACK */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		program {
 			label = "Program";
 			gpios = <&gpio5 12 0>;
 			linux,code = <362>; /* KEY_PROGRAM */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		volume-up {
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 53fd75c8ffcf..368ccd0a053e 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -67,14 +67,14 @@
 			label = "Volume Up";
 			gpios = <&gpio2 14 0>;
 			linux,code = <115>; /* KEY_VOLUMEUP */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		volume-down {
 			label = "Volume Down";
 			gpios = <&gpio2 15 0>;
 			linux,code = <114>; /* KEY_VOLUMEDOWN */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts
index 3b73e81dc3f0..ce8a14ed6f5f 100644
--- a/arch/arm/boot/dts/imx53-tx53-x03x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts
@@ -230,7 +230,7 @@
 		interrupts = <26 0>;
 		gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
 		ti,x-plate-ohms = <660>;
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
diff --git a/arch/arm/boot/dts/imx53-tx53-x13x.dts b/arch/arm/boot/dts/imx53-tx53-x13x.dts
index 64804719f0f4..4520f1ec3d87 100644
--- a/arch/arm/boot/dts/imx53-tx53-x13x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x13x.dts
@@ -101,7 +101,7 @@
 		interrupt-parent = <&gpio3>;
 		interrupts = <23 0>;
 		wakeup-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
@@ -126,7 +126,7 @@
 		interrupt-parent = <&gpio3>;
 		interrupts = <22 0>;
 		wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index d3e50b22064f..006289ae9f99 100644
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -50,7 +50,7 @@
 			label = "Power Button";
 			gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
 			linux,code = <116>; /* KEY_POWER */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
index c275eecc9472..d35a5cdc3229 100644
--- a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
@@ -77,7 +77,7 @@
 		interrupt-parent = <&gpio3>;
 		interrupts = <22 0>;
 		wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
diff --git a/arch/arm/boot/dts/imx6q-gk802.dts b/arch/arm/boot/dts/imx6q-gk802.dts
index 00bd63e63d0c..b715deb4ea46 100644
--- a/arch/arm/boot/dts/imx6q-gk802.dts
+++ b/arch/arm/boot/dts/imx6q-gk802.dts
@@ -44,7 +44,7 @@
 			label = "recovery";
 			gpios = <&gpio3 16 1>;
 			linux,code = <0x198>; /* KEY_RESTART */
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/imx6q-tx6q-1110.dts b/arch/arm/boot/dts/imx6q-tx6q-1110.dts
index 88aa1e4c792d..2792da93db1f 100644
--- a/arch/arm/boot/dts/imx6q-tx6q-1110.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1110.dts
@@ -77,7 +77,7 @@
 		interrupt-parent = <&gpio3>;
 		interrupts = <22 0>;
 		wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi b/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
index e26ebeb5b45c..a8f3500ee522 100644
--- a/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -94,7 +94,7 @@
 			label = "User button";
 			gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_MISC>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index 340bc8e42650..95d82133dacd 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -76,7 +76,7 @@
 			label = "Power Button";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		menu {
diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
index ce4c7313f509..1e3251f3d16d 100644
--- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
@@ -75,7 +75,7 @@
 			label = "Power Button";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		menu {
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 2c07d3a86b61..47cfc264311c 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -79,21 +79,21 @@
 		power {
 			label = "Power Button";
 			gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup;
+			wakeup-source;
 			linux,code = <KEY_POWER>;
 		};
 
 		volume-up {
 			label = "Volume Up";
 			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup;
+			wakeup-source;
 			linux,code = <KEY_VOLUMEUP>;
 		};
 
 		volume-down {
 			label = "Volume Down";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup;
+			wakeup-source;
 			linux,code = <KEY_VOLUMEDOWN>;
 		};
 	};
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index da08de324e9e..8e187f8084ac 100644
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -51,7 +51,7 @@
 			label = "Power Button";
 			gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
@@ -275,7 +275,7 @@
 		interrupts = <15 0>;
 		reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
 		wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
-		linux,wakeup;
+		wakeup-source;
 	};
 
 	touchscreen: tsc2007@48 {
@@ -287,7 +287,7 @@
 		interrupts = <26 0>;
 		gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
 		ti,x-plate-ohms = <660>;
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
diff --git a/arch/arm/boot/dts/imx6sl-warp.dts b/arch/arm/boot/dts/imx6sl-warp.dts
index 10c69963100f..058bcdceb81a 100644
--- a/arch/arm/boot/dts/imx6sl-warp.dts
+++ b/arch/arm/boot/dts/imx6sl-warp.dts
@@ -118,7 +118,7 @@
 	bus-width = <4>;
 	non-removable;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	mmc-pwrseq = <&usdhc3_pwrseq>;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index 115f3fd78971..96ea936eeeb0 100644
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -52,7 +52,7 @@
 	cd-gpios = <&gpio7 10 GPIO_ACTIVE_LOW>;
 	wp-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	vmmc-supply = <&vcc_sd3>;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index ac88c3467078..62a7e397044e 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -283,7 +283,7 @@
 	non-removable;
 	no-1-8-v;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	status = "okay";
 };
 
@@ -296,7 +296,7 @@
 	cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
 	wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	vmmc-supply = <&vcc_sd3>;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
index 25746b122ea6..5a9f5f6e3485 100644
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
@@ -118,7 +118,7 @@
 	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
 	cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	vmmc-supply = <&reg_sd1_vmmc>;
 	status = "okay";
 };
@@ -128,7 +128,7 @@
 	pinctrl-0 = <&pinctrl_usdhc2>;
 	no-1-8-v;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index fdd1d7c9a5cc..725b7ef47632 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -236,7 +236,7 @@
 	pinctrl-0 = <&pinctrl_usdhc1>;
 	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
 	wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
-	enable-sdio-wakeup;
+	wakeup-source;
 	keep-power-in-suspend;
 	status = "okay";
 };
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1252680 — [PATCH 16/19] ARM: dts: s5pv210: replace legacy *,wakeup property with wakeup-source

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:20 +0200
Subject[PATCH 16/19] ARM: dts: s5pv210: replace legacy *,wakeup property with wakeup-source
Message-ID<qlYEX-8lO-31@gated-at.bofh.it>
In reply to#1252673
Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "linux,input-wakeup" boolean property to enable the
wakeup source, "wakeup-source" is the new standard binding.

This patch replaces all the legacy wakeup properties with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: linux-samsung-soc@vger.kernel.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm/boot/dts/s5pv210-aquila.dts   | 4 ++--
 arch/arm/boot/dts/s5pv210-goni.dts     | 4 ++--
 arch/arm/boot/dts/s5pv210-smdkv210.dts | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/s5pv210-aquila.dts b/arch/arm/boot/dts/s5pv210-aquila.dts
index f00cea7aca2f..72f162e7040b 100644
--- a/arch/arm/boot/dts/s5pv210-aquila.dts
+++ b/arch/arm/boot/dts/s5pv210-aquila.dts
@@ -257,7 +257,7 @@
 			linux,code = <KEY_POWER>;
 			label = "power";
 			debounce-interval = <1>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 };
@@ -268,7 +268,7 @@
 
 &keypad {
 	linux,input-no-autorepeat;
-	linux,input-wakeup;
+	wakeup-source;
 	samsung,keypad-num-rows = <3>;
 	samsung,keypad-num-columns = <3>;
 	pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/s5pv210-goni.dts b/arch/arm/boot/dts/s5pv210-goni.dts
index a3d4643b202e..f4d0a023c31c 100644
--- a/arch/arm/boot/dts/s5pv210-goni.dts
+++ b/arch/arm/boot/dts/s5pv210-goni.dts
@@ -239,7 +239,7 @@
 			linux,code = <KEY_POWER>;
 			label = "power";
 			debounce-interval = <1>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 };
@@ -250,7 +250,7 @@
 
 &keypad {
 	linux,input-no-autorepeat;
-	linux,input-wakeup;
+	wakeup-source;
 	samsung,keypad-num-rows = <3>;
 	samsung,keypad-num-columns = <3>;
 	pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/s5pv210-smdkv210.dts b/arch/arm/boot/dts/s5pv210-smdkv210.dts
index da7d210df670..54fcc3fc82e2 100644
--- a/arch/arm/boot/dts/s5pv210-smdkv210.dts
+++ b/arch/arm/boot/dts/s5pv210-smdkv210.dts
@@ -59,7 +59,7 @@
 
 &keypad {
 	linux,input-no-autorepeat;
-	linux,input-wakeup;
+	wakeup-source;
 	samsung,keypad-num-rows = <8>;
 	samsung,keypad-num-columns = <8>;
 	pinctrl-names = "default";
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1252681 — [PATCH 17/19] ARM: dts: armada: replace isil,irq2-can-wakeup-machine with wakeup-source property

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:20 +0200
Subject[PATCH 17/19] ARM: dts: armada: replace isil,irq2-can-wakeup-machine with wakeup-source property
Message-ID<qlYEW-8lO-29@gated-at.bofh.it>
In reply to#1252673
Though the driver will continue to check for and support the legacy
"isil,irq2-can-wakeup-machine" boolean property to wakeup source,
"wakeup-source" is the new standard binding.

This patch replaces the legacy "isil,irq2-can-wakeup-machine" with the
unified "wakeup-source" property in order to avoid any futher copy-paste
duplication.

Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +-
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index a31207860f34..6012c8ff778e 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -120,7 +120,7 @@
 				isl12057: isl12057@68 {
 					compatible = "isil,isl12057";
 					reg = <0x68>;
-					isil,irq2-can-wakeup-machine;
+					wakeup-source;
 				};
 
 				g762: g762@3e {
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
index 00540f292979..7c5e8041cf48 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
@@ -126,7 +126,7 @@
 				isl12057: isl12057@68 {
 					compatible = "isil,isl12057";
 					reg = <0x68>;
-					isil,irq2-can-wakeup-machine;
+					wakeup-source;
 				};
 
 				g762: g762@3e {
diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
index 1516fc2627f9..daf88ede1192 100644
--- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
@@ -133,7 +133,7 @@
 				isl12057: isl12057@68 {
 					compatible = "isil,isl12057";
 					reg = <0x68>;
-					isil,irq2-can-wakeup-machine;
+					wakeup-source;
 				};
 
 				/* Controller for rear fan #1 of 3 (Protechnic
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1252682 — [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:20 +0200
Subject[PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties
Message-ID<qlYEX-8lO-37@gated-at.bofh.it>
In reply to#1252673
This patch marks all the reference to the legacy wakeup bindings
and replaces them with the standard "wakeup-source" property.

All these legacy property are also listed under a separate section in
the generic wakeup-source binding document.

Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 Documentation/devicetree/bindings/crypto/fsl-sec4.txt          |  4 ++--
 Documentation/devicetree/bindings/input/ads7846.txt            |  3 ++-
 Documentation/devicetree/bindings/input/gpio-keys-polled.txt   |  1 +
 Documentation/devicetree/bindings/input/gpio-keys.txt          |  1 +
 Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt |  1 +
 Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt |  3 ++-
 Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt |  1 +
 Documentation/devicetree/bindings/input/samsung-keypad.txt     |  3 ++-
 Documentation/devicetree/bindings/mfd/tc3589x.txt              |  1 +
 Documentation/devicetree/bindings/mmc/mmc.txt                  |  5 +++--
 Documentation/devicetree/bindings/rtc/isil,isl12057.txt        | 10 +++++-----
 Documentation/devicetree/bindings/rtc/rtc-opal.txt             |  5 +++--
 12 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index 6831d025ec24..adeca34c5a33 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -441,7 +441,7 @@ System ON/OFF key driver
 		regmap = <&snvs>;
 		interrupts = <0 4 0x4>
 	        linux,keycode = <116>; /* KEY_POWER */
-		wakeup;
+		wakeup-source;
 	};
 
 =====================================================================
@@ -530,7 +530,7 @@ FULL EXAMPLE
 			regmap = <&sec_mon>;
 			interrupts = <0 4 0x4>;
 			linux,keycode = <116>; /* KEY_POWER */
-			wakeup;
+			wakeup-source;
 		};
 	};
 
diff --git a/Documentation/devicetree/bindings/input/ads7846.txt b/Documentation/devicetree/bindings/input/ads7846.txt
index df8b1279491d..33a1638b61d6 100644
--- a/Documentation/devicetree/bindings/input/ads7846.txt
+++ b/Documentation/devicetree/bindings/input/ads7846.txt
@@ -65,6 +65,7 @@ must be specified.
 	pendown-gpio			GPIO handle describing the pin the !PENIRQ
 					line is connected to.
 	wakeup-source			use any event on touchscreen as wakeup event.
+					(Legacy property support: "linux,wakeup")
 
 
 Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::
@@ -86,6 +87,6 @@ must be specified.
 			ti,x-plate-ohms = /bits/ 16 <40>;
 			ti,pressure-max = /bits/ 16 <255>;
 
-			linux,wakeup;
+			wakeup-source;
 		};
 	};
diff --git a/Documentation/devicetree/bindings/input/gpio-keys-polled.txt b/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
index 5b91f5a3bd5c..d698475a9262 100644
--- a/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
+++ b/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
@@ -21,6 +21,7 @@ Device-Tree bindings for input/gpio_keys_polled.c keyboard driver
 	- debounce-interval: Debouncing interval time in milliseconds.
 	  If not specified defaults to 5.
 	- wakeup-source: Boolean, button can wake-up the system.
+			 (Legacy property supported: "gpio-key,wakeup")
 
 Example nodes:
 
diff --git a/Documentation/devicetree/bindings/input/gpio-keys.txt b/Documentation/devicetree/bindings/input/gpio-keys.txt
index 072bf7573c37..cf1333d1dd52 100644
--- a/Documentation/devicetree/bindings/input/gpio-keys.txt
+++ b/Documentation/devicetree/bindings/input/gpio-keys.txt
@@ -24,6 +24,7 @@ both at the same time. Specifying both properties is allowed.
 	- debounce-interval: Debouncing interval time in milliseconds.
 	  If not specified defaults to 5.
 	- wakeup-source: Boolean, button can wake-up the system.
+			 (Legacy property supported: "gpio-key,wakeup")
 	- linux,can-disable: Boolean, indicates that button is connected
 	  to dedicated (not shared) interrupt which can be disabled to
 	  suppress events from the button.
diff --git a/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt b/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
index 4d86059c370c..d0ea09ba249f 100644
--- a/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
+++ b/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
@@ -20,6 +20,7 @@ report the event using GPIO interrupts to the cpu.
 Optional Properties:
 - linux,no-autorepeat:	do no enable autorepeat feature.
 - wakeup-source:	use any event on keypad as wakeup event.
+			(Legacy property supported: "linux,wakeup")
 - debounce-delay-ms:	debounce interval in milliseconds
 - col-scan-delay-us:	delay, measured in microseconds, that is needed
 			before we can scan keypad after activating column gpio
diff --git a/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
index 0382b8bd69c6..1faa7292e21f 100644
--- a/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
+++ b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
@@ -29,7 +29,8 @@ Optional properties, in addition to those specified by the shared
 - nvidia,debounce-delay-ms: delay in milliseconds per row scan for debouncing
 - nvidia,repeat-delay-ms: delay in milliseconds before repeat starts
 - nvidia,ghost-filter: enable ghost filtering for this device
-- nvidia,wakeup-source: configure keyboard as a wakeup source for suspend/resume
+- wakeup-source: configure keyboard as a wakeup source for suspend/resume
+		 (Legacy property supported: "nvidia,wakeup-source")
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt b/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
index ee6215681182..4a9dc6ba96b1 100644
--- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
+++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
@@ -37,6 +37,7 @@ PROPERTIES
 	Usage: optional
 	Value type: <bool>
 	Definition: use any event on keypad as wakeup event.
+		    (Legacy property supported: "linux,keypad-wakeup")
 
 - keypad,num-rows:
 	Usage: required
diff --git a/Documentation/devicetree/bindings/input/samsung-keypad.txt b/Documentation/devicetree/bindings/input/samsung-keypad.txt
index 863e77f619dc..5305e74e5742 100644
--- a/Documentation/devicetree/bindings/input/samsung-keypad.txt
+++ b/Documentation/devicetree/bindings/input/samsung-keypad.txt
@@ -38,6 +38,7 @@ event using a interrupt to the cpu.
 
 Optional Properties:
 - wakeup-source: use any event on keypad as wakeup event.
+		 (Legacy property supported: "linux,input-wakeup")
 
 Optional Properties specific to linux:
 - linux,keypad-no-autorepeat: do no enable autorepeat feature.
@@ -51,7 +52,7 @@ event using a interrupt to the cpu.
 		samsung,keypad-num-rows = <2>;
 		samsung,keypad-num-columns = <8>;
 		linux,input-no-autorepeat;
-		linux,input-wakeup;
+		wakeup-source;
 
 		pinctrl-names = "default";
 		pinctrl-0 = <&keypad_rows &keypad_columns>;
diff --git a/Documentation/devicetree/bindings/mfd/tc3589x.txt b/Documentation/devicetree/bindings/mfd/tc3589x.txt
index 37bf7f1aa70a..23fc2f21f5a4 100644
--- a/Documentation/devicetree/bindings/mfd/tc3589x.txt
+++ b/Documentation/devicetree/bindings/mfd/tc3589x.txt
@@ -56,6 +56,7 @@ following built-in devices: gpio, keypad, rotator (vibrator), PWM (for
    bindings/input/matrix-keymap.txt
  - linux,no-autorepeat: do no enable autorepeat feature.
  - wakeup-source: use any event on keypad as wakeup event.
+		  (Legacy property supported: "linux,wakeup")
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 0384fc3f64e8..a88f5dc775bd 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -67,7 +67,8 @@ polarity is in effect.
 
 Optional SDIO properties:
 - keep-power-in-suspend: Preserves card power during a suspend/resume cycle
-- enable-sdio-wakeup: Enables wake up of host system on SDIO IRQ assertion
+- wakeup-source: Enables wake up of host system on SDIO IRQ assertion
+		 (Legacy property supported: "enable-sdio-wakeup")
 
 
 MMC power sequences:
@@ -117,7 +118,7 @@ sdhci@ab000000 {
 	wp-gpios = <&gpio 70 0>;
 	max-frequency = <50000000>;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	mmc-pwrseq = <&sdhci0_pwrseq>
 }
 
diff --git a/Documentation/devicetree/bindings/rtc/isil,isl12057.txt b/Documentation/devicetree/bindings/rtc/isil,isl12057.txt
index 501c39ceae79..cf83e0940302 100644
--- a/Documentation/devicetree/bindings/rtc/isil,isl12057.txt
+++ b/Documentation/devicetree/bindings/rtc/isil,isl12057.txt
@@ -5,7 +5,7 @@ consisting of a compatible field, an address and possibly an interrupt
 line).
 
 Nonetheless, it also supports an option boolean property
-("isil,irq2-can-wakeup-machine") to handle the specific use-case found
+("wakeup-source") to handle the specific use-case found
 on at least three in-tree users of the chip (NETGEAR ReadyNAS 102, 104
 and 2120 ARM-based NAS); On those devices, the IRQ#2 pin of the chip
 (associated with the alarm supported by the driver) is not connected
@@ -22,9 +22,9 @@ can wake up the device.
 
 Optional properties:
 
- - "isil,irq2-can-wakeup-machine": mark the chip as a wakeup source,
-   independently of the availability of an IRQ line connected to the
-   SoC.
+ - "wakeup-source": mark the chip as a wakeup source, independently of
+    the availability of an IRQ line connected to the SoC.
+    (Legacy property supported: "isil,irq2-can-wakeup-machine")
 
  - "interrupt-parent", "interrupts": for passing the interrupt line
    of the SoC connected to IRQ#2 of the RTC chip.
@@ -74,5 +74,5 @@ Example isl12057 node without IRQ#2 pin connected to the SoC but to a
 	isl12057: isl12057@68 {
 		compatible = "isil,isl12057";
 		reg = <0x68>;
-		isil,irq2-can-wakeup-machine;
+		wakeup-source;
 	};
diff --git a/Documentation/devicetree/bindings/rtc/rtc-opal.txt b/Documentation/devicetree/bindings/rtc/rtc-opal.txt
index af87e5ecac54..a1734e5cb75b 100644
--- a/Documentation/devicetree/bindings/rtc/rtc-opal.txt
+++ b/Documentation/devicetree/bindings/rtc/rtc-opal.txt
@@ -5,12 +5,13 @@ IBM OPAL real-time clock
 - comapatible: Should be "ibm,opal-rtc"
 
 Optional properties:
-- has-tpo: Decides if the wakeup is supported or not.
+- wakeup-source: Decides if the wakeup is supported or not
+		 (Legacy property supported: "has-tpo")
 
 Example:
 	rtc {
 		compatible = "ibm,opal-rtc";
-		has-tpo;
+		wakeup-source;
 		phandle = <0x10000029>;
 		linux,phandle = <0x10000029>;
 	};
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1253303 — Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties

FromRob Herring <robh+dt@kernel.org>
Date2015-10-22 00:10 +0200
SubjectRe: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties
Message-ID<qm9K2-7MW-5@gated-at.bofh.it>
In reply to#1252682
On Wed, Oct 21, 2015 at 5:09 AM, Sudeep Holla <sudeep.holla@arm.com> wrote:
> This patch marks all the reference to the legacy wakeup bindings
> and replaces them with the standard "wakeup-source" property.
>
> All these legacy property are also listed under a separate section in
> the generic wakeup-source binding document.
>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Pawel Moll <pawel.moll@arm.com>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Acked-by: Rob Herring <robh@kernel.org>

> ---
>  Documentation/devicetree/bindings/crypto/fsl-sec4.txt          |  4 ++--
>  Documentation/devicetree/bindings/input/ads7846.txt            |  3 ++-
>  Documentation/devicetree/bindings/input/gpio-keys-polled.txt   |  1 +
>  Documentation/devicetree/bindings/input/gpio-keys.txt          |  1 +
>  Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt |  1 +
>  Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt |  3 ++-
>  Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt |  1 +
>  Documentation/devicetree/bindings/input/samsung-keypad.txt     |  3 ++-
>  Documentation/devicetree/bindings/mfd/tc3589x.txt              |  1 +
>  Documentation/devicetree/bindings/mmc/mmc.txt                  |  5 +++--
>  Documentation/devicetree/bindings/rtc/isil,isl12057.txt        | 10 +++++-----
>  Documentation/devicetree/bindings/rtc/rtc-opal.txt             |  5 +++--
>  12 files changed, 24 insertions(+), 14 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
> index 6831d025ec24..adeca34c5a33 100644
> --- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
> +++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
> @@ -441,7 +441,7 @@ System ON/OFF key driver
>                 regmap = <&snvs>;
>                 interrupts = <0 4 0x4>
>                 linux,keycode = <116>; /* KEY_POWER */
> -               wakeup;
> +               wakeup-source;
>         };
>
>  =====================================================================
> @@ -530,7 +530,7 @@ FULL EXAMPLE
>                         regmap = <&sec_mon>;
>                         interrupts = <0 4 0x4>;
>                         linux,keycode = <116>; /* KEY_POWER */
> -                       wakeup;
> +                       wakeup-source;
>                 };
>         };
>
> diff --git a/Documentation/devicetree/bindings/input/ads7846.txt b/Documentation/devicetree/bindings/input/ads7846.txt
> index df8b1279491d..33a1638b61d6 100644
> --- a/Documentation/devicetree/bindings/input/ads7846.txt
> +++ b/Documentation/devicetree/bindings/input/ads7846.txt
> @@ -65,6 +65,7 @@ must be specified.
>         pendown-gpio                    GPIO handle describing the pin the !PENIRQ
>                                         line is connected to.
>         wakeup-source                   use any event on touchscreen as wakeup event.
> +                                       (Legacy property support: "linux,wakeup")
>
>
>  Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::
> @@ -86,6 +87,6 @@ must be specified.
>                         ti,x-plate-ohms = /bits/ 16 <40>;
>                         ti,pressure-max = /bits/ 16 <255>;
>
> -                       linux,wakeup;
> +                       wakeup-source;
>                 };
>         };
> diff --git a/Documentation/devicetree/bindings/input/gpio-keys-polled.txt b/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
> index 5b91f5a3bd5c..d698475a9262 100644
> --- a/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
> +++ b/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
> @@ -21,6 +21,7 @@ Device-Tree bindings for input/gpio_keys_polled.c keyboard driver
>         - debounce-interval: Debouncing interval time in milliseconds.
>           If not specified defaults to 5.
>         - wakeup-source: Boolean, button can wake-up the system.
> +                        (Legacy property supported: "gpio-key,wakeup")
>
>  Example nodes:
>
> diff --git a/Documentation/devicetree/bindings/input/gpio-keys.txt b/Documentation/devicetree/bindings/input/gpio-keys.txt
> index 072bf7573c37..cf1333d1dd52 100644
> --- a/Documentation/devicetree/bindings/input/gpio-keys.txt
> +++ b/Documentation/devicetree/bindings/input/gpio-keys.txt
> @@ -24,6 +24,7 @@ both at the same time. Specifying both properties is allowed.
>         - debounce-interval: Debouncing interval time in milliseconds.
>           If not specified defaults to 5.
>         - wakeup-source: Boolean, button can wake-up the system.
> +                        (Legacy property supported: "gpio-key,wakeup")
>         - linux,can-disable: Boolean, indicates that button is connected
>           to dedicated (not shared) interrupt which can be disabled to
>           suppress events from the button.
> diff --git a/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt b/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
> index 4d86059c370c..d0ea09ba249f 100644
> --- a/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
> +++ b/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
> @@ -20,6 +20,7 @@ report the event using GPIO interrupts to the cpu.
>  Optional Properties:
>  - linux,no-autorepeat: do no enable autorepeat feature.
>  - wakeup-source:       use any event on keypad as wakeup event.
> +                       (Legacy property supported: "linux,wakeup")
>  - debounce-delay-ms:   debounce interval in milliseconds
>  - col-scan-delay-us:   delay, measured in microseconds, that is needed
>                         before we can scan keypad after activating column gpio
> diff --git a/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
> index 0382b8bd69c6..1faa7292e21f 100644
> --- a/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
> +++ b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
> @@ -29,7 +29,8 @@ Optional properties, in addition to those specified by the shared
>  - nvidia,debounce-delay-ms: delay in milliseconds per row scan for debouncing
>  - nvidia,repeat-delay-ms: delay in milliseconds before repeat starts
>  - nvidia,ghost-filter: enable ghost filtering for this device
> -- nvidia,wakeup-source: configure keyboard as a wakeup source for suspend/resume
> +- wakeup-source: configure keyboard as a wakeup source for suspend/resume
> +                (Legacy property supported: "nvidia,wakeup-source")
>
>  Example:
>
> diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt b/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
> index ee6215681182..4a9dc6ba96b1 100644
> --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
> +++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
> @@ -37,6 +37,7 @@ PROPERTIES
>         Usage: optional
>         Value type: <bool>
>         Definition: use any event on keypad as wakeup event.
> +                   (Legacy property supported: "linux,keypad-wakeup")
>
>  - keypad,num-rows:
>         Usage: required
> diff --git a/Documentation/devicetree/bindings/input/samsung-keypad.txt b/Documentation/devicetree/bindings/input/samsung-keypad.txt
> index 863e77f619dc..5305e74e5742 100644
> --- a/Documentation/devicetree/bindings/input/samsung-keypad.txt
> +++ b/Documentation/devicetree/bindings/input/samsung-keypad.txt
> @@ -38,6 +38,7 @@ event using a interrupt to the cpu.
>
>  Optional Properties:
>  - wakeup-source: use any event on keypad as wakeup event.
> +                (Legacy property supported: "linux,input-wakeup")
>
>  Optional Properties specific to linux:
>  - linux,keypad-no-autorepeat: do no enable autorepeat feature.
> @@ -51,7 +52,7 @@ event using a interrupt to the cpu.
>                 samsung,keypad-num-rows = <2>;
>                 samsung,keypad-num-columns = <8>;
>                 linux,input-no-autorepeat;
> -               linux,input-wakeup;
> +               wakeup-source;
>
>                 pinctrl-names = "default";
>                 pinctrl-0 = <&keypad_rows &keypad_columns>;
> diff --git a/Documentation/devicetree/bindings/mfd/tc3589x.txt b/Documentation/devicetree/bindings/mfd/tc3589x.txt
> index 37bf7f1aa70a..23fc2f21f5a4 100644
> --- a/Documentation/devicetree/bindings/mfd/tc3589x.txt
> +++ b/Documentation/devicetree/bindings/mfd/tc3589x.txt
> @@ -56,6 +56,7 @@ following built-in devices: gpio, keypad, rotator (vibrator), PWM (for
>     bindings/input/matrix-keymap.txt
>   - linux,no-autorepeat: do no enable autorepeat feature.
>   - wakeup-source: use any event on keypad as wakeup event.
> +                 (Legacy property supported: "linux,wakeup")
>
>  Example:
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
> index 0384fc3f64e8..a88f5dc775bd 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/mmc.txt
> @@ -67,7 +67,8 @@ polarity is in effect.
>
>  Optional SDIO properties:
>  - keep-power-in-suspend: Preserves card power during a suspend/resume cycle
> -- enable-sdio-wakeup: Enables wake up of host system on SDIO IRQ assertion
> +- wakeup-source: Enables wake up of host system on SDIO IRQ assertion
> +                (Legacy property supported: "enable-sdio-wakeup")
>
>
>  MMC power sequences:
> @@ -117,7 +118,7 @@ sdhci@ab000000 {
>         wp-gpios = <&gpio 70 0>;
>         max-frequency = <50000000>;
>         keep-power-in-suspend;
> -       enable-sdio-wakeup;
> +       wakeup-source;
>         mmc-pwrseq = <&sdhci0_pwrseq>
>  }
>
> diff --git a/Documentation/devicetree/bindings/rtc/isil,isl12057.txt b/Documentation/devicetree/bindings/rtc/isil,isl12057.txt
> index 501c39ceae79..cf83e0940302 100644
> --- a/Documentation/devicetree/bindings/rtc/isil,isl12057.txt
> +++ b/Documentation/devicetree/bindings/rtc/isil,isl12057.txt
> @@ -5,7 +5,7 @@ consisting of a compatible field, an address and possibly an interrupt
>  line).
>
>  Nonetheless, it also supports an option boolean property
> -("isil,irq2-can-wakeup-machine") to handle the specific use-case found
> +("wakeup-source") to handle the specific use-case found
>  on at least three in-tree users of the chip (NETGEAR ReadyNAS 102, 104
>  and 2120 ARM-based NAS); On those devices, the IRQ#2 pin of the chip
>  (associated with the alarm supported by the driver) is not connected
> @@ -22,9 +22,9 @@ can wake up the device.
>
>  Optional properties:
>
> - - "isil,irq2-can-wakeup-machine": mark the chip as a wakeup source,
> -   independently of the availability of an IRQ line connected to the
> -   SoC.
> + - "wakeup-source": mark the chip as a wakeup source, independently of
> +    the availability of an IRQ line connected to the SoC.
> +    (Legacy property supported: "isil,irq2-can-wakeup-machine")
>
>   - "interrupt-parent", "interrupts": for passing the interrupt line
>     of the SoC connected to IRQ#2 of the RTC chip.
> @@ -74,5 +74,5 @@ Example isl12057 node without IRQ#2 pin connected to the SoC but to a
>         isl12057: isl12057@68 {
>                 compatible = "isil,isl12057";
>                 reg = <0x68>;
> -               isil,irq2-can-wakeup-machine;
> +               wakeup-source;
>         };
> diff --git a/Documentation/devicetree/bindings/rtc/rtc-opal.txt b/Documentation/devicetree/bindings/rtc/rtc-opal.txt
> index af87e5ecac54..a1734e5cb75b 100644
> --- a/Documentation/devicetree/bindings/rtc/rtc-opal.txt
> +++ b/Documentation/devicetree/bindings/rtc/rtc-opal.txt
> @@ -5,12 +5,13 @@ IBM OPAL real-time clock
>  - comapatible: Should be "ibm,opal-rtc"
>
>  Optional properties:
> -- has-tpo: Decides if the wakeup is supported or not.
> +- wakeup-source: Decides if the wakeup is supported or not
> +                (Legacy property supported: "has-tpo")
>
>  Example:
>         rtc {
>                 compatible = "ibm,opal-rtc";
> -               has-tpo;
> +               wakeup-source;
>                 phandle = <0x10000029>;
>                 linux,phandle = <0x10000029>;
>         };
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1258351 — Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-28 19:30 +0100
SubjectRe: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties
Message-ID<qoDDX-6eY-1@gated-at.bofh.it>
In reply to#1253303

On 21/10/15 23:04, Rob Herring wrote:
> On Wed, Oct 21, 2015 at 5:09 AM, Sudeep Holla <sudeep.holla@arm.com> wrote:
>> This patch marks all the reference to the legacy wakeup bindings
>> and replaces them with the standard "wakeup-source" property.
>>
>> All these legacy property are also listed under a separate section in
>> the generic wakeup-source binding document.
>>
>> Cc: Rob Herring <robh+dt@kernel.org>
>> Cc: Pawel Moll <pawel.moll@arm.com>
>> Cc: Mark Rutland <mark.rutland@arm.com>
>> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
>> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
>
> Acked-by: Rob Herring <robh@kernel.org>
>

Thanks Rob, can you take these couple(first two) of DT binding patches
via devicetree. I can then push remaining patches via respective trees
later.

-- 
Regards,
Sudeep
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1259706 — Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties

FromRob Herring <robh+dt@kernel.org>
Date2015-10-30 19:40 +0100
SubjectRe: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties
Message-ID<qpmKK-Q6-13@gated-at.bofh.it>
In reply to#1258351
On Wed, Oct 28, 2015 at 1:23 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:
>
>
> On 21/10/15 23:04, Rob Herring wrote:
>>
>> On Wed, Oct 21, 2015 at 5:09 AM, Sudeep Holla <sudeep.holla@arm.com>
>> wrote:
>>>
>>> This patch marks all the reference to the legacy wakeup bindings
>>> and replaces them with the standard "wakeup-source" property.
>>>
>>> All these legacy property are also listed under a separate section in
>>> the generic wakeup-source binding document.
>>>
>>> Cc: Rob Herring <robh+dt@kernel.org>
>>> Cc: Pawel Moll <pawel.moll@arm.com>
>>> Cc: Mark Rutland <mark.rutland@arm.com>
>>> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
>>> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
>>
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>>
>
> Thanks Rob, can you take these couple(first two) of DT binding patches
> via devicetree. I can then push remaining patches via respective trees
> later.

Both applied.

Rob
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1252683 — [PATCH 08/19] ARM: dts: spear: replace gpio-key,wakeup with wakeup-source property

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:20 +0200
Subject[PATCH 08/19] ARM: dts: spear: replace gpio-key,wakeup with wakeup-source property
Message-ID<qlYEX-8lO-33@gated-at.bofh.it>
In reply to#1252673
Keyboard driver for GPIO buttons(gpio-keys) checks for the legacy
"gpio-key,wakeup" boolean property to enable gpio buttons as wakeup
source.

Few dts files assign value "1" to gpio-key,wakeup which is incorrect.
Since the presence of the boolean property indicates it is enabled,
value of "0" or "1" have no significance.

This patch replaces the legacy "gpio-key,wakeup" with the unified
"wakeup-source" property which inturn fixes the above mentioned issue.

Cc: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm/boot/dts/spear1310-evb.dts | 2 +-
 arch/arm/boot/dts/spear1340-evb.dts | 2 +-
 arch/arm/boot/dts/spear320-hmi.dts  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index e48857249ce7..84101e4eebbf 100644
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -161,7 +161,7 @@
 				linux,code = <0x100>;
 				gpios = <&gpio0 7 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				wakeup-source;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index c611f5606dfe..6565f3cb866f 100644
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -223,7 +223,7 @@
 				linux,code = <0x100>;
 				gpios = <&gpio1 1 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				wakeup-source;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts
index 0aa6fef5ce22..0d0da1f65f0e 100644
--- a/arch/arm/boot/dts/spear320-hmi.dts
+++ b/arch/arm/boot/dts/spear320-hmi.dts
@@ -141,7 +141,7 @@
 				linux,code = <0x100>;
 				gpios = <&stmpegpio 3 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				wakeup-source;
 			};
 
 			button@2 {
@@ -149,7 +149,7 @@
 				linux,code = <0x200>;
 				gpios = <&stmpegpio 2 0x4>;
 				debounce-interval = <20>;
-				gpio-key,wakeup = <1>;
+				wakeup-source;
 			};
 		};
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1252684 — [PATCH 04/19] rtc: isl12057: enable support for the standard "wakeup-source" property

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:20 +0200
Subject[PATCH 04/19] rtc: isl12057: enable support for the standard "wakeup-source" property
Message-ID<qlYEX-8lO-43@gated-at.bofh.it>
In reply to#1252673
Though the isl12057 rtc driver should and will continue to support the
legacy "isil,irq2-can-wakeup-machine" property to enable RTC as the
wakeup source, we need to add support for the new standard property
"wakeup-source".

This patch adds support for "wakeup-source" property in addition to the
existing "isil,irq2-can-wakeup-machine" property.

Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: rtc-linux@googlegroups.com
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 drivers/rtc/rtc-isl12057.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/rtc/rtc-isl12057.c b/drivers/rtc/rtc-isl12057.c
index a0462e5430c7..54328d4ac0d3 100644
--- a/drivers/rtc/rtc-isl12057.c
+++ b/drivers/rtc/rtc-isl12057.c
@@ -466,9 +466,8 @@ static int isl12057_check_rtc_status(struct device *dev, struct regmap *regmap)
  * is for instance the case on ReadyNAS 102, 104 and 2120. On those
  * devices with no IRQ driectly connected to the SoC, the RTC chip
  * can be forced as a wakeup source by stating that explicitly in
- * the device's .dts file using the "isil,irq2-can-wakeup-machine"
- * boolean property. This will guarantee 'wakealarm' sysfs entry is
- * available on the device.
+ * the device's .dts file using the "wakeup-source" boolean property.
+ * This will guarantee 'wakealarm' sysfs entry is available on the device.
  *
  * The function below returns 1, i.e. the capability of the chip to
  * wakeup the device, based on IRQ availability or if the boolean
@@ -479,8 +478,9 @@ static bool isl12057_can_wakeup_machine(struct device *dev)
 {
 	struct isl12057_rtc_data *data = dev_get_drvdata(dev);
 
-	return (data->irq || of_property_read_bool(dev->of_node,
-					      "isil,irq2-can-wakeup-machine"));
+	return data->irq || of_property_read_bool(dev->of_node, "wakeup-source")
+		|| of_property_read_bool(dev->of_node, /* legacy */
+					 "isil,irq2-can-wakeup-machine");
 }
 #else
 static bool isl12057_can_wakeup_machine(struct device *dev)
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1257455 — Re: [PATCH 04/19] rtc: isl12057: enable support for the standard "wakeup-source" property

FromAlexandre Belloni <alexandre.belloni@free-electrons.com>
Date2015-10-28 00:00 +0100
SubjectRe: [PATCH 04/19] rtc: isl12057: enable support for the standard "wakeup-source" property
Message-ID<qolnI-2I6-27@gated-at.bofh.it>
In reply to#1252684
On 21/10/2015 at 11:10:01 +0100, Sudeep Holla wrote :
> Though the isl12057 rtc driver should and will continue to support the
> legacy "isil,irq2-can-wakeup-machine" property to enable RTC as the
> wakeup source, we need to add support for the new standard property
> "wakeup-source".
> 
> This patch adds support for "wakeup-source" property in addition to the
> existing "isil,irq2-can-wakeup-machine" property.
> 
> Cc: Alessandro Zummo <a.zummo@towertech.it>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: rtc-linux@googlegroups.com
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  drivers/rtc/rtc-isl12057.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
Applied, thanks.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1252685 — [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:20 +0200
Subject[PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source
Message-ID<qlYEX-8lO-47@gated-at.bofh.it>
In reply to#1252673
Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "linux,wakeup" boolean property to enable the wakeup
source, "wakeup-source" is the new standard binding.

This patch replaces all the legacy wakeup properties with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 2 +-
 arch/arm/boot/dts/ste-nomadik-s8815.dts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
index 0e1c96943d47..3228119f91d1 100644
--- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -66,7 +66,7 @@
 					keypad,num-columns = <8>;
 					keypad,num-rows = <8>;
 					linux,no-autorepeat;
-					linux,wakeup;
+					wakeup-source;
 					linux,keymap = <0x0301006b
 						        0x04010066
 							0x06040072
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index 35282c0105c6..789329030658 100644
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -163,7 +163,7 @@
 			label = "user_button";
 			gpios = <&gpio0 3 0x1>;
 			linux,code = <1>; /* KEY_ESC */
-			gpio-key,wakeup;
+			wakeup-source;
 			pinctrl-names = "default";
 			pinctrl-0 = <&user_button_default_mode>;
 		};
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1256732 — Re: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source

FromLinus Walleij <linus.walleij@linaro.org>
Date2015-10-27 13:40 +0100
SubjectRe: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source
Message-ID<qobHI-5cG-17@gated-at.bofh.it>
In reply to#1252685
On Wed, Oct 21, 2015 at 12:10 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:

> Though the keyboard and other driver will continue to support the legacy
> "gpio-key,wakeup", "linux,wakeup" boolean property to enable the wakeup
> source, "wakeup-source" is the new standard binding.
>
> This patch replaces all the legacy wakeup properties with the unified
> "wakeup-source" property in order to avoid any futher copy-paste
> duplication.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Are you sending this to ARM SoC or do I need to handle the
patch?

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1256738 — Re: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-27 13:50 +0100
SubjectRe: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source
Message-ID<qobRn-5fZ-1@gated-at.bofh.it>
In reply to#1256732

On 27/10/15 12:34, Linus Walleij wrote:
> On Wed, Oct 21, 2015 at 12:10 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:
>
>> Though the keyboard and other driver will continue to support the legacy
>> "gpio-key,wakeup", "linux,wakeup" boolean property to enable the wakeup
>> source, "wakeup-source" is the new standard binding.
>>
>> This patch replaces all the legacy wakeup properties with the unified
>> "wakeup-source" property in order to avoid any futher copy-paste
>> duplication.
>>
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> Are you sending this to ARM SoC or do I need to handle the
> patch?
>

Many platform maintainers preferred to pick up via their tree, so if you
want to pick up with other STE patches, I am fine as there's no
dependency on the driver changes.

-- 
Regards,
Sudeep
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1252686 — Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property

FromGeert Uytterhoeven <geert@linux-m68k.org>
Date2015-10-21 12:20 +0200
SubjectRe: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
Message-ID<qlYEX-8lO-49@gated-at.bofh.it>
In reply to#1252673
On Wed, Oct 21, 2015 at 12:10 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:
> Though the keyboard driver for GPIO buttons(gpio-keys) will continue to
> check for/support the legacy "gpio-key,wakeup" boolean property to
> enable gpio buttons as wakeup source, "wakeup-source" is the new
> standard binding.
>
> This patch replaces the legacy "gpio-key,wakeup" with the unified
> "wakeup-source" property in order to avoid any futher copy-paste
> duplication.

Thanks!

I made the same changes to my local tree a few weeks ago, but never found
time to send them out...

> Cc: Simon Horman <horms@verge.net.au>
> Cc: Magnus Damm <magnus.damm@gmail.com>
> Cc: linux-sh@vger.kernel.org
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1252698 — Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-21 12:30 +0200
SubjectRe: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
Message-ID<qlYOD-5L-27@gated-at.bofh.it>
In reply to#1252686

On 21/10/15 11:18, Geert Uytterhoeven wrote:
> On Wed, Oct 21, 2015 at 12:10 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:
>> Though the keyboard driver for GPIO buttons(gpio-keys) will continue to
>> check for/support the legacy "gpio-key,wakeup" boolean property to
>> enable gpio buttons as wakeup source, "wakeup-source" is the new
>> standard binding.
>>
>> This patch replaces the legacy "gpio-key,wakeup" with the unified
>> "wakeup-source" property in order to avoid any futher copy-paste
>> duplication.
>
> Thanks!
>
> I made the same changes to my local tree a few weeks ago, but never found
> time to send them out...
>

Ah OK, even I had these changes for long. I waited until I fixed all the
binding documents(which was boring ;))

>> Cc: Simon Horman <horms@verge.net.au>
>> Cc: Magnus Damm <magnus.damm@gmail.com>
>> Cc: linux-sh@vger.kernel.org
>> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
>
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
>

Thanks

-- 
Regards,
Sudeep
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1253378 — Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property

FromSimon Horman <horms@verge.net.au>
Date2015-10-22 03:00 +0200
SubjectRe: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
Message-ID<qmcoy-2Xf-3@gated-at.bofh.it>
In reply to#1252698
On Wed, Oct 21, 2015 at 11:23:03AM +0100, Sudeep Holla wrote:
> 
> 
> On 21/10/15 11:18, Geert Uytterhoeven wrote:
> >On Wed, Oct 21, 2015 at 12:10 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:
> >>Though the keyboard driver for GPIO buttons(gpio-keys) will continue to
> >>check for/support the legacy "gpio-key,wakeup" boolean property to
> >>enable gpio buttons as wakeup source, "wakeup-source" is the new
> >>standard binding.
> >>
> >>This patch replaces the legacy "gpio-key,wakeup" with the unified
> >>"wakeup-source" property in order to avoid any futher copy-paste
> >>duplication.
> >
> >Thanks!
> >
> >I made the same changes to my local tree a few weeks ago, but never found
> >time to send them out...
> >
> 
> Ah OK, even I had these changes for long. I waited until I fixed all the
> binding documents(which was boring ;))
>
> >>Cc: Simon Horman <horms@verge.net.au>
> >>Cc: Magnus Damm <magnus.damm@gmail.com>
> >>Cc: linux-sh@vger.kernel.org
> >>Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> >
> >Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Can I clarify that you would like me to pick up this patch?
If so I'm happy to do so.

Else:

Acked-by: Simon Horman <horms+renesas@verge.net.au>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1253654 — Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-10-22 11:40 +0200
SubjectRe: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
Message-ID<qmkvL-6IE-17@gated-at.bofh.it>
In reply to#1253378

On 22/10/15 01:50, Simon Horman wrote:
> On Wed, Oct 21, 2015 at 11:23:03AM +0100, Sudeep Holla wrote:
>>
>>
>> On 21/10/15 11:18, Geert Uytterhoeven wrote:
>>> On Wed, Oct 21, 2015 at 12:10 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:
>>>> Though the keyboard driver for GPIO buttons(gpio-keys) will continue to
>>>> check for/support the legacy "gpio-key,wakeup" boolean property to
>>>> enable gpio buttons as wakeup source, "wakeup-source" is the new
>>>> standard binding.
>>>>
>>>> This patch replaces the legacy "gpio-key,wakeup" with the unified
>>>> "wakeup-source" property in order to avoid any futher copy-paste
>>>> duplication.
>>>
>>> Thanks!
>>>
>>> I made the same changes to my local tree a few weeks ago, but never found
>>> time to send them out...
>>>
>>
>> Ah OK, even I had these changes for long. I waited until I fixed all the
>> binding documents(which was boring ;))
>>
>>>> Cc: Simon Horman <horms@verge.net.au>
>>>> Cc: Magnus Damm <magnus.damm@gmail.com>
>>>> Cc: linux-sh@vger.kernel.org
>>>> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
>>>
>>> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Can I clarify that you would like me to pick up this patch?
> If so I'm happy to do so.
>

Yes you can pick up this patch as it has no dependency on driver changes.

> Else:
>
> Acked-by: Simon Horman <horms+renesas@verge.net.au>
>

Thanks.

-- 
Regards,
Sudeep
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


Page 1 of 2  [1] 2  Next page →

Back to top | Article view | linux.kernel


csiph-web