[PATCH v2 0/4] Add reset controllers for STiH407 SoC

[PATCH v2 0/4] Add reset controllers for STiH407 SoC

[Peter Griffin]

This series adds reset controller support for the STiH407 SoC.

Changes since v1
 - Update copyright to 2014
 - Add const qualifier
 - Fix various whitespace issues
 - Remove THIS_OWNER
 - Move DT documentation into separate patch

Peter Griffin (4):
  reset: stih407: Add softreset, powerdown and picophy controllers
  reset: sti: Document sti-picophyreset controllers bindings.
  ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET
  ARM: sti: Add STiH407 reset controller support.

 .../bindings/reset/st,sti-picophyreset.txt         |  42 ++++++
 arch/arm/boot/dts/stih407.dtsi                     |  16 +++
 arch/arm/mach-sti/Kconfig                          |  10 ++
 drivers/reset/sti/Kconfig                          |   4 +
 drivers/reset/sti/Makefile                         |   1 +
 drivers/reset/sti/reset-stih407.c                  | 158 +++++++++++++++++++++
 .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++++++
 7 files changed, 292 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
 create mode 100644 drivers/reset/sti/reset-stih407.c
 create mode 100644 include/dt-bindings/reset-controller/stih407-resets.h

-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 1/4] reset: stih407: Add softreset, powerdown and picophy controllers

[Peter Griffin]

This patch adds softreset, powerdown and picophy reset controllers for
the STiH407 SoC.

With this patch three new devices are registered: -
1. st,stih407-powerdown
2. st,stih407-softreset
3. st,stih407-picophyreset

All three devices use system configuration registers mapped via regmap to
perform the reset or powerdown. The powerdown controller also has
an acknowledgement.

A separate picophy reset controller manages the different reset channels within
the picophy, which have a different polarity to the other system softresets.
Managing these different picophy softreset channels is necessary to correctly
handle resuming from suspend when USB2 devices are plugged into the USB3 port.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 drivers/reset/sti/Kconfig                          |   4 +
 drivers/reset/sti/Makefile                         |   1 +
 drivers/reset/sti/reset-stih407.c                  | 158 +++++++++++++++++++++
 .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++++++
 4 files changed, 224 insertions(+)
 create mode 100644 drivers/reset/sti/reset-stih407.c
 create mode 100644 include/dt-bindings/reset-controller/stih407-resets.h

diff --git a/drivers/reset/sti/Kconfig b/drivers/reset/sti/Kconfig
index 88d2d03..f8c15a3 100644
--- a/drivers/reset/sti/Kconfig
+++ b/drivers/reset/sti/Kconfig
@@ -12,4 +12,8 @@ config STIH416_RESET
 	bool
 	select STI_RESET_SYSCFG
 
+config STIH407_RESET
+	bool
+	select STI_RESET_SYSCFG
+
 endif
diff --git a/drivers/reset/sti/Makefile b/drivers/reset/sti/Makefile
index be1c976..dc85dfb 100644
--- a/drivers/reset/sti/Makefile
+++ b/drivers/reset/sti/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_STI_RESET_SYSCFG) += reset-syscfg.o
 
 obj-$(CONFIG_STIH415_RESET) += reset-stih415.o
 obj-$(CONFIG_STIH416_RESET) += reset-stih416.o
