[PATCH 1/4] dt: fsl-imx-esdhc.txt: Fix gpio number assignment

[PATCH 1/4] dt: fsl-imx-esdhc.txt: Fix gpio number assignment

[Fabio Estevam]

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

Fix gpio number assignment, so that it can match the number stated in the comment.

Cc: 
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
index c7e404b..fea541e 100644
--- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
+++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
@@ -29,6 +29,6 @@ esdhc@70008000 {
 	compatible = "fsl,imx51-esdhc";
 	reg = <0x70008000 0x4000>;
 	interrupts = <2>;
-	cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */
-	wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */
+	cd-gpios = <&gpio1 6 0>; /* GPIO1_6 */
+	wp-gpios = <&gpio1 5 0>; /* GPIO1_5 */
 };
-- 
1.7.1

[PATCH 2/4] dt: fsl-mma8450.tx: Add missing 'reg' description

[Fabio Estevam]

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

Add missing 'reg' description.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
----
 .../devicetree/bindings/input/fsl-mma8450.txt      |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Documentation/devicetree/bindings/input/fsl-mma8450.txt b/Documentation/devicetree/bindings/input/fsl-mma8450.txt
index a00c94c..0b96e57 100644
--- a/Documentation/devicetree/bindings/input/fsl-mma8450.txt
+++ b/Documentation/devicetree/bindings/input/fsl-mma8450.txt
@@ -2,6 +2,7 @@
 
 Required properties:
 - compatible : "fsl,mma8450".
+- reg: the I2C address of MMA8450
 
 Example:
 
-- 
1.7.1

[PATCH 3/4] dt: fsl-fec.txt: Fix gpio number assignment

[Fabio Estevam]

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

Fix gpio number assignment, so that it can match the number stated in the comment.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 Documentation/devicetree/bindings/net/fsl-fec.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/fsl-fec.txt b/Documentation/devicetree/bindings/net/fsl-fec.txt
index 7ab9e1a..4616fc2 100644
--- a/Documentation/devicetree/bindings/net/fsl-fec.txt
+++ b/Documentation/devicetree/bindings/net/fsl-fec.txt
@@ -19,6 +19,6 @@ ethernet@83fec000 {
 	reg = <0x83fec000 0x4000>;
 	interrupts = <87>;
 	phy-mode = "mii";
-	phy-reset-gpios = <&gpio1 14 0>; /* GPIO2_14 */
+	phy-reset-gpios = <&gpio2 14 0>; /* GPIO2_14 */
 	local-mac-address = [00 04 9F 01 1B B9];
 };
-- 
1.7.1

[PATCH 4/4] dt: mc13xxx.txt: Fix gpio number assignment

[Fabio Estevam]

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

