diff for duplicates of <20180222061208.2031-5-rnayak@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 050dea3..199637c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,13 +26,13 @@ index 979ab49913f1..2a1ed55b703e 100644 +}; + +&soc { -+ geni-se@ac0000 { -+ serial@a84000 { ++ geni-se at ac0000 { ++ serial at a84000 { + status = "okay"; + }; + }; + -+ pinctrl@3400000 { ++ pinctrl at 3400000 { + qup-uart2-default { + pinconf_tx { + pins = "gpio4"; @@ -87,13 +87,13 @@ index da3d6ac906c8..0acd6c51115d 100644 + }; }; - timer@17c90000 { + timer at 17c90000 { @@ -273,5 +288,29 @@ #interrupt-cells = <4>; cell-index = <0>; }; + -+ geni-se@ac0000 { ++ geni-se at ac0000 { + compatible = "qcom,geni-se-qup"; + #address-cells = <1>; + #size-cells = <1>; @@ -103,7 +103,7 @@ index da3d6ac906c8..0acd6c51115d 100644 + <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>; + clock-names = "m-ahb", "s-ahb"; + -+ qup_uart2: serial@a84000 { ++ qup_uart2: serial at a84000 { + compatible = "qcom,geni-debug-uart"; + reg = <0xa84000 0x4000>; + reg-names = "se-phys"; diff --git a/a/content_digest b/N1/content_digest index 91512d5..8eeb170 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,8 @@ "ref\020180222061208.2031-1-rnayak@codeaurora.org\0" - "From\0Rajendra Nayak <rnayak@codeaurora.org>\0" + "From\0rnayak@codeaurora.org (Rajendra Nayak)\0" "Subject\0[PATCH v5 4/4] arm64: dts: sdm845: Add serial console support\0" "Date\0Thu, 22 Feb 2018 11:42:08 +0530\0" - "To\0andy.gross@linaro.org\0" - "Cc\0devicetree@vger.kernel.org" - dianders@chromium.org - Rajendra Nayak <rnayak@codeaurora.org> - marc.zyngier@arm.com - linux-arm-msm@vger.kernel.org - sboyd@codeaurora.org - linux-kernel@vger.kernel.org - evgreen@chromium.org - bjorn.andersson@linaro.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add the qup uart node and geni se instance needed to\n" @@ -43,13 +33,13 @@ "+};\n" "+\n" "+&soc {\n" - "+\tgeni-se@ac0000 {\n" - "+\t\tserial@a84000 {\n" + "+\tgeni-se at ac0000 {\n" + "+\t\tserial at a84000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\t};\n" "+\n" - "+\tpinctrl@3400000 {\n" + "+\tpinctrl at 3400000 {\n" "+\t\tqup-uart2-default {\n" "+\t\t\tpinconf_tx {\n" "+\t\t\t\tpins = \"gpio4\";\n" @@ -104,13 +94,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\ttimer@17c90000 {\n" + " \t\ttimer at 17c90000 {\n" "@@ -273,5 +288,29 @@\n" " \t\t\t#interrupt-cells = <4>;\n" " \t\t\tcell-index = <0>;\n" " \t\t};\n" "+\n" - "+\t\tgeni-se@ac0000 {\n" + "+\t\tgeni-se at ac0000 {\n" "+\t\t\tcompatible = \"qcom,geni-se-qup\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" @@ -120,7 +110,7 @@ "+\t\t\t\t <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;\n" "+\t\t\tclock-names = \"m-ahb\", \"s-ahb\";\n" "+\n" - "+\t\t\tqup_uart2: serial@a84000 {\n" + "+\t\t\tqup_uart2: serial at a84000 {\n" "+\t\t\t\tcompatible = \"qcom,geni-debug-uart\";\n" "+\t\t\t\treg = <0xa84000 0x4000>;\n" "+\t\t\t\treg-names = \"se-phys\";\n" @@ -139,4 +129,4 @@ "QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member\n" of Code Aurora Forum, hosted by The Linux Foundation -d2f18341b9235f11183a912c35ffcb8103c02bf6c5afb0865fc591525262a15d +e9472c6d6540f908cba5c34e9cd91162ea1777aa9f77b99ecf07d9007c64f28c
diff --git a/a/content_digest b/N2/content_digest index 91512d5..d7c7666 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,15 +4,15 @@ "Date\0Thu, 22 Feb 2018 11:42:08 +0530\0" "To\0andy.gross@linaro.org\0" "Cc\0devicetree@vger.kernel.org" - dianders@chromium.org - Rajendra Nayak <rnayak@codeaurora.org> - marc.zyngier@arm.com linux-arm-msm@vger.kernel.org - sboyd@codeaurora.org linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + sboyd@codeaurora.org evgreen@chromium.org bjorn.andersson@linaro.org - " linux-arm-kernel@lists.infradead.org\0" + dianders@chromium.org + marc.zyngier@arm.com + " Rajendra Nayak <rnayak@codeaurora.org>\0" "\00:1\0" "b\0" "Add the qup uart node and geni se instance needed to\n" @@ -139,4 +139,4 @@ "QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member\n" of Code Aurora Forum, hosted by The Linux Foundation -d2f18341b9235f11183a912c35ffcb8103c02bf6c5afb0865fc591525262a15d +de7894c1d1d1762c5aa35b0a29f6257194fa6e932fe336ce1de3e57cdee6d740
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.