LKML Archive on lore.kernel.org help / color / mirror / Atom feed
* [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property @ 2015-01-26 19:49 Soren Brinkmann 2015-01-26 19:49 ` [PATCH 2/2] ARM: zynq: DT: Add pinctrl information to USB nodes Soren Brinkmann 2015-01-27 0:38 ` [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property Andreas Färber 0 siblings, 2 replies; 6+ messages in thread From: Soren Brinkmann @ 2015-01-26 19:49 UTC (permalink / raw) To: Michal Simek Cc: devicetree, linux-arm-kernel, linux-kernel, Andreas Färber, Peter Crosthwaite, Linus Walleij, Soren Brinkmann In one pinctrl node, a 'bias-disable' property is erroneously assigned a value. Fixes: ARM: zynq: DT: Add pinctrl information Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> --- Feel free to squash this into the mentioned patch. I don't see it in any stable branch yet. Sören --- arch/arm/boot/dts/zynq-zc702.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index 365bdd407eb4..4f8835be4874 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -309,7 +309,7 @@ conf-tx { pins = "MIO48"; - bias-disable = <0>; + bias-disable; }; }; }; -- 2.2.2.1.g63c5777 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: zynq: DT: Add pinctrl information to USB nodes 2015-01-26 19:49 [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property Soren Brinkmann @ 2015-01-26 19:49 ` Soren Brinkmann 2015-01-27 0:38 ` [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property Andreas Färber 1 sibling, 0 replies; 6+ messages in thread From: Soren Brinkmann @ 2015-01-26 19:49 UTC (permalink / raw) To: Michal Simek Cc: devicetree, linux-arm-kernel, linux-kernel, Andreas Färber, Peter Crosthwaite, Linus Walleij, Soren Brinkmann Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> --- Hi Michal, This could be squashed into 1643b31658c4 'ARM: zynq: DT: Add USB to device tree' if you decide to rebuild the zynq/dt branch. Sören --- arch/arm/boot/dts/zynq-zc702.dts | 26 ++++++++++++++++++++++++++ arch/arm/boot/dts/zynq-zc706.dts | 26 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index 4f8835be4874..483f69ba2cf5 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -312,6 +312,30 @@ bias-disable; }; }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = <0>; + io-standard = <1>; + }; + + conf-rx { + pins = "MIO29", "MIO31", "MIO36"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO28", "MIO30", "MIO32", "MIO33", "MIO34", + "MIO35", "MIO37", "MIO38", "MIO39"; + bias-disable; + }; + }; }; &sdhci0 { @@ -330,4 +354,6 @@ status = "okay"; dr_mode = "host"; usb-phy = <&usb_phy0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; }; diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts index 6979ce23175f..3a6260998116 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts @@ -261,6 +261,30 @@ bias-disable; }; }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = <0>; + io-standard = <1>; + }; + + conf-rx { + pins = "MIO29", "MIO31", "MIO36"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO28", "MIO30", "MIO32", "MIO33", "MIO34", + "MIO35", "MIO37", "MIO38", "MIO39"; + bias-disable; + }; + }; }; &sdhci0 { @@ -279,4 +303,6 @@ status = "okay"; dr_mode = "host"; usb-phy = <&usb_phy0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; }; -- 2.2.2.1.g63c5777 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property 2015-01-26 19:49 [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property Soren Brinkmann 2015-01-26 19:49 ` [PATCH 2/2] ARM: zynq: DT: Add pinctrl information to USB nodes Soren Brinkmann @ 2015-01-27 0:38 ` Andreas Färber 2015-01-28 14:21 ` Michal Simek 1 sibling, 1 reply; 6+ messages in thread From: Andreas Färber @ 2015-01-27 0:38 UTC (permalink / raw) To: Soren Brinkmann, Michal Simek Cc: devicetree, linux-arm-kernel, linux-kernel, Peter Crosthwaite, Linus Walleij [-- Attachment #1: Type: text/plain, Size: 492 bytes --] Am 26.01.2015 um 20:49 schrieb Soren Brinkmann: > In one pinctrl node, a 'bias-disable' property is erroneously assigned a > value. > > Fixes: ARM: zynq: DT: Add pinctrl information > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Reviewed-by: Andreas Färber <afaerber@suse.de> Andreas -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu, Graham Norton; HRB 21284 (AG Nürnberg) [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property 2015-01-27 0:38 ` [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property Andreas Färber @ 2015-01-28 14:21 ` Michal Simek 2015-01-28 15:41 ` Sören Brinkmann [not found] ` <20150128154139.GK13057@xsjandreislx> 0 siblings, 2 replies; 6+ messages in thread From: Michal Simek @ 2015-01-28 14:21 UTC (permalink / raw) To: Andreas Färber, Soren Brinkmann, Michal Simek Cc: devicetree, linux-arm-kernel, linux-kernel, Peter Crosthwaite, Linus Walleij [-- Attachment #1: Type: text/plain, Size: 417 bytes --] On 01/27/2015 01:38 AM, Andreas Färber wrote: > Am 26.01.2015 um 20:49 schrieb Soren Brinkmann: >> In one pinctrl node, a 'bias-disable' property is erroneously assigned a >> value. >> >> Fixes: ARM: zynq: DT: Add pinctrl information >> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> > > Reviewed-by: Andreas Färber <afaerber@suse.de> > > Andreas > Applied both. Thanks, Michal [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property 2015-01-28 14:21 ` Michal Simek @ 2015-01-28 15:41 ` Sören Brinkmann [not found] ` <20150128154139.GK13057@xsjandreislx> 1 sibling, 0 replies; 6+ messages in thread From: Sören Brinkmann @ 2015-01-28 15:41 UTC (permalink / raw) To: Michal Simek Cc: Andreas Färber, devicetree, Peter Crosthwaite, linux-kernel, linux-arm-kernel, Linus Walleij On Wed, 2015-01-28 at 03:21PM +0100, Michal Simek wrote: > On 01/27/2015 01:38 AM, Andreas Färber wrote: > > Am 26.01.2015 um 20:49 schrieb Soren Brinkmann: > >> In one pinctrl node, a 'bias-disable' property is erroneously assigned a > >> value. > >> > >> Fixes: ARM: zynq: DT: Add pinctrl information > >> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> > > > > Reviewed-by: Andreas Färber <afaerber@suse.de> > > > > Andreas > > > > Applied both. Thanks. Given how the branch looks now, you could squash 'ARM: zynq: DT: Remove bogus value from 'bias-disable' property' and 'ARM: zynq: DT: Add pinctrl information to USB nodes' into 'ARM: zynq: DT: Add pinctrl information'. Then we have it all in one patch and spare everybody the intermittent, partly broken commits. Sören ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20150128154139.GK13057@xsjandreislx>]
* Re: [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property [not found] ` <20150128154139.GK13057@xsjandreislx> @ 2015-01-29 14:35 ` Michal Simek 0 siblings, 0 replies; 6+ messages in thread From: Michal Simek @ 2015-01-29 14:35 UTC (permalink / raw) To: Sören Brinkmann, Michal Simek Cc: Andreas Färber, devicetree, Peter Crosthwaite, linux-kernel, linux-arm-kernel, Linus Walleij On 01/28/2015 04:41 PM, Sören Brinkmann wrote: > On Wed, 2015-01-28 at 03:21PM +0100, Michal Simek wrote: >> On 01/27/2015 01:38 AM, Andreas Färber wrote: >>> Am 26.01.2015 um 20:49 schrieb Soren Brinkmann: >>>> In one pinctrl node, a 'bias-disable' property is erroneously assigned a >>>> value. >>>> >>>> Fixes: ARM: zynq: DT: Add pinctrl information >>>> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> >>> >>> Reviewed-by: Andreas Färber <afaerber@suse.de> >>> >>> Andreas >>> >> >> Applied both. > > Thanks. Given how the branch looks now, you could squash 'ARM: zynq: DT: > Remove bogus value from 'bias-disable' property' and 'ARM: zynq: DT: Add > pinctrl information to USB nodes' into 'ARM: zynq: DT: Add pinctrl > information'. Then we have it all in one patch and spare everybody the > intermittent, partly broken commits. That's not a problem. I have sent pull request with current state. Thanks, Michal ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-01-29 14:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-26 19:49 [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property Soren Brinkmann
2015-01-26 19:49 ` [PATCH 2/2] ARM: zynq: DT: Add pinctrl information to USB nodes Soren Brinkmann
2015-01-27 0:38 ` [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property Andreas Färber
2015-01-28 14:21 ` Michal Simek
2015-01-28 15:41 ` Sören Brinkmann
[not found] ` <20150128154139.GK13057@xsjandreislx>
2015-01-29 14:35 ` Michal Simek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).