[PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property

[PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property

[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

[PATCH 2/2] ARM: zynq: DT: Add pinctrl information to USB nodes

[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

Re: [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property

[Andreas Färber]

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

Re: [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property

[Michal Simek]

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

Re: [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property

[Sören Brinkmann]

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

Re: [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property

[Michal Simek]

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