diff mbox

[v3,3/3] ARM: dts: dra7-evm: Add extcon nodes for USB ID pin detection

Message ID 1377711185-31238-4-git-send-email-george.cherian@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

George Cherian Aug. 28, 2013, 5:33 p.m. UTC
Add
	-extcon nodes for USB ID pin detection.
	-i2c nodes.
	-pcf nodes to which USB ID pin is connected.

Signed-off-by: George Cherian <george.cherian@ti.com>
---
 arch/arm/boot/dts/dra7-evm.dts | 50 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

Comments

Sergei Shtylyov Aug. 28, 2013, 5:54 p.m. UTC | #1
On 08/28/2013 09:33 PM, George Cherian wrote:

> Add
> 	-extcon nodes for USB ID pin detection.
> 	-i2c nodes.
> 	-pcf nodes to which USB ID pin is connected.

> Signed-off-by: George Cherian <george.cherian@ti.com>
> ---
>   arch/arm/boot/dts/dra7-evm.dts | 50 +++++++++++++++++++++++++++++++++++++++++-
>   1 file changed, 49 insertions(+), 1 deletion(-)

> diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
> index acd3c09..8b0738a 100644
> --- a/arch/arm/boot/dts/dra7-evm.dts
> +++ b/arch/arm/boot/dts/dra7-evm.dts
[...]
> @@ -33,10 +44,47 @@
>           };
>   };
>
> +&i2c1 {
> +	clock-frequency = <400000>;
> +
> +	gpio20: pcf8575@20 {

     ePAPR was talking about the node naming, not about labelling. Back to the 
drawing board. ;-)

> +		compatible = "ti,pcf8575";
> +		reg = <0x20>;
> +		n_latch = <0x4000>;
> +		gpio-controller;
> +		#gpio-cells = <2>;
> +		interrupt-parent = <&gpio6>;
> +		interrupts = <11 2>;
> +		interrupt-controller;
> +		#interrupt-cells = <2>;
> +	};
> +
> +	gpio21: pcf8575@21 {
> +		compatible = "ti,pcf8575";
> +		reg = <0x21>;
> +		n_latch = <0x1408>;
> +		gpio-controller;
> +		#gpio-cells = <2>;
> +		interrupt-parent = <&pcf_20>;
> +		interrupts = <14 2>;
> +		interrupt-controller;
> +		#interrupt-cells = <2>;
> +	};
> +
> +};
> +

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
George Cherian Aug. 29, 2013, 2:53 a.m. UTC | #2
On 8/28/2013 11:24 PM, Sergei Shtylyov wrote:
> On 08/28/2013 09:33 PM, George Cherian wrote:
>
>> Add
>>     -extcon nodes for USB ID pin detection.
>>     -i2c nodes.
>>     -pcf nodes to which USB ID pin is connected.
>
>> Signed-off-by: George Cherian <george.cherian@ti.com>
>> ---
>>   arch/arm/boot/dts/dra7-evm.dts | 50 
>> +++++++++++++++++++++++++++++++++++++++++-
>>   1 file changed, 49 insertions(+), 1 deletion(-)
>
>> diff --git a/arch/arm/boot/dts/dra7-evm.dts 
>> b/arch/arm/boot/dts/dra7-evm.dts
>> index acd3c09..8b0738a 100644
>> --- a/arch/arm/boot/dts/dra7-evm.dts
>> +++ b/arch/arm/boot/dts/dra7-evm.dts
> [...]
>> @@ -33,10 +44,47 @@
>>           };
>>   };
>>
>> +&i2c1 {
>> +    clock-frequency = <400000>;
>> +
>> +    gpio20: pcf8575@20 {
>
>     ePAPR was talking about the node naming, not about labelling. Back 
> to the drawing board. ;-)
>
ha..... :-/
>> +        compatible = "ti,pcf8575";
>> +        reg = <0x20>;
>> +        n_latch = <0x4000>;
>> +        gpio-controller;
>> +        #gpio-cells = <2>;
>> +        interrupt-parent = <&gpio6>;
>> +        interrupts = <11 2>;
>> +        interrupt-controller;
>> +        #interrupt-cells = <2>;
>> +    };
>> +
>> +    gpio21: pcf8575@21 {
>> +        compatible = "ti,pcf8575";
>> +        reg = <0x21>;
>> +        n_latch = <0x1408>;
>> +        gpio-controller;
>> +        #gpio-cells = <2>;
>> +        interrupt-parent = <&pcf_20>;
>> +        interrupts = <14 2>;
>> +        interrupt-controller;
>> +        #interrupt-cells = <2>;
>> +    };
>> +
>> +};
>> +
>
> WBR, Sergei
>
Stephen Warren Aug. 29, 2013, 7:21 p.m. UTC | #3
On 08/28/2013 11:33 AM, George Cherian wrote:
> Add
> 	-extcon nodes for USB ID pin detection.
> 	-i2c nodes.
> 	-pcf nodes to which USB ID pin is connected.

> diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts

>  &dwc3_1 {
> -	dr_mode = "otg";
> +	dr_mode = "host";
>  };

I wonder why one cares about ID/VBUS detection if the port doesn't
operate in OTG mode?

>  &dwc3_2 {
>  	dr_mode = "host";
>  };
> +
> +&usb1 {
> +	extcon = <&extcon1>;
> +};
> +
> +&usb2 {
> +	extcon = <&extcon2>;
> +};

I assume the "extcon" property is already fully documented in the
binding for the USB controller? For some reason, "extcon" looks like an
odd property name; I would have expected something more HW-oriented that
Linux-subsystem-oriented, such as "connector", or "usb-connector".

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index acd3c09..8b0738a 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -17,6 +17,17 @@ 
 		device_type = "memory";
 		reg = <0x80000000 0x60000000>; /* 1536 MB */
 	};
+
+	extcon1: gpio_usbvid_extcon1 {
+		compatible = "ti,gpio-usb-id";
+		gpios = <&gpio21 1 0>;
+	};
+
+	extcon2: gpio_usbvid_extcon2 {
+		compatible = "ti,gpio-usb-id";
+		gpios = <&gpio21 2 0>;
+	};
+
 };
 
 &dra7_pmx_core {
@@ -33,10 +44,47 @@ 
         };
 };
 
+&i2c1 {
+	clock-frequency = <400000>;
+
+	gpio20: pcf8575@20 {
+		compatible = "ti,pcf8575";
+		reg = <0x20>;
+		n_latch = <0x4000>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		interrupt-parent = <&gpio6>;
+		interrupts = <11 2>;
+		interrupt-controller;
+		#interrupt-cells = <2>;
+	};
+
+	gpio21: pcf8575@21 {
+		compatible = "ti,pcf8575";
+		reg = <0x21>;
+		n_latch = <0x1408>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		interrupt-parent = <&pcf_20>;
+		interrupts = <14 2>;
+		interrupt-controller;
+		#interrupt-cells = <2>;
+	};
+
+};
+
 &dwc3_1 {
-	dr_mode = "otg";
+	dr_mode = "host";
 };
 
 &dwc3_2 {
 	dr_mode = "host";
 };
+
+&usb1 {
+	extcon = <&extcon1>;
+};
+
+&usb2 {
+	extcon = <&extcon2>;
+};