diff for duplicates of <542933E1.8010809@smartplayin.com> diff --git a/a/1.txt b/N1/1.txt index b8d3ebc..b485025 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ On Monday 29 September 2014 02:45 PM, Srinivas Kandagatla wrote: > }; > > + /* OTG */ -> + usb1_phy:phy@12500000 { +> + usb1_phy:phy at 12500000 { > + status = "ok"; Its canonical value is "okay" (although in practice anything @@ -29,23 +29,23 @@ other than "disabled" should work). > + }; > + -> usb3_phy:phy@12520000 { +> usb3_phy:phy at 12520000 { > status = "ok"; > }; > @@ -48,6 +53,15 @@ > status = "ok"; > }; > -> + gadget1:gadget@12500000 { +> + gadget1:gadget at 12500000 { > + status = "ok"; > + }; > + > + /* OTG */ -> + usb1: usb@12500000 { +> + usb1: usb at 12500000 { > + status = "ok"; > + }; > + -> usb3: usb@12520000 { +> usb3: usb at 12520000 { > status = "ok"; > }; > diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -73,7 +73,7 @@ other than "disabled" should work). > > }; > -> + usb1_phy:phy@12500000 { +> + usb1_phy:phy at 12500000 { > + compatible = "qcom,usb-otg-ci"; > + reg = <0x12500000 0x400>; > + interrupts = <0 100 0>; @@ -99,14 +99,14 @@ Usually the status property goes first. > + reset-names = "link"; > + }; > + -> usb3_phy:phy@12520000 { +> usb3_phy:phy at 12520000 { > compatible = "qcom,usb-otg-ci"; > reg = <0x12520000 0x400>; > @@ -334,6 +363,23 @@ > reset-names = "link"; > }; > -> + gadget1:gadget@12500000 { +> + gadget1:gadget at 12500000 { > + compatible = "qcom,ci-hdrc"; > + reg = <0x12500000 0x400>; > + status = "disabled"; @@ -115,7 +115,7 @@ Usually the status property goes first. > + usb-phy = <&usb1_phy>; > + }; > + -> + usb1: usb@12500000 { +> + usb1: usb at 12500000 { > + compatible = "qcom,ehci-host"; > + reg = <0x12500000 0x400>; > + interrupts = <0 100 0>; @@ -123,7 +123,7 @@ Usually the status property goes first. > + usb-phy = <&usb1_phy>; > + }; > + -> usb3: usb@12520000 { +> usb3: usb at 12520000 { > compatible = "qcom,ehci-host"; > reg = <0x12520000 0x400>; > diff --git a/a/content_digest b/N1/content_digest index 49115e2..d4a41e5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,9 @@ "ref\01411982044-7873-1-git-send-email-srinivas.kandagatla@linaro.org\0" "ref\01411982127-8048-1-git-send-email-srinivas.kandagatla@linaro.org\0" - "From\0Kiran Padwal <kiran.padwal@smartplayin.com>\0" - "Subject\0Re: [PATCH 3/4] ARM: DT: apq8064: Add USB OTG support\0" + "From\0kiran.padwal@smartplayin.com (Kiran Padwal)\0" + "Subject\0[PATCH 3/4] ARM: DT: apq8064: Add USB OTG support\0" "Date\0Mon, 29 Sep 2014 15:56:41 +0530\0" - "To\0Srinivas Kandagatla <srinivas.kandagatla@linaro.org>\0" - "Cc\0Kumar Gala <galak@codeaurora.org>" - devicetree@vger.kernel.org - broonie@kernel.org - lee.jones@linaro.org - Rob Herring <robh+dt@kernel.org> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Russell King <linux@arm.linux.org.uk> - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - arm@kernel.org - linux-arm-msm@vger.kernel.org - " bjorn.andersson@sonymobile.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Srinivas,\n" @@ -43,7 +29,7 @@ "> \t\t};\n" "> \n" "> +\t\t/* OTG */\n" - "> +\t\tusb1_phy:phy@12500000 {\n" + "> +\t\tusb1_phy:phy at 12500000 {\n" "> +\t\t\tstatus = \"ok\";\n" "\n" "Its canonical value is \"okay\" (although in practice anything\n" @@ -51,23 +37,23 @@ "\n" "> +\t\t};\n" "> +\n" - "> \t\tusb3_phy:phy@12520000 {\n" + "> \t\tusb3_phy:phy at 12520000 {\n" "> \t\t\tstatus = \"ok\";\n" "> \t\t};\n" "> @@ -48,6 +53,15 @@\n" "> \t\t\tstatus = \"ok\";\n" "> \t\t};\n" "> \n" - "> +\t\tgadget1:gadget@12500000 {\n" + "> +\t\tgadget1:gadget at 12500000 {\n" "> +\t\t\tstatus = \"ok\";\n" "> +\t\t};\n" "> +\n" "> +\t\t/* OTG */\n" - "> +\t\tusb1: usb@12500000 {\n" + "> +\t\tusb1: usb at 12500000 {\n" "> +\t\t\tstatus = \"ok\";\n" "> +\t\t};\n" "> +\n" - "> \t\tusb3: usb@12520000 {\n" + "> \t\tusb3: usb at 12520000 {\n" "> \t\t\tstatus = \"ok\";\n" "> \t\t};\n" "> diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi\n" @@ -95,7 +81,7 @@ "> \n" "> \t\t};\n" "> \n" - "> +\t\tusb1_phy:phy@12500000 {\n" + "> +\t\tusb1_phy:phy at 12500000 {\n" "> +\t\t\tcompatible\t= \"qcom,usb-otg-ci\";\n" "> +\t\t\treg\t\t= <0x12500000 0x400>;\n" "> +\t\t\tinterrupts\t= <0 100 0>;\n" @@ -121,14 +107,14 @@ "> +\t\t\treset-names\t= \"link\";\n" "> +\t\t};\n" "> +\n" - "> \t\tusb3_phy:phy@12520000 {\n" + "> \t\tusb3_phy:phy at 12520000 {\n" "> \t\t\tcompatible\t= \"qcom,usb-otg-ci\";\n" "> \t\t\treg\t\t= <0x12520000 0x400>;\n" "> @@ -334,6 +363,23 @@\n" "> \t\t\treset-names\t= \"link\";\n" "> \t\t};\n" "> \n" - "> +\t\tgadget1:gadget@12500000 {\n" + "> +\t\tgadget1:gadget at 12500000 {\n" "> +\t\t\tcompatible\t= \"qcom,ci-hdrc\";\n" "> +\t\t\treg\t\t= <0x12500000 0x400>;\n" "> +\t\t\tstatus\t\t= \"disabled\";\n" @@ -137,7 +123,7 @@ "> +\t\t\tusb-phy\t\t= <&usb1_phy>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb1: usb@12500000 {\n" + "> +\t\tusb1: usb at 12500000 {\n" "> +\t\t\tcompatible\t= \"qcom,ehci-host\";\n" "> +\t\t\treg\t\t= <0x12500000 0x400>;\n" "> +\t\t\tinterrupts\t= <0 100 0>;\n" @@ -145,9 +131,9 @@ "> +\t\t\tusb-phy\t\t= <&usb1_phy>;\n" "> +\t\t};\n" "> +\n" - "> \t\tusb3: usb@12520000 {\n" + "> \t\tusb3: usb at 12520000 {\n" "> \t\t\tcompatible\t= \"qcom,ehci-host\";\n" "> \t\t\treg\t\t= <0x12520000 0x400>;\n" > -91e73ed1648a7c17d1fd794bab709154998718503f771a2eddd183ebcf2e0be7 +cd25fe162b85f7ff6e32356fa7538992582c19130e2a1fe838e90befc2ec0122
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.