+obj-$(CONFIG_STIH407_RESET) += reset-stih407.o
diff --git a/drivers/reset/sti/reset-stih407.c b/drivers/reset/sti/reset-stih407.c
new file mode 100644
index 0000000..d83db5d7
--- /dev/null
+++ b/drivers/reset/sti/reset-stih407.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2014 STMicroelectronics (R&D) Limited
+ * Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <dt-bindings/reset-controller/stih407-resets.h>
+#include "reset-syscfg.h"
+
+/* STiH407 Peripheral powerdown definitions. */
+static const char stih407_core[] = "st,stih407-core-syscfg";
+static const char stih407_sbc_reg[] = "st,stih407-sbc-reg-syscfg";
+static const char stih407_lpm[] = "st,stih407-lpm-syscfg";
+
+#define STIH407_PDN_0(_bit) \
+	_SYSCFG_RST_CH(stih407_core, SYSCFG_5000, _bit, SYSSTAT_5500, _bit)
+#define STIH407_PDN_1(_bit) \
+	_SYSCFG_RST_CH(stih407_core, SYSCFG_5001, _bit, SYSSTAT_5501, _bit)
+#define STIH407_PDN_ETH(_bit, _stat) \
+	_SYSCFG_RST_CH(stih407_sbc_reg, SYSCFG_4032, _bit, SYSSTAT_4520, _stat)
+
+/* Powerdown requests control 0 */
+#define SYSCFG_5000	0x0
+#define SYSSTAT_5500	0x7d0
+/* Powerdown requests control 1 (High Speed Links) */
+#define SYSCFG_5001	0x4
+#define SYSSTAT_5501	0x7d4
+
+/* Ethernet powerdown/status/reset */
+#define SYSCFG_4032	0x80
+#define SYSSTAT_4520	0x820
+#define SYSCFG_4002	0x8
+
+static const struct syscfg_reset_channel_data stih407_powerdowns[] = {
+	[STIH407_EMISS_POWERDOWN] = STIH407_PDN_0(1),
+	[STIH407_NAND_POWERDOWN] = STIH407_PDN_0(0),
+	[STIH407_USB3_POWERDOWN] = STIH407_PDN_1(6),
+	[STIH407_USB2_PORT1_POWERDOWN] = STIH407_PDN_1(5),
+	[STIH407_USB2_PORT0_POWERDOWN] = STIH407_PDN_1(4),
+	[STIH407_PCIE1_POWERDOWN] = STIH407_PDN_1(3),
+	[STIH407_PCIE0_POWERDOWN] = STIH407_PDN_1(2),
+	[STIH407_SATA1_POWERDOWN] = STIH407_PDN_1(1),
+	[STIH407_SATA0_POWERDOWN] = STIH407_PDN_1(0),
+	[STIH407_ETH1_POWERDOWN] = STIH407_PDN_ETH(0, 2),
+};
+
+/* Reset Generator control 0/1 */
+#define SYSCFG_5131	0x20c
+#define SYSCFG_5132	0x210
+
+#define LPM_SYSCFG_1	0x4	/* Softreset IRB & SBC UART */
+
+#define STIH407_SRST_CORE(_reg, _bit) \
+	_SYSCFG_RST_CH_NO_ACK(stih407_core, _reg, _bit)
+
+#define STIH407_SRST_SBC(_reg, _bit) \
+	_SYSCFG_RST_CH_NO_ACK(stih407_sbc_reg, _reg, _bit)
+
+#define STIH407_SRST_LPM(_reg, _bit) \
+	_SYSCFG_RST_CH_NO_ACK(stih407_lpm, _reg, _bit)
+
+static const struct syscfg_reset_channel_data stih407_softresets[] = {
+	[STIH407_ETH1_SOFTRESET] = STIH407_SRST_SBC(SYSCFG_4002, 4),
+	[STIH407_MMC1_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 3),
+	[STIH407_USB2_PORT0_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 28),
+	[STIH407_USB2_PORT1_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 29),
+	[STIH407_PICOPHY_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 30),
+	[STIH407_IRB_SOFTRESET] = STIH407_SRST_LPM(LPM_SYSCFG_1, 6),
+	[STIH407_PCIE0_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 6),
+	[STIH407_PCIE1_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 15),
+	[STIH407_SATA0_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 7),
+	[STIH407_SATA1_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 16),
+	[STIH407_MIPHY0_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 4),
+	[STIH407_MIPHY1_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 13),
+	[STIH407_MIPHY2_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 22),
+	[STIH407_SATA0_PWR_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 5),
+	[STIH407_SATA1_PWR_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 14),
+	[STIH407_DELTA_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 3),
+	[STIH407_BLITTER_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 10),
+	[STIH407_HDTVOUT_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 11),
+	[STIH407_HDQVDP_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 12),
+	[STIH407_VDP_AUX_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 14),
+	[STIH407_COMPO_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 15),
+	[STIH407_HDMI_TX_PHY_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 21),
+	[STIH407_JPEG_DEC_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 23),
+	[STIH407_VP8_DEC_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 24),
+	[STIH407_GPU_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 30),
+	[STIH407_HVA_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 0),
+	[STIH407_ERAM_HVA_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 1),
+	[STIH407_LPM_SOFTRESET] = STIH407_SRST_SBC(SYSCFG_4002, 2),
+	[STIH407_KEYSCAN_SOFTRESET] = STIH407_SRST_LPM(LPM_SYSCFG_1, 8),
+};
+
+/* PicoPHY reset/control */
+#define SYSCFG_5061	0x0f4
+
+static const struct syscfg_reset_channel_data stih407_picophyresets[] = {
+	[STIH407_PICOPHY0_RESET] = STIH407_SRST_CORE(SYSCFG_5061, 5),
+	[STIH407_PICOPHY1_RESET] = STIH407_SRST_CORE(SYSCFG_5061, 6),
+	[STIH407_PICOPHY2_RESET] = STIH407_SRST_CORE(SYSCFG_5061, 7),
+};
+
+static const struct syscfg_reset_controller_data stih407_powerdown_controller = {
+	.wait_for_ack = true,
+	.nr_channels = ARRAY_SIZE(stih407_powerdowns),
+	.channels = stih407_powerdowns,
+};
+
+static const struct syscfg_reset_controller_data stih407_softreset_controller = {
+	.wait_for_ack = false,
+	.active_low = true,
+	.nr_channels = ARRAY_SIZE(stih407_softresets),
+	.channels = stih407_softresets,
+};
+
+static const struct syscfg_reset_controller_data stih407_picophyreset_controller = {
+	.wait_for_ack = false,
+	.nr_channels = ARRAY_SIZE(stih407_picophyresets),
+	.channels = stih407_picophyresets,
+};
+
+static struct of_device_id stih407_reset_match[] = {
+	{
+		.compatible = "st,stih407-powerdown",
+		.data = &stih407_powerdown_controller,
+	},
+	{
+		.compatible = "st,stih407-softreset",
+		.data = &stih407_softreset_controller,
+	},
+	{
+		.compatible = "st,stih407-picophyreset",
+		.data = &stih407_picophyreset_controller,
+	},
+	{ /* sentinel */ },
+};
+
+static struct platform_driver stih407_reset_driver = {
+	.probe = syscfg_reset_probe,
+	.driver = {
+		.name = "reset-stih407",
+		.of_match_table = stih407_reset_match,
+	},
+};
+
+static int __init stih407_reset_init(void)
+{
+	return platform_driver_register(&stih407_reset_driver);
+}
+
+arch_initcall(stih407_reset_init);
diff --git a/include/dt-bindings/reset-controller/stih407-resets.h b/include/dt-bindings/reset-controller/stih407-resets.h
new file mode 100644
index 0000000..02d4328
--- /dev/null
+++ b/include/dt-bindings/reset-controller/stih407-resets.h
@@ -0,0 +1,61 @@
+/*
+ * This header provides constants for the reset controller
+ * based peripheral powerdown requests on the STMicroelectronics
+ * STiH407 SoC.
+ */
+#ifndef _DT_BINDINGS_RESET_CONTROLLER_STIH407
+#define _DT_BINDINGS_RESET_CONTROLLER_STIH407
+
+/* Powerdown requests control 0 */
+#define STIH407_EMISS_POWERDOWN		0
+#define STIH407_NAND_POWERDOWN		1
+
+/* Synp GMAC PowerDown */
+#define STIH407_ETH1_POWERDOWN		2
+
+/* Powerdown requests control 1 */
+#define STIH407_USB3_POWERDOWN		3
+#define STIH407_USB2_PORT1_POWERDOWN	4
+#define STIH407_USB2_PORT0_POWERDOWN	5
+#define STIH407_PCIE1_POWERDOWN		6
+#define STIH407_PCIE0_POWERDOWN		7
+#define STIH407_SATA1_POWERDOWN		8
+#define STIH407_SATA0_POWERDOWN		9
+
+/* Reset defines */
+#define STIH407_ETH1_SOFTRESET		0
+#define STIH407_MMC1_SOFTRESET		1
+#define STIH407_PICOPHY_SOFTRESET	2
+#define STIH407_IRB_SOFTRESET		3
+#define STIH407_PCIE0_SOFTRESET		4
+#define STIH407_PCIE1_SOFTRESET		5
+#define STIH407_SATA0_SOFTRESET		6
+#define STIH407_SATA1_SOFTRESET		7
+#define STIH407_MIPHY0_SOFTRESET	8
+#define STIH407_MIPHY1_SOFTRESET	9
+#define STIH407_MIPHY2_SOFTRESET	10
+#define STIH407_SATA0_PWR_SOFTRESET	11
+#define STIH407_SATA1_PWR_SOFTRESET	12
+#define STIH407_DELTA_SOFTRESET		13
+#define STIH407_BLITTER_SOFTRESET	14
+#define STIH407_HDTVOUT_SOFTRESET	15
+#define STIH407_HDQVDP_SOFTRESET	16
+#define STIH407_VDP_AUX_SOFTRESET	17
+#define STIH407_COMPO_SOFTRESET		18
+#define STIH407_HDMI_TX_PHY_SOFTRESET	19
+#define STIH407_JPEG_DEC_SOFTRESET	20
+#define STIH407_VP8_DEC_SOFTRESET	21
+#define STIH407_GPU_SOFTRESET		22
+#define STIH407_HVA_SOFTRESET		23
+#define STIH407_ERAM_HVA_SOFTRESET	24
+#define STIH407_LPM_SOFTRESET		25
+#define STIH407_KEYSCAN_SOFTRESET	26
+#define STIH407_USB2_PORT0_SOFTRESET	27
+#define STIH407_USB2_PORT1_SOFTRESET	28
+
+/* Picophy reset defines */
+#define STIH407_PICOPHY0_RESET		0
+#define STIH407_PICOPHY1_RESET		1
+#define STIH407_PICOPHY2_RESET		2
+
+#endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH407 */
-- 
1.9.1

