* [PATCH 1/2] ARM: dts: imx7d: enable snvs rtc, onoffkey and power off
@ 2015-07-08 17:22 Frank.Li at freescale.com
2015-07-08 17:23 ` [PATCH 2/2] ARM: imx_v6_v7_defconfig: enable powerkey and syscon " Frank.Li at freescale.com
2015-07-14 3:44 ` [PATCH 1/2] ARM: dts: imx7d: enable snvs rtc, onoffkey and " Shawn Guo
0 siblings, 2 replies; 5+ messages in thread
From: Frank.Li at freescale.com @ 2015-07-08 17:22 UTC (permalink / raw)
To: linux-arm-kernel
From: Frank Li <Frank.Li@freescale.com>
Change SNVS rtc to syscon interface.
Enable onoff key and power off function.
Signed-off-by: Frank Li <Frank.Li@freescale.com>
---
arch/arm/boot/dts/imx7d-sdb.dts | 4 ++++
arch/arm/boot/dts/imx7d.dtsi | 27 +++++++++++++++++++++------
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index 4d1a4b9..214eba9 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -223,6 +223,10 @@
};
};
+&snvs_poweroff {
+ status = "okay";
+};
+
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index b4cd8fd..308ad1b 100644
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -322,17 +322,32 @@
};
snvs: snvs at 30370000 {
- compatible = "fsl,sec-v4.0-mon", "simple-bus";
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0 0x30370000 0x10000>;
+ compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";
+ reg = <0x30370000 0x10000>;
- snvs-rtc-lp at 34 {
+ snvs_rtc: snvs-rtc-lp {
compatible = "fsl,sec-v4.0-mon-rtc-lp";
- reg = <0x34 0x58>;
+ regmap = <&snvs>;
+ offset = <0x34>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
};
+
+ snvs_poweroff: snvs-poweroff {
+ compatible = "syscon-poweroff";
+ regmap = <&snvs>;
+ offset = <0x38>;
+ mask = <0x60>;
+ status = "disabled";
+ };
+
+ snvs_pwrkey: snvs-powerkey {
+ compatible = "fsl,sec-v4.0-pwrkey";
+ regmap = <&snvs>;
+ interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+ linux,keycode = <KEY_POWER>;
+ wakeup;
+ };
};
clks: ccm at 30380000 {
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] ARM: imx_v6_v7_defconfig: enable powerkey and syscon power off
2015-07-08 17:22 [PATCH 1/2] ARM: dts: imx7d: enable snvs rtc, onoffkey and power off Frank.Li at freescale.com
@ 2015-07-08 17:23 ` Frank.Li at freescale.com
2015-07-14 6:43 ` Shawn Guo
2015-07-14 3:44 ` [PATCH 1/2] ARM: dts: imx7d: enable snvs rtc, onoffkey and " Shawn Guo
1 sibling, 1 reply; 5+ messages in thread
From: Frank.Li at freescale.com @ 2015-07-08 17:23 UTC (permalink / raw)
To: linux-arm-kernel
From: Frank Li <Frank.Li@freescale.com>
build in snvs powerkey
build in syscon power off support
Signed-off-by: Frank Li <Frank.Li@freescale.com>
---
arch/arm/configs/imx_v6_v7_defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 4458554..5303eda 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -151,6 +151,7 @@ CONFIG_WLCORE_SDIO=m
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_SNVS_PWRKEY=y
CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
@@ -186,6 +187,7 @@ CONFIG_POWER_SUPPLY=y
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_IMX=y
CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
CONFIG_SENSORS_GPIO_FAN=y
CONFIG_THERMAL=y
CONFIG_CPU_THERMAL=y
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: dts: imx7d: enable snvs rtc, onoffkey and power off
2015-07-08 17:22 [PATCH 1/2] ARM: dts: imx7d: enable snvs rtc, onoffkey and power off Frank.Li at freescale.com
2015-07-08 17:23 ` [PATCH 2/2] ARM: imx_v6_v7_defconfig: enable powerkey and syscon " Frank.Li at freescale.com
@ 2015-07-14 3:44 ` Shawn Guo
2015-07-14 14:31 ` Zhi Li
1 sibling, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2015-07-14 3:44 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 09, 2015 at 01:22:59AM +0800, Frank.Li at freescale.com wrote:
> From: Frank Li <Frank.Li@freescale.com>
>
> Change SNVS rtc to syscon interface.
> Enable onoff key and power off function.
>
> Signed-off-by: Frank Li <Frank.Li@freescale.com>
> ---
> arch/arm/boot/dts/imx7d-sdb.dts | 4 ++++
> arch/arm/boot/dts/imx7d.dtsi | 27 +++++++++++++++++++++------
> 2 files changed, 25 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
> index 4d1a4b9..214eba9 100644
> --- a/arch/arm/boot/dts/imx7d-sdb.dts
> +++ b/arch/arm/boot/dts/imx7d-sdb.dts
> @@ -223,6 +223,10 @@
> };
> };
>
> +&snvs_poweroff {
> + status = "okay";
> +};
> +
> &uart1 {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_uart1>;
> diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
> index b4cd8fd..308ad1b 100644
> --- a/arch/arm/boot/dts/imx7d.dtsi
> +++ b/arch/arm/boot/dts/imx7d.dtsi
> @@ -322,17 +322,32 @@
> };
>
> snvs: snvs at 30370000 {
> - compatible = "fsl,sec-v4.0-mon", "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <1>;
> - ranges = <0 0x30370000 0x10000>;
> + compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";
> + reg = <0x30370000 0x10000>;
>
> - snvs-rtc-lp at 34 {
> + snvs_rtc: snvs-rtc-lp {
> compatible = "fsl,sec-v4.0-mon-rtc-lp";
> - reg = <0x34 0x58>;
> + regmap = <&snvs>;
> + offset = <0x34>;
> interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
> };
> +
> + snvs_poweroff: snvs-poweroff {
> + compatible = "syscon-poweroff";
> + regmap = <&snvs>;
> + offset = <0x38>;
> + mask = <0x60>;
> + status = "disabled";
> + };
For such completely internal device without any board level
configuration and pin-out, we should probably just leave it enabled by
default, i.e. drop status = "disabled" and save status = "okay" in board
level dts?
Shawn
> +
> + snvs_pwrkey: snvs-powerkey {
> + compatible = "fsl,sec-v4.0-pwrkey";
> + regmap = <&snvs>;
> + interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
> + linux,keycode = <KEY_POWER>;
> + wakeup;
> + };
> };
>
> clks: ccm at 30380000 {
> --
> 1.9.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-07-14 14:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-08 17:22 [PATCH 1/2] ARM: dts: imx7d: enable snvs rtc, onoffkey and power off Frank.Li at freescale.com
2015-07-08 17:23 ` [PATCH 2/2] ARM: imx_v6_v7_defconfig: enable powerkey and syscon " Frank.Li at freescale.com
2015-07-14 6:43 ` Shawn Guo
2015-07-14 3:44 ` [PATCH 1/2] ARM: dts: imx7d: enable snvs rtc, onoffkey and " Shawn Guo
2015-07-14 14:31 ` Zhi Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).