diff for duplicates of <54AFCDA3.1030601@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index 4c55c60..f23aa15 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ On 09/01/2015 13:31, Imre Kaloz wrote: Thanks for your contribution > -> Signed-off-by: Imre Kaloz <kaloz@openwrt.org> +> Signed-off-by: Imre Kaloz <kaloz-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/armada-xp-mamba.dts | 264 ++++++++++++++++++++++++++++++++++ @@ -46,13 +46,13 @@ Thanks for your contribution > + * is used, the CONFIG_DEBUG_MVEBU_UART_ALTERNATE option should be > + * used. > + * -> + * Copyright (C) 2014 Imre Kaloz <kaloz@openwrt.org> +> + * Copyright (C) 2014 Imre Kaloz <kaloz-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> > + * > + * Based on armada-xp-axpwifiap.dts: > + * > + * Copyright (C) 2013 Marvell > + * -> + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +> + * Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any @@ -102,19 +102,19 @@ Gregory > + status = "okay"; > + > + /* Etron EJ168 USB 3.0 controller */ -> + pcie at 1,0 { +> + pcie@1,0 { > + /* Port 0, Lane 0 */ > + status = "okay"; > + }; > + > + /* First mini-PCIe port */ -> + pcie at 2,0 { +> + pcie@2,0 { > + /* Port 0, Lane 1 */ > + status = "okay"; > + }; > + > + /* Second mini-PCIe port */ -> + pcie at 3,0 { +> + pcie@3,0 { > + /* Port 0, Lane 3 */ > + status = "okay"; > + }; @@ -157,17 +157,17 @@ Gregory > + }; > + }; > + -> + serial at 12000 { +> + serial@12000 { > + clock-frequency = <250000000>; > + status = "okay"; > + }; > + -> + sata at a0000 { +> + sata@a0000 { > + nr-ports = <1>; > + status = "okay"; > + }; > + -> + ethernet at 70000 { +> + ethernet@70000 { > + pinctrl-0 = <&pmx_ge0>; > + pinctrl-names = "default"; > + status = "okay"; @@ -178,7 +178,7 @@ Gregory > + }; > + }; > + -> + ethernet at 74000 { +> + ethernet@74000 { > + pinctrl-0 = <&pmx_ge1>; > + pinctrl-names = "default"; > + status = "okay"; @@ -190,21 +190,21 @@ Gregory > + }; > + > + /* USB part of the eSATA/USB 2.0 port */ -> + usb at 50000 { +> + usb@50000 { > + status = "okay"; > + }; > + -> + i2c at 11000 { +> + i2c@11000 { > + status = "okay"; > + clock-frequency = <100000>; > + -> + tmp421 at 4c { +> + tmp421@4c { > + compatible = "ti,tmp421"; > + reg = <0x4c>; > + }; > + }; > + -> + nand at d0000 { +> + nand@d0000 { > + status = "okay"; > + num-cs = <1>; > + marvell,nand-keep-config; @@ -213,61 +213,61 @@ Gregory > + nand-ecc-strength = <4>; > + nand-ecc-step-size = <512>; > + -> + partition at 0 { +> + partition@0 { > + label = "u-boot"; > + reg = <0x0000000 0x100000>; /* 1MB */ > + read-only; > + }; > + -> + partition at 100000 { +> + partition@100000 { > + label = "u_env"; > + reg = <0x100000 0x40000>; /* 256KB */ > + }; > + -> + partition at 140000 { +> + partition@140000 { > + label = "s_env"; > + reg = <0x140000 0x40000>; /* 256KB */ > + }; > + -> + partition at 900000 { +> + partition@900000 { > + label = "devinfo"; > + reg = <0x900000 0x100000>; /* 1MB */ > + read-only; > + }; > + -> + partition at a00000 { +> + partition@a00000 { > + label = "kernel1"; > + reg = <0xa00000 0x2800000>; /* 3MB + rootfs1 */ > + }; > + -> + partition at d00000 { +> + partition@d00000 { > + label = "rootfs1"; > + reg = <0xd00000 0x2500000>; /* 37MB */ > + }; > + -> + partition at 3200000 { +> + partition@3200000 { > + label = "kernel2"; > + reg = <0x3200000 0x2800000>; /* 3MB + rootfs2 */ > + }; > + -> + partition at 3500000 { +> + partition@3500000 { > + label = "rootfs2"; > + reg = <0x3500000 0x2500000>; /* 37MB */ > + }; > + > + /* Last MB is for the BBT, i.e. not writable */ -> + partition at 5a00000 { +> + partition@5a00000 { > + label = "syscfg"; > + reg = <0x5a00000 0x2600000>; /* 38MB */ > + }; > + }; > + -> + spi0: spi at 10600 { +> + spi0: spi@10600 { > + status = "okay"; > + pinctrl-0 = <&pmx_spi>; > + pinctrl-names = "default"; > + -> + spi-flash at 0 { +> + spi-flash@0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "mr25h256"; @@ -285,13 +285,13 @@ Gregory > + pinctrl-0 = <&pmx_keys>; > + pinctrl-names = "default"; > + -> + button at 1 { +> + button@1 { > + label = "WPS"; > + linux,code = <KEY_WPS_BUTTON>; > + gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; > + }; > + -> + button at 2 { +> + button@2 { > + label = "Factory Reset Button"; > + linux,code = <KEY_RESTART>; > + gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; @@ -327,3 +327,7 @@ Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com +-- +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 8f53ada..52b4e0b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,13 @@ "ref\01420806710-27619-1-git-send-email-kaloz@openwrt.org\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH] mvebu: add Linksys WRT1900AC (Mamba) support\0" + "ref\01420806710-27619-1-git-send-email-kaloz-p3rKhJxN3npAfugRpC6u6w@public.gmane.org\0" + "From\0Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Subject\0Re: [PATCH] mvebu: add Linksys WRT1900AC (Mamba) support\0" "Date\0Fri, 09 Jan 2015 13:46:27 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Imre Kaloz <kaloz-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>\0" + "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org\0" "\00:1\0" "b\0" "Hi Imre,\n" @@ -20,7 +25,7 @@ "Thanks for your contribution\n" "\n" "> \n" - "> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>\n" + "> Signed-off-by: Imre Kaloz <kaloz-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/Makefile | 1 +\n" "> arch/arm/boot/dts/armada-xp-mamba.dts | 264 ++++++++++++++++++++++++++++++++++\n" @@ -53,13 +58,13 @@ "> + * is used, the CONFIG_DEBUG_MVEBU_UART_ALTERNATE option should be\n" "> + * used.\n" "> + *\n" - "> + * Copyright (C) 2014 Imre Kaloz <kaloz@openwrt.org>\n" + "> + * Copyright (C) 2014 Imre Kaloz <kaloz-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>\n" "> + *\n" "> + * Based on armada-xp-axpwifiap.dts:\n" "> + *\n" "> + * Copyright (C) 2013 Marvell\n" "> + *\n" - "> + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>\n" + "> + * Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "> + *\n" "> + * This file is licensed under the terms of the GNU General Public\n" "> + * License version 2. This program is licensed \"as is\" without any\n" @@ -109,19 +114,19 @@ "> +\t\t\tstatus = \"okay\";\n" "> +\n" "> +\t\t\t/* Etron EJ168 USB 3.0 controller */\n" - "> +\t\t\tpcie at 1,0 {\n" + "> +\t\t\tpcie@1,0 {\n" "> +\t\t\t\t/* Port 0, Lane 0 */\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* First mini-PCIe port */\n" - "> +\t\t\tpcie at 2,0 {\n" + "> +\t\t\tpcie@2,0 {\n" "> +\t\t\t\t/* Port 0, Lane 1 */\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* Second mini-PCIe port */\n" - "> +\t\t\tpcie at 3,0 {\n" + "> +\t\t\tpcie@3,0 {\n" "> +\t\t\t\t/* Port 0, Lane 3 */\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" @@ -164,17 +169,17 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tserial at 12000 {\n" + "> +\t\t\tserial@12000 {\n" "> +\t\t\t\tclock-frequency = <250000000>;\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tsata at a0000 {\n" + "> +\t\t\tsata@a0000 {\n" "> +\t\t\t\tnr-ports = <1>;\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tethernet at 70000 {\n" + "> +\t\t\tethernet@70000 {\n" "> +\t\t\t\tpinctrl-0 = <&pmx_ge0>;\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\t\tstatus = \"okay\";\n" @@ -185,7 +190,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tethernet at 74000 {\n" + "> +\t\t\tethernet@74000 {\n" "> +\t\t\t\tpinctrl-0 = <&pmx_ge1>;\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\t\tstatus = \"okay\";\n" @@ -197,21 +202,21 @@ "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* USB part of the eSATA/USB 2.0 port */\n" - "> +\t\t\tusb at 50000 {\n" + "> +\t\t\tusb@50000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c at 11000 {\n" + "> +\t\t\ti2c@11000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\tclock-frequency = <100000>;\n" "> +\n" - "> +\t\t\t\ttmp421 at 4c {\n" + "> +\t\t\t\ttmp421@4c {\n" "> +\t\t\t\t\tcompatible = \"ti,tmp421\";\n" "> +\t\t\t\t\treg = <0x4c>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tnand at d0000 {\n" + "> +\t\t\tnand@d0000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\tnum-cs = <1>;\n" "> +\t\t\t\tmarvell,nand-keep-config;\n" @@ -220,61 +225,61 @@ "> +\t\t\t\tnand-ecc-strength = <4>;\n" "> +\t\t\t\tnand-ecc-step-size = <512>;\n" "> +\n" - "> +\t\t\t\tpartition at 0 {\n" + "> +\t\t\t\tpartition@0 {\n" "> +\t\t\t\t\tlabel = \"u-boot\";\n" "> +\t\t\t\t\treg = <0x0000000 0x100000>; /* 1MB */\n" "> +\t\t\t\t\tread-only;\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tpartition at 100000 {\n" + "> +\t\t\t\tpartition@100000 {\n" "> +\t\t\t\t\tlabel = \"u_env\";\n" "> +\t\t\t\t\treg = <0x100000 0x40000>; /* 256KB */\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tpartition at 140000 {\n" + "> +\t\t\t\tpartition@140000 {\n" "> +\t\t\t\t\tlabel = \"s_env\";\n" "> +\t\t\t\t\treg = <0x140000 0x40000>; /* 256KB */\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tpartition at 900000 {\n" + "> +\t\t\t\tpartition@900000 {\n" "> +\t\t\t\t\tlabel = \"devinfo\";\n" "> +\t\t\t\t\treg = <0x900000 0x100000>; /* 1MB */\n" "> +\t\t\t\t\tread-only;\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tpartition at a00000 {\n" + "> +\t\t\t\tpartition@a00000 {\n" "> +\t\t\t\t\tlabel = \"kernel1\";\n" "> +\t\t\t\t\treg = <0xa00000 0x2800000>; /* 3MB + rootfs1 */\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tpartition at d00000 {\n" + "> +\t\t\t\tpartition@d00000 {\n" "> +\t\t\t\t\tlabel = \"rootfs1\";\n" "> +\t\t\t\t\treg = <0xd00000 0x2500000>; /* 37MB */\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tpartition at 3200000 {\n" + "> +\t\t\t\tpartition@3200000 {\n" "> +\t\t\t\t\tlabel = \"kernel2\";\n" "> +\t\t\t\t\treg = <0x3200000 0x2800000>; /* 3MB + rootfs2 */\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tpartition at 3500000 {\n" + "> +\t\t\t\tpartition@3500000 {\n" "> +\t\t\t\t\tlabel = \"rootfs2\";\n" "> +\t\t\t\t\treg = <0x3500000 0x2500000>; /* 37MB */\n" "> +\t\t\t\t};\n" "> +\n" "> +\t\t\t\t/* Last MB is for the BBT, i.e. not writable */\n" - "> +\t\t\t\tpartition at 5a00000 {\n" + "> +\t\t\t\tpartition@5a00000 {\n" "> +\t\t\t\t\tlabel = \"syscfg\";\n" "> +\t\t\t\t\treg = <0x5a00000 0x2600000>; /* 38MB */\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tspi0: spi at 10600 {\n" + "> +\t\t\tspi0: spi@10600 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\tpinctrl-0 = <&pmx_spi>;\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" "> +\n" - "> +\t\t\t\tspi-flash at 0 {\n" + "> +\t\t\t\tspi-flash@0 {\n" "> +\t\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t\t#size-cells = <1>;\n" "> +\t\t\t\t\tcompatible = \"mr25h256\";\n" @@ -292,13 +297,13 @@ "> +\t\tpinctrl-0 = <&pmx_keys>;\n" "> +\t\tpinctrl-names = \"default\";\n" "> +\n" - "> +\t\tbutton at 1 {\n" + "> +\t\tbutton@1 {\n" "> +\t\t\tlabel = \"WPS\";\n" "> +\t\t\tlinux,code = <KEY_WPS_BUTTON>;\n" "> +\t\t\tgpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tbutton at 2 {\n" + "> +\t\tbutton@2 {\n" "> +\t\t\tlabel = \"Factory Reset Button\";\n" "> +\t\t\tlinux,code = <KEY_RESTART>;\n" "> +\t\t\tgpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;\n" @@ -333,6 +338,10 @@ "Gregory Clement, Free Electrons\n" "Kernel, drivers, real-time and embedded Linux\n" "development, consulting, training and support.\n" - http://free-electrons.com + "http://free-electrons.com\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 -c09eec5ec3f3df8254edbedd2bdc60220034d73bfb8ba438d419ec1c18856628 +2bd2b5459e0807d9ddddca8144b027bac03f6e2a431baf56445764b377968d9c
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.