Re: [PATCH v2 1/4] reset: stih407: Add softreset, powerdown and picophy controllers

[Lee Jones]

On Wed, 02 Jul 2014, Peter Griffin wrote:

> This patch adds softreset, powerdown and picophy reset controllers for
> the STiH407 SoC.
> 
> With this patch three new devices are registered: -
> 1. st,stih407-powerdown
> 2. st,stih407-softreset
> 3. st,stih407-picophyreset
> 
> All three devices use system configuration registers mapped via regmap to
> perform the reset or powerdown. The powerdown controller also has
> an acknowledgement.
> 
> A separate picophy reset controller manages the different reset channels within
> the picophy, which have a different polarity to the other system softresets.
> Managing these different picophy softreset channels is necessary to correctly
> handle resuming from suspend when USB2 devices are plugged into the USB3 port.
> 
> Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro-qxv4g6HH51o@public.gmane.org>
> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>  drivers/reset/sti/Kconfig                          |   4 +
>  drivers/reset/sti/Makefile                         |   1 +
>  drivers/reset/sti/reset-stih407.c                  | 158 +++++++++++++++++++++
>  .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++++++
>  4 files changed, 224 insertions(+)
>  create mode 100644 drivers/reset/sti/reset-stih407.c
>  create mode 100644 include/dt-bindings/reset-controller/stih407-resets.h

