diff for duplicates of <20160329143829.GJ8929@tuxbot> diff --git a/a/1.txt b/N1/1.txt index 7bc605e..6e3f3c4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,7 @@ On Wed 23 Mar 12:47 PDT 2016, Srinivas Kandagatla wrote: > }; > > soc { -> + pinctrl@800000 { +> + pinctrl at 800000 { > + card_detect: card_detect { > + mux { > + pins = "gpio26"; @@ -32,7 +32,7 @@ On Wed 23 Mar 12:47 PDT 2016, Srinivas Kandagatla wrote: > + }; > + }; > + -> rpm@108000 { +> rpm at 108000 { > regulators { > vdd_l1_l2_l12_l18-supply = <&pm8921_s4>; > @@ -62,6 +73,18 @@ @@ -64,14 +64,14 @@ I would prefer if you folded these into the regulator patch. > + > + amba { > + /* eMMC */ -> + sdcc@12400000 { +> + sdcc at 12400000 { > + status = "okay"; > + vmmc-supply = <&pm8921_l5>; > + vqmmc-supply = <&pm8921_s4>; > + }; > + > + /* External micro SD card */ -> + sdcc@12180000 { +> + sdcc at 12180000 { > + status = "okay"; > + vmmc-supply = <&pm8921_l6>; > + pinctrl-names = "default"; diff --git a/a/content_digest b/N1/content_digest index 85350ea..bee1609 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\01458762366-9233-1-git-send-email-srinivas.kandagatla@linaro.org\0" "ref\01458762458-9584-1-git-send-email-srinivas.kandagatla@linaro.org\0" - "From\0Bjorn Andersson <bjorn.andersson@linaro.org>\0" - "Subject\0Re: [PATCH 06/12] ARM: dts: dragonboard-600c: Add eMMC and SD card support\0" + "From\0bjorn.andersson@linaro.org (Bjorn Andersson)\0" + "Subject\0[PATCH 06/12] ARM: dts: dragonboard-600c: Add eMMC and SD card support\0" "Date\0Tue, 29 Mar 2016 07:38:29 -0700\0" - "To\0Srinivas Kandagatla <srinivas.kandagatla@linaro.org>\0" - "Cc\0Andy Gross <andy.gross@linaro.org>" - linux-arm-msm@vger.kernel.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " linux-soc@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed 23 Mar 12:47 PDT 2016, Srinivas Kandagatla wrote:\n" @@ -36,7 +30,7 @@ "> \t};\n" "> \n" "> \tsoc {\n" - "> +\t\tpinctrl@800000 {\n" + "> +\t\tpinctrl at 800000 {\n" "> +\t\t\tcard_detect: card_detect {\n" "> +\t\t\t\tmux {\n" "> +\t\t\t\t\tpins = \"gpio26\";\n" @@ -46,7 +40,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\trpm@108000 {\n" + "> \t\trpm at 108000 {\n" "> \t\t\tregulators {\n" "> \t\t\t\tvdd_l1_l2_l12_l18-supply = <&pm8921_s4>;\n" "> @@ -62,6 +73,18 @@\n" @@ -78,14 +72,14 @@ "> +\n" "> +\t\tamba {\n" "> +\t\t\t/* eMMC */\n" - "> +\t\t\tsdcc@12400000 {\n" + "> +\t\t\tsdcc at 12400000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\tvmmc-supply = <&pm8921_l5>;\n" "> +\t\t\t\tvqmmc-supply = <&pm8921_s4>;\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* External micro SD card */\n" - "> +\t\t\tsdcc@12180000 {\n" + "> +\t\t\tsdcc at 12180000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\tvmmc-supply = <&pm8921_l6>;\n" "> +\t\t\t\tpinctrl-names\t= \"default\";\n" @@ -101,4 +95,4 @@ "Regards,\n" Bjorn -cd3c7e8c119c5b4e5aa2ab3ec5f34e7074a6e7589e789dd4e5794aab408ffb42 +5bac009fc31f702baae2c21f0a7bf75a11664a5d972c51e007443fd01ec4000a
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.