diff mbox

[4/8] ARM: dts: bcm283x: Add a new EMMC pin group from the downstream tree.

Message ID 1473244289-20728-5-git-send-email-kraxel@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gerd Hoffmann Sept. 7, 2016, 10:31 a.m. UTC
From: Eric Anholt <eric@anholt.net>

This will be used for having EMMC (sdhci-bcm2835.c) drive the
wireless.

Signed-off-by: Eric Anholt <eric@anholt.net>
---
 arch/arm/boot/dts/bcm283x.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Stefan Wahren Sept. 7, 2016, 6:13 p.m. UTC | #1
> Gerd Hoffmann <kraxel@redhat.com> hat am 7. September 2016 um 12:31
> geschrieben:
> 
> 
> From: Eric Anholt <eric@anholt.net>
> 
> This will be used for having EMMC (sdhci-bcm2835.c) drive the
> wireless.

sdhci-bcm2835.c has been replaced by sdhci-iproc.c

> 
> Signed-off-by: Eric Anholt <eric@anholt.net>
> ---
>  arch/arm/boot/dts/bcm283x.dtsi | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
> index 062d09db..b6b1950 100644
> --- a/arch/arm/boot/dts/bcm283x.dtsi
> +++ b/arch/arm/boot/dts/bcm283x.dtsi
> @@ -257,6 +257,11 @@
>  				brcm,pins = <32 33>;
>  				brcm,function = <BCM2835_FSEL_ALT3>;
>  			};
> +			emmc_gpio34: emmc_gpio34 {
> +				brcm,pins = <34 35 36 37 38 39>;
> +				brcm,function = <BCM2835_FSEL_ALT3>;
> +				brcm,pull = <0 2 2 2 2 2>;

How about adding pull defines to include/dt-bindings/pinctrl/bcm2835.h?

> +			};
>  			emmc_gpio48: emmc_gpio48 {
>  				brcm,pins = <48 49 50 51 52 53>;
>  				brcm,function = <BCM2835_FSEL_ALT3>;
> -- 
> 1.8.3.1
> 
> 
> _______________________________________________
> linux-rpi-kernel mailing list
> linux-rpi-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rpi-kernel
Gerd Hoffmann Sept. 8, 2016, 7:44 a.m. UTC | #2
On Mi, 2016-09-07 at 20:13 +0200, Stefan Wahren wrote:
> > Gerd Hoffmann <kraxel@redhat.com> hat am 7. September 2016 um 12:31
> > geschrieben:
> > 
> > 
> > From: Eric Anholt <eric@anholt.net>
> > 
> > This will be used for having EMMC (sdhci-bcm2835.c) drive the
> > wireless.
> 
> sdhci-bcm2835.c has been replaced by sdhci-iproc.c

Ah, right, I'll update the commit msg for v2.

> How about adding pull defines to include/dt-bindings/pinctrl/bcm2835.h?

Already there (or do you mean something other than '#define
BCM2835_FSEL_*' ?)

cheers,
  Gerd
Stefan Wahren Sept. 8, 2016, 12:06 p.m. UTC | #3
Am 08.09.2016 um 09:44 schrieb Gerd Hoffmann:
> On Mi, 2016-09-07 at 20:13 +0200, Stefan Wahren wrote:
>>> Gerd Hoffmann <kraxel@redhat.com> hat am 7. September 2016 um 12:31
>>> geschrieben:
>>>
>>>
>>> From: Eric Anholt <eric@anholt.net>
>>>
>>> This will be used for having EMMC (sdhci-bcm2835.c) drive the
>>> wireless.
>> sdhci-bcm2835.c has been replaced by sdhci-iproc.c
> Ah, right, I'll update the commit msg for v2.
>
>> How about adding pull defines to include/dt-bindings/pinctrl/bcm2835.h?
> Already there (or do you mean something other than '#define
> BCM2835_FSEL_*' ?)

No, i thought of the GPIO pull up/down register values:

BCM2835_PUD_OFF 0
BCM2835_PUD_DOWN 1
BCM2835_PUD_UP 2

>
> cheers,
>   Gerd
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Scott Branden Sept. 8, 2016, 7:50 p.m. UTC | #4
Hi Gerd/Eric

On 16-09-08 12:44 AM, Gerd Hoffmann wrote:
> On Mi, 2016-09-07 at 20:13 +0200, Stefan Wahren wrote:
>>> Gerd Hoffmann <kraxel@redhat.com> hat am 7. September 2016 um 12:31
>>> geschrieben:
>>>
>>>
>>> From: Eric Anholt <eric@anholt.net>
>>>
>>> This will be used for having EMMC (sdhci-bcm2835.c) drive the
>>> wireless.
>>
>> sdhci-bcm2835.c has been replaced by sdhci-iproc.c
>
> Ah, right, I'll update the commit msg for v2.
>
Should we entirely remove sdhci-bcm2835.c to reduce confusion going forward?

>> How about adding pull defines to include/dt-bindings/pinctrl/bcm2835.h?
>
> Already there (or do you mean something other than '#define
> BCM2835_FSEL_*' ?)
>
> cheers,
>   Gerd
>

Thanks,
  Scott
Stefan Wahren Sept. 9, 2016, 6:58 a.m. UTC | #5
Hi Scott,

Am 08.09.2016 um 21:50 schrieb Scott Branden:
> Hi Gerd/Eric
>
> On 16-09-08 12:44 AM, Gerd Hoffmann wrote:
>> On Mi, 2016-09-07 at 20:13 +0200, Stefan Wahren wrote:
>>>> Gerd Hoffmann <kraxel@redhat.com> hat am 7. September 2016 um 12:31
>>>> geschrieben:
>>>>
>>>>
>>>> From: Eric Anholt <eric@anholt.net>
>>>>
>>>> This will be used for having EMMC (sdhci-bcm2835.c) drive the
>>>> wireless.
>>>
>>> sdhci-bcm2835.c has been replaced by sdhci-iproc.c
>>
>> Ah, right, I'll update the commit msg for v2.
>>
> Should we entirely remove sdhci-bcm2835.c to reduce confusion going
> forward?

did i missed something?

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=46cd175c9788e39a1c57698ab58f34844d216428

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7eb16493ecaa41ceeb448717ee2c59690cd9047f


>
>>> How about adding pull defines to include/dt-bindings/pinctrl/bcm2835.h?
>>
>> Already there (or do you mean something other than '#define
>> BCM2835_FSEL_*' ?)
>>
>> cheers,
>>   Gerd
>>
>
> Thanks,
>  Scott
Gerd Hoffmann Sept. 9, 2016, 8:26 a.m. UTC | #6
Hi,

> No, i thought of the GPIO pull up/down register values:
> 
> BCM2835_PUD_OFF 0
> BCM2835_PUD_DOWN 1
> BCM2835_PUD_UP 2

We can do that, sure (and probably drop the unused "enum
bcm2835_pinconf_pull" from drivers/pinctrl/bcm/pinctrl-bcm2835.c at the
same time).

But I fail to see how this is related to the patch discussed, looks like
a independent issue to me ...

cheers,
  Gerd
Gerd Hoffmann Sept. 9, 2016, 8:47 a.m. UTC | #7
On Fr, 2016-09-09 at 10:26 +0200, Gerd Hoffmann wrote:
>   Hi,
> 
> > No, i thought of the GPIO pull up/down register values:
> > 
> > BCM2835_PUD_OFF 0
> > BCM2835_PUD_DOWN 1
> > BCM2835_PUD_UP 2
> 
> We can do that, sure (and probably drop the unused "enum
> bcm2835_pinconf_pull" from drivers/pinctrl/bcm/pinctrl-bcm2835.c at the
> same time).
> 
> But I fail to see how this is related to the patch discussed, looks like
> a independent issue to me ...

Oops, noticed that emmc_gpio34 uses them while ordering all the entries.

cheers,
  Gerd
Scott Branden Sept. 9, 2016, 4:37 p.m. UTC | #8
Hi Stefan,

On 16-09-08 11:58 PM, Stefan Wahren wrote:
> Hi Scott,
>
> Am 08.09.2016 um 21:50 schrieb Scott Branden:
>> Hi Gerd/Eric
>>
>> On 16-09-08 12:44 AM, Gerd Hoffmann wrote:
>>> On Mi, 2016-09-07 at 20:13 +0200, Stefan Wahren wrote:
>>>>> Gerd Hoffmann <kraxel@redhat.com> hat am 7. September 2016 um 12:31
>>>>> geschrieben:
>>>>>
>>>>>
>>>>> From: Eric Anholt <eric@anholt.net>
>>>>>
>>>>> This will be used for having EMMC (sdhci-bcm2835.c) drive the
>>>>> wireless.
>>>>
>>>> sdhci-bcm2835.c has been replaced by sdhci-iproc.c
>>>
>>> Ah, right, I'll update the commit msg for v2.
>>>
>> Should we entirely remove sdhci-bcm2835.c to reduce confusion going
>> forward?
>
> did i missed something?
No - looks like I did.  Everything is cleaned up in latest.
>
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=46cd175c9788e39a1c57698ab58f34844d216428
>
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7eb16493ecaa41ceeb448717ee2c59690cd9047f
>
>
>>
>>>> How about adding pull defines to include/dt-bindings/pinctrl/bcm2835.h?
>>>
>>> Already there (or do you mean something other than '#define
>>> BCM2835_FSEL_*' ?)
>>>
>>> cheers,
>>>   Gerd
>>>
>>
>> Thanks,
>>  Scott
>
Eric Anholt Sept. 9, 2016, 9:22 p.m. UTC | #9
Stefan Wahren <stefan.wahren@i2se.com> writes:

>> Gerd Hoffmann <kraxel@redhat.com> hat am 7. September 2016 um 12:31
>> geschrieben:
>> 
>> 
>> From: Eric Anholt <eric@anholt.net>
>> 
>> This will be used for having EMMC (sdhci-bcm2835.c) drive the
>> wireless.
>
> sdhci-bcm2835.c has been replaced by sdhci-iproc.c
>
>> 
>> Signed-off-by: Eric Anholt <eric@anholt.net>
>> ---
>>  arch/arm/boot/dts/bcm283x.dtsi | 5 +++++
>>  1 file changed, 5 insertions(+)
>> 
>> diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
>> index 062d09db..b6b1950 100644
>> --- a/arch/arm/boot/dts/bcm283x.dtsi
>> +++ b/arch/arm/boot/dts/bcm283x.dtsi
>> @@ -257,6 +257,11 @@
>>  				brcm,pins = <32 33>;
>>  				brcm,function = <BCM2835_FSEL_ALT3>;
>>  			};
>> +			emmc_gpio34: emmc_gpio34 {
>> +				brcm,pins = <34 35 36 37 38 39>;
>> +				brcm,function = <BCM2835_FSEL_ALT3>;
>> +				brcm,pull = <0 2 2 2 2 2>;
>
> How about adding pull defines to include/dt-bindings/pinctrl/bcm2835.h?

A fine idea, but it should not be a requirement for this series.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 062d09db..b6b1950 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -257,6 +257,11 @@ 
 				brcm,pins = <32 33>;
 				brcm,function = <BCM2835_FSEL_ALT3>;
 			};
+			emmc_gpio34: emmc_gpio34 {
+				brcm,pins = <34 35 36 37 38 39>;
+				brcm,function = <BCM2835_FSEL_ALT3>;
+				brcm,pull = <0 2 2 2 2 2>;
+			};
 			emmc_gpio48: emmc_gpio48 {
 				brcm,pins = <48 49 50 51 52 53>;
 				brcm,function = <BCM2835_FSEL_ALT3>;