Looks good to me now:
  Acked-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 2/4] reset: sti: Document sti-picophyreset controllers bindings.

[Peter Griffin]

Add DT bindings documentation for sti-picophyreset controller.

Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 .../bindings/reset/st,sti-picophyreset.txt         | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt

diff --git a/Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt b/Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
new file mode 100644
index 0000000..54ae9f7
--- /dev/null
+++ b/Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
@@ -0,0 +1,42 @@
+STMicroelectronics STi family Sysconfig Picophy SoftReset Controller
+=============================================================================
+
+This binding describes a reset controller device that is used to enable and
+disable on-chip PicoPHY USB2 phy(s) using "softreset" control bits found in
+the STi family SoC system configuration registers.
+
+The actual action taken when softreset is asserted is hardware dependent.
+However, when asserted it may not be possible to access the hardware's
+registers and after an assert/deassert sequence the hardware's previous state
+may no longer be valid.
+
+Please refer to Documentation/devicetree/bindings/reset/reset.txt
+for common reset controller binding usage.
+
+Required properties:
+- compatible: Should be "st,stih407-picophyreset"
+- #reset-cells: 1, see below
+
+Example:
+
+	picophyreset: picophyreset-controller {
+		compatible = "st,stih407-picophyreset";
+		#reset-cells = <1>;
+	};
+
+Specifying picophyreset control of devices
+=======================================
+
+Device nodes should specify the reset channel required in their "resets"
+property, containing a phandle to the picophyreset device node and an
+index specifying which channel to use, as described in
+Documentation/devicetree/bindings/reset/reset.txt.
+
+Example:
+
+	usb2_picophy0: usbpicophy@0 {
+		resets = <&picophyreset STIH407_PICOPHY0_RESET>;
+	};
+
+Macro definitions for the supported reset channels can be found in:
+include/dt-bindings/reset-controller/stih407-resets.h
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 3/4] ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET

