[U-Boot] [PATCH v3 0/3] drivers: Add reset ctrl to drivers
Add reset ctrl to dwmmc socfpga, designware Ethernet and ns16550 serial drivers.
A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
This is preparation to upstream Intel Stratix 10 SoC support in [1].
v2 change: - remove #ifdef CONFIG_DM_RESET switch - add maintainer emails
History: v1: https://patchwork.ozlabs.org/cover/905519/ v2: https://patchwork.ozlabs.org/cover/908667/
[1]: https://patchwork.ozlabs.org/cover/900499/
Ley Foon Tan (3): mmc: dwmmc: socfpga: Add reset ctrl to driver serial: ns16550: Add reset ctrl to driver net: designware: Add reset ctrl to driver
drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ drivers/net/designware.c | 8 ++++++++ drivers/serial/ns16550.c | 8 ++++++++ 3 files changed, 33 insertions(+), 0 deletions(-)
Add code to reset all reset signals as in mmc DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com --- drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index fa0e449..eb7e64e 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -13,6 +13,7 @@ #include <linux/libfdt.h> #include <linux/err.h> #include <malloc.h> +#include <reset.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -33,6 +34,20 @@ struct dwmci_socfpga_priv_data { unsigned int smplsel; };
+static void socfpga_dwmci_reset(struct udevice *dev) +{ + struct reset_ctl_bulk reset_bulk; + int ret; + + ret = reset_get_bulk(dev, &reset_bulk); + if (ret) { + dev_warn(dev, "Can't get reset: %d\n", ret); + return; + } + + reset_deassert_bulk(&reset_bulk); +} + static void socfpga_dwmci_clksel(struct dwmci_host *host) { struct dwmci_socfpga_priv_data *priv = host->priv; @@ -109,6 +124,8 @@ static int socfpga_dwmmc_probe(struct udevice *dev) struct dwmci_socfpga_priv_data *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host;
+ socfpga_dwmci_reset(dev); + #ifdef CONFIG_BLK dwmci_setup_cfg(&plat->cfg, host, host->bus_hz, 400000); host->mmc = &plat->mmc;
On 8 May 2018 at 13:19, Ley Foon Tan ley.foon.tan@intel.com wrote:
Add code to reset all reset signals as in mmc DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com
drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Mon, May 14, 2018 at 6:01 AM, Simon Glass sjg@chromium.org wrote:
On 8 May 2018 at 13:19, Ley Foon Tan ley.foon.tan@intel.com wrote:
Add code to reset all reset signals as in mmc DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com
drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Hi Jaehoon
Can you help to merge this patch?
Regards Ley Foon
On Tue, May 08, 2018 at 11:19:24AM +0800, Ley Foon Tan wrote:
Add code to reset all reset signals as in mmc DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com Reviewed-by: Simon Glass sjg@chromium.org
drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index fa0e449..eb7e64e 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -13,6 +13,7 @@ #include <linux/libfdt.h> #include <linux/err.h> #include <malloc.h> +#include <reset.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -33,6 +34,20 @@ struct dwmci_socfpga_priv_data { unsigned int smplsel; };
+static void socfpga_dwmci_reset(struct udevice *dev) +{
- struct reset_ctl_bulk reset_bulk;
- int ret;
- ret = reset_get_bulk(dev, &reset_bulk);
- if (ret) {
dev_warn(dev, "Can't get reset: %d\n", ret);return;- }
- reset_deassert_bulk(&reset_bulk);
+}
The driver doesn't depend on DM_RESET and this code hunk doesn't either so it fails to build on a number of platforms. This type of comment applies to the whole series, and may be fixed differently in different cases (it might be OK to enforce DM_RESET for this driver, but not for the ns16550 driver).
On Thu, May 24, 2018 at 8:39 PM, Tom Rini trini@konsulko.com wrote:
On Tue, May 08, 2018 at 11:19:24AM +0800, Ley Foon Tan wrote:
Add code to reset all reset signals as in mmc DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com Reviewed-by: Simon Glass sjg@chromium.org
drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index fa0e449..eb7e64e 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -13,6 +13,7 @@ #include <linux/libfdt.h> #include <linux/err.h> #include <malloc.h> +#include <reset.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -33,6 +34,20 @@ struct dwmci_socfpga_priv_data { unsigned int smplsel; };
+static void socfpga_dwmci_reset(struct udevice *dev) +{
struct reset_ctl_bulk reset_bulk;int ret;ret = reset_get_bulk(dev, &reset_bulk);if (ret) {dev_warn(dev, "Can't get reset: %d\n", ret);return;}reset_deassert_bulk(&reset_bulk);+}
The driver doesn't depend on DM_RESET and this code hunk doesn't either so it fails to build on a number of platforms. This type of comment applies to the whole series, and may be fixed differently in different cases (it might be OK to enforce DM_RESET for this driver, but not for the ns16550 driver).
-- Tom
include/reset.h has the DM_RESET wrapper, so it will not cause the compilation error if the CONFIG_DM_RESET is disabled.
I have tried compile the uboot with CONFIG_DM_RESET disabled, compilation is fine.
Thanks.
Regards Ley Foon
On Fri, May 25, 2018 at 10:45:53AM +0800, Ley Foon Tan wrote:
On Thu, May 24, 2018 at 8:39 PM, Tom Rini trini@konsulko.com wrote:
On Tue, May 08, 2018 at 11:19:24AM +0800, Ley Foon Tan wrote:
Add code to reset all reset signals as in mmc DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com Reviewed-by: Simon Glass sjg@chromium.org
drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index fa0e449..eb7e64e 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -13,6 +13,7 @@ #include <linux/libfdt.h> #include <linux/err.h> #include <malloc.h> +#include <reset.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -33,6 +34,20 @@ struct dwmci_socfpga_priv_data { unsigned int smplsel; };
+static void socfpga_dwmci_reset(struct udevice *dev) +{
struct reset_ctl_bulk reset_bulk;int ret;ret = reset_get_bulk(dev, &reset_bulk);if (ret) {dev_warn(dev, "Can't get reset: %d\n", ret);return;}reset_deassert_bulk(&reset_bulk);+}
The driver doesn't depend on DM_RESET and this code hunk doesn't either so it fails to build on a number of platforms. This type of comment applies to the whole series, and may be fixed differently in different cases (it might be OK to enforce DM_RESET for this driver, but not for the ns16550 driver).
-- Tom
include/reset.h has the DM_RESET wrapper, so it will not cause the compilation error if the CONFIG_DM_RESET is disabled.
I have tried compile the uboot with CONFIG_DM_RESET disabled, compilation is fine.
This whole series causes a good percent of the world to fail to link, so something is off about the wrappers or use of them. See: https://travis-ci.org/trini/u-boot/jobs/382783645
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
On 05/25/2018 06:16 AM, Tom Rini wrote:
On Fri, May 25, 2018 at 10:45:53AM +0800, Ley Foon Tan wrote:
On Thu, May 24, 2018 at 8:39 PM, Tom Rini trini@konsulko.com wrote:
On Tue, May 08, 2018 at 11:19:24AM +0800, Ley Foon Tan wrote:
Add code to reset all reset signals as in mmc DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com Reviewed-by: Simon Glass sjg@chromium.org --- drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index fa0e449..eb7e64e 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -13,6 +13,7 @@ #include <linux/libfdt.h> #include <linux/err.h> #include <malloc.h> +#include <reset.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -33,6 +34,20 @@ struct dwmci_socfpga_priv_data { unsigned int smplsel; };
+static void socfpga_dwmci_reset(struct udevice *dev) +{ + struct reset_ctl_bulk reset_bulk; + int ret; + + ret = reset_get_bulk(dev, &reset_bulk); + if (ret) { + dev_warn(dev, "Can't get reset: %d\n", ret); + return; + } + + reset_deassert_bulk(&reset_bulk); +}
The driver doesn't depend on DM_RESET and this code hunk doesn't either so it fails to build on a number of platforms. This type of comment applies to the whole series, and may be fixed differently in different cases (it might be OK to enforce DM_RESET for this driver, but not for the ns16550 driver).
-- Tom
include/reset.h has the DM_RESET wrapper, so it will not cause the compilation error if the CONFIG_DM_RESET is disabled.
I have tried compile the uboot with CONFIG_DM_RESET disabled, compilation is fine.
The case is fine when CONFIG_DM_RESET is disabled, but it fails when CONFIG_DM_RESET is enabled.
You need:
CONFIG_SPL_RESET_SUPPORT=y
Dinh
On Fri, May 25, 2018 at 7:16 PM, Tom Rini trini@konsulko.com wrote:
On Fri, May 25, 2018 at 10:45:53AM +0800, Ley Foon Tan wrote:
On Thu, May 24, 2018 at 8:39 PM, Tom Rini trini@konsulko.com wrote:
On Tue, May 08, 2018 at 11:19:24AM +0800, Ley Foon Tan wrote:
Add code to reset all reset signals as in mmc DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com Reviewed-by: Simon Glass sjg@chromium.org
drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index fa0e449..eb7e64e 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -13,6 +13,7 @@ #include <linux/libfdt.h> #include <linux/err.h> #include <malloc.h> +#include <reset.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -33,6 +34,20 @@ struct dwmci_socfpga_priv_data { unsigned int smplsel; };
+static void socfpga_dwmci_reset(struct udevice *dev) +{
struct reset_ctl_bulk reset_bulk;int ret;ret = reset_get_bulk(dev, &reset_bulk);if (ret) {dev_warn(dev, "Can't get reset: %d\n", ret);return;}reset_deassert_bulk(&reset_bulk);+}
The driver doesn't depend on DM_RESET and this code hunk doesn't either so it fails to build on a number of platforms. This type of comment applies to the whole series, and may be fixed differently in different cases (it might be OK to enforce DM_RESET for this driver, but not for the ns16550 driver).
-- Tom
include/reset.h has the DM_RESET wrapper, so it will not cause the compilation error if the CONFIG_DM_RESET is disabled.
I have tried compile the uboot with CONFIG_DM_RESET disabled, compilation is fine.
This whole series causes a good percent of the world to fail to link, so something is off about the wrappers or use of them. See: https://travis-ci.org/trini/u-boot/jobs/382783645
This build is happened in SPL build, when CONF_DM_RESET is enabled, but CONFIG_SPL_RESET_SUPPORT is disabled. So, adding #ifdef CONFIG_DM_RESET checking in these peripherals also can't resolve the compilation error. Two possible fix below, or you have better suggestion.
(1) select SPL_RESET_SUPPORT when DM_RESET is enabled.
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 33c39b7..b43cd89 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -3,6 +3,7 @@ menu "Reset Controller Support" config DM_RESET bool "Enable reset controllers using Driver Model" depends on DM && OF_CONTROL + select SPL_RESET_SUPPORT help
(2) Add CONFIG_SPL_RESET_SUPPORT checking in reset.h file
diff --git a/include/reset.h b/include/reset.h index 201bafc..0ac0a47 100644 --- a/include/reset.h +++ b/include/reset.h @@ -77,7 +77,8 @@ struct reset_ctl_bulk { unsigned int count; };
-#ifdef CONFIG_DM_RESET +#if (!defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM_RESET)) || \ + (defined(CONFIG_SPL_RESET_SUPPORT) && defined(CONFIG_DM_RESET))
Regards Ley Foon
On Thu, May 31, 2018 at 11:02:39AM +0800, Ley Foon Tan wrote:
On Fri, May 25, 2018 at 7:16 PM, Tom Rini trini@konsulko.com wrote:
On Fri, May 25, 2018 at 10:45:53AM +0800, Ley Foon Tan wrote:
On Thu, May 24, 2018 at 8:39 PM, Tom Rini trini@konsulko.com wrote:
On Tue, May 08, 2018 at 11:19:24AM +0800, Ley Foon Tan wrote:
Add code to reset all reset signals as in mmc DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com Reviewed-by: Simon Glass sjg@chromium.org
drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index fa0e449..eb7e64e 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -13,6 +13,7 @@ #include <linux/libfdt.h> #include <linux/err.h> #include <malloc.h> +#include <reset.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -33,6 +34,20 @@ struct dwmci_socfpga_priv_data { unsigned int smplsel; };
+static void socfpga_dwmci_reset(struct udevice *dev) +{
struct reset_ctl_bulk reset_bulk;int ret;ret = reset_get_bulk(dev, &reset_bulk);if (ret) {dev_warn(dev, "Can't get reset: %d\n", ret);return;}reset_deassert_bulk(&reset_bulk);+}
The driver doesn't depend on DM_RESET and this code hunk doesn't either so it fails to build on a number of platforms. This type of comment applies to the whole series, and may be fixed differently in different cases (it might be OK to enforce DM_RESET for this driver, but not for the ns16550 driver).
-- Tom
include/reset.h has the DM_RESET wrapper, so it will not cause the compilation error if the CONFIG_DM_RESET is disabled.
I have tried compile the uboot with CONFIG_DM_RESET disabled, compilation is fine.
This whole series causes a good percent of the world to fail to link, so something is off about the wrappers or use of them. See: https://travis-ci.org/trini/u-boot/jobs/382783645
This build is happened in SPL build, when CONF_DM_RESET is enabled, but CONFIG_SPL_RESET_SUPPORT is disabled. So, adding #ifdef CONFIG_DM_RESET checking in these peripherals also can't resolve the compilation error. Two possible fix below, or you have better suggestion.
(1) select SPL_RESET_SUPPORT when DM_RESET is enabled.
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 33c39b7..b43cd89 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -3,6 +3,7 @@ menu "Reset Controller Support" config DM_RESET bool "Enable reset controllers using Driver Model" depends on DM && OF_CONTROL
select SPL_RESET_SUPPORT help(2) Add CONFIG_SPL_RESET_SUPPORT checking in reset.h file
diff --git a/include/reset.h b/include/reset.h index 201bafc..0ac0a47 100644 --- a/include/reset.h +++ b/include/reset.h @@ -77,7 +77,8 @@ struct reset_ctl_bulk { unsigned int count; };
-#ifdef CONFIG_DM_RESET +#if (!defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM_RESET)) || \
- (defined(CONFIG_SPL_RESET_SUPPORT) && defined(CONFIG_DM_RESET))
We need option #2, thanks!
On Thu, May 31, 2018 at 7:16 PM, Tom Rini trini@konsulko.com wrote:
On Thu, May 31, 2018 at 11:02:39AM +0800, Ley Foon Tan wrote:
On Fri, May 25, 2018 at 7:16 PM, Tom Rini trini@konsulko.com wrote:
On Fri, May 25, 2018 at 10:45:53AM +0800, Ley Foon Tan wrote:
On Thu, May 24, 2018 at 8:39 PM, Tom Rini trini@konsulko.com wrote:
On Tue, May 08, 2018 at 11:19:24AM +0800, Ley Foon Tan wrote:
Add code to reset all reset signals as in mmc DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com Reviewed-by: Simon Glass sjg@chromium.org
drivers/mmc/socfpga_dw_mmc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index fa0e449..eb7e64e 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -13,6 +13,7 @@ #include <linux/libfdt.h> #include <linux/err.h> #include <malloc.h> +#include <reset.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -33,6 +34,20 @@ struct dwmci_socfpga_priv_data { unsigned int smplsel; };
+static void socfpga_dwmci_reset(struct udevice *dev) +{
struct reset_ctl_bulk reset_bulk;int ret;ret = reset_get_bulk(dev, &reset_bulk);if (ret) {dev_warn(dev, "Can't get reset: %d\n", ret);return;}reset_deassert_bulk(&reset_bulk);+}
The driver doesn't depend on DM_RESET and this code hunk doesn't either so it fails to build on a number of platforms. This type of comment applies to the whole series, and may be fixed differently in different cases (it might be OK to enforce DM_RESET for this driver, but not for the ns16550 driver).
-- Tom
include/reset.h has the DM_RESET wrapper, so it will not cause the compilation error if the CONFIG_DM_RESET is disabled.
I have tried compile the uboot with CONFIG_DM_RESET disabled, compilation is fine.
This whole series causes a good percent of the world to fail to link, so something is off about the wrappers or use of them. See: https://travis-ci.org/trini/u-boot/jobs/382783645
This build is happened in SPL build, when CONF_DM_RESET is enabled, but CONFIG_SPL_RESET_SUPPORT is disabled. So, adding #ifdef CONFIG_DM_RESET checking in these peripherals also can't resolve the compilation error. Two possible fix below, or you have better suggestion.
(1) select SPL_RESET_SUPPORT when DM_RESET is enabled.
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 33c39b7..b43cd89 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -3,6 +3,7 @@ menu "Reset Controller Support" config DM_RESET bool "Enable reset controllers using Driver Model" depends on DM && OF_CONTROL
select SPL_RESET_SUPPORT help(2) Add CONFIG_SPL_RESET_SUPPORT checking in reset.h file
diff --git a/include/reset.h b/include/reset.h index 201bafc..0ac0a47 100644 --- a/include/reset.h +++ b/include/reset.h @@ -77,7 +77,8 @@ struct reset_ctl_bulk { unsigned int count; };
-#ifdef CONFIG_DM_RESET +#if (!defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM_RESET)) || \
- (defined(CONFIG_SPL_RESET_SUPPORT) && defined(CONFIG_DM_RESET))
We need option #2, thanks!
Okay, will add this patch in new revision.
Regards Ley Foon
Add code to reset all reset signals as in serial DT node. A reset property is an optional feature, so do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com Reviewed-by: Marek Vasut marex@denx.de --- drivers/serial/ns16550.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 53550bf..9c80090 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -9,6 +9,7 @@ #include <dm.h> #include <errno.h> #include <ns16550.h> +#include <reset.h> #include <serial.h> #include <watchdog.h> #include <linux/types.h> @@ -177,6 +178,7 @@ void NS16550_init(NS16550_t com_port, int baud_divisor) #if defined(CONFIG_ARCH_OMAP2PLUS) serial_out(0x7, &com_port->mdr1); /* mode select reset TL16C750*/ #endif + serial_out(UART_MCRVAL, &com_port->mcr); serial_out(ns16550_getfcr(com_port), &com_port->fcr); if (baud_divisor != -1) @@ -370,6 +372,12 @@ static int ns16550_serial_setbrg(struct udevice *dev, int baudrate) int ns16550_serial_probe(struct udevice *dev) { struct NS16550 *const com_port = dev_get_priv(dev); + struct reset_ctl_bulk reset_bulk; + int ret; + + ret = reset_get_bulk(dev, &reset_bulk); + if (!ret) + reset_deassert_bulk(&reset_bulk);
com_port->plat = dev_get_platdata(dev); NS16550_init(com_port, -1);
On Tue, May 8, 2018 at 11:19 AM, Ley Foon Tan ley.foon.tan@intel.com wrote:
Add code to reset all reset signals as in serial DT node. A reset property is an optional feature, so do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com Reviewed-by: Marek Vasut marex@denx.de
drivers/serial/ns16550.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 53550bf..9c80090 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -9,6 +9,7 @@ #include <dm.h> #include <errno.h> #include <ns16550.h> +#include <reset.h> #include <serial.h> #include <watchdog.h> #include <linux/types.h> @@ -177,6 +178,7 @@ void NS16550_init(NS16550_t com_port, int baud_divisor) #if defined(CONFIG_ARCH_OMAP2PLUS) serial_out(0x7, &com_port->mdr1); /* mode select reset TL16C750*/ #endif
serial_out(UART_MCRVAL, &com_port->mcr); serial_out(ns16550_getfcr(com_port), &com_port->fcr); if (baud_divisor != -1)@@ -370,6 +372,12 @@ static int ns16550_serial_setbrg(struct udevice *dev, int baudrate) int ns16550_serial_probe(struct udevice *dev) { struct NS16550 *const com_port = dev_get_priv(dev);
struct reset_ctl_bulk reset_bulk;int ret;ret = reset_get_bulk(dev, &reset_bulk);if (!ret)reset_deassert_bulk(&reset_bulk); com_port->plat = dev_get_platdata(dev); NS16550_init(com_port, -1);-- 1.7.1
Hi Tom
Can you help to merge this patch if okay with this patch?
Regards Ley Foon
Add code to reset all reset signals as in Ethernet DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com --- drivers/net/designware.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/net/designware.c b/drivers/net/designware.c index cf12521..6797691 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -15,6 +15,7 @@ #include <miiphy.h> #include <malloc.h> #include <pci.h> +#include <reset.h> #include <linux/compiler.h> #include <linux/err.h> #include <linux/kernel.h> @@ -664,6 +665,7 @@ int designware_eth_probe(struct udevice *dev) u32 iobase = pdata->iobase; ulong ioaddr; int ret; + struct reset_ctl_bulk reset_bulk; #ifdef CONFIG_CLK int i, err, clock_nb;
@@ -710,6 +712,12 @@ int designware_eth_probe(struct udevice *dev) } #endif
+ ret = reset_get_bulk(dev, &reset_bulk); + if (ret) + dev_warn(dev, "Can't get reset: %d\n", ret); + else + reset_deassert_bulk(&reset_bulk); + #ifdef CONFIG_DM_PCI /* * If we are on PCI bus, either directly attached to a PCI root port,
On 8 May 2018 at 13:19, Ley Foon Tan ley.foon.tan@intel.com wrote:
Add code to reset all reset signals as in Ethernet DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com
drivers/net/designware.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Mon, May 7, 2018 at 10:19 PM, Ley Foon Tan ley.foon.tan@intel.com wrote:
Add code to reset all reset signals as in Ethernet DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com
Acked-by: Joe Hershberger joe.hershberger@ni.com
On Wed, May 16, 2018 at 5:08 AM, Joe Hershberger joe.hershberger@ni.com wrote:
On Mon, May 7, 2018 at 10:19 PM, Ley Foon Tan ley.foon.tan@intel.com wrote:
Add code to reset all reset signals as in Ethernet DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com
Acked-by: Joe Hershberger joe.hershberger@ni.com
Hi Joe
Will you merge this patch to mainline?
Regards Ley Foon
On Wed, May 23, 2018 at 9:22 PM, Ley Foon Tan lftan.linux@gmail.com wrote:
On Wed, May 16, 2018 at 5:08 AM, Joe Hershberger joe.hershberger@ni.com wrote:
On Mon, May 7, 2018 at 10:19 PM, Ley Foon Tan ley.foon.tan@intel.com wrote:
Add code to reset all reset signals as in Ethernet DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present.
If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset.
Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com
Acked-by: Joe Hershberger joe.hershberger@ni.com
Hi Joe
Will you merge this patch to mainline?
OK... it was assigned to Tom in patchwork, but I moved it to me.
-Joe
participants (6)
-
Dinh Nguyen -
Joe Hershberger -
Ley Foon Tan -
Ley Foon Tan -
Simon Glass -
Tom Rini