diff for duplicates of <53FE21C9.7060909@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 84f7b4d..dd63976 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,17 +15,17 @@ are adding, so we can match them. > }; > }; > -> + nvram0: nvram@0 { +> + nvram0: nvram at 0 { > + compatible = "brcm,bcm47xx-nvram"; > + reg = <0x1c000000 0x01000000>; > + }; > + -> + sprom0: sprom@0 { +> + sprom0: sprom at 0 { > + compatible = "brcm,bcm47xx-sprom"; > + nvram = <&nvram0>; > + }; > + -> + aix@18000000 { +> + aix at 18000000 { > + compatible = "brcm,bus-aix"; > + reg = <0x18000000 0x1000>; > + ranges = <0x00000000 0x18000000 0x00100000>; @@ -33,42 +33,42 @@ are adding, so we can match them. > + #size-cells = <1>; > + sprom = <&sprom0>; > + -> + usb2@0 { +> + usb2 at 0 { > + reg = <0x18021000 0x1000>; > + interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + usb3@0 { +> + usb3 at 0 { > + reg = <0x18023000 0x1000>; > + interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + gmac@0 { +> + gmac at 0 { > + reg = <0x18024000 0x1000>; > + interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + gmac@1 { +> + gmac at 1 { > + reg = <0x18025000 0x1000>; > + interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + gmac@2 { +> + gmac at 2 { > + reg = <0x18026000 0x1000>; > + interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + gmac@3 { +> + gmac at 3 { > + reg = <0x18027000 0x1000>; > + interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + pcie@0 { +> + pcie at 0 { > + reg = <0x18012000 0x1000>; > + interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + pcie@1 { +> + pcie at 1 { > + reg = <0x18013000 0x1000>; > + interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>; > + }; diff --git a/a/content_digest b/N1/content_digest index e63a0ac..ec006fe 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,9 @@ "ref\01408915485-8078-1-git-send-email-hauke@hauke-m.de\0" "ref\01408915485-8078-9-git-send-email-hauke@hauke-m.de\0" - "From\0Florian Fainelli <f.fainelli@gmail.com>\0" - "Subject\0Re: [RFC 7/7] ARM: BCM5301X: register bcma bus\0" + "From\0f.fainelli@gmail.com (Florian Fainelli)\0" + "Subject\0[RFC 7/7] ARM: BCM5301X: register bcma bus\0" "Date\0Wed, 27 Aug 2014 11:22:01 -0700\0" - "To\0Hauke Mehrtens <hauke@hauke-m.de>" - linux-wireless@vger.kernel.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-mips@linux-mips.org\0" - "Cc\0zajec5@gmail.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 08/24/2014 02:24 PM, Hauke Mehrtens wrote:\n" @@ -28,17 +23,17 @@ "> \t\t};\n" "> \t};\n" "> \n" - "> +\tnvram0: nvram@0 {\n" + "> +\tnvram0: nvram at 0 {\n" "> +\t\tcompatible = \"brcm,bcm47xx-nvram\";\n" "> +\t\treg = <0x1c000000 0x01000000>;\n" "> +\t};\n" "> +\n" - "> +\tsprom0: sprom@0 {\n" + "> +\tsprom0: sprom at 0 {\n" "> +\t\tcompatible = \"brcm,bcm47xx-sprom\";\n" "> +\t\tnvram = <&nvram0>;\n" "> +\t};\n" "> +\n" - "> +\taix@18000000 {\n" + "> +\taix at 18000000 {\n" "> +\t\tcompatible = \"brcm,bus-aix\";\n" "> +\t\treg = <0x18000000 0x1000>;\n" "> +\t\tranges = <0x00000000 0x18000000 0x00100000>;\n" @@ -46,42 +41,42 @@ "> +\t\t#size-cells = <1>;\n" "> +\t\tsprom = <&sprom0>;\n" "> +\n" - "> +\t\tusb2@0 {\n" + "> +\t\tusb2 at 0 {\n" "> +\t\t\treg = <0x18021000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb3@0 {\n" + "> +\t\tusb3 at 0 {\n" "> +\t\t\treg = <0x18023000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tgmac@0 {\n" + "> +\t\tgmac at 0 {\n" "> +\t\t\treg = <0x18024000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tgmac@1 {\n" + "> +\t\tgmac at 1 {\n" "> +\t\t\treg = <0x18025000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tgmac@2 {\n" + "> +\t\tgmac at 2 {\n" "> +\t\t\treg = <0x18026000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tgmac@3 {\n" + "> +\t\tgmac at 3 {\n" "> +\t\t\treg = <0x18027000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tpcie@0 {\n" + "> +\t\tpcie at 0 {\n" "> +\t\t\treg = <0x18012000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tpcie@1 {\n" + "> +\t\tpcie at 1 {\n" "> +\t\t\treg = <0x18013000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t};\n" @@ -89,4 +84,4 @@ "> };\n" > -caac51afe26a918ba5fa23b0f3306555554bbd8e47b10d910924b3d743d796b4 +4bc1b9852272532203b3fac99207609a766ce1588a3e07f33ca1f9cf9746c64e
diff --git a/a/1.txt b/N2/1.txt index 84f7b4d..4a7e9cb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -74,4 +74,9 @@ are adding, so we can match them. > + }; > + }; > }; -> +> + +-- +To unsubscribe from this list: send the line "unsubscribe linux-wireless" 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/N2/content_digest index e63a0ac..7f349bb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,15 @@ "ref\01408915485-8078-1-git-send-email-hauke@hauke-m.de\0" "ref\01408915485-8078-9-git-send-email-hauke@hauke-m.de\0" - "From\0Florian Fainelli <f.fainelli@gmail.com>\0" + "ref\01408915485-8078-9-git-send-email-hauke-5/S+JYg5SzeELgA04lAiVw@public.gmane.org\0" + "From\0Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Subject\0Re: [RFC 7/7] ARM: BCM5301X: register bcma bus\0" "Date\0Wed, 27 Aug 2014 11:22:01 -0700\0" - "To\0Hauke Mehrtens <hauke@hauke-m.de>" - linux-wireless@vger.kernel.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-mips@linux-mips.org\0" - "Cc\0zajec5@gmail.com\0" + "To\0Hauke Mehrtens <hauke-5/S+JYg5SzeELgA04lAiVw@public.gmane.org>" + linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org\0" + "Cc\0zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" "\00:1\0" "b\0" "On 08/24/2014 02:24 PM, Hauke Mehrtens wrote:\n" @@ -87,6 +88,11 @@ "> +\t\t};\n" "> +\t};\n" "> };\n" - > + "> \n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-wireless\" 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 -caac51afe26a918ba5fa23b0f3306555554bbd8e47b10d910924b3d743d796b4 +d6b1561ce17a185db7b3815560bfa2bb140d26cf3598627d7db95339bec6c5f5
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.