[Peter Griffin]

The STiH407 is a STMicroelectronics Digital Consumer electronics
family, targetted at set-top-box and other audio/video applications.

This patch selects the reset controller driver for this family which
is essential to take various IP's on the SoC out of powerdown / reset.

Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Acked-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 arch/arm/mach-sti/Kconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index 878e9ec..8825bc9 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -42,4 +42,14 @@ config SOC_STIH416
 	  and other digital audio/video applications using Flattened Device
 	  Trees.
 
+config SOC_STIH407
+	bool "STiH407 STMicroelectronics Consumer Electronics family"
+	default y
+	select STIH407_RESET
+	help
+	  This enables support for STMicroelectronics Digital Consumer
+	  Electronics family StiH407 parts, targetted at set-top-box
+	  and other digital audio/video applications using Flattened Device
+	  Trees.
+
 endif
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 3/4] ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET

[Maxime Coquelin]

Hi Peter,

On 07/02/2014 04:08 PM, Peter Griffin wrote:
> The STiH407 is a STMicroelectronics Digital Consumer electronics
> family, targetted at set-top-box and other audio/video applications.
>
> This patch selects the reset controller driver for this family which
> is essential to take various IP's on the SoC out of powerdown / reset.
>
> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Acked-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

Applied.

Thanks!
Maxime

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 0/4] Add reset controllers for STiH407 SoC

[Maxime Coquelin]

Hi Peter,

	The series look good to me.

Thanks,
Maxime

On 07/02/2014 04:08 PM, Peter Griffin wrote:
> This series adds reset controller support for the STiH407 SoC.
>
> Changes since v1
>   - Update copyright to 2014
>   - Add const qualifier
>   - Fix various whitespace issues
>   - Remove THIS_OWNER
>   - Move DT documentation into separate patch
>
> Peter Griffin (4):
>    reset: stih407: Add softreset, powerdown and picophy controllers
>    reset: sti: Document sti-picophyreset controllers bindings.
>    ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET
>    ARM: sti: Add STiH407 reset controller support.
>
>   .../bindings/reset/st,sti-picophyreset.txt         |  42 ++++++
>   arch/arm/boot/dts/stih407.dtsi                     |  16 +++
>   arch/arm/mach-sti/Kconfig                          |  10 ++
>   drivers/reset/sti/Kconfig                          |   4 +
>   drivers/reset/sti/Makefile                         |   1 +
>   drivers/reset/sti/reset-stih407.c                  | 158 +++++++++++++++++++++
>   .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++++++
>   7 files changed, 292 insertions(+)
>   create mode 100644 Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
>   create mode 100644 drivers/reset/sti/reset-stih407.c
>   create mode 100644 include/dt-bindings/reset-controller/stih407-resets.h
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 4/4] ARM: sti: Add STiH407 reset controller support.

[Peter Griffin]

This patch adds the reset controller DT nodes for the powerdown,
 softreset and picophy controllers.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 arch/arm/boot/dts/stih407.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi
index 4f9024f..d2f1aaa 100644
--- a/arch/arm/boot/dts/stih407.dtsi
+++ b/arch/arm/boot/dts/stih407.dtsi
@@ -8,6 +8,7 @@
  */
 #include "stih407-clock.dtsi"
 #include "stih407-pinctrl.dtsi"
+#include <dt-bindings/reset-controller/stih407-resets.h>
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -63,6 +64,21 @@
 		ranges;
 		compatible = "simple-bus";
 
