devicetree: standardize/consolidate on "wakeup-source" property
Subsystems (18)
cover devicetree: standardize/consolidate on "wakeup-source" property
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
Signature · 1 line
1.9.1
PATCH 1/19 Documentation: devicetree: standardize/consolidate on "wakeup-source" property
Currently different drivers use multiple forms of annotating devices that should be set up as wakeup sources for the system.
This patch adds a separate binding document inorder to standardize and consolidate to use "wakeup-source" boolean property to mark the devices as wakeup capable.
--- .../devicetree/bindings/power/wakeup-source.txt | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/wakeup-source.txt
Documentation/devicetree/bindings/power/wakeup-source.txt new file +71 -0
@@ -0,0 +1,71 @@ +Specifying wakeup capability for devices +============================================ + +Any device nodes +---------------- +Nodes that describe devices which has wakeup capability must contain an +"wakeup-source" boolean property. + +Also, if device is marked as a wakeup source, then all the primary +interrupt(s) can be used as wakeup interrupt(s). + +However if the devices have dedicated interrupt as the wakeup source +then they need to specify/identify the same using device specific +interrupt name. In such cases only that interrupt can be used as wakeup +interrupt. + +List of legacy properties and respective binding document +--------------------------------------------------------- + +1. "enable-sdio-wakeup" Documentation/devicetree/bindings/mmc/mmc.txt +2. "gpio-key,wakeup" Documentation/devicetree/bindings/input/gpio-keys{,-polled}.txt +3. "has-tpo" Documentation/devicetree/bindings/rtc/rtc-opal.txt +4. "isil,irq2-can-wakeup-machine" Documentation/devicetree/bindings/rtc/isil,isl12057.txt +5. "linux,wakeup" Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt + Documentation/devicetree/bindings/mfd/tc3589x.txt + Documentation/devicetree/bindings/input/ads7846.txt +6. "linux,keypad-wakeup" Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt +7. "linux,input-wakeup" Documentation/devicetree/bindings/input/samsung-keypad.txt +8. "nvidia,wakeup-source" Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt + +Examples +-------- + +1. With "wakeup" interrupt name + + device at 10000 { + compatible = "vendor,device-id"; + reg = <0x10000 0x1000>; + interrupts = <0 19 4>, <0 21 4>, <0 22 4>; + interrupt-names = "ack", "err", "wakeup"; + wakeup-source; + }; + +2. Without "wakeup" interrupt name + + embedded-controller { + compatible = "google,cros-ec-i2c"; + reg = <0x1e>; + interrupts = <6 0>; + interrupt-parent = <&gpx1>; + pinctrl-names = "default"; + pinctrl-0 = <&ec_irq>; + wakeup-source; + }; + +3. Without interrupts + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + + button at 1 { + debounce_interval = <50>; + wakeup-source; + linux,code = <116>; + label = "POWER"; + gpios = <&iofpga_gpio0 0 0x4>; + }; + [....] + };
Signature · 1 line
1.9.1
Re: [PATCH 01/19] Documentation: devicetree: standardize/consolidate on "wakeup-source" property
Quoted 7 lines · Sudeep Holla
Currently different drivers use multiple forms of annotating devices that should be set up as wakeup sources for the system.
This patch adds a separate binding document inorder to standardize and consolidate to use "wakeup-source" boolean property to mark the devices as wakeup capable.
Quoted 5 lines
Cc Rob Herring <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Ian Campbell <[email protected]>Signed-off-by Sudeep Holla <[email protected]>
Looks good to me.
Quoted 85 lines
--- .../devicetree/bindings/power/wakeup-source.txt | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/wakeup-source.txtDocumentation/devicetree/bindings/power/wakeup-source.txt new file +71
-1@@ -0,0 +1,71 @@ +Specifying wakeup capability for devices +============================================ + +Any device nodes +---------------- +Nodes that describe devices which has wakeup capability must contain an +"wakeup-source" boolean property. + +Also, if device is marked as a wakeup source, then all the primary +interrupt(s) can be used as wakeup interrupt(s). + +However if the devices have dedicated interrupt as the wakeup source +then they need to specify/identify the same using device specific +interrupt name. In such cases only that interrupt can be used as wakeup +interrupt. + +List of legacy properties and respective binding document +--------------------------------------------------------- + +1. "enable-sdio-wakeup" Documentation/devicetree/bindings/mmc/mmc.txt +2. "gpio-key,wakeup" Documentation/devicetree/bindings/input/gpio-keys{,-polled}.txt +3. "has-tpo" Documentation/devicetree/bindings/rtc/rtc-opal.txt +4. "isil,irq2-can-wakeup-machine" Documentation/devicetree/bindings/rtc/isil,isl12057.txt +5. "linux,wakeup" Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt + Documentation/devicetree/bindings/mfd/tc3589x.txt + Documentation/devicetree/bindings/input/ads7846.txt +6. "linux,keypad-wakeup" Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt +7. "linux,input-wakeup" Documentation/devicetree/bindings/input/samsung-keypad.txt +8. "nvidia,wakeup-source" Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt + +Examples +-------- + +1. With "wakeup" interrupt name + + device at 10000 { + compatible = "vendor,device-id"; + reg = <0x10000 0x1000>; + interrupts = <0 19 4>, <0 21 4>, <0 22 4>; + interrupt-names = "ack", "err", "wakeup"; + wakeup-source; + }; + +2. Without "wakeup" interrupt name + + embedded-controller { + compatible = "google,cros-ec-i2c"; + reg = <0x1e>; + interrupts = <6 0>; + interrupt-parent = <&gpx1>; + pinctrl-names = "default"; + pinctrl-0 = <&ec_irq>; + wakeup-source; + }; + +3. Without interrupts + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + + button at 1 { + debounce_interval = <50>; + wakeup-source; + linux,code = <116>; + label = "POWER"; + gpios = <&iofpga_gpio0 0 0x4>; + }; + [....] + }; --1.9.1
PATCH 2/19 Documentation: devicetree: fix reference to legacy wakeup properties
In reply to Sudeep HollaThis 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.
--- 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(-)
Documentation/devicetree/bindings/crypto/fsl-sec4.txt +2 -2
@@ -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; }; };
Documentation/devicetree/bindings/input/ads7846.txt +2 -1
@@ -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; }; };
Documentation/devicetree/bindings/input/gpio-keys-polled.txt +1 -0
@@ -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:
Documentation/devicetree/bindings/input/gpio-keys.txt +1 -0
@@ -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.
Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt +1 -0
@@ -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
Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt +2 -1
@@ -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:
Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt +1 -0
@@ -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
Documentation/devicetree/bindings/input/samsung-keypad.txt +2 -1
@@ -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>;
Documentation/devicetree/bindings/mfd/tc3589x.txt +1 -0
@@ -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:
Documentation/devicetree/bindings/mmc/mmc.txt +3 -2
@@ -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 at ab000000 { wp-gpios = <&gpio 70 0>; max-frequency = <50000000>; keep-power-in-suspend; - enable-sdio-wakeup; + wakeup-source; mmc-pwrseq = <&sdhci0_pwrseq> }
Documentation/devicetree/bindings/rtc/isil,isl12057.txt +5 -5
@@ -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 at 68 { compatible = "isil,isl12057"; reg = <0x68>; - isil,irq2-can-wakeup-machine; + wakeup-source; };
Documentation/devicetree/bindings/rtc/rtc-opal.txt +3 -2
@@ -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>; };
Signature · 1 line
1.9.1
Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties
Quoted 11 lines · Sudeep Holla
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 <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Ian Campbell <[email protected]>Signed-off-by Sudeep Holla <[email protected]>
Quoted 231 lines
--- 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(-)Documentation/devicetree/bindings/crypto/fsl-sec4.txt +2
-2@@ -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; }; };Documentation/devicetree/bindings/input/ads7846.txt +2
-1@@ -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; }; };Documentation/devicetree/bindings/input/gpio-keys-polled.txt +1
-0@@ -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:Documentation/devicetree/bindings/input/gpio-keys.txt +1
-0@@ -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.Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt +1
-0@@ -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 gpioDocumentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt +2
-1@@ -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:Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt +1
-0@@ -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: requiredDocumentation/devicetree/bindings/input/samsung-keypad.txt +2
-1@@ -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>;Documentation/devicetree/bindings/mfd/tc3589x.txt +1
-0@@ -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:Documentation/devicetree/bindings/mmc/mmc.txt +3
-2@@ -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 at ab000000 { wp-gpios = <&gpio 70 0>; max-frequency = <50000000>; keep-power-in-suspend; - enable-sdio-wakeup; + wakeup-source; mmc-pwrseq = <&sdhci0_pwrseq> }Documentation/devicetree/bindings/rtc/isil,isl12057.txt +5
-5@@ -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 at 68 { compatible = "isil,isl12057"; reg = <0x68>; - isil,irq2-can-wakeup-machine; + wakeup-source; };Documentation/devicetree/bindings/rtc/rtc-opal.txt +3
-3@@ -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
Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties
Quoted 7 lines · Rob Herring
Quoted 6 lines · Sudeep Holla
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.
Quoted 8 lines
Quoted 5 lines
Cc Rob Herring <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Ian Campbell <[email protected]>Signed-off-by Sudeep Holla <[email protected]>Acked-by Rob Herring <[email protected]>
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.
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 02/19] Documentation: devicetree: fix reference to legacy wakeup properties
Quoted 20 lines · Sudeep Holla
Quoted 17 lines · Rob Herring
Quoted 12 lines · Sudeep Holla
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 <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Ian Campbell <[email protected]>Signed-off-by Sudeep Holla <[email protected]>
Quoted 6 lines
Quoted 2 lines
Acked-by Rob Herring <[email protected]>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
PATCH 3/19 rtc: opal: enable support for the stardard "wakeup-source" property
In reply to Sudeep HollaThough the opal rtc driver should and will continue to support the legacy "has-tpo" 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 "has-tpo" property.
--- drivers/rtc/rtc-opal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/rtc/rtc-opal.c +3 -2
@@ -199,8 +199,9 @@ static int opal_rtc_probe(struct platform_device *pdev) {struct rtc_device *rtc; -if (pdev->dev.of_node &&of_get_property (pdev->dev.of_node,"has-tpo" , -NULL )) { +if (pdev->dev.of_node && + (of_property_read_bool (pdev->dev.of_node,"wakeup-source" ) || +of_property_read_bool (pdev->dev.of_node,"has-tpo" )/* legacy */ )) {device_set_wakeup_capable (&pdev->dev, true); opal_rtc_ops.read_alarm = opal_get_tpo_time; opal_rtc_ops.set_alarm = opal_set_tpo_time;
Signature · 1 line
1.9.1
Alexandre Belloni
AppliedRe: [PATCH 03/19] rtc: opal: enable support for the stardard "wakeup-source" property
Quoted 7 lines · Sudeep Holla
Though the opal rtc driver should and will continue to support the legacy "has-tpo" 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 "has-tpo" property.
Quoted 8 lines
Cc Alessandro Zummo <[email protected]>Cc Alexandre Belloni <[email protected]>Cc rtc-linux at googlegroups.comSigned-off-by Sudeep Holla <[email protected]>--- drivers/rtc/rtc-opal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Applied, thanks.
Signature · 3 lines
Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 4/19 rtc: isl12057: enable support for the standard "wakeup-source" property
In reply to Sudeep HollaThough 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.
--- drivers/rtc/rtc-isl12057.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/rtc/rtc-isl12057.c +5 -5
@@ -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)
Signature · 1 line
1.9.1
Alexandre Belloni
AppliedRe: [PATCH 04/19] rtc: isl12057: enable support for the standard "wakeup-source" property
Quoted 8 lines · Sudeep Holla
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.
Quoted 8 lines
Cc Alessandro Zummo <[email protected]>Cc Alexandre Belloni <[email protected]>Cc rtc-linux at googlegroups.comSigned-off-by Sudeep Holla <[email protected]>--- drivers/rtc/rtc-isl12057.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Applied, thanks.
Signature · 3 lines
Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 5/19 mmc: core/host: enable support for the standard "wakeup-source" property
In reply to Sudeep HollaThough 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.
--- drivers/mmc/core/host.c | 3 ++- drivers/mmc/host/sdhci-pltfm.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/mmc/core/host.c +2 -1
@@ -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 ;
drivers/mmc/host/sdhci-pltfm.c +2 -1
@@ -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
Signature · 1 line
1.9.1
Ulf Hansson
AppliedRe: [PATCH 05/19] mmc: core/host: enable support for the standard "wakeup-source" property
Quoted 11 lines · Sudeep Holla
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 <[email protected]>Cc Adrian Hunter <[email protected]>Cc linux-mmc at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>
Thanks, applied for next!
Kind regards
Uffe
Quoted 36 lines
--- drivers/mmc/core/host.c | 3 ++- drivers/mmc/host/sdhci-pltfm.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)drivers/mmc/core/host.c +2
-1@@ -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 ;drivers/mmc/host/sdhci-pltfm.c +2
-2@@ -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
PATCH 6/19 input: tegra-kbc: enable support for the standard "wakeup-source" property
In reply to Sudeep HollaThough the mmc core driver should/will continue to support the legacy "nvidia,wakeup-source" 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 "nvidia,wakeup-source" property.
--- drivers/input/keyboard/tegra-kbc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/input/keyboard/tegra-kbc.c +2 -1
@@ -517,7 +517,8 @@ static int tegra_kbc_parse_dt(struct tegra_kbc *kbc)if (of_find_property (np,"nvidia,needs-ghost-filter" ,NULL )) kbc->use_ghost_filter = true; -if (of_find_property (np,"nvidia,wakeup-source" ,NULL )) +if (of_property_read_bool (np,"wakeup-source" ) || +of_property_read_bool (np,"nvidia,wakeup-source" ))/* legacy */ kbc->wakeup = true;if (!of_get_property (np,"nvidia,kbc-row-pins" , &proplen)) {
Signature · 1 line
1.9.1
Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property
Quoted 7 lines · Sudeep Holla
Though the mmc core driver should/will continue to support the legacy "nvidia,wakeup-source" 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 "nvidia,wakeup-source" property.
Quoted 6 lines
Cc Laxman Dewangan <[email protected]>Cc Dmitry Torokhov <[email protected]>Cc Thierry Reding <[email protected]>Cc linux-input at vger.kernel.orgCc linux-tegra at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>
Applied, thank you.
Quoted 21 lines
--- drivers/input/keyboard/tegra-kbc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/input/keyboard/tegra-kbc.c +2
-1@@ -517,7 +517,8 @@ static int tegra_kbc_parse_dt(struct tegra_kbc *kbc)if (of_find_property (np,"nvidia,needs-ghost-filter" ,NULL )) kbc->use_ghost_filter = true; -if (of_find_property (np,"nvidia,wakeup-source" ,NULL )) +if (of_property_read_bool (np,"wakeup-source" ) || +of_property_read_bool (np,"nvidia,wakeup-source" ))/* legacy */ kbc->wakeup = true;if (!of_get_property (np,"nvidia,kbc-row-pins" , &proplen)) {Signature · 1 line
1.9.1
Signature · 1 line
Dmitry
Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property
Quoted 8 lines · Dmitry Torokhov
Quoted 7 lines · Sudeep Holla
Though the mmc core driver should/will continue to support the legacy "nvidia,wakeup-source" 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 "nvidia,wakeup-source" property.
Quoted 9 lines
Quoted 6 lines
Cc Laxman Dewangan <[email protected]>Cc Dmitry Torokhov <[email protected]>Cc Thierry Reding <[email protected]>Cc linux-input at vger.kernel.orgCc linux-tegra at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>Applied, thank you.
Thanks, but I think I sent out a old copy which had unrelated commit message because of copy-paste. *Sorry for that*. Can you update it something like:
"
Though the tegra-kbc driver should/will continue to support the legacy "nvidia,wakeup-source" property to enable keyboard 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 "nvidia,wakeup-source" property.
"
Signature · 2 lines
Regards, Sudeep
Dmitry Torokhov
maintainerRe: [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property
Quoted 25 lines · Sudeep Holla
Quoted 8 lines · Dmitry Torokhov
Quoted 7 lines · Sudeep Holla
Though the mmc core driver should/will continue to support the legacy "nvidia,wakeup-source" 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 "nvidia,wakeup-source" property.
Quoted 9 lines
Quoted 6 lines
Cc Laxman Dewangan <[email protected]>Cc Dmitry Torokhov <[email protected]>Cc Thierry Reding <[email protected]>Cc linux-input at vger.kernel.orgCc linux-tegra at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>Applied, thank you.
Thanks, but I think I sent out a old copy which had unrelated commit message because of copy-paste. *Sorry for that*. Can you update it something like:
Quoted 8 lines
"
Though the tegra-kbc driver should/will continue to support the legacy "nvidia,wakeup-source" property to enable keyboard 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 "nvidia,wakeup-source" property.
"
Thanks, I replaced the description with what you supplied.
Signature · 1 line
Dmitry
PATCH 7/19 ARM: dts: rockchip: replace gpio-key,wakeup with wakeup-source property
In reply to Sudeep HollaKeyboard 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 and in one instance a value "0" is assigned probably assuming it won't be enabled as a wakeup source. Since the presence of the boolean property indicates it is enabled, value of "0" have no value.
This patch replaces the legacy "gpio-key,wakeup" with the unified "wakeup-source" property which inturn fixes the above mentioned issue.
--- 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/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-)
arch/arm/boot/dts/rk3066a-bqcurie2.dts +1 -2
@@ -74,7 +74,7 @@ linux,code = <116>; label = "GPIO Key Power"; linux,input-type = <1>; - gpio-key,wakeup = <1>; + wakeup-source; debounce-interval = <100>; }; button at 1 {
@@ -82,7 +82,6 @@ linux,code = <104>; label = "GPIO Key Vol-"; linux,input-type = <1>; - gpio-key,wakeup = <0>; debounce-interval = <100>; }; /* VOL+ comes somehow thru the ADC */
arch/arm/boot/dts/rk3066a-rayeager.dts +1 -1
@@ -65,7 +65,7 @@ #size-cells = <0>; button at 0 { - gpio-key,wakeup = <1>; + wakeup-source; gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; label = "GPIO Power"; linux,code = <116>;
arch/arm/boot/dts/rk3188-radxarock.dts +1 -1
@@ -63,7 +63,7 @@ linux,code = <116>; label = "GPIO Key Power"; linux,input-type = <1>; - gpio-key,wakeup = <1>; + wakeup-source; debounce-interval = <100>; }; };
arch/arm/boot/dts/rk3288-evb.dtsi +1 -1
@@ -103,7 +103,7 @@ linux,code = <116>; label = "GPIO Key Power"; linux,input-type = <1>; - gpio-key,wakeup = <1>; + wakeup-source; debounce-interval = <100>; }; };
arch/arm/boot/dts/rk3288-firefly.dtsi +1 -1
@@ -67,7 +67,7 @@ #size-cells = <0>; button at 0 { - gpio-key,wakeup = <1>; + wakeup-source; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; label = "GPIO Power"; linux,code = <116>;
arch/arm/boot/dts/rk3288-popmetal.dts +1 -1
@@ -74,7 +74,7 @@ linux,code = <116>; label = "GPIO Key Power"; linux,input-type = <1>; - gpio-key,wakeup = <1>; + wakeup-source; debounce-interval = <100>; }; };
arch/arm/boot/dts/rk3288-r89.dts +1 -1
@@ -73,7 +73,7 @@ linux,code = <116>; label = "GPIO Key Power"; linux,input-type = <1>; - gpio-key,wakeup = <1>; + wakeup-source; debounce-interval = <100>; }; };
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi +1 -1
@@ -108,7 +108,7 @@ lid { label = "Lid"; gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; linux,code = <0>; /* SW_LID */ linux,input-type = <5>; /* EV_SW */ debounce-interval = <1>;
arch/arm/boot/dts/rk3288-veyron.dtsi +1 -1
@@ -64,7 +64,7 @@ gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; debounce-interval = <100>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm64/boot/dts/rockchip/rk3368-r88.dts +1 -1
@@ -71,7 +71,7 @@ pinctrl-0 = <&pwr_key>; button at 0 { - gpio-key,wakeup = <1>; + wakeup-source; gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; label = "GPIO Power"; linux,code = <116>;
Signature · 1 line
1.9.1
PATCH 8/19 ARM: dts: spear: replace gpio-key,wakeup with wakeup-source property
In reply to Sudeep HollaKeyboard 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.
--- 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(-)
arch/arm/boot/dts/spear1310-evb.dts +1 -1
@@ -161,7 +161,7 @@ linux,code = <0x100>; gpios = <&gpio0 7 0x4>; debounce-interval = <20>; - gpio-key,wakeup = <1>; + wakeup-source; }; };
arch/arm/boot/dts/spear1340-evb.dts +1 -1
@@ -223,7 +223,7 @@ linux,code = <0x100>; gpios = <&gpio1 1 0x4>; debounce-interval = <20>; - gpio-key,wakeup = <1>; + wakeup-source; }; };
arch/arm/boot/dts/spear320-hmi.dts +2 -2
@@ -141,7 +141,7 @@ linux,code = <0x100>; gpios = <&stmpegpio 3 0x4>; debounce-interval = <20>; - gpio-key,wakeup = <1>; + wakeup-source; }; button at 2 {
@@ -149,7 +149,7 @@ linux,code = <0x200>; gpios = <&stmpegpio 2 0x4>; debounce-interval = <20>; - gpio-key,wakeup = <1>; + wakeup-source; }; };
Signature · 1 line
1.9.1
PATCH 9/19 ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property
In reply to Sudeep HollaThough 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.
--- arch/arm/boot/dts/am335x-evm.dts | 4 ++-- arch/arm/boot/dts/am335x-evmsk.dts | 2 +- arch/arm/boot/dts/am335x-pepper.dts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/am335x-evm.dts +2 -2
@@ -83,14 +83,14 @@ label = "volume-up"; linux,code = <115>; gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; }; switch at 10 { label = "volume-down"; linux,code = <114>; gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/am335x-evmsk.dts +1 -1
@@ -123,7 +123,7 @@ label = "button2"; linux,code = <0x102>; gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; - gpio-key,wakeup; + wakeup-source; }; switch at 4 {
arch/arm/boot/dts/am335x-pepper.dts +3 -3
@@ -627,21 +627,21 @@ label = "home"; linux,code = <KEY_HOME>; gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; }; button at 1 { label = "menu"; linux,code = <KEY_MENU>; gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; }; buttons at 2 { label = "power"; linux,code = <KEY_POWER>; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; }; };
Signature · 1 line
1.9.1
Re: [PATCH 09/19] ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property
Quoted 11 lines · Sudeep Holla
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.
Cc "Beno?t Cousson" <[email protected]>Cc Tony Lindgren <[email protected]>
Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 09/19] ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property
Quoted 12 lines · Sudeep Holla
Quoted 9 lines · Sudeep Holla
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.
Quoted 5 lines
Quoted 2 lines
Cc "Beno?t Cousson" <[email protected]>Cc Tony Lindgren <[email protected]>Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Sorry I did not realized you're waiting for me to pick this one, applying into omap-for-v4.5/dt thanks.
Tony
PATCH 10/19 ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property
In reply to Sudeep HollaThough 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.
--- arch/arm/boot/dts/animeo_ip.dts | 6 +++--- 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/sama5d35ek.dts | 2 +- arch/arm/boot/dts/usb_a9260_common.dtsi | 2 +- arch/arm/boot/dts/usb_a9263.dts | 2 +- 18 files changed, 32 insertions(+), 32 deletions(-)
arch/arm/boot/dts/animeo_ip.dts +3 -3
@@ -155,21 +155,21 @@ label = "keyswitch_in"; gpios = <&pioB 1 GPIO_ACTIVE_HIGH>; linux,code = <28>; - gpio-key,wakeup; + wakeup-source; }; error_in { label = "error_in"; gpios = <&pioB 2 GPIO_ACTIVE_HIGH>; linux,code = <29>; - gpio-key,wakeup; + wakeup-source; }; btn { label = "btn"; gpios = <&pioC 23 GPIO_ACTIVE_HIGH>; linux,code = <31>; - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/at91-foxg20.dts +1 -1
@@ -159,7 +159,7 @@ label = "Button"; gpios = <&pioC 4 GPIO_ACTIVE_LOW>; linux,code = <0x103>; - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/at91-kizbox.dts +2 -2
@@ -94,14 +94,14 @@ label = "PB_RST"; gpios = <&pioB 30 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; user { label = "PB_USER"; gpios = <&pioB 31 GPIO_ACTIVE_HIGH>; linux,code = <0x101>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/at91-kizbox2.dts +3 -3
@@ -171,21 +171,21 @@ label = "PB_PROG"; gpios = <&pioE 27 GPIO_ACTIVE_LOW>; linux,code = <0x102>; - gpio-key,wakeup; + wakeup-source; }; reset { label = "PB_RST"; gpios = <&pioE 29 GPIO_ACTIVE_LOW>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; user { label = "PB_USER"; gpios = <&pioE 31 GPIO_ACTIVE_HIGH>; linux,code = <0x101>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/at91-kizboxmini.dts +2 -2
@@ -98,14 +98,14 @@ label = "PB_PROG"; gpios = <&pioC 17 GPIO_ACTIVE_LOW>; linux,code = <0x102>; - gpio-key,wakeup; + wakeup-source; }; reset { label = "PB_RST"; gpios = <&pioC 16 GPIO_ACTIVE_LOW>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/at91-qil_a9260.dts +1 -1
@@ -183,7 +183,7 @@ label = "user_pb"; gpios = <&pioB 10 GPIO_ACTIVE_LOW>; linux,code = <28>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/at91-sama5d3_xplained.dts +1 -1
@@ -315,7 +315,7 @@ label = "PB_USER"; gpios = <&pioE 29 GPIO_ACTIVE_LOW>; linux,code = <0x104>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/at91-sama5d4_xplained.dts +1 -1
@@ -235,7 +235,7 @@ label = "pb_user1"; gpios = <&pioE 8 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/at91-sama5d4ek.dts +1 -1
@@ -277,7 +277,7 @@ label = "pb_user1"; gpios = <&pioE 13 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/at91sam9261ek.dts +5 -5
@@ -149,7 +149,7 @@ ti,debounce-tol = /bits/ 16 <65535>; ti,debounce-max = /bits/ 16 <1>; - linux,wakeup; + wakeup-source; }; };
@@ -193,28 +193,28 @@ label = "button_0"; gpios = <&pioA 27 GPIO_ACTIVE_LOW>; linux,code = <256>; - gpio-key,wakeup; + wakeup-source; }; button_1 { label = "button_1"; gpios = <&pioA 26 GPIO_ACTIVE_LOW>; linux,code = <257>; - gpio-key,wakeup; + wakeup-source; }; button_2 { label = "button_2"; gpios = <&pioA 25 GPIO_ACTIVE_LOW>; linux,code = <258>; - gpio-key,wakeup; + wakeup-source; }; button_3 { label = "button_3"; gpios = <&pioA 24 GPIO_ACTIVE_LOW>; linux,code = <259>; - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/at91sam9263ek.dts +2 -2
@@ -213,14 +213,14 @@ label = "left_click"; gpios = <&pioC 5 GPIO_ACTIVE_LOW>; linux,code = <272>; - gpio-key,wakeup; + wakeup-source; }; right_click { label = "right_click"; gpios = <&pioC 4 GPIO_ACTIVE_LOW>; linux,code = <273>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/at91sam9g20ek_common.dtsi +2 -2
@@ -206,14 +206,14 @@ label = "Button 3"; gpios = <&pioA 30 GPIO_ACTIVE_LOW>; linux,code = <0x103>; - gpio-key,wakeup; + wakeup-source; }; btn4 { label = "Button 4"; gpios = <&pioA 31 GPIO_ACTIVE_LOW>; linux,code = <0x104>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/at91sam9m10g45ek.dts +2 -2
@@ -321,14 +321,14 @@ label = "left_click"; gpios = <&pioB 6 GPIO_ACTIVE_LOW>; linux,code = <272>; - gpio-key,wakeup; + wakeup-source; }; right_click { label = "right_click"; gpios = <&pioB 7 GPIO_ACTIVE_LOW>; linux,code = <273>; - gpio-key,wakeup; + wakeup-source; }; left {
arch/arm/boot/dts/at91sam9n12ek.dts +1 -1
@@ -223,7 +223,7 @@ label = "Enter"; gpios = <&pioB 3 GPIO_ACTIVE_LOW>; linux,code = <28>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/at91sam9rlek.dts +2 -2
@@ -225,14 +225,14 @@ label = "right_click"; gpios = <&pioB 0 GPIO_ACTIVE_LOW>; linux,code = <273>; - gpio-key,wakeup; + wakeup-source; }; left_click { label = "left_click"; gpios = <&pioB 1 GPIO_ACTIVE_LOW>; linux,code = <272>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/sama5d35ek.dts +1 -1
@@ -49,7 +49,7 @@ label = "pb_user1"; gpios = <&pioE 27 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/usb_a9260_common.dtsi +1 -1
@@ -115,7 +115,7 @@ label = "user_pb"; gpios = <&pioB 10 GPIO_ACTIVE_LOW>; linux,code = <28>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/usb_a9263.dts +1 -1
@@ -143,7 +143,7 @@ label = "user_pb"; gpios = <&pioB 10 GPIO_ACTIVE_LOW>; linux,code = <28>; - gpio-key,wakeup; + wakeup-source; }; };
Signature · 1 line
1.9.1
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property
Le 21/10/2015 12:10, Sudeep Holla a ?crit :
Quoted 10 lines
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.
Cc Nicolas Ferre <[email protected]>
I'm not against this if the whole series goes further.
I suspect that we would need to take this patch with us on the AT91 branches that would go to arm-soc. Is it the intentions?
Thanks, bye.
Quoted 372 lines
Cc Alexandre Belloni <[email protected]>Cc Jean-Christophe Plagniol-Villard <[email protected]>Signed-off-by Sudeep Holla <[email protected]>--- arch/arm/boot/dts/animeo_ip.dts | 6 +++--- 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/sama5d35ek.dts | 2 +- arch/arm/boot/dts/usb_a9260_common.dtsi | 2 +- arch/arm/boot/dts/usb_a9263.dts | 2 +- 18 files changed, 32 insertions(+), 32 deletions(-)arch/arm/boot/dts/animeo_ip.dts +3
-3@@ -155,21 +155,21 @@ label = "keyswitch_in"; gpios = <&pioB 1 GPIO_ACTIVE_HIGH>; linux,code = <28>; - gpio-key,wakeup; + wakeup-source; }; error_in { label = "error_in"; gpios = <&pioB 2 GPIO_ACTIVE_HIGH>; linux,code = <29>; - gpio-key,wakeup; + wakeup-source; }; btn { label = "btn"; gpios = <&pioC 23 GPIO_ACTIVE_HIGH>; linux,code = <31>; - gpio-key,wakeup; + wakeup-source; }; }; };arch/arm/boot/dts/at91-foxg20.dts +1
-1@@ -159,7 +159,7 @@ label = "Button"; gpios = <&pioC 4 GPIO_ACTIVE_LOW>; linux,code = <0x103>; - gpio-key,wakeup; + wakeup-source; }; }; };arch/arm/boot/dts/at91-kizbox.dts +2
-2@@ -94,14 +94,14 @@ label = "PB_RST"; gpios = <&pioB 30 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; user { label = "PB_USER"; gpios = <&pioB 31 GPIO_ACTIVE_HIGH>; linux,code = <0x101>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/at91-kizbox2.dts +3
-3@@ -171,21 +171,21 @@ label = "PB_PROG"; gpios = <&pioE 27 GPIO_ACTIVE_LOW>; linux,code = <0x102>; - gpio-key,wakeup; + wakeup-source; }; reset { label = "PB_RST"; gpios = <&pioE 29 GPIO_ACTIVE_LOW>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; user { label = "PB_USER"; gpios = <&pioE 31 GPIO_ACTIVE_HIGH>; linux,code = <0x101>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/at91-kizboxmini.dts +2
-2@@ -98,14 +98,14 @@ label = "PB_PROG"; gpios = <&pioC 17 GPIO_ACTIVE_LOW>; linux,code = <0x102>; - gpio-key,wakeup; + wakeup-source; }; reset { label = "PB_RST"; gpios = <&pioC 16 GPIO_ACTIVE_LOW>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/at91-qil_a9260.dts +1
-1@@ -183,7 +183,7 @@ label = "user_pb"; gpios = <&pioB 10 GPIO_ACTIVE_LOW>; linux,code = <28>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/at91-sama5d3_xplained.dts +1
-1@@ -315,7 +315,7 @@ label = "PB_USER"; gpios = <&pioE 29 GPIO_ACTIVE_LOW>; linux,code = <0x104>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/at91-sama5d4_xplained.dts +1
-1@@ -235,7 +235,7 @@ label = "pb_user1"; gpios = <&pioE 8 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/at91-sama5d4ek.dts +1
-1@@ -277,7 +277,7 @@ label = "pb_user1"; gpios = <&pioE 13 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/at91sam9261ek.dts +5
-5@@ -149,7 +149,7 @@ ti,debounce-tol = /bits/ 16 <65535>; ti,debounce-max = /bits/ 16 <1>; - linux,wakeup; + wakeup-source; }; };@@ -193,28 +193,28 @@ label = "button_0"; gpios = <&pioA 27 GPIO_ACTIVE_LOW>; linux,code = <256>; - gpio-key,wakeup; + wakeup-source; }; button_1 { label = "button_1"; gpios = <&pioA 26 GPIO_ACTIVE_LOW>; linux,code = <257>; - gpio-key,wakeup; + wakeup-source; }; button_2 { label = "button_2"; gpios = <&pioA 25 GPIO_ACTIVE_LOW>; linux,code = <258>; - gpio-key,wakeup; + wakeup-source; }; button_3 { label = "button_3"; gpios = <&pioA 24 GPIO_ACTIVE_LOW>; linux,code = <259>; - gpio-key,wakeup; + wakeup-source; }; }; };arch/arm/boot/dts/at91sam9263ek.dts +2
-2@@ -213,14 +213,14 @@ label = "left_click"; gpios = <&pioC 5 GPIO_ACTIVE_LOW>; linux,code = <272>; - gpio-key,wakeup; + wakeup-source; }; right_click { label = "right_click"; gpios = <&pioC 4 GPIO_ACTIVE_LOW>; linux,code = <273>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/at91sam9g20ek_common.dtsi +2
-2@@ -206,14 +206,14 @@ label = "Button 3"; gpios = <&pioA 30 GPIO_ACTIVE_LOW>; linux,code = <0x103>; - gpio-key,wakeup; + wakeup-source; }; btn4 { label = "Button 4"; gpios = <&pioA 31 GPIO_ACTIVE_LOW>; linux,code = <0x104>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/at91sam9m10g45ek.dts +2
-2@@ -321,14 +321,14 @@ label = "left_click"; gpios = <&pioB 6 GPIO_ACTIVE_LOW>; linux,code = <272>; - gpio-key,wakeup; + wakeup-source; }; right_click { label = "right_click"; gpios = <&pioB 7 GPIO_ACTIVE_LOW>; linux,code = <273>; - gpio-key,wakeup; + wakeup-source; }; left {arch/arm/boot/dts/at91sam9n12ek.dts +1
-1@@ -223,7 +223,7 @@ label = "Enter"; gpios = <&pioB 3 GPIO_ACTIVE_LOW>; linux,code = <28>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/at91sam9rlek.dts +2
-2@@ -225,14 +225,14 @@ label = "right_click"; gpios = <&pioB 0 GPIO_ACTIVE_LOW>; linux,code = <273>; - gpio-key,wakeup; + wakeup-source; }; left_click { label = "left_click"; gpios = <&pioB 1 GPIO_ACTIVE_LOW>; linux,code = <272>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/sama5d35ek.dts +1
-1@@ -49,7 +49,7 @@ label = "pb_user1"; gpios = <&pioE 27 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; }; };arch/arm/boot/dts/usb_a9260_common.dtsi +1
-1@@ -115,7 +115,7 @@ label = "user_pb"; gpios = <&pioB 10 GPIO_ACTIVE_LOW>; linux,code = <28>; - gpio-key,wakeup; + wakeup-source; }; };arch/arm/boot/dts/usb_a9263.dts +1
-1@@ -143,7 +143,7 @@ label = "user_pb"; gpios = <&pioB 10 GPIO_ACTIVE_LOW>; linux,code = <28>; - gpio-key,wakeup; + wakeup-source; }; };
Signature · 1 line
Nicolas Ferre
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property
Quoted 6 lines · Nicolas Ferre
Le 21/10/2015 12:10, Sudeep Holla a ?crit :
Quoted 5 lines
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.
Quoted 9 lines
Quoted 5 lines
This patch replaces the legacy "gpio-key,wakeup" with the unified "wakeup-source" property in order to avoid any futher copy-paste duplication.
Cc Nicolas Ferre <[email protected]>I'm not against this if the whole series goes further.
Acked-by Nicolas Ferre <[email protected]>
Thanks !
Quoted 3 lines
I suspect that we would need to take this patch with us on the AT91 branches that would go to arm-soc. Is it the intentions?
Yes that was my intention for splitting the patches per SoC group. Many SoC maintainers prefer that.
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property
Quoted 22 lines · Sudeep Holla
Quoted 12 lines · Nicolas Ferre
Le 21/10/2015 12:10, Sudeep Holla a ?crit :
Quoted 10 lines
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.
Quoted 6 lines
Quoted 1 line
Cc Nicolas Ferre <[email protected]>I'm not against this if the whole series goes further.
Acked-by Nicolas Ferre <[email protected]>
Quoted 8 lines
Thanks !
Quoted 3 lines
I suspect that we would need to take this patch with us on the AT91 branches that would go to arm-soc. Is it the intentions?
Yes that was my intention for splitting the patches per SoC group. Many SoC maintainers prefer that.
Hold on! All patches that changes the DT parsing to accept the "standardized wakeup-source" binding, need to be merged upstream before corresponding DTS changes.
Therefore, I suggest we go for a two step approach, starting with changes affecting the DT parsing/documentation for various drivers/subsystem and perhaps we can reach 4.4 for these. Then the DTS changes can go in at any later point.
Kind regards
Uffe
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property
Quoted 29 lines · Ulf Hansson
Quoted 28 lines · Sudeep Holla
Quoted 12 lines · Nicolas Ferre
Le 21/10/2015 12:10, Sudeep Holla a ?crit :
Quoted 10 lines
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.
Quoted 6 lines
Quoted 1 line
Cc Nicolas Ferre <[email protected]>I'm not against this if the whole series goes further.
Acked-by Nicolas Ferre <[email protected]>Thanks !
Quoted 3 lines
I suspect that we would need to take this patch with us on the AT91 branches that would go to arm-soc. Is it the intentions?
Quoted 7 lines
Quoted 2 lines
Yes that was my intention for splitting the patches per SoC group. Many SoC maintainers prefer that.
Hold on! All patches that changes the DT parsing to accept the "standardized wakeup-source" binding, need to be merged upstream before corresponding DTS changes.
Agreed. Sorry for that I forgot about it as there are only few subsystems that needed additions. Most of the input subsystem had already moved to new binding, just that binding documents were left unchanged.
Quoted 5 lines
Therefore, I suggest we go for a two step approach, starting with changes affecting the DT parsing/documentation for various
drivers/subsystemand perhaps we can reach 4.4 for these. Then the DTS changes can go in at any later point.
Looks good to me.
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property
Quoted 2 lines · Sudeep Holla
Quoted 1 line · Ulf Hansson
On 21 October 2015 at 12:25, Sudeep Holla <[email protected]> wrote:
[..]
Quoted 9 lines
Quoted 8 lines
Quoted 3 lines
Yes that was my intention for splitting the patches per SoC group. Many SoC maintainers prefer that.
Hold on! All patches that changes the DT parsing to accept the "standardized wakeup-source" binding, need to be merged upstream before corresponding DTS changes.
Quoted 5 lines
Agreed. Sorry for that I forgot about it as there are only few subsystems that needed additions. Most of the input subsystem had already moved to new binding, just that binding documents were left unchanged.
Having looked at it again, I think at-least this patch has no dependency on those driver/sub-system changes. Only patch 11, 13 and 17 has dependency. All the other DTS changes are related to input subsystem where all the required changes are already there.
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 10/19] ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property
Le 21/10/2015 14:41, Sudeep Holla a ?crit :
Quoted 23 lines · Sudeep Holla
Quoted 2 lines · Ulf Hansson
Quoted 1 line · Sudeep Holla
[..]
Quoted 9 lines
Quoted 8 lines
Quoted 3 lines
Yes that was my intention for splitting the patches per SoC group. Many SoC maintainers prefer that.
Hold on! All patches that changes the DT parsing to accept the "standardized wakeup-source" binding, need to be merged upstream before corresponding DTS changes.
Quoted 5 lines
Agreed. Sorry for that I forgot about it as there are only few subsystems that needed additions. Most of the input subsystem had already moved to new binding, just that binding documents were left unchanged.
Quoted 4 lines
Having looked at it again, I think at-least this patch has no dependency on those driver/sub-system changes. Only patch 11, 13 and 17 has dependency. All the other DTS changes are related to input subsystem where all the required changes are already there.
Actually I checked before answering and all the drivers are already converted for the AT91 patch: so for this 10/19 patch I'm fine...
Bye,
Signature · 1 line
Nicolas Ferre
PATCH 11/19 ARM: dts: imx: replace legacy *,wakeup property with wakeup-source
In reply to Sudeep HollaThough 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.
--- 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(-)
arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts +1 -1
@@ -30,7 +30,7 @@ label = "BP1"; gpios = <&gpio3 18 GPIO_ACTIVE_LOW>; linux,code = <BTN_MISC>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/imx28-apf28dev.dts +1 -1
@@ -225,7 +225,7 @@ label = "User button"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi +2 -2
@@ -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; }; };
arch/arm/boot/dts/imx28-tx28.dts +1 -1
@@ -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;
arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts +1 -1
@@ -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>; }; };
arch/arm/boot/dts/imx51-babbage.dts +1 -1
@@ -107,7 +107,7 @@ label = "Power Button"; gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +1 -1
@@ -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;
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts +1 -1
@@ -41,7 +41,7 @@ label = "BP1"; gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; linux,code = <256>; - gpio-key,wakeup; + wakeup-source; linux,input-type = <1>; }; };
arch/arm/boot/dts/imx53-ard.dts +3 -3
@@ -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 {
arch/arm/boot/dts/imx53-qsb-common.dtsi +2 -2
@@ -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; }; };
arch/arm/boot/dts/imx53-tx53-x03x.dts +1 -1
@@ -230,7 +230,7 @@ interrupts = <26 0>; gpios = <&gpio3 26 GPIO_ACTIVE_LOW>; ti,x-plate-ohms = <660>; - linux,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/imx53-tx53-x13x.dts +2 -2
@@ -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; }; };
arch/arm/boot/dts/imx53-tx53.dtsi +1 -1
@@ -50,7 +50,7 @@ label = "Power Button"; gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; linux,code = <116>; /* KEY_POWER */ - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/imx6dl-tx6u-811x.dts +1 -1
@@ -77,7 +77,7 @@ interrupt-parent = <&gpio3>; interrupts = <22 0>; wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; - linux,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/imx6q-gk802.dts +1 -1
@@ -44,7 +44,7 @@ label = "recovery"; gpios = <&gpio3 16 1>; linux,code = <0x198>; /* KEY_RESTART */ - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/imx6q-tx6q-1110.dts +1 -1
@@ -77,7 +77,7 @@ interrupt-parent = <&gpio3>; interrupts = <22 0>; wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; - linux,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/imx6qdl-apf6dev.dtsi +1 -1
@@ -94,7 +94,7 @@ label = "User button"; gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; linux,code = <BTN_MISC>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +1 -1
@@ -76,7 +76,7 @@ label = "Power Button"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; menu {
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1 -1
@@ -75,7 +75,7 @@ label = "Power Button"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; menu {
arch/arm/boot/dts/imx6qdl-sabresd.dtsi +3 -3
@@ -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>; }; };
arch/arm/boot/dts/imx6qdl-tx6.dtsi +3 -3
@@ -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 at 48 {
@@ -287,7 +287,7 @@ interrupts = <26 0>; gpios = <&gpio3 26 GPIO_ACTIVE_LOW>; ti,x-plate-ohms = <660>; - linux,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/imx6sl-warp.dts +1 -1
@@ -118,7 +118,7 @@ bus-width = <4>; non-removable; keep-power-in-suspend; - enable-sdio-wakeup; + wakeup-source; mmc-pwrseq = <&usdhc3_pwrseq>; status = "okay"; };
arch/arm/boot/dts/imx6sx-sabreauto.dts +1 -1
@@ -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"; };
arch/arm/boot/dts/imx6sx-sdb.dtsi +2 -2
@@ -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"; };
arch/arm/boot/dts/imx6ul-14x14-evk.dts +2 -2
@@ -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 = <®_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"; };
arch/arm/boot/dts/imx7d-sdb.dts +1 -1
@@ -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"; };
Signature · 1 line
1.9.1
Re: [PATCH 11/19] ARM: dts: imx: replace legacy *,wakeup property with wakeup-source
Quoted 11 lines · Sudeep Holla
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 <[email protected]>Cc Sascha Hauer <[email protected]>Signed-off-by Sudeep Holla <[email protected]>
<snip>
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi line 159
Quoted 10 lines
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +1
-1@@ -156,7 +156,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc2>; cap-sdio-irq; - enable-sdio-wakeup; + wakeup-source;
I do not see this be mentioned in commit log. I do not see relevant kernel changes in v4.4-rc1 to support that. Am I missing anything?
Shawn
Quoted 3 lines
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +0
-0keep-power-in-suspend; max-frequency = <50000000>; no-1-8-v;
Re: [PATCH 11/19] ARM: dts: imx: replace legacy *,wakeup property with wakeup-source
Quoted 15 lines · Shawn Guo
Quoted 11 lines · Sudeep Holla
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 <[email protected]>Cc Sascha Hauer <[email protected]>Signed-off-by Sudeep Holla <[email protected]><snip>
Quoted 14 lines
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi line 159
Quoted 10 lines
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +1
-1@@ -156,7 +156,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc2>; cap-sdio-irq; - enable-sdio-wakeup; + wakeup-source;I do not see this be mentioned in commit log. I do not see relevant kernel changes in v4.4-rc1 to support that. Am I missing anything?
Sorry for that, you weren't copied on that patch[1], Ulf has queued it now [2]
Signature · 5 lines
Regards, Sudeep [1] http://www.spinics.net/lists/arm-kernel/msg454747.html [2] http://www.spinics.net/lists/arm-kernel/msg461424.html
Re: [PATCH 11/19] ARM: dts: imx: replace legacy *,wakeup property with wakeup-source
Quoted 33 lines · Sudeep Holla
Quoted 15 lines · Shawn Guo
Quoted 11 lines · Sudeep Holla
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 <[email protected]>Cc Sascha Hauer <[email protected]>Signed-off-by Sudeep Holla <[email protected]><snip>
Quoted 14 lines
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi line 159
Quoted 10 lines
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +1
-1@@ -156,7 +156,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc2>; cap-sdio-irq; - enable-sdio-wakeup; + wakeup-source;I do not see this be mentioned in commit log. I do not see relevant kernel changes in v4.4-rc1 to support that. Am I missing anything?
Quoted 2 lines
Sorry for that, you weren't copied on that patch[1], Ulf has queued it now [2]
My branch is based on v4.4-rc1 which doesn't have that patch. That said, I can not apply it for now.
Shawn
Re: [PATCH 11/19] ARM: dts: imx: replace legacy *,wakeup property with wakeup-source
Quoted 34 lines · Shawn Guo
Quoted 33 lines · Sudeep Holla
Quoted 29 lines · Shawn Guo
Quoted 11 lines · Sudeep Holla
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 <[email protected]>Cc Sascha Hauer <[email protected]>Signed-off-by Sudeep Holla <[email protected]><snip>
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi line 159
Quoted 10 lines
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +1
-1@@ -156,7 +156,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc2>; cap-sdio-irq; - enable-sdio-wakeup; + wakeup-source;I do not see this be mentioned in commit log. I do not see relevant kernel changes in v4.4-rc1 to support that. Am I missing anything?
Quoted 6 lines
Quoted 2 lines
Sorry for that, you weren't copied on that patch[1], Ulf has queued it now [2]
My branch is based on v4.4-rc1 which doesn't have that patch. That said, I can not apply it for now.
Ah OK, that's fine pick it up when appropriate. I just wanted to let you know that dependent patch is already queued.
Signature · 2 lines
Regards, Sudeep
PATCH 12/19 ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source
In reply to Sudeep HollaThough the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "linux-keypad,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.
--- 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 ++-- 17 files changed, 36 insertions(+), 36 deletions(-)
arch/arm/boot/dts/exynos3250-monk.dts +3 -3
@@ -43,7 +43,7 @@ linux,code = <KEY_POWER>; label = "power key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
@@ -67,7 +67,7 @@ interrupt-parent = <&gpx1>; interrupts = <5 0>; reg = <0x25>; - wakeup; + wakeup-source; muic: max77836-muic { compatible = "maxim,max77836-muic";
@@ -184,7 +184,7 @@ interrupt-parent = <&gpx0>; interrupts = <7 0>; reg = <0x66>; - wakeup; + wakeup-source; s2mps14_osc: clocks { compatible = "samsung,s2mps14-clk";
arch/arm/boot/dts/exynos3250-rinato.dts +3 -3
@@ -43,7 +43,7 @@ linux,code = <KEY_POWER>; label = "power key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
@@ -58,7 +58,7 @@ interrupt-parent = <&gpx1>; interrupts = <5 0>; reg = <0x25>; - wakeup; + wakeup-source; muic: max77836-muic { compatible = "maxim,max77836-muic";
@@ -245,7 +245,7 @@ interrupt-parent = <&gpx0>; interrupts = <7 0>; reg = <0x66>; - wakeup; + wakeup-source; s2mps14_osc: clocks { compatible = "samsung,s2mps14-clk";
arch/arm/boot/dts/exynos4210-origen.dts +5 -5
@@ -59,35 +59,35 @@ label = "Up"; gpios = <&gpx2 0 1>; linux,code = <KEY_UP>; - gpio-key,wakeup; + wakeup-source; }; down { label = "Down"; gpios = <&gpx2 1 1>; linux,code = <KEY_DOWN>; - gpio-key,wakeup; + wakeup-source; }; back { label = "Back"; gpios = <&gpx1 7 1>; linux,code = <KEY_BACK>; - gpio-key,wakeup; + wakeup-source; }; home { label = "Home"; gpios = <&gpx1 6 1>; linux,code = <KEY_HOME>; - gpio-key,wakeup; + wakeup-source; }; menu { label = "Menu"; gpios = <&gpx1 5 1>; linux,code = <KEY_MENU>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos4210-smdkv310.dts +1 -1
@@ -69,7 +69,7 @@ samsung,keypad-num-rows = <2>; samsung,keypad-num-columns = <8>; linux,keypad-no-autorepeat; - linux,keypad-wakeup; + wakeup-source; pinctrl-names = "default"; pinctrl-0 = <&keypad_rows &keypad_cols>; status = "okay";
arch/arm/boot/dts/exynos4210-trats.dts +1 -1
@@ -111,7 +111,7 @@ linux,code = <116>; label = "power"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; ok-key {
arch/arm/boot/dts/exynos4210-universal_c210.dts +2 -2
@@ -91,7 +91,7 @@ linux,code = <171>; label = "config"; debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; camera-key {
@@ -106,7 +106,7 @@ linux,code = <116>; label = "power"; debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; ok-key {
arch/arm/boot/dts/exynos4412-odroid-common.dtsi +1 -1
@@ -34,7 +34,7 @@ linux,code = <KEY_POWER>; label = "power key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos4412-odroidx.dts +1 -1
@@ -48,7 +48,7 @@ linux,code = <KEY_HOME>; label = "home key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos4412-origen.dts +1 -1
@@ -426,7 +426,7 @@ samsung,keypad-num-rows = <3>; samsung,keypad-num-columns = <2>; linux,keypad-no-autorepeat; - linux,keypad-wakeup; + wakeup-source; pinctrl-0 = <&keypad_rows &keypad_cols>; pinctrl-names = "default"; status = "okay";
arch/arm/boot/dts/exynos4412-smdk4412.dts +1 -1
@@ -49,7 +49,7 @@ samsung,keypad-num-rows = <3>; samsung,keypad-num-columns = <8>; linux,keypad-no-autorepeat; - linux,keypad-wakeup; + wakeup-source; pinctrl-0 = <&keypad_rows &keypad_cols>; pinctrl-names = "default"; status = "okay";
arch/arm/boot/dts/exynos4412-trats2.dts +2 -2
@@ -119,7 +119,7 @@ linux,code = <116>; label = "power"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; key-ok {
@@ -127,7 +127,7 @@ linux,code = <139>; label = "ok"; debounce-inteval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos5250-arndale.dts +6 -6
@@ -34,42 +34,42 @@ label = "SW-TACT2"; gpios = <&gpx1 4 GPIO_ACTIVE_LOW>; linux,code = <KEY_MENU>; - gpio-key,wakeup; + wakeup-source; }; home { label = "SW-TACT3"; gpios = <&gpx1 5 GPIO_ACTIVE_LOW>; linux,code = <KEY_HOME>; - gpio-key,wakeup; + wakeup-source; }; up { label = "SW-TACT4"; gpios = <&gpx1 6 GPIO_ACTIVE_LOW>; linux,code = <KEY_UP>; - gpio-key,wakeup; + wakeup-source; }; down { label = "SW-TACT5"; gpios = <&gpx1 7 GPIO_ACTIVE_LOW>; linux,code = <KEY_DOWN>; - gpio-key,wakeup; + wakeup-source; }; back { label = "SW-TACT6"; gpios = <&gpx2 0 GPIO_ACTIVE_LOW>; linux,code = <KEY_BACK>; - gpio-key,wakeup; + wakeup-source; }; wakeup { label = "SW-TACT7"; gpios = <&gpx2 1 GPIO_ACTIVE_LOW>; linux,code = <KEY_WAKEUP>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos5250-snow.dts +2 -2
@@ -41,7 +41,7 @@ label = "Power"; gpios = <&gpx1 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; lid-switch {
@@ -50,7 +50,7 @@ linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos5250-spring.dts +2 -2
@@ -37,7 +37,7 @@ label = "Power"; gpios = <&gpx1 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; lid-switch {
@@ -46,7 +46,7 @@ linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos5420-arndale-octa.dts +1 -1
@@ -46,7 +46,7 @@ label = "SW-TACT1"; gpios = <&gpx2 7 1>; linux,code = <KEY_WAKEUP>; - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/exynos5420-peach-pit.dts +2 -2
@@ -64,7 +64,7 @@ label = "Power"; gpios = <&gpx1 2 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; lid-switch {
@@ -73,7 +73,7 @@ linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos5800-peach-pi.dts +2 -2
@@ -63,7 +63,7 @@ label = "Power"; gpios = <&gpx1 2 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; lid-switch {
@@ -72,7 +72,7 @@ linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; };
Signature · 1 line
1.9.1
Re: [PATCH 12/19] ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source
Quoted 10 lines · Sudeep Holla
Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "linux-keypad,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 Kukjin Kim <[email protected]>Cc Krzysztof Kozlowski <[email protected]>
Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 12/19] ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source
Quoted 11 lines · Sudeep Holla
Quoted 8 lines · Sudeep Holla
Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "linux-keypad,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.
Quoted 5 lines
Quoted 2 lines
Cc Kukjin Kim <[email protected]>Cc Krzysztof Kozlowski <[email protected]>Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Usually it depends on the dependencies... but:
1. I just received this patch - 12/19.
2. No cover letter, no other patches, no explanation about any dependencies or other related changes. Nothing. Just one patch.
3. The patch mentions new standard binding. Was the new binding already merged? Or is it part of these series? What about backward compatibility?
BR,
Krzysztof
Re: [PATCH 12/19] ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source
Quoted 12 lines · Krzysztof Kozlowski
Quoted 11 lines · Sudeep Holla
Quoted 8 lines · Sudeep Holla
Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "linux-keypad,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.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Cc Kukjin Kim <[email protected]>Cc Krzysztof Kozlowski <[email protected]>Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Usually it depends on the dependencies... but:
1. I just received this patch - 12/19.
Sorry for that. The initial idea was to show all the changes but merge the binding and dependencies first, so didn't cc all.
Quoted 2 lines
2. No cover letter, no other patches, no explanation about any dependencies or other related changes. Nothing. Just one patch.
Yes this was initially posted as part of the series, but only dependencies were merged for v4.4
Quoted 2 lines
3. The patch mentions new standard binding. Was the new binding already merged? Or is it part of these series? What about backward compatibility?
Not a brand new binding, but made existing one a standard so that we don't continue to be creative and generate more bindings for the same thing. Yes binding and dependent patches are already in mainline. And yes backward compatibility is maintained as mentioned in the commit message.
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 12/19] ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source
Quoted 34 lines · Sudeep Holla
Quoted 13 lines · Krzysztof Kozlowski
Quoted 12 lines · Sudeep Holla
Quoted 9 lines · Sudeep Holla
Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "linux-keypad,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.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Cc Kukjin Kim <[email protected]>Cc Krzysztof Kozlowski <[email protected]>Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Usually it depends on the dependencies... but:
1. I just received this patch - 12/19.Sorry for that. The initial idea was to show all the changes but merge the binding and dependencies first, so didn't cc all.
Quoted 2 lines
2. No cover letter, no other patches, no explanation about any dependencies or other related changes. Nothing. Just one patch.
Yes this was initially posted as part of the series, but only dependencies were merged for v4.4
Quoted 8 lines
Quoted 2 lines
3. The patch mentions new standard binding. Was the new binding already merged? Or is it part of these series? What about backward compatibility?
Not a brand new binding, but made existing one a standard so that we don't continue to be creative and generate more bindings for the same thing. Yes binding and dependent patches are already in mainline. And yes backward compatibility is maintained as mentioned in the commit message.
That explains everything, thanks. We'll take it through samsung-soc, just give me some time for review.
As for other patch - the s5pv210 - I did not get it directly but I think I can find it on list subscription archives.
Best regards,
Krzysztof
Re: [PATCH 12/19] ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source
In reply to Sudeep HollaQuoted 86 lines · Sudeep Holla
Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "linux-keypad,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 Kukjin Kim <[email protected]>Cc Krzysztof Kozlowski <[email protected]>Cc linux-samsung-soc at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>--- 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 ++-- 17 files changed, 36 insertions(+), 36 deletions(-)arch/arm/boot/dts/exynos3250-monk.dts +3
-3@@ -43,7 +43,7 @@ linux,code = <KEY_POWER>; label = "power key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };@@ -67,7 +67,7 @@ interrupt-parent = <&gpx1>; interrupts = <5 0>; reg = <0x25>; - wakeup; + wakeup-source; muic: max77836-muic { compatible = "maxim,max77836-muic";@@ -184,7 +184,7 @@ interrupt-parent = <&gpx0>; interrupts = <7 0>; reg = <0x66>; - wakeup; + wakeup-source; s2mps14_osc: clocks { compatible = "samsung,s2mps14-clk";arch/arm/boot/dts/exynos3250-rinato.dts +2
-2@@ -43,7 +43,7 @@ linux,code = <KEY_POWER>; label = "power key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };@@ -58,7 +58,7 @@ interrupt-parent = <&gpx1>; interrupts = <5 0>; reg = <0x25>; - wakeup; + wakeup-source; muic: max77836-muic { compatible = "maxim,max77836-muic";
arch/arm/boot/dts/exynos3250-rinato.dts line 248
Quoted 5 lines
arch/arm/boot/dts/exynos3250-rinato.dts +1
-1@@ -245,7 +245,7 @@ interrupt-parent = <&gpx0>; interrupts = <7 0>; reg = <0x66>; - wakeup; + wakeup-source;
I think here and in Monk board these four "wakeup" properties are bogus, not parsed by driver. Instead wakeup is always initialized to true.
Anyway fixing this is not part of this patch but instead this should be fixed in separate commit. Here everything looks good:
Best regards,
Krzysztof
Re: [PATCH 12/19] ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source
Quoted 96 lines · Krzysztof Kozlowski
Quoted 86 lines · Sudeep Holla
Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "linux-keypad,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 Kukjin Kim <[email protected]>Cc Krzysztof Kozlowski <[email protected]>Cc linux-samsung-soc at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>--- 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 ++-- 17 files changed, 36 insertions(+), 36 deletions(-)arch/arm/boot/dts/exynos3250-monk.dts +3
-3@@ -43,7 +43,7 @@ linux,code = <KEY_POWER>; label = "power key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };@@ -67,7 +67,7 @@ interrupt-parent = <&gpx1>; interrupts = <5 0>; reg = <0x25>; - wakeup; + wakeup-source; muic: max77836-muic { compatible = "maxim,max77836-muic";@@ -184,7 +184,7 @@ interrupt-parent = <&gpx0>; interrupts = <7 0>; reg = <0x66>; - wakeup; + wakeup-source; s2mps14_osc: clocks { compatible = "samsung,s2mps14-clk";arch/arm/boot/dts/exynos3250-rinato.dts +2
-2@@ -43,7 +43,7 @@ linux,code = <KEY_POWER>; label = "power key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };@@ -58,7 +58,7 @@ interrupt-parent = <&gpx1>; interrupts = <5 0>; reg = <0x25>; - wakeup; + wakeup-source; muic: max77836-muic { compatible = "maxim,max77836-muic";arch/arm/boot/dts/exynos3250-rinato.dts line 248
Quoted 5 lines
arch/arm/boot/dts/exynos3250-rinato.dts +1
-1@@ -245,7 +245,7 @@ interrupt-parent = <&gpx0>; interrupts = <7 0>; reg = <0x66>; - wakeup; + wakeup-source;I think here and in Monk board these four "wakeup" properties are bogus, not parsed by driver. Instead wakeup is always initialized to true.
Quoted 4 lines
Anyway fixing this is not part of this patch but instead this should be fixed in separate commit. Here everything looks good:
Reviewed-by Krzysztof Kozlowski <[email protected]>
This patch does not apply. Can you rebase it on linux-next or my next/dt branch (git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git)?
I applied the 16/19 (s5pv210).
Best regards,
Krzysztof
PATCH 12/19 ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source
Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "linux-keypad,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 further copy-paste duplication.
--- 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-common.dtsi | 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 ++-- 17 files changed, 36 insertions(+), 36 deletions(-)
Hi Krzysztof,
Thanks for picking up on this. I have rebased on:git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git next/dt
Regards,
Sudeep
arch/arm/boot/dts/exynos3250-monk.dts +3 -3
@@ -43,7 +43,7 @@ linux,code = <KEY_POWER>; label = "power key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
@@ -67,7 +67,7 @@ interrupt-parent = <&gpx1>; interrupts = <5 0>; reg = <0x25>; - wakeup; + wakeup-source; muic: max77836-muic { compatible = "maxim,max77836-muic";
@@ -185,7 +185,7 @@ interrupt-parent = <&gpx0>; interrupts = <7 0>; reg = <0x66>; - wakeup; + wakeup-source; s2mps14_osc: clocks { compatible = "samsung,s2mps14-clk";
arch/arm/boot/dts/exynos3250-rinato.dts +3 -3
@@ -43,7 +43,7 @@ linux,code = <KEY_POWER>; label = "power key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
@@ -58,7 +58,7 @@ interrupt-parent = <&gpx1>; interrupts = <5 0>; reg = <0x25>; - wakeup; + wakeup-source; muic: max77836-muic { compatible = "maxim,max77836-muic";
@@ -246,7 +246,7 @@ interrupt-parent = <&gpx0>; interrupts = <7 0>; reg = <0x66>; - wakeup; + wakeup-source; s2mps14_osc: clocks { compatible = "samsung,s2mps14-clk";
arch/arm/boot/dts/exynos4210-origen.dts +5 -5
@@ -60,35 +60,35 @@ label = "Up"; gpios = <&gpx2 0 GPIO_ACTIVE_LOW>; linux,code = <KEY_UP>; - gpio-key,wakeup; + wakeup-source; }; down { label = "Down"; gpios = <&gpx2 1 GPIO_ACTIVE_LOW>; linux,code = <KEY_DOWN>; - gpio-key,wakeup; + wakeup-source; }; back { label = "Back"; gpios = <&gpx1 7 GPIO_ACTIVE_LOW>; linux,code = <KEY_BACK>; - gpio-key,wakeup; + wakeup-source; }; home { label = "Home"; gpios = <&gpx1 6 GPIO_ACTIVE_LOW>; linux,code = <KEY_HOME>; - gpio-key,wakeup; + wakeup-source; }; menu { label = "Menu"; gpios = <&gpx1 5 GPIO_ACTIVE_LOW>; linux,code = <KEY_MENU>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos4210-smdkv310.dts +1 -1
@@ -66,7 +66,7 @@ samsung,keypad-num-rows = <2>; samsung,keypad-num-columns = <8>; linux,keypad-no-autorepeat; - linux,keypad-wakeup; + wakeup-source; pinctrl-names = "default"; pinctrl-0 = <&keypad_rows &keypad_cols>; status = "okay";
arch/arm/boot/dts/exynos4210-trats.dts +1 -1
@@ -112,7 +112,7 @@ linux,code = <116>; label = "power"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; ok-key {
arch/arm/boot/dts/exynos4210-universal_c210.dts +2 -2
@@ -92,7 +92,7 @@ linux,code = <171>; label = "config"; debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; camera-key {
@@ -107,7 +107,7 @@ linux,code = <116>; label = "power"; debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; ok-key {
arch/arm/boot/dts/exynos4412-odroid-common.dtsi +1 -1
@@ -35,7 +35,7 @@ linux,code = <KEY_POWER>; label = "power key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos4412-odroidx.dts +1 -1
@@ -48,7 +48,7 @@ linux,code = <KEY_HOME>; label = "home key"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos4412-origen.dts +1 -1
@@ -423,7 +423,7 @@ samsung,keypad-num-rows = <3>; samsung,keypad-num-columns = <2>; linux,keypad-no-autorepeat; - linux,keypad-wakeup; + wakeup-source; pinctrl-0 = <&keypad_rows &keypad_cols>; pinctrl-names = "default"; status = "okay";
arch/arm/boot/dts/exynos4412-smdk4412.dts +1 -1
@@ -45,7 +45,7 @@ samsung,keypad-num-rows = <3>; samsung,keypad-num-columns = <8>; linux,keypad-no-autorepeat; - linux,keypad-wakeup; + wakeup-source; pinctrl-0 = <&keypad_rows &keypad_cols>; pinctrl-names = "default"; status = "okay";
arch/arm/boot/dts/exynos4412-trats2.dts +2 -2
@@ -119,7 +119,7 @@ linux,code = <116>; label = "power"; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; key-ok {
@@ -127,7 +127,7 @@ linux,code = <139>; label = "ok"; debounce-inteval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos5250-arndale.dts +6 -6
@@ -34,42 +34,42 @@ label = "SW-TACT2"; gpios = <&gpx1 4 GPIO_ACTIVE_LOW>; linux,code = <KEY_MENU>; - gpio-key,wakeup; + wakeup-source; }; home { label = "SW-TACT3"; gpios = <&gpx1 5 GPIO_ACTIVE_LOW>; linux,code = <KEY_HOME>; - gpio-key,wakeup; + wakeup-source; }; up { label = "SW-TACT4"; gpios = <&gpx1 6 GPIO_ACTIVE_LOW>; linux,code = <KEY_UP>; - gpio-key,wakeup; + wakeup-source; }; down { label = "SW-TACT5"; gpios = <&gpx1 7 GPIO_ACTIVE_LOW>; linux,code = <KEY_DOWN>; - gpio-key,wakeup; + wakeup-source; }; back { label = "SW-TACT6"; gpios = <&gpx2 0 GPIO_ACTIVE_LOW>; linux,code = <KEY_BACK>; - gpio-key,wakeup; + wakeup-source; }; wakeup { label = "SW-TACT7"; gpios = <&gpx2 1 GPIO_ACTIVE_LOW>; linux,code = <KEY_WAKEUP>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos5250-snow-common.dtsi +2 -2
@@ -37,7 +37,7 @@ label = "Power"; gpios = <&gpx1 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; lid-switch {
@@ -46,7 +46,7 @@ linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos5250-spring.dts +2 -2
@@ -37,7 +37,7 @@ label = "Power"; gpios = <&gpx1 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; lid-switch {
@@ -46,7 +46,7 @@ linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos5420-arndale-octa.dts +1 -1
@@ -48,7 +48,7 @@ label = "SW-TACT1"; gpios = <&gpx2 7 GPIO_ACTIVE_LOW>; linux,code = <KEY_WAKEUP>; - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/exynos5420-peach-pit.dts +2 -2
@@ -65,7 +65,7 @@ label = "Power"; gpios = <&gpx1 2 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; lid-switch {
@@ -74,7 +74,7 @@ linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/exynos5800-peach-pi.dts +2 -2
@@ -64,7 +64,7 @@ label = "Power"; gpios = <&gpx1 2 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; lid-switch {
@@ -73,7 +73,7 @@ linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; };
Signature · 1 line
1.9.1
Re: [UPDATE] [PATCH 12/19] ARM: dts: exynos: replace legacy *,wakeup property with wakeup-source
Quoted 32 lines · Sudeep Holla
Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "linux-keypad,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 further copy-paste duplication.
Cc Kukjin Kim <[email protected]>Cc linux-samsung-soc at vger.kernel.orgReviewed-by Krzysztof Kozlowski <[email protected]>Signed-off-by Sudeep Holla <[email protected]>--- 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-common.dtsi | 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 ++-- 17 files changed, 36 insertions(+), 36 deletions(-)
Quoted 4 lines
Hi Krzysztof,
Thanks for picking up on this. I have rebased on:
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.gitnext/dt
Thanks!
Applied for v4.6.
Best regards,
Krzysztof
PATCH 13/19 ARM: dts: tegra: replace legacy *,wakeup property with wakeup-source
In reply to Sudeep HollaThough the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "nvidia,wakeup-source" 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.
--- 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 +- 15 files changed, 17 insertions(+), 17 deletions(-)
arch/arm/boot/dts/tegra114-dalmore.dts +1 -1
@@ -1164,7 +1164,7 @@ label = "Power"; gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; volume_down {
arch/arm/boot/dts/tegra114-roth.dts +1 -1
@@ -1047,7 +1047,7 @@ label = "Power"; gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/tegra114-tn7.dts +1 -1
@@ -292,7 +292,7 @@ label = "Power"; gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; volume_down {
arch/arm/boot/dts/tegra124-jetson-tk1.dts +1 -1
@@ -1761,7 +1761,7 @@ gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/tegra124-nyan.dtsi +2 -2
@@ -496,7 +496,7 @@ linux,input-type = <5>; linux,code = <KEY_RESERVED>; debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; power {
@@ -504,7 +504,7 @@ gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; debounce-interval = <30>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/tegra124-venice2.dts +1 -1
@@ -975,7 +975,7 @@ gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/tegra20-harmony.dts +1 -1
@@ -655,7 +655,7 @@ label = "Power"; gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/tegra20-paz00.dts +1 -1
@@ -521,7 +521,7 @@ label = "Power"; gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/tegra20-seaboard.dts +2 -2
@@ -807,7 +807,7 @@ label = "Power"; gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; lid {
@@ -816,7 +816,7 @@ linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/tegra20-trimslice.dts +1 -1
@@ -392,7 +392,7 @@ label = "Power"; gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/tegra20-ventana.dts +1 -1
@@ -601,7 +601,7 @@ label = "Power"; gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/tegra20-whistler.dts +1 -1
@@ -508,7 +508,7 @@ nvidia,repeat-delay-ms = <160>; nvidia,kbc-row-pins = <0 1 2>; nvidia,kbc-col-pins = <16 17>; - nvidia,wakeup-source; + wakeup-source; linux,keymap = <MATRIX_KEY(0x00, 0x00, KEY_POWER) MATRIX_KEY(0x01, 0x00, KEY_HOME) MATRIX_KEY(0x01, 0x01, KEY_BACK)
arch/arm/boot/dts/tegra30-apalis-eval.dts +1 -1
@@ -191,7 +191,7 @@ gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/tegra30-cardhu.dtsi +1 -1
@@ -626,7 +626,7 @@ interrupts = <2 0>; linux,code = <KEY_POWER>; debounce-interval = <100>; - gpio-key,wakeup; + wakeup-source; }; volume-down {
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -1
@@ -141,7 +141,7 @@ gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>; linux,code = <KEY_POWER>; debounce-interval = <10>; - gpio-key,wakeup; + wakeup-source; }; };
Signature · 1 line
1.9.1
Re: [PATCH 13/19] ARM: dts: tegra: replace legacy *,wakeup property with wakeup-source
Quoted 8 lines · Sudeep Holla
Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "nvidia,wakeup-source" 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.
Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 13/19] ARM: dts: tegra: replace legacy *,wakeup property with wakeup-source
In reply to Sudeep HollaQuoted 11 lines · Sudeep Holla
Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "nvidia,wakeup-source" 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 Stephen Warren <[email protected]>Cc Thierry Reding <[email protected]>Cc Alexandre Courbot <[email protected]>
Ping, do you prefer taking via your tree or should I send to armsoc directly ?
--
Regards,
Sudeep
PATCH 14/19 ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
In reply to Sudeep HollaThough 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.
--- 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/sh73a0-kzm9g.dts | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-)
arch/arm/boot/dts/r8a73a4-ape6evm.dts +1 -1
@@ -110,7 +110,7 @@ gpios = <&pfc 324 GPIO_ACTIVE_LOW>; linux,code = <KEY_0>; label = "S16"; - gpio-key,wakeup; + wakeup-source; }; menu-key {
arch/arm/boot/dts/r8a7740-armadillo800eva.dts +1 -1
@@ -85,7 +85,7 @@ gpios = <&pfc 99 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; label = "SW3"; - gpio-key,wakeup; + wakeup-source; }; back-key {
arch/arm/boot/dts/r8a7790-lager.dts +4 -4
@@ -77,28 +77,28 @@ button at 1 { linux,code = <KEY_1>; label = "SW2-1"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; button at 2 { linux,code = <KEY_2>; label = "SW2-2"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; }; button at 3 { linux,code = <KEY_3>; label = "SW2-3"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; gpios = <&gpio1 26 GPIO_ACTIVE_LOW>; }; button at 4 { linux,code = <KEY_4>; label = "SW2-4"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; gpios = <&gpio1 28 GPIO_ACTIVE_LOW>; };
arch/arm/boot/dts/r8a7791-koelsch.dts +11 -11
@@ -79,77 +79,77 @@ gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; linux,code = <KEY_1>; label = "SW2-1"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-2 { gpios = <&gpio5 1 GPIO_ACTIVE_LOW>; linux,code = <KEY_2>; label = "SW2-2"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-3 { gpios = <&gpio5 2 GPIO_ACTIVE_LOW>; linux,code = <KEY_3>; label = "SW2-3"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-4 { gpios = <&gpio5 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_4>; label = "SW2-4"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-a { gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; linux,code = <KEY_A>; label = "SW30"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-b { gpios = <&gpio7 1 GPIO_ACTIVE_LOW>; linux,code = <KEY_B>; label = "SW31"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-c { gpios = <&gpio7 2 GPIO_ACTIVE_LOW>; linux,code = <KEY_C>; label = "SW32"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-d { gpios = <&gpio7 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_D>; label = "SW33"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-e { gpios = <&gpio7 4 GPIO_ACTIVE_LOW>; linux,code = <KEY_E>; label = "SW34"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-f { gpios = <&gpio7 5 GPIO_ACTIVE_LOW>; linux,code = <KEY_F>; label = "SW35"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; key-g { gpios = <&gpio7 6 GPIO_ACTIVE_LOW>; linux,code = <KEY_G>; label = "SW36"; - gpio-key,wakeup; + wakeup-source; debounce-interval = <20>; }; };
arch/arm/boot/dts/sh73a0-kzm9g.dts +1 -1
@@ -147,7 +147,7 @@ gpios = <&pcf8575 14 GPIO_ACTIVE_LOW>; linux,code = <KEY_HOME>; label = "SW1"; - gpio-key,wakeup; + wakeup-source; }; };
Signature · 1 line
1.9.1
Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
Quoted 8 lines · Sudeep Holla
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...
Quoted 4 lines
Cc Simon Horman <[email protected]>Cc Magnus Damm <[email protected]>Cc linux-sh at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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
Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
Quoted 6 lines · Geert Uytterhoeven
Quoted 5 lines · Sudeep Holla
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.
Quoted 9 lines
Quoted 3 lines
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 ;))
Quoted 7 lines
Quoted 4 lines
Cc Simon Horman <[email protected]>Cc Magnus Damm <[email protected]>Cc linux-sh at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>
Thanks
Signature · 2 lines
Regards, Sudeep
Simon Horman
Acked-byRe: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
Quoted 13 lines · Sudeep Holla
Quoted 10 lines · Geert Uytterhoeven
Quoted 8 lines · Sudeep Holla
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.
Quoted 15 lines
Quoted 5 lines
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 ;))
Quoted 6 lines
Quoted 4 lines
Cc Simon Horman <[email protected]>Cc Magnus Damm <[email protected]>Cc linux-sh at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>
Can I clarify that you would like me to pick up this patch? If so I'm happy to do so.
Else:
Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
Quoted 28 lines · Simon Horman
Quoted 27 lines · Sudeep Holla
Quoted 6 lines · Geert Uytterhoeven
Quoted 5 lines · Sudeep Holla
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.
Quoted 9 lines
Quoted 3 lines
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 ;))
Quoted 5 lines
Quoted 4 lines
Cc Simon Horman <[email protected]>Cc Magnus Damm <[email protected]>Cc linux-sh at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>
Quoted 5 lines
Quoted 1 line
Quoted 1 line
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.
Quoted 4 lines
Else:
Acked-by Simon Horman <[email protected]>
Thanks.
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 14/19] ARM: dts: shmobile/r8a7xxx: replace gpio-key,wakeup with wakeup-source property
Quoted 31 lines · Sudeep Holla
Quoted 28 lines · Simon Horman
Quoted 27 lines · Sudeep Holla
Quoted 6 lines · Geert Uytterhoeven
Quoted 5 lines · Sudeep Holla
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.
Quoted 9 lines
Quoted 3 lines
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 ;))
Quoted 5 lines
Quoted 4 lines
Cc Simon Horman <[email protected]>Cc Magnus Damm <[email protected]>Cc linux-sh at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
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.
Thanks, I have queued this up for v4.5.
It should appear in the devel branch of the renesas tree some time today. I will include it in the next branch, which is included in the linux-next tree, once v4.4-rc1 has been released.
PATCH 15/19 ARM: dts: omap: replace legacy *,wakeup property with wakeup-source
In reply to Sudeep HollaThough 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.
--- 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(-)
arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts +4 -4
@@ -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; }; };
arch/arm/boot/dts/omap3-beagle-xm.dts +1 -1
@@ -69,7 +69,7 @@ label = "user"; gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; linux,code = <0x114>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap3-beagle.dts +1 -1
@@ -80,7 +80,7 @@ label = "user"; gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; linux,code = <0x114>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap3-cm-t3x.dtsi +1 -1
@@ -238,7 +238,7 @@ ti,debounce-tol = /bits/ 16 <10>; ti,debounce-rep = /bits/ 16 <1>; - linux,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap3-devkit8000-common.dtsi +1 -1
@@ -64,7 +64,7 @@ label = "user"; gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; linux,code = <BTN_EXTRA>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi +1 -1
@@ -68,6 +68,6 @@ ti,keep-vref-on = <1>; ti,settle-delay-usec = /bits/ 16 <150>; - linux,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap3-gta04.dtsi +1 -1
@@ -37,7 +37,7 @@ label = "aux"; linux,code = <169>; gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap3-ldp.dts +9 -9
@@ -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; }; }; };
arch/arm/boot/dts/omap3-lilly-a83x.dtsi +1 -1
@@ -327,7 +327,7 @@ ti,pressure-max = /bits/ 16 <255>; ti,swap-xy; - linux,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap3-n900.dts +5 -5
@@ -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 {
arch/arm/boot/dts/omap3-overo-alto35-common.dtsi +1 -1
@@ -48,7 +48,7 @@ label = "button0"; linux,code = <BTN_0>; gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; /* gpio_10 */ - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi +2 -2
@@ -41,13 +41,13 @@ label = "button0"; linux,code = <BTN_0>; gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */ - gpio-key,wakeup; + wakeup-source; }; button1 at 14 { label = "button1"; linux,code = <BTN_1>; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */ - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi +1 -1
@@ -161,6 +161,6 @@ ti,x-plate-ohms = /bits/ 16 <180>; ti,pressure-max = /bits/ 16 <255>; - linux,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi +1 -1
@@ -172,7 +172,7 @@ ti,x-plate-ohms = /bits/ 16 <180>; ti,pressure-max = /bits/ 16 <255>; - linux,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi +2 -2
@@ -41,13 +41,13 @@ label = "button0"; linux,code = <BTN_0>; gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */ - gpio-key,wakeup; + wakeup-source; }; button1 at 14 { label = "button1"; linux,code = <BTN_1>; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */ - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/omap3-overo-palo35-common.dtsi +2 -2
@@ -41,13 +41,13 @@ label = "button0"; linux,code = <BTN_0>; gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */ - gpio-key,wakeup; + wakeup-source; }; button1 at 14 { label = "button1"; linux,code = <BTN_1>; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */ - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/omap3-overo-palo43-common.dtsi +2 -2
@@ -41,13 +41,13 @@ label = "button0"; linux,code = <BTN_0>; gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */ - gpio-key,wakeup; + wakeup-source; }; button1 at 14 { label = "button1"; linux,code = <BTN_1>; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */ - gpio-key,wakeup; + wakeup-source; }; }; };
arch/arm/boot/dts/omap3-pandora-common.dtsi +17 -17
@@ -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 at 1 {
arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi +1 -1
@@ -66,6 +66,6 @@ ti,x-plate-ohms = /bits/ 16 <40>; ti,pressure-max = /bits/ 16 <255>; ti,swap-xy; - linux,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap4-duovero-parlor.dts +1 -1
@@ -36,7 +36,7 @@ label = "button0"; linux,code = <BTN_0>; gpios = <&gpio4 25 GPIO_ACTIVE_LOW>; /* gpio_121 */ - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap4-var-om44customboard.dtsi +1 -1
@@ -41,7 +41,7 @@ label = "user"; gpios = <&gpio6 24 GPIO_ACTIVE_HIGH>; /* gpio 184 */ linux,code = <BTN_EXTRA>; - gpio-key,wakeup; + wakeup-source; }; };
arch/arm/boot/dts/omap5-cm-t54.dts +1 -1
@@ -359,7 +359,7 @@ ti,debounce-tol = /bits/ 16 <10>; ti,debounce-rep = /bits/ 16 <1>; - linux,wakeup; + wakeup-source; }; };
Signature · 1 line
1.9.1
Re: [PATCH 15/19] ARM: dts: omap: replace legacy *,wakeup property with wakeup-source
Quoted 10 lines · Sudeep Holla
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" <[email protected]>Cc Tony Lindgren <[email protected]>
Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 15/19] ARM: dts: omap: replace legacy *,wakeup property with wakeup-source
Quoted 11 lines · Sudeep Holla
Quoted 8 lines · Sudeep Holla
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.
Quoted 5 lines
Quoted 2 lines
Cc "Beno?t Cousson" <[email protected]>Cc Tony Lindgren <[email protected]>Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Applying this one too thanks.
Tony
PATCH 16/19 ARM: dts: s5pv210: replace legacy *,wakeup property with wakeup-source
In reply to Sudeep HollaThough 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.
--- 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(-)
arch/arm/boot/dts/s5pv210-aquila.dts +2 -2
@@ -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";
arch/arm/boot/dts/s5pv210-goni.dts +2 -2
@@ -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";
arch/arm/boot/dts/s5pv210-smdkv210.dts +1 -1
@@ -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";
Signature · 1 line
1.9.1
Re: [PATCH 16/19] ARM: dts: s5pv210: replace legacy *,wakeup property with wakeup-source
Quoted 10 lines · Sudeep Holla
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 <[email protected]>Cc Kukjin Kim <[email protected]>
Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 16/19] ARM: dts: s5pv210: replace legacy *,wakeup property with wakeup-source
In reply to Sudeep Holla2015-10-21 19:10 GMT+09:00 Sudeep Holla <[email protected]>:
Quoted 12 lines
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 <[email protected]>Cc Kukjin Kim <[email protected]>Cc linux-samsung-soc at vger.kernel.orgSigned-off-by Sudeep Holla <[email protected]>
Quoted 5 lines
--- 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(-)
Best regards,
Krzysztof
PATCH 17/19 ARM: dts: armada: replace isil,irq2-can-wakeup-machine with wakeup-source property
In reply to Sudeep HollaThough 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.
--- 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(-)
arch/arm/boot/dts/armada-370-netgear-rn102.dts +1 -1
@@ -120,7 +120,7 @@ isl12057: isl12057 at 68 { compatible = "isil,isl12057"; reg = <0x68>; - isil,irq2-can-wakeup-machine; + wakeup-source; }; g762: g762 at 3e {
arch/arm/boot/dts/armada-370-netgear-rn104.dts +1 -1
@@ -126,7 +126,7 @@ isl12057: isl12057 at 68 { compatible = "isil,isl12057"; reg = <0x68>; - isil,irq2-can-wakeup-machine; + wakeup-source; }; g762: g762 at 3e {
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +1 -1
@@ -133,7 +133,7 @@ isl12057: isl12057 at 68 { compatible = "isil,isl12057"; reg = <0x68>; - isil,irq2-can-wakeup-machine; + wakeup-source; }; /* Controller for rear fan #1 of 3 (Protechnic
Signature · 1 line
1.9.1
Re: [PATCH 17/19] ARM: dts: armada: replace isil,irq2-can-wakeup-machine with wakeup-source property
Quoted 4 lines · Sudeep Holla
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.
Quoted 9 lines
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 <[email protected]>Cc Andrew Lunn <[email protected]>Cc Gregory Clement <[email protected]>Cc Sebastian Hesselbarth <[email protected]>
Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 17/19] ARM: dts: armada: replace isil,irq2-can-wakeup-machine with wakeup-source property
Hi Sudeep,
Quoted 9 lines · Sudeep Holla
Quoted 8 lines · Sudeep Holla
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.
Quoted 8 lines
Quoted 5 lines
Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Gregory Clement <[email protected]>Cc Sebastian Hesselbarth <[email protected]>Ping, do you prefer taking via your tree or should I send to armsoc directly ?
Sorry for the delay it was in my inbox since too many time. I didn't get the time to check it. This looks ok for me, so I've just applied it on mvebu/dt,
Thanks,
Gregory
Quoted 4 lines
Signature · 3 lines
-- Regards, Sudeep
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 18/19 ARM: dts: ste: replace legacy *,wakeup property with wakeup-source
In reply to Sudeep HollaThough 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.
--- 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(-)
arch/arm/boot/dts/ste-href-tvk1281618.dtsi +1 -1
@@ -66,7 +66,7 @@ keypad,num-columns = <8>; keypad,num-rows = <8>; linux,no-autorepeat; - linux,wakeup; + wakeup-source; linux,keymap = <0x0301006b 0x04010066 0x06040072
arch/arm/boot/dts/ste-nomadik-s8815.dts +1 -1
@@ -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>; };
Signature · 1 line
1.9.1
Re: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source
Quoted 10 lines · Sudeep Holla
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 <[email protected]>Signed-off-by Sudeep Holla <[email protected]>
Are you sending this to ARM SoC or do I need to handle the patch?
Yours,
Linus Walleij
Re: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source
Quoted 10 lines · Linus Walleij
Quoted 8 lines · Sudeep Holla
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.
Quoted 8 lines
Quoted 2 lines
Cc Linus Walleij <[email protected]>Signed-off-by Sudeep Holla <[email protected]>Acked-by Linus Walleij <[email protected]>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.
Signature · 2 lines
Regards, Sudeep
Re: [PATCH 18/19] ARM: dts: ste: replace legacy *,wakeup property with wakeup-source
Quoted 18 lines · Sudeep Holla
Quoted 17 lines · Linus Walleij
Quoted 10 lines · Sudeep Holla
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 <[email protected]>Signed-off-by Sudeep Holla <[email protected]>Acked-by Linus Walleij <[email protected]>
Quoted 7 lines
Quoted 3 lines
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.
Patch applied to my ux500-devicetree branch, sorry for the delay.
Yours,
Linus Walleij
PATCH 19/19 ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property
In reply to Sudeep HollaThough 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.
--- arch/arm/boot/dts/zynq-zc702.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/zynq-zc702.dts +2 -2
@@ -43,14 +43,14 @@ label = "sw14"; gpios = <&gpio0 12 0>; linux,code = <108>; /* down */ - gpio-key,wakeup; + wakeup-source; autorepeat; }; sw13 { label = "sw13"; gpios = <&gpio0 14 0>; linux,code = <103>; /* up */ - gpio-key,wakeup; + wakeup-source; autorepeat; }; };
Signature · 1 line
1.9.1
Michal Simek
AppliedRe: [PATCH 19/19] ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property
Quoted 28 lines · Sudeep Holla
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.
Cc Michal Simek <[email protected]>Cc "S?ren Brinkmann" <[email protected]>Signed-off-by Sudeep Holla <[email protected]>--- arch/arm/boot/dts/zynq-zc702.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/boot/dts/zynq-zc702.dts +1
-1@@ -43,14 +43,14 @@ label = "sw14"; gpios = <&gpio0 12 0>; linux,code = <108>; /* down */ - gpio-key,wakeup; + wakeup-source; autorepeat;
arch/arm/boot/dts/zynq-zc702.dts line 56
Quoted 10 lines
arch/arm/boot/dts/zynq-zc702.dts +1
-1}; sw13 { label = "sw13"; gpios = <&gpio0 14 0>; linux,code = <103>; /* up */ - gpio-key,wakeup; + wakeup-source; autorepeat; }; };
Applied to zynq/dt.
Thanks,
Michal