Patchwork mtd: spear-smi: Update compatible property

login
register
mail settings
Submitter Viresh KUMAR
Date March 23, 2012, 8:48 a.m.
Message ID <97859bb4d86d008968a784339be8567094c487a1.1332492461.git.viresh.kumar@st.com>
Download mbox | patch
Permalink /patch/148400/
State New
Headers show

Comments

Viresh KUMAR - March 23, 2012, 8:48 a.m.
SPEAr SMI controller version is same for all SPEAr machines. Thus we don't need
per machine compatible property in driver.

Thus this patch updates compatible entry to: "st,spear-smi", so that it
works for all SPEAr machines.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
---
 .../devicetree/bindings/mtd/spear_smi.txt          |    4 ++--
 drivers/mtd/devices/spear_smi.c                    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Rob Herring - March 23, 2012, 2:10 p.m.
On 03/23/2012 03:48 AM, Viresh Kumar wrote:
> SPEAr SMI controller version is same for all SPEAr machines. Thus we don't need
> per machine compatible property in driver.

Until the next chip...

> Thus this patch updates compatible entry to: "st,spear-smi", so that it
> works for all SPEAr machines.
> 

There is no reason all machines can't use "st,spear600-smi" in their
dts. It doesn't have to be a spear600, just compatible with it. Really
you want the string to be the oldest SOC the block is in and then newer
SOCs can claim compatibility with the old version.

This is also bad that you would break any existing dtb's out there. This
is probably not a concern yet since it's all new and in transition, but
down the road this is something that can't be done.

Rob

> Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
> ---
>  .../devicetree/bindings/mtd/spear_smi.txt          |    4 ++--
>  drivers/mtd/devices/spear_smi.c                    |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mtd/spear_smi.txt b/Documentation/devicetree/bindings/mtd/spear_smi.txt
> index 7248aad..80dfd96 100644
> --- a/Documentation/devicetree/bindings/mtd/spear_smi.txt
> +++ b/Documentation/devicetree/bindings/mtd/spear_smi.txt
> @@ -1,7 +1,7 @@
>  * SPEAr SMI
>  
>  Required properties:
> -- compatible : "st,spear600-smi"
> +- compatible : "st,spear-smi"
>  - reg : Address range of the mtd chip
>  - #address-cells, #size-cells : Must be present if the device has sub-nodes
>    representing partitions.
> @@ -16,7 +16,7 @@ Optional properties:
>  Example:
>  
>  	smi: flash@fc000000 {
> -		compatible = "st,spear600-smi";
> +		compatible = "st,spear-smi";
>  		#address-cells = <1>;
>  		#size-cells = <1>;
>  		reg = <0xfc000000 0x1000>;
> diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
> index bebce11..f392594 100644
> --- a/drivers/mtd/devices/spear_smi.c
> +++ b/drivers/mtd/devices/spear_smi.c
> @@ -1113,7 +1113,7 @@ int spear_smi_resume(struct platform_device *pdev)
>  
>  #ifdef CONFIG_OF
>  static const struct of_device_id spear_smi_id_table[] = {
> -	{ .compatible = "st,spear600-smi" },
> +	{ .compatible = "st,spear-smi" },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, spear_smi_id_table);
viresh kumar - March 25, 2012, 7:25 a.m.
On Fri, Mar 23, 2012 at 7:40 PM, Rob Herring <robherring2@gmail.com> wrote:
> On 03/23/2012 03:48 AM, Viresh Kumar wrote:
>> SPEAr SMI controller version is same for all SPEAr machines. Thus we don't need
>> per machine compatible property in driver.
>
> Until the next chip...

Sorry couldn't get you point here.

>> Thus this patch updates compatible entry to: "st,spear-smi", so that it
>> works for all SPEAr machines.
>
> There is no reason all machines can't use "st,spear600-smi" in their
> dts. It doesn't have to be a spear600, just compatible with it. Really
> you want the string to be the oldest SOC the block is in and then newer
> SOCs can claim compatibility with the old version.

Got your point. But actually as we just had smi DT support patch recently,
so we can name it better right now. In future, i agree with your point.

> This is also bad that you would break any existing dtb's out there. This
> is probably not a concern yet since it's all new and in transition, but
> down the road this is something that can't be done.

Yes i agree. Actually i had patch for spear600-evb.dts ready with me, but
just wanted to have inputs on this change before posting the complete
patchset.

Would post both patches again, with my 3xx DT support.

--
viresh

Patch

diff --git a/Documentation/devicetree/bindings/mtd/spear_smi.txt b/Documentation/devicetree/bindings/mtd/spear_smi.txt
index 7248aad..80dfd96 100644
--- a/Documentation/devicetree/bindings/mtd/spear_smi.txt
+++ b/Documentation/devicetree/bindings/mtd/spear_smi.txt
@@ -1,7 +1,7 @@ 
 * SPEAr SMI
 
 Required properties:
-- compatible : "st,spear600-smi"
+- compatible : "st,spear-smi"
 - reg : Address range of the mtd chip
 - #address-cells, #size-cells : Must be present if the device has sub-nodes
   representing partitions.
@@ -16,7 +16,7 @@  Optional properties:
 Example:
 
 	smi: flash@fc000000 {
-		compatible = "st,spear600-smi";
+		compatible = "st,spear-smi";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		reg = <0xfc000000 0x1000>;
diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index bebce11..f392594 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -1113,7 +1113,7 @@  int spear_smi_resume(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id spear_smi_id_table[] = {
-	{ .compatible = "st,spear600-smi" },
+	{ .compatible = "st,spear-smi" },
 	{}
 };
 MODULE_DEVICE_TABLE(of, spear_smi_id_table);