+		powerdown: powerdown-controller {
+			compatible = "st,stih407-powerdown";
+			#reset-cells = <1>;
+		};
+
+		softreset: softreset-controller {
+			compatible = "st,stih407-softreset";
+			#reset-cells = <1>;
+		};
+
+		picophyreset: picophyreset-controller {
+			compatible = "st,stih407-picophyreset";
+			#reset-cells = <1>;
+		};
+
 		syscfg_sbc: sbc-syscfg@9620000 {
 			compatible = "st,stih407-sbc-syscfg", "syscon";
 			reg = <0x9620000 0x1000>;
-- 
1.9.1

Re: [PATCH v2 4/4] ARM: sti: Add STiH407 reset controller support.

[Maxime Coquelin]

Hi Peter,

On 07/02/2014 04:08 PM, Peter Griffin wrote:
> This patch adds the reset controller DT nodes for the powerdown,
>   softreset and picophy controllers.
>
> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>   arch/arm/boot/dts/stih407.dtsi | 16 ++++++++++++++++
>   1 file changed, 16 insertions(+)
>

Applied.

Thanks!
Maxime
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 0/4] Add reset controllers for STiH407 SoC

[Philipp Zabel]

Hi Peter,

Am Mittwoch, den 02.07.2014, 15:08 +0100 schrieb Peter Griffin:
> This series adds reset controller support for the STiH407 SoC.
> 
> Changes since v1
>  - Update copyright to 2014
>  - Add const qualifier
>  - Fix various whitespace issues
>  - Remove THIS_OWNER
>  - Move DT documentation into separate patch
> 
> Peter Griffin (4):
>   reset: stih407: Add softreset, powerdown and picophy controllers
>   reset: sti: Document sti-picophyreset controllers bindings.
>   ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET
>   ARM: sti: Add STiH407 reset controller support.
> 
>  .../bindings/reset/st,sti-picophyreset.txt         |  42 ++++++
>  arch/arm/boot/dts/stih407.dtsi                     |  16 +++
>  arch/arm/mach-sti/Kconfig                          |  10 ++
>  drivers/reset/sti/Kconfig                          |   4 +
>  drivers/reset/sti/Makefile                         |   1 +
>  drivers/reset/sti/reset-stih407.c                  | 158 +++++++++++++++++++++
>  .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++++++
>  7 files changed, 292 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
>  create mode 100644 drivers/reset/sti/reset-stih407.c
>  create mode 100644 include/dt-bindings/reset-controller/stih407-resets.h

Looks good to me now.

Acked-by: Philipp Zabel <p.zabel@pengutronix.de>

regards
Philipp

Re: [PATCH v2 0/4] Add reset controllers for STiH407 SoC

[Lee Jones]

On Wed, 02 Jul 2014, Philipp Zabel wrote:

> Hi Peter,
> 
> Am Mittwoch, den 02.07.2014, 15:08 +0100 schrieb Peter Griffin:
> > This series adds reset controller support for the STiH407 SoC.
> > 
> > Changes since v1
> >  - Update copyright to 2014
> >  - Add const qualifier
> >  - Fix various whitespace issues
> >  - Remove THIS_OWNER
> >  - Move DT documentation into separate patch
> > 
> > Peter Griffin (4):
> >   reset: stih407: Add softreset, powerdown and picophy controllers
> >   reset: sti: Document sti-picophyreset controllers bindings.
> >   ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET
> >   ARM: sti: Add STiH407 reset controller support.
> > 
> >  .../bindings/reset/st,sti-picophyreset.txt         |  42 ++++++
> >  arch/arm/boot/dts/stih407.dtsi                     |  16 +++
> >  arch/arm/mach-sti/Kconfig                          |  10 ++
> >  drivers/reset/sti/Kconfig                          |   4 +
> >  drivers/reset/sti/Makefile                         |   1 +
> >  drivers/reset/sti/reset-stih407.c                  | 158 +++++++++++++++++++++
> >  .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++++++
> >  7 files changed, 292 insertions(+)
> >  create mode 100644 Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
> >  create mode 100644 drivers/reset/sti/reset-stih407.c
> >  create mode 100644 include/dt-bindings/reset-controller/stih407-resets.h
> 
> Looks good to me now.
> 
> Acked-by: Philipp Zabel <p.zabel@pengutronix.de>

Do you have a tree for Reset?  If not, which route do these patches
normally follow?

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 0/4] Add reset controllers for STiH407 SoC

[Maxime Coquelin]