Fix gpio number assignment, so that it can match the number stated in the comment.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 Documentation/devicetree/bindings/mfd/mc13xxx.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/mc13xxx.txt b/Documentation/devicetree/bindings/mfd/mc13xxx.txt
index 19f6af4..baf0798 100644
--- a/Documentation/devicetree/bindings/mfd/mc13xxx.txt
+++ b/Documentation/devicetree/bindings/mfd/mc13xxx.txt
@@ -46,8 +46,8 @@ Examples:
 
 ecspi@70010000 { /* ECSPI1 */
 	fsl,spi-num-chipselects = <2>;
-	cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */
-		   <&gpio3 25 0>; /* GPIO4_25 */
+	cs-gpios = <&gpio4 24 0>, /* GPIO4_24 */
+		   <&gpio4 25 0>; /* GPIO4_25 */
 	status = "okay";
 
 	pmic: mc13892@0 {
-- 
1.7.1

Re: [PATCH 1/4] dt: fsl-imx-esdhc.txt: Fix gpio number assignment

[Rob Herring]

On 06/10/2012 12:24 PM, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Fix gpio number assignment, so that it can match the number stated in the comment.
> 
> Cc: 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
> index c7e404b..fea541e 100644
> --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
> +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
> @@ -29,6 +29,6 @@ esdhc@70008000 {
>  	compatible = "fsl,imx51-esdhc";
>  	reg = <0x70008000 0x4000>;
>  	interrupts = <2>;
> -	cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */
> -	wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */
> +	cd-gpios = <&gpio1 6 0>; /* GPIO1_6 */
> +	wp-gpios = <&gpio1 5 0>; /* GPIO1_5 */

Are you sure all these aren't just DT is 0 based and the chip is 1 based
numbering?

Rob

>  };

Re: [PATCH 1/4] dt: fsl-imx-esdhc.txt: Fix gpio number assignment

[Fabio Estevam]

On Sun, Jun 10, 2012 at 8:11 PM, Rob Herring <robherring2@gmail.com> wrote:
> On 06/10/2012 12:24 PM, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> Fix gpio number assignment, so that it can match the number stated in the comment.
>>
>> Cc:
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>> ---
>>  .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
>> index c7e404b..fea541e 100644
>> --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
>> +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
>> @@ -29,6 +29,6 @@ esdhc@70008000 {
>>       compatible = "fsl,imx51-esdhc";
>>       reg = <0x70008000 0x4000>;
>>       interrupts = <2>;
>> -     cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */
>> -     wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */
>> +     cd-gpios = <&gpio1 6 0>; /* GPIO1_6 */
>> +     wp-gpios = <&gpio1 5 0>; /* GPIO1_5 */
>
> Are you sure all these aren't just DT is 0 based and the chip is 1 based
> numbering?

We start counting gpio number from 0 in i.mx, so the DT number and the
GPIO number should match.

Re: [PATCH 1/4] dt: fsl-imx-esdhc.txt: Fix gpio number assignment

[Rob Herring]

On 06/10/2012 09:03 PM, Fabio Estevam wrote:
> On Sun, Jun 10, 2012 at 8:11 PM, Rob Herring <robherring2@gmail.com> wrote:
>> On 06/10/2012 12:24 PM, Fabio Estevam wrote:
>>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>>
>>> Fix gpio number assignment, so that it can match the number stated in the comment.
>>>
>>> Cc:
>>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>>> ---
>>>  .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |    4 ++--
>>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
>>> index c7e404b..fea541e 100644
>>> --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
>>> +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
>>> @@ -29,6 +29,6 @@ esdhc@70008000 {
>>>       compatible = "fsl,imx51-esdhc";
>>>       reg = <0x70008000 0x4000>;
>>>       interrupts = <2>;
>>> -     cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */
>>> -     wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */
>>> +     cd-gpios = <&gpio1 6 0>; /* GPIO1_6 */
>>> +     wp-gpios = <&gpio1 5 0>; /* GPIO1_5 */
>>
>> Are you sure all these aren't just DT is 0 based and the chip is 1 based
>> numbering?
> 
> We start counting gpio number from 0 in i.mx, so the DT number and the
> GPIO number should match.

I'm talking about bank numbers, not gpio numbers:

/* There's a off-by-one betweem the gpio bank number and the gpiochip */
/* range e.g. GPIO_1_5 is gpio 5 under linux */
#define IMX_GPIO_NR(bank, nr)		(((bank) - 1) * 32 + (nr))


Rob

Re: [PATCH 1/4] dt: fsl-imx-esdhc.txt: Fix gpio number assignment

[Sascha Hauer]

On Sun, Jun 10, 2012 at 11:11:13PM -0500, Rob Herring wrote:
> On 06/10/2012 09:03 PM, Fabio Estevam wrote:
> > On Sun, Jun 10, 2012 at 8:11 PM, Rob Herring <robherring2@gmail.com> wrote:
> >> On 06/10/2012 12:24 PM, Fabio Estevam wrote:
> >>> From: Fabio Estevam <fabio.estevam@freescale.com>
> >>>
> >>> Fix gpio number assignment, so that it can match the number stated in the comment.
> >>>
> >>> Cc:
> >>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> >>> ---
> >>>  .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |    4 ++--
> >>>  1 files changed, 2 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
> >>> index c7e404b..fea541e 100644
> >>> --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
> >>> +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
> >>> @@ -29,6 +29,6 @@ esdhc@70008000 {
> >>>       compatible = "fsl,imx51-esdhc";
> >>>       reg = <0x70008000 0x4000>;
> >>>       interrupts = <2>;
> >>> -     cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */
> >>> -     wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */
> >>> +     cd-gpios = <&gpio1 6 0>; /* GPIO1_6 */
> >>> +     wp-gpios = <&gpio1 5 0>; /* GPIO1_5 */
> >>
> >> Are you sure all these aren't just DT is 0 based and the chip is 1 based
> >> numbering?
> > 
> > We start counting gpio number from 0 in i.mx, so the DT number and the
> > GPIO number should match.
> 
> I'm talking about bank numbers, not gpio numbers:
> 
> /* There's a off-by-one betweem the gpio bank number and the gpiochip */
> /* range e.g. GPIO_1_5 is gpio 5 under linux */
> #define IMX_GPIO_NR(bank, nr)		(((bank) - 1) * 32 + (nr))

Traditionally I started counting at 0 no matter what the datasheet told.
Now we go to match the numbering with the datasheets, which of course
can be confusing while transitioning this.
Fabios patch is correct, there is no gpio0 in the devicetree.

Sascha


-- 
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 |

Re: [PATCH 1/4] dt: fsl-imx-esdhc.txt: Fix gpio number assignment

[Fabio Estevam]

Hi Sascha,

On Mon, Jun 11, 2012 at 3:50 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:

> Traditionally I started counting at 0 no matter what the datasheet told.
> Now we go to match the numbering with the datasheets, which of course
> can be confusing while transitioning this.
> Fabios patch is correct, there is no gpio0 in the devicetree.

Who could pick this patch series?

Thanks,

Fabio Estevam

Re: [PATCH 1/4] dt: fsl-imx-esdhc.txt: Fix gpio number assignment

[Rob Herring]

On 06/11/2012 01:50 AM, Sascha Hauer wrote:
> On Sun, Jun 10, 2012 at 11:11:13PM -0500, Rob Herring wrote:
>> On 06/10/2012 09:03 PM, Fabio Estevam wrote:
>>> On Sun, Jun 10, 2012 at 8:11 PM, Rob Herring <robherring2@gmail.com> wrote:
>>>> On 06/10/2012 12:24 PM, Fabio Estevam wrote:
>>>>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>>>>
>>>>> Fix gpio number assignment, so that it can match the number stated in the comment.
>>>>>
>>>>> Cc:
>>>>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>>>>> ---
>>>>>  .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |    4 ++--
>>>>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
>>>>> index c7e404b..fea541e 100644
>>>>> --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
>>>>> +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
>>>>> @@ -29,6 +29,6 @@ esdhc@70008000 {
>>>>>       compatible = "fsl,imx51-esdhc";
>>>>>       reg = <0x70008000 0x4000>;
>>>>>       interrupts = <2>;
>>>>> -     cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */
>>>>> -     wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */
>>>>> +     cd-gpios = <&gpio1 6 0>; /* GPIO1_6 */
>>>>> +     wp-gpios = <&gpio1 5 0>; /* GPIO1_5 */
>>>>
>>>> Are you sure all these aren't just DT is 0 based and the chip is 1 based
>>>> numbering?
>>>
>>> We start counting gpio number from 0 in i.mx, so the DT number and the
>>> GPIO number should match.
>>
>> I'm talking about bank numbers, not gpio numbers:
>>
>> /* There's a off-by-one betweem the gpio bank number and the gpiochip */
>> /* range e.g. GPIO_1_5 is gpio 5 under linux */
>> #define IMX_GPIO_NR(bank, nr)		(((bank) - 1) * 32 + (nr))
> 
> Traditionally I started counting at 0 no matter what the datasheet told.
> Now we go to match the numbering with the datasheets, which of course
> can be confusing while transitioning this.
> Fabios patch is correct, there is no gpio0 in the devicetree.
> 

Okay, applied.

Rob