[PATCH] bus: imx-weim: Take the 'status' property value into account

[PATCH] bus: imx-weim: Take the 'status' property value into account

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@nxp.com>

Currently we have an incorrect behaviour when multiple devices
are present under the weim node. For example:

&weim {
	...
	status = "okay";
	
	sram at 0,0 {
		...
        	status = "okay";
	};

	mram at 0,0 {
		...
        	status = "disabled";
    	};
};

In this case only the 'sram' device should be probed and not 'mram'.

However what happens currently is that the status variable is ignored,
causing the 'sram' device to be disabled and 'mram' to be enabled.  

Change the weim_parse_dt() function to use
for_each_available_child_of_node()so that the devices marked with
'status = disabled' are not probed.

Cc: <stable@vger.kernel.org>
Suggested-by: Wolfgang Netbal <wolfgang.netbal@sigmatek.at>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 drivers/bus/imx-weim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
index e98d15e..1827fc4 100644
--- a/drivers/bus/imx-weim.c
+++ b/drivers/bus/imx-weim.c
@@ -150,7 +150,7 @@ static int __init weim_parse_dt(struct platform_device *pdev,
 			return ret;
 	}
 
-	for_each_child_of_node(pdev->dev.of_node, child) {
+	for_each_available_child_of_node(pdev->dev.of_node, child) {
 		if (!child->name)
 			continue;
 
-- 
1.9.1

[PATCH] bus: imx-weim: Take the 'status' property value into account

[Sascha Hauer]

On Mon, Feb 22, 2016 at 09:01:53AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Currently we have an incorrect behaviour when multiple devices
> are present under the weim node. For example:
> 
> &weim {
> 	...
> 	status = "okay";
> 	
> 	sram at 0,0 {
> 		...
>         	status = "okay";
> 	};
> 
> 	mram at 0,0 {
> 		...
>         	status = "disabled";
>     	};
> };
> 
> In this case only the 'sram' device should be probed and not 'mram'.
> 
> However what happens currently is that the status variable is ignored,
> causing the 'sram' device to be disabled and 'mram' to be enabled.  
> 
> Change the weim_parse_dt() function to use
> for_each_available_child_of_node()so that the devices marked with
> 'status = disabled' are not probed.
> 
> Cc: <stable@vger.kernel.org>
> Suggested-by: Wolfgang Netbal <wolfgang.netbal@sigmatek.at>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
>  drivers/bus/imx-weim.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Seems to be the right thing to do.

Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>

Sascha

> 
> diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
> index e98d15e..1827fc4 100644
> --- a/drivers/bus/imx-weim.c
> +++ b/drivers/bus/imx-weim.c
> @@ -150,7 +150,7 @@ static int __init weim_parse_dt(struct platform_device *pdev,
>  			return ret;
>  	}
>  
> -	for_each_child_of_node(pdev->dev.of_node, child) {
> +	for_each_available_child_of_node(pdev->dev.of_node, child) {
>  		if (!child->name)
>  			continue;
>  
> -- 
> 1.9.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH] bus: imx-weim: Take the 'status' property value into account

[Shawn Guo]

On Mon, Feb 22, 2016 at 09:01:53AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Currently we have an incorrect behaviour when multiple devices
> are present under the weim node. For example:
> 
> &weim {
> 	...
> 	status = "okay";
> 	
> 	sram at 0,0 {
> 		...
>         	status = "okay";
> 	};
> 
> 	mram at 0,0 {
> 		...
>         	status = "disabled";
>     	};
> };
> 
> In this case only the 'sram' device should be probed and not 'mram'.
> 
> However what happens currently is that the status variable is ignored,
> causing the 'sram' device to be disabled and 'mram' to be enabled.  
> 
> Change the weim_parse_dt() function to use
> for_each_available_child_of_node()so that the devices marked with
> 'status = disabled' are not probed.
> 
> Cc: <stable@vger.kernel.org>
> Suggested-by: Wolfgang Netbal <wolfgang.netbal@sigmatek.at>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>

Acked-by: Shawn Guo <shawnguo@kernel.org>

Arnd, Olof,

I do not have any other 'driver' patches queued, so please help directly
apply this one.  Considering this fixes a real problem, it would be good
if we can merge this through -rc.  But we understand that it's -rc6 now,
and this doesn't fix a regression or so-critical issue, so it should be
fine to queue the patch for the next release as well.

Shawn

> ---
>  drivers/bus/imx-weim.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
> index e98d15e..1827fc4 100644
> --- a/drivers/bus/imx-weim.c
> +++ b/drivers/bus/imx-weim.c
> @@ -150,7 +150,7 @@ static int __init weim_parse_dt(struct platform_device *pdev,
>  			return ret;
>  	}
>  
> -	for_each_child_of_node(pdev->dev.of_node, child) {
> +	for_each_available_child_of_node(pdev->dev.of_node, child) {
>  		if (!child->name)
>  			continue;
>  
> -- 
> 1.9.1
> 
> 

[PATCH] bus: imx-weim: Take the 'status' property value into account

[Olof Johansson]

On Mon, Feb 29, 2016 at 11:36:49AM +0800, Shawn Guo wrote:
> On Mon, Feb 22, 2016 at 09:01:53AM -0300, Fabio Estevam wrote:
> > From: Fabio Estevam <fabio.estevam@nxp.com>
> > 
> > Currently we have an incorrect behaviour when multiple devices
> > are present under the weim node. For example:
> > 
> > &weim {
> > 	...
> > 	status = "okay";
> > 	
> > 	sram at 0,0 {
> > 		...
> >         	status = "okay";
> > 	};
> > 
> > 	mram at 0,0 {
> > 		...
> >         	status = "disabled";
> >     	};
> > };
> > 
> > In this case only the 'sram' device should be probed and not 'mram'.
> > 
> > However what happens currently is that the status variable is ignored,
> > causing the 'sram' device to be disabled and 'mram' to be enabled.  
> > 
> > Change the weim_parse_dt() function to use
> > for_each_available_child_of_node()so that the devices marked with
> > 'status = disabled' are not probed.
> > 
> > Cc: <stable@vger.kernel.org>
> > Suggested-by: Wolfgang Netbal <wolfgang.netbal@sigmatek.at>
> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Acked-by: Shawn Guo <shawnguo@kernel.org>
> 
> Arnd, Olof,
> 
> I do not have any other 'driver' patches queued, so please help directly
> apply this one.  Considering this fixes a real problem, it would be good
> if we can merge this through -rc.  But we understand that it's -rc6 now,
> and this doesn't fix a regression or so-critical issue, so it should be
> fine to queue the patch for the next release as well.

Sorry for the high latency here, I had missed this patch and noticed now when
I did a sweep. I've merged it into next/drivers for 4.6.


-Olof