diff for duplicates of <1448490457-9799-2-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index be95092..0008144 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,7 @@ index 9f357f68713c..0512f645922e 100644 +++ b/arch/arm/boot/dts/qcom-pm8841.dtsi @@ -11,7 +11,7 @@ - pm8841_mpps: mpps@a000 { + pm8841_mpps: mpps at a000 { compatible = "qcom,pm8841-mpp", "qcom,spmi-mpp"; - reg = <0xa000 0x400>; + reg = <0xa000>; @@ -25,7 +25,7 @@ index 9f357f68713c..0512f645922e 100644 interrupts = <4 0xa0 0 IRQ_TYPE_NONE>, @@ -22,7 +22,7 @@ - temp-alarm@2400 { + temp-alarm at 2400 { compatible = "qcom,spmi-temp-alarm"; - reg = <0x2400 0x100>; + reg = <0x2400>; @@ -38,7 +38,7 @@ index 64622bd251d1..3960b96273ec 100644 +++ b/arch/arm/boot/dts/qcom-pm8941.dtsi @@ -12,15 +12,15 @@ - rtc@6000 { + rtc at 6000 { compatible = "qcom,pm8941-rtc"; - reg = <0x6000 0x100>, - <0x6100 0x100>; @@ -48,7 +48,7 @@ index 64622bd251d1..3960b96273ec 100644 interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>; }; - pwrkey@800 { + pwrkey at 800 { compatible = "qcom,pm8941-pwrkey"; - reg = <0x800 0x100>; + reg = <0x800>; @@ -57,7 +57,7 @@ index 64622bd251d1..3960b96273ec 100644 bias-pull-up; @@ -28,7 +28,7 @@ - charger@1000 { + charger at 1000 { compatible = "qcom,pm8941-charger"; - reg = <0x1000 0x700>; + reg = <0x1000>; @@ -66,7 +66,7 @@ index 64622bd251d1..3960b96273ec 100644 <0x0 0x10 4 IRQ_TYPE_EDGE_BOTH>, @@ -49,7 +49,7 @@ - pm8941_gpios: gpios@c000 { + pm8941_gpios: gpios at c000 { compatible = "qcom,pm8941-gpio", "qcom,spmi-gpio"; - reg = <0xc000 0x2400>; + reg = <0xc000>; @@ -75,7 +75,7 @@ index 64622bd251d1..3960b96273ec 100644 interrupts = <0 0xc0 0 IRQ_TYPE_NONE>, @@ -92,7 +92,7 @@ - pm8941_mpps: mpps@a000 { + pm8941_mpps: mpps at a000 { compatible = "qcom,pm8941-mpp", "qcom,spmi-mpp"; - reg = <0xa000 0x800>; + reg = <0xa000>; @@ -84,7 +84,7 @@ index 64622bd251d1..3960b96273ec 100644 interrupts = <0 0xa0 0 IRQ_TYPE_NONE>, @@ -107,7 +107,7 @@ - pm8941_temp: temp-alarm@2400 { + pm8941_temp: temp-alarm at 2400 { compatible = "qcom,spmi-temp-alarm"; - reg = <0x2400 0x100>; + reg = <0x2400>; @@ -93,7 +93,7 @@ index 64622bd251d1..3960b96273ec 100644 io-channel-names = "thermal"; @@ -116,7 +116,7 @@ - pm8941_vadc: vadc@3100 { + pm8941_vadc: vadc at 3100 { compatible = "qcom,spmi-vadc"; - reg = <0x3100 0x100>; + reg = <0x3100>; @@ -102,7 +102,7 @@ index 64622bd251d1..3960b96273ec 100644 #size-cells = <0>; @@ -141,14 +141,14 @@ - pm8941_iadc: iadc@3600 { + pm8941_iadc: iadc at 3600 { compatible = "qcom,pm8941-iadc", "qcom,spmi-iadc"; - reg = <0x3600 0x100>; + reg = <0x3600>; @@ -110,7 +110,7 @@ index 64622bd251d1..3960b96273ec 100644 qcom,external-resistor-micro-ohms = <10000>; }; - coincell@2800 { + coincell at 2800 { compatible = "qcom,pm8941-coincell"; - reg = <0x2800 0x100>; + reg = <0x2800>; @@ -119,7 +119,7 @@ index 64622bd251d1..3960b96273ec 100644 }; @@ -161,7 +161,7 @@ - wled@d800 { + wled at d800 { compatible = "qcom,pm8941-wled"; - reg = <0xd800 0x100>; + reg = <0xd800>; diff --git a/a/content_digest b/N1/content_digest index c8db972..4f19c1c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,8 @@ "ref\01448490457-9799-1-git-send-email-sboyd@codeaurora.org\0" - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" + "From\0sboyd@codeaurora.org (Stephen Boyd)\0" "Subject\0[PATCH 1/2] ARM: dts: qcom: Remove size elements from pmic reg properties\0" "Date\0Wed, 25 Nov 2015 14:27:36 -0800\0" - "To\0Andy Gross <agross@codeaurora.org>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-arm-msm@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The #size-cells for the pmics are 0, but we specify a size in the\n" @@ -26,7 +23,7 @@ "+++ b/arch/arm/boot/dts/qcom-pm8841.dtsi\n" "@@ -11,7 +11,7 @@\n" " \n" - " \t\tpm8841_mpps: mpps@a000 {\n" + " \t\tpm8841_mpps: mpps at a000 {\n" " \t\t\tcompatible = \"qcom,pm8841-mpp\", \"qcom,spmi-mpp\";\n" "-\t\t\treg = <0xa000 0x400>;\n" "+\t\t\treg = <0xa000>;\n" @@ -35,7 +32,7 @@ " \t\t\tinterrupts = <4 0xa0 0 IRQ_TYPE_NONE>,\n" "@@ -22,7 +22,7 @@\n" " \n" - " \t\ttemp-alarm@2400 {\n" + " \t\ttemp-alarm at 2400 {\n" " \t\t\tcompatible = \"qcom,spmi-temp-alarm\";\n" "-\t\t\treg = <0x2400 0x100>;\n" "+\t\t\treg = <0x2400>;\n" @@ -48,7 +45,7 @@ "+++ b/arch/arm/boot/dts/qcom-pm8941.dtsi\n" "@@ -12,15 +12,15 @@\n" " \n" - " \t\trtc@6000 {\n" + " \t\trtc at 6000 {\n" " \t\t\tcompatible = \"qcom,pm8941-rtc\";\n" "-\t\t\treg = <0x6000 0x100>,\n" "-\t\t\t <0x6100 0x100>;\n" @@ -58,7 +55,7 @@ " \t\t\tinterrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;\n" " \t\t};\n" " \n" - " \t\tpwrkey@800 {\n" + " \t\tpwrkey at 800 {\n" " \t\t\tcompatible = \"qcom,pm8941-pwrkey\";\n" "-\t\t\treg = <0x800 0x100>;\n" "+\t\t\treg = <0x800>;\n" @@ -67,7 +64,7 @@ " \t\t\tbias-pull-up;\n" "@@ -28,7 +28,7 @@\n" " \n" - " \t\tcharger@1000 {\n" + " \t\tcharger at 1000 {\n" " \t\t\tcompatible = \"qcom,pm8941-charger\";\n" "-\t\t\treg = <0x1000 0x700>;\n" "+\t\t\treg = <0x1000>;\n" @@ -76,7 +73,7 @@ " \t\t\t\t <0x0 0x10 4 IRQ_TYPE_EDGE_BOTH>,\n" "@@ -49,7 +49,7 @@\n" " \n" - " \t\tpm8941_gpios: gpios@c000 {\n" + " \t\tpm8941_gpios: gpios at c000 {\n" " \t\t\tcompatible = \"qcom,pm8941-gpio\", \"qcom,spmi-gpio\";\n" "-\t\t\treg = <0xc000 0x2400>;\n" "+\t\t\treg = <0xc000>;\n" @@ -85,7 +82,7 @@ " \t\t\tinterrupts = <0 0xc0 0 IRQ_TYPE_NONE>,\n" "@@ -92,7 +92,7 @@\n" " \n" - " \t\tpm8941_mpps: mpps@a000 {\n" + " \t\tpm8941_mpps: mpps at a000 {\n" " \t\t\tcompatible = \"qcom,pm8941-mpp\", \"qcom,spmi-mpp\";\n" "-\t\t\treg = <0xa000 0x800>;\n" "+\t\t\treg = <0xa000>;\n" @@ -94,7 +91,7 @@ " \t\t\tinterrupts = <0 0xa0 0 IRQ_TYPE_NONE>,\n" "@@ -107,7 +107,7 @@\n" " \n" - " \t\tpm8941_temp: temp-alarm@2400 {\n" + " \t\tpm8941_temp: temp-alarm at 2400 {\n" " \t\t\tcompatible = \"qcom,spmi-temp-alarm\";\n" "-\t\t\treg = <0x2400 0x100>;\n" "+\t\t\treg = <0x2400>;\n" @@ -103,7 +100,7 @@ " \t\t\tio-channel-names = \"thermal\";\n" "@@ -116,7 +116,7 @@\n" " \n" - " \t\tpm8941_vadc: vadc@3100 {\n" + " \t\tpm8941_vadc: vadc at 3100 {\n" " \t\t\tcompatible = \"qcom,spmi-vadc\";\n" "-\t\t\treg = <0x3100 0x100>;\n" "+\t\t\treg = <0x3100>;\n" @@ -112,7 +109,7 @@ " \t\t\t#size-cells = <0>;\n" "@@ -141,14 +141,14 @@\n" " \n" - " \t\tpm8941_iadc: iadc@3600 {\n" + " \t\tpm8941_iadc: iadc at 3600 {\n" " \t\t\tcompatible = \"qcom,pm8941-iadc\", \"qcom,spmi-iadc\";\n" "-\t\t\treg = <0x3600 0x100>;\n" "+\t\t\treg = <0x3600>;\n" @@ -120,7 +117,7 @@ " \t\t\tqcom,external-resistor-micro-ohms = <10000>;\n" " \t\t};\n" " \n" - " \t\tcoincell@2800 {\n" + " \t\tcoincell at 2800 {\n" " \t\t\tcompatible = \"qcom,pm8941-coincell\";\n" "-\t\t\treg = <0x2800 0x100>;\n" "+\t\t\treg = <0x2800>;\n" @@ -129,7 +126,7 @@ " \t};\n" "@@ -161,7 +161,7 @@\n" " \n" - " \t\twled@d800 {\n" + " \t\twled at d800 {\n" " \t\t\tcompatible = \"qcom,pm8941-wled\";\n" "-\t\t\treg = <0xd800 0x100>;\n" "+\t\t\treg = <0xd800>;\n" @@ -140,4 +137,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" a Linux Foundation Collaborative Project -a5caa40f7c42cb1d7948adc4cf04d0a91af638e1b4b869d62ee66a6f921e7cdc +224469af8305daecf4ea65bfb78a0f44f14f1075282d06e494a27055083b71e7
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.