diff for duplicates of <1455963652-24618-4-git-send-email-michael@amarulasolutions.com> diff --git a/a/1.txt b/N1/1.txt index d7d56bc..63717d7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ Add support for GPMI nand controller. -Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> +Signed-off-by: Michael Trimarchi <michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> --- arch/arm/boot/dts/imx6ul.dtsi | 33 +++++++++++++++++++++++++++++++++ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 10 ++++++++++ @@ -15,7 +15,7 @@ index f369fa4..42b0a29 100644 reg = <0x00900000 0x20000>; }; -+ dma_apbh: dma-apbh at 01804000 { ++ dma_apbh: dma-apbh@01804000 { + compatible = "fsl,imx6ul-dma-apbh", "fsl,imx28-dma-apbh"; + reg = <0x01804000 0x2000>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, @@ -28,7 +28,7 @@ index f369fa4..42b0a29 100644 + clocks = <&clks IMX6UL_CLK_APBHDMA>; + }; + -+ gpmi: gpmi-nand at 01806000 { ++ gpmi: gpmi-nand@01806000 { + compatible = "fsl,imx6ul-gpmi-nand"; + #address-cells = <1>; + #size-cells = <1>; @@ -48,7 +48,7 @@ index f369fa4..42b0a29 100644 + status = "disabled"; + }; + - aips1: aips-bus at 02000000 { + aips1: aips-bus@02000000 { compatible = "fsl,aips-bus", "simple-bus"; #address-cells = <1>; diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -105,3 +105,8 @@ index 4e49a1f..c5fa52a 100644 #endif -- 2.7.0 + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 35c65b9..45294ad 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,20 @@ "ref\01455963652-24618-1-git-send-email-michael@amarulasolutions.com\0" - "From\0michael@amarulasolutions.com (Michael Trimarchi)\0" + "ref\01455963652-24618-1-git-send-email-michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org\0" + "From\0Michael Trimarchi <michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>\0" "Subject\0[PATCH 3/4] ARM: dts: imx6ul: Add GPMI nand controller support\0" "Date\0Sat, 20 Feb 2016 11:20:51 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" + " kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org\0" + "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org + computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org + " michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org\0" "\00:1\0" "b\0" "Add support for GPMI nand controller.\n" "\n" - "Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>\n" + "Signed-off-by: Michael Trimarchi <michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/imx6ul.dtsi | 33 +++++++++++++++++++++++++++++++++\n" " drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 10 ++++++++++\n" @@ -22,7 +29,7 @@ " \t\t\treg = <0x00900000 0x20000>;\n" " \t\t};\n" " \n" - "+\t\tdma_apbh: dma-apbh at 01804000 {\n" + "+\t\tdma_apbh: dma-apbh@01804000 {\n" "+\t\t\tcompatible = \"fsl,imx6ul-dma-apbh\", \"fsl,imx28-dma-apbh\";\n" "+\t\t\treg = <0x01804000 0x2000>;\n" "+\t\t\tinterrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,\n" @@ -35,7 +42,7 @@ "+\t\t\tclocks = <&clks IMX6UL_CLK_APBHDMA>;\n" "+\t\t};\n" "+\n" - "+\t\tgpmi: gpmi-nand at 01806000 {\n" + "+\t\tgpmi: gpmi-nand@01806000 {\n" "+\t\t\tcompatible = \"fsl,imx6ul-gpmi-nand\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" @@ -55,7 +62,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - " \t\taips1: aips-bus at 02000000 {\n" + " \t\taips1: aips-bus@02000000 {\n" " \t\t\tcompatible = \"fsl,aips-bus\", \"simple-bus\";\n" " \t\t\t#address-cells = <1>;\n" "diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c\n" @@ -111,6 +118,11 @@ "+#define GPMI_IS_MX6(x)\t\t(GPMI_IS_MX6Q(x) || GPMI_IS_MX6SX(x) || GPMI_IS_MX6UL(x))\n" " #endif\n" "-- \n" - 2.7.0 + "2.7.0\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -a2badc5f034cfdfea792ae46be96d3e7d4f13dff739a9c304bfde21f286f6c84 +0023f44edd9d31468529148d4e55bfc4f0c7c828574cbb7ce6832ce8b7b5f64a
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.