diff for duplicates of <53329243.8090604@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 2b39eb0..e934203 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ Hi, On 03/19/2014 08:21 PM, Carlo Caione wrote: > This patch adds DTS entries for NMI controller as child of GIC. > -> Signed-off-by: Carlo Caione <carlo@caione.org> +> Signed-off-by: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org> Note this breaks the kernel on sun6i / A31 since we don't have a pmic driver there yet, and thus the nmi gets constantly fired without @@ -29,7 +29,7 @@ Hans > #size-cells = <1>; > ranges; > -> + nmi_intc: interrupt-controller at 01f00c0c { +> + nmi_intc: interrupt-controller@01f00c0c { > + compatible = "allwinner,sun6i-a31-sc-nmi"; > + interrupt-controller; > + #interrupt-cells = <2>; @@ -37,7 +37,7 @@ Hans > + interrupts = <0 0 4>; > + }; > + -> pio: pinctrl at 01c20800 { +> pio: pinctrl@01c20800 { > compatible = "allwinner,sun6i-a31-pinctrl"; > reg = <0x01c20800 0x400>; > diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -48,7 +48,7 @@ Hans > #size-cells = <1>; > ranges; > -> + nmi_intc: interrupt-controller at 01c00030 { +> + nmi_intc: interrupt-controller@01c00030 { > + compatible = "allwinner,sun7i-a20-sc-nmi"; > + interrupt-controller; > + #interrupt-cells = <2>; @@ -56,7 +56,7 @@ Hans > + interrupts = <0 0 4>; > + }; > + -> emac: ethernet at 01c0b000 { +> emac: ethernet@01c0b000 { > compatible = "allwinner,sun4i-a10-emac"; > reg = <0x01c0b000 0x1000>; > diff --git a/a/content_digest b/N1/content_digest index 21fb871..378acd6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,16 @@ "ref\01395256879-8475-1-git-send-email-carlo@caione.org\0" "ref\01395256879-8475-3-git-send-email-carlo@caione.org\0" - "From\0hdegoede@redhat.com (Hans de Goede)\0" - "Subject\0[PATCH v7 2/3] ARM: sun7i/sun6i: dts: Add NMI irqchip support\0" + "ref\01395256879-8475-3-git-send-email-carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org\0" + "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "Subject\0Re: [PATCH v7 2/3] ARM: sun7i/sun6i: dts: Add NMI irqchip support\0" "Date\0Wed, 26 Mar 2014 09:39:31 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org + maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -11,7 +18,7 @@ "On 03/19/2014 08:21 PM, Carlo Caione wrote:\n" "> This patch adds DTS entries for NMI controller as child of GIC.\n" "> \n" - "> Signed-off-by: Carlo Caione <carlo@caione.org>\n" + "> Signed-off-by: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>\n" "\n" "Note this breaks the kernel on sun6i / A31 since we don't have a\n" "pmic driver there yet, and thus the nmi gets constantly fired without\n" @@ -37,7 +44,7 @@ "> \t\t#size-cells = <1>;\n" "> \t\tranges;\n" "> \n" - "> +\t\tnmi_intc: interrupt-controller at 01f00c0c {\n" + "> +\t\tnmi_intc: interrupt-controller@01f00c0c {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-sc-nmi\";\n" "> +\t\t\tinterrupt-controller;\n" "> +\t\t\t#interrupt-cells = <2>;\n" @@ -45,7 +52,7 @@ "> +\t\t\tinterrupts = <0 0 4>;\n" "> +\t\t};\n" "> +\n" - "> \t\tpio: pinctrl at 01c20800 {\n" + "> \t\tpio: pinctrl@01c20800 {\n" "> \t\t\tcompatible = \"allwinner,sun6i-a31-pinctrl\";\n" "> \t\t\treg = <0x01c20800 0x400>;\n" "> diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi\n" @@ -56,7 +63,7 @@ "> \t\t#size-cells = <1>;\n" "> \t\tranges;\n" "> \n" - "> +\t\tnmi_intc: interrupt-controller at 01c00030 {\n" + "> +\t\tnmi_intc: interrupt-controller@01c00030 {\n" "> +\t\t\tcompatible = \"allwinner,sun7i-a20-sc-nmi\";\n" "> +\t\t\tinterrupt-controller;\n" "> +\t\t\t#interrupt-cells = <2>;\n" @@ -64,9 +71,9 @@ "> +\t\t\tinterrupts = <0 0 4>;\n" "> +\t\t};\n" "> +\n" - "> \t\temac: ethernet at 01c0b000 {\n" + "> \t\temac: ethernet@01c0b000 {\n" "> \t\t\tcompatible = \"allwinner,sun4i-a10-emac\";\n" "> \t\t\treg = <0x01c0b000 0x1000>;\n" > -567cd7e320192400dd1c53527a75ca4f2da048e64e300f15a4c7ea71814934ca +45f6fc536da91e7256d0b960041fc9478a1440efb5bb20654a18c997526642f1
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.