On 07/02/2014 06:59 PM, Lee Jones wrote:
> On Wed, 02 Jul 2014, Philipp Zabel wrote:
>
>> Hi Peter,
>>
>> Am Mittwoch, den 02.07.2014, 15:08 +0100 schrieb Peter Griffin:
>>> This series adds reset controller support for the STiH407 SoC.
>>>
>>> Changes since v1
>>>   - Update copyright to 2014
>>>   - Add const qualifier
>>>   - Fix various whitespace issues
>>>   - Remove THIS_OWNER
>>>   - Move DT documentation into separate patch
>>>
>>> Peter Griffin (4):
>>>    reset: stih407: Add softreset, powerdown and picophy controllers
>>>    reset: sti: Document sti-picophyreset controllers bindings.
>>>    ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET
>>>    ARM: sti: Add STiH407 reset controller support.
>>>
>>>   .../bindings/reset/st,sti-picophyreset.txt         |  42 ++++++
>>>   arch/arm/boot/dts/stih407.dtsi                     |  16 +++
>>>   arch/arm/mach-sti/Kconfig                          |  10 ++
>>>   drivers/reset/sti/Kconfig                          |   4 +
>>>   drivers/reset/sti/Makefile                         |   1 +
>>>   drivers/reset/sti/reset-stih407.c                  | 158 +++++++++++++++++++++
>>>   .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++++++
>>>   7 files changed, 292 insertions(+)
>>>   create mode 100644 Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
>>>   create mode 100644 drivers/reset/sti/reset-stih407.c
>>>   create mode 100644 include/dt-bindings/reset-controller/stih407-resets.h
>>
>> Looks good to me now.
>>
>> Acked-by: Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
>
> Do you have a tree for Reset?  If not, which route do these patches
> normally follow?
>

I will queue patch 4 to STi DT branch for v3.17.
For now, no nodes uses reset for STiH407, so we don't need the 
dt-bindings header file in the STi tree.

If we have a DT node using a reset line before my pull-request, I might 
have to integrate the series in the STi DT branch.
Philipp, does that sound reasonable?

Regards,
Maxime
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 0/4] Add reset controllers for STiH407 SoC

[Philipp Zabel]

Hi,

Am Donnerstag, den 03.07.2014, 10:06 +0200 schrieb Maxime Coquelin:
> I will queue patch 4 to STi DT branch for v3.17.
> For now, no nodes uses reset for STiH407, so we don't need the 
> dt-bindings header file in the STi tree.
> 
> If we have a DT node using a reset line before my pull-request, I might 
> have to integrate the series in the STi DT branch.
> Philipp, does that sound reasonable?

Patch 4 depends on patch 1 for the header. My tree is still empty, how
about I take the first two, and you merge that branch and then take 3
and 4 on top?

    git://git.pengutronix.de/git/pza/linux.git reset/for_v3.17

Lee, shall I also add your Ack to the documentation patch?

regards
Philipp

Re: [PATCH v2 0/4] Add reset controllers for STiH407 SoC

[Lee Jones]

On Thu, 03 Jul 2014, Philipp Zabel wrote:

> Hi,
> 
> Am Donnerstag, den 03.07.2014, 10:06 +0200 schrieb Maxime Coquelin:
> > I will queue patch 4 to STi DT branch for v3.17.
> > For now, no nodes uses reset for STiH407, so we don't need the 
> > dt-bindings header file in the STi tree.
> > 
> > If we have a DT node using a reset line before my pull-request, I might 
> > have to integrate the series in the STi DT branch.
> > Philipp, does that sound reasonable?
> 
> Patch 4 depends on patch 1 for the header. My tree is still empty, how
> about I take the first two, and you merge that branch and then take 3
> and 4 on top?
> 
>     git://git.pengutronix.de/git/pza/linux.git reset/for_v3.17
> 
> Lee, shall I also add your Ack to the documentation patch?

I don't think there's anything to contentious in there:

  Acked-by: Lee Jones <lee.jones@linaro.org>

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 0/4] Add reset controllers for STiH407 SoC

[Lee Jones]

On Thu, 03 Jul 2014, Philipp Zabel wrote:
> Am Donnerstag, den 03.07.2014, 10:06 +0200 schrieb Maxime Coquelin:
> > I will queue patch 4 to STi DT branch for v3.17.
> > For now, no nodes uses reset for STiH407, so we don't need the 
> > dt-bindings header file in the STi tree.
> > 
> > If we have a DT node using a reset line before my pull-request, I might 
> > have to integrate the series in the STi DT branch.
> > Philipp, does that sound reasonable?
> 
> Patch 4 depends on patch 1 for the header. My tree is still empty, how
> about I take the first two, and you merge that branch and then take 3
> and 4 on top?

That approach sounds reasonable.  Once you've applied the patches can
you tag the branch and provide Maxime with a pull-request please
Philipp?

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[GIT PULL] STiH407 reset controller support

[Philipp Zabel]

Hi Maxime,

Am Donnerstag, den 03.07.2014, 10:40 +0100 schrieb Lee Jones:
> On Thu, 03 Jul 2014, Philipp Zabel wrote:
> > Patch 4 depends on patch 1 for the header. My tree is still empty, how
> > about I take the first two, and you merge that branch and then take 3
> > and 4 on top?
> 
> That approach sounds reasonable.  Once you've applied the patches can
> you tag the branch and provide Maxime with a pull-request please
> Philipp?

The following changes since commit
7171511eaec5bf23fb06078f59784a3a0626b38f:

  Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)

are available in the git repository at:

  git://git.pengutronix.de/git/pza/linux.git tags/reset-for-sti-3.17

for you to fetch changes up to d29d2a38d1c1b21730487e991183ffe7e16e1ef5:

  reset: sti: Document sti-picophyreset controllers bindings.
(2014-07-03 14:58:22 +0200)

----------------------------------------------------------------
STiH407 reset controller support

----------------------------------------------------------------
Peter Griffin (2):
      reset: stih407: Add softreset, powerdown and picophy controllers
      reset: sti: Document sti-picophyreset controllers bindings.

 .../bindings/reset/st,sti-picophyreset.txt         |  42 ++++++
 drivers/reset/sti/Kconfig                          |   4 +
 drivers/reset/sti/Makefile                         |   1 +
 drivers/reset/sti/reset-stih407.c                  | 158
+++++++++++++++++++++
 .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++++++
 5 files changed, 266 insertions(+)
 create mode 100644
Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
 create mode 100644 drivers/reset/sti/reset-stih407.c
 create mode 100644
include/dt-bindings/reset-controller/stih407-resets.h

regards
Philipp

Re: [GIT PULL] STiH407 reset controller support

[Maxime Coquelin]

Hi Philipp,

On 07/03/2014 03:32 PM, Philipp Zabel wrote:
> Hi Maxime,
> 
> Am Donnerstag, den 03.07.2014, 10:40 +0100 schrieb Lee Jones:
>> On Thu, 03 Jul 2014, Philipp Zabel wrote:
>>> Patch 4 depends on patch 1 for the header. My tree is still empty, how
>>> about I take the first two, and you merge that branch and then take 3
>>> and 4 on top?
>>
>> That approach sounds reasonable.  Once you've applied the patches can
>> you tag the branch and provide Maxime with a pull-request please
>> Philipp?
> 
> The following changes since commit
> 7171511eaec5bf23fb06078f59784a3a0626b38f:
> 
>    Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
> 
> are available in the git repository at:
> 
>    git://git.pengutronix.de/git/pza/linux.git tags/reset-for-sti-3.17
> 
> for you to fetch changes up to d29d2a38d1c1b21730487e991183ffe7e16e1ef5:
> 
>    reset: sti: Document sti-picophyreset controllers bindings.
> (2014-07-03 14:58:22 +0200)
> 
> ----------------------------------------------------------------
> STiH407 reset controller support
> 
> ----------------------------------------------------------------
> Peter Griffin (2):
>        reset: stih407: Add softreset, powerdown and picophy controllers
>        reset: sti: Document sti-picophyreset controllers bindings.
> 
>   .../bindings/reset/st,sti-picophyreset.txt         |  42 ++++++
>   drivers/reset/sti/Kconfig                          |   4 +
>   drivers/reset/sti/Makefile                         |   1 +
>   drivers/reset/sti/reset-stih407.c                  | 158
> +++++++++++++++++++++
>   .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++++++
>   5 files changed, 266 insertions(+)
>   create mode 100644
> Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
>   create mode 100644 drivers/reset/sti/reset-stih407.c
>   create mode 100644
> include/dt-bindings/reset-controller/stih407-resets.h

Merged into sti-dt-for-v3.17-1.

Thanks for you help!
Maxime

> 
> regards
> Philipp
> 
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html