diff for duplicates of <20150206172153.GY25985@lunn.ch> diff --git a/a/1.txt b/N1/1.txt index 14c2630..2f6cb68 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -106,7 +106,7 @@ On Fri, Feb 06, 2015 at 04:57:55PM +0100, Thomas Petazzoni wrote: > +/ { > + soc { > + internal-regs { -> + pinctrl@18000 { +> + pinctrl at 18000 { > + compatible = "marvell,mv88f6920-pinctrl"; > + reg = <0x18000 0x20>; > + }; @@ -190,14 +190,14 @@ serial ports. > + MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>; > + > + internal-regs { -> + i2c@11000 { +> + i2c at 11000 { > + pinctrl-0 = <&i2c0_pins>; > + pinctrl-names = "default"; > + status = "okay"; > + clock-frequency = <100000>; > + }; > + -> + serial@12000 { +> + serial at 12000 { > + pinctrl-0 = <&uart0_pins>; > + pinctrl-names = "default"; > + status = "okay"; @@ -206,13 +206,13 @@ serial ports. Tab vs space issue here somewhere? Probably the i2c node. -> + serial@12100 { +> + serial at 12100 { > + pinctrl-0 = <&uart1_pins>; > + pinctrl-names = "default"; > + status = "okay"; > + }; > + -> + pinctrl@18000 { +> + pinctrl at 18000 { > + uart0_pins: uart0-pins { > + marvell,pins = "mpp0", "mpp1"; > + marvell,function = "ua0"; @@ -235,15 +235,15 @@ reference design. > + pcie-controller { > + status = "okay"; > + -> + pcie@1,0 { +> + pcie at 1,0 { > + status = "okay"; > + }; > + -> + pcie@2,0 { +> + pcie at 2,0 { > + status = "okay"; > + }; > + -> + pcie@3,0 { +> + pcie at 3,0 { > + status = "okay"; > + }; > + }; @@ -308,7 +308,7 @@ reference design. > + > + soc { > + internal-regs { -> + pinctrl@18000 { +> + pinctrl at 18000 { > + compatible = "marvell,mv88f6928-pinctrl"; > + reg = <0x18000 0x20>; > + }; @@ -382,12 +382,12 @@ reference design. > + #size-cells = <0>; > + enable-method = "marvell,armada-390-smp"; > + -> + cpu@0 { +> + cpu at 0 { > + device_type = "cpu"; > + compatible = "arm,cortex-a9"; > + reg = <0>; > + }; -> + cpu@1 { +> + cpu at 1 { > + device_type = "cpu"; > + compatible = "arm,cortex-a9"; > + reg = <1>; @@ -415,19 +415,19 @@ reference design. > + #size-cells = <1>; > + ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>; > + -> + scu@c000 { +> + scu at c000 { > + compatible = "arm,cortex-a9-scu"; > + reg = <0xc000 0x100>; > + }; > + -> + timer@c600 { +> + timer at c600 { > + compatible = "arm,cortex-a9-twd-timer"; > + reg = <0xc600 0x20>; > + interrupts = <GIC_PPI 13 (IRQ_TYPE_EDGE_RISING | GIC_CPU_MASK_SIMPLE(2))>; > + clocks = <&coreclk 2>; > + }; > + -> + gic: interrupt-controller@d000 { +> + gic: interrupt-controller at d000 { > + compatible = "arm,cortex-a9-gic"; > + #interrupt-cells = <3>; > + #size-cells = <0>; @@ -436,7 +436,7 @@ reference design. > + <0xc100 0x100>; > + }; > + -> + i2c0: i2c@11000 { +> + i2c0: i2c at 11000 { > + compatible = "marvell,mv64xxx-i2c"; > + reg = <0x11000 0x20>; > + #address-cells = <1>; @@ -447,7 +447,7 @@ reference design. > + status = "disabled"; > + }; > + -> + i2c1: i2c@11100 { +> + i2c1: i2c at 11100 { > + compatible = "marvell,mv64xxx-i2c"; > + reg = <0x11100 0x20>; > + #address-cells = <1>; @@ -458,7 +458,7 @@ reference design. > + status = "disabled"; > + }; > + -> + i2c2: i2c@11200 { +> + i2c2: i2c at 11200 { > + compatible = "marvell,mv64xxx-i2c"; > + reg = <0x11200 0x20>; > + #address-cells = <1>; @@ -469,7 +469,7 @@ reference design. > + status = "disabled"; > + }; > + -> + i2c3: i2c@11300 { +> + i2c3: i2c at 11300 { > + compatible = "marvell,mv64xxx-i2c"; > + reg = <0x11300 0x20>; > + #address-cells = <1>; @@ -480,7 +480,7 @@ reference design. > + status = "disabled"; > + }; > + -> + serial@12000 { +> + serial at 12000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x12000 0x100>; > + reg-shift = <2>; @@ -490,7 +490,7 @@ reference design. > + status = "disabled"; > + }; > + -> + serial@12100 { +> + serial at 12100 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x12100 0x100>; > + reg-shift = <2>; @@ -500,7 +500,7 @@ reference design. > + status = "disabled"; > + }; > + -> + serial@12200 { +> + serial at 12200 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x12200 0x100>; > + reg-shift = <2>; @@ -510,7 +510,7 @@ reference design. > + status = "disabled"; > + }; > + -> + serial@12300 { +> + serial at 12300 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x12300 0x100>; > + reg-shift = <2>; @@ -520,38 +520,38 @@ reference design. > + status = "disabled"; > + }; > + -> + pinctrl@18000 { +> + pinctrl at 18000 { > + i2c0_pins: i2c0-pins { > + marvell,pins = "mpp2", "mpp3"; > + marvell,function = "i2c0"; > + }; > + }; > + -> + system-controller@18200 { +> + system-controller at 18200 { > + compatible = "marvell,armada-390-system-controller", > + "marvell,armada-370-xp-system-controller"; > + reg = <0x18200 0x100>; > + }; > + -> + gateclk: clock-gating-control@18220 { +> + gateclk: clock-gating-control at 18220 { > + compatible = "marvell,armada-390-gating-clock"; > + reg = <0x18220 0x4>; > + clocks = <&coreclk 0>; > + #clock-cells = <1>; > + }; > + -> + coreclk: mvebu-sar@18600 { +> + coreclk: mvebu-sar at 18600 { > + compatible = "marvell,armada-390-core-clock"; > + reg = <0x18600 0x04>; > + #clock-cells = <1>; > + }; > + -> + mbusc: mbus-controller@20000 { +> + mbusc: mbus-controller at 20000 { > + compatible = "marvell,mbus-controller"; > + reg = <0x20000 0x100>, <0x20180 0x20>, <0x20250 0x8>; > + }; > + -> + mpic: interrupt-controller@20000 { +> + mpic: interrupt-controller at 20000 { > + compatible = "marvell,mpic"; > + reg = <0x20a00 0x2d0>, <0x21070 0x58>; > + #interrupt-cells = <1>; @@ -561,7 +561,7 @@ reference design. > + interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + timer@20300 { +> + timer at 20300 { > + compatible = "marvell,armada-380-timer", > + "marvell,armada-xp-timer"; > + reg = <0x20300 0x30>, <0x21040 0x30>; @@ -575,12 +575,12 @@ reference design. > + clock-names = "nbclk", "fixed"; > + }; > + -> + cpurst@20800 { +> + cpurst at 20800 { > + compatible = "marvell,armada-370-cpu-reset"; > + reg = <0x20800 0x10>; > + }; > + -> + pmsu@22000 { +> + pmsu at 22000 { > + compatible = "marvell,armada-390-pmsu", > + "marvell,armada-380-pmsu"; > + reg = <0x22000 0x1000>; @@ -615,9 +615,9 @@ reference design. > + /* > + * This port can be either x4 or x1. When > + * configured in x4 by the bootloader, then -> + * pcie@4,0 is not available. +> + * pcie at 4,0 is not available. > + */ -> + pcie@1,0 { +> + pcie at 1,0 { > + device_type = "pci"; > + assigned-addresses = <0x82000800 0 0x80000 0 0x2000>; > + reg = <0x0800 0 0 0 0>; @@ -635,7 +635,7 @@ reference design. > + }; > + > + /* x1 port */ -> + pcie@2,0 { +> + pcie at 2,0 { > + device_type = "pci"; > + assigned-addresses = <0x82000800 0 0x40000 0 0x2000>; > + reg = <0x1000 0 0 0 0>; @@ -653,7 +653,7 @@ reference design. > + }; > + > + /* x1 port */ -> + pcie@3,0 { +> + pcie at 3,0 { > + device_type = "pci"; > + assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; > + reg = <0x1800 0 0 0 0>; @@ -671,10 +671,10 @@ reference design. > + }; > + > + /* -> + * x1 port only available when pcie@1,0 is +> + * x1 port only available when pcie at 1,0 is > + * configured as a x1 port > + */ -> + pcie@4,0 { +> + pcie at 4,0 { > + device_type = "pci"; > + assigned-addresses = <0x82000800 0 0x48000 0 0x2000>; > + reg = <0x2000 0 0 0 0>; diff --git a/a/content_digest b/N1/content_digest index 59ea322..7bf7d1e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,28 +1,9 @@ "ref\01423238276-9206-1-git-send-email-thomas.petazzoni@free-electrons.com\0" "ref\01423238276-9206-10-git-send-email-thomas.petazzoni@free-electrons.com\0" - "From\0Andrew Lunn <andrew@lunn.ch>\0" - "Subject\0Re: [PATCH 09/10] ARM: mvebu: add Device Tree files for Armada 39x SoC and board\0" + "From\0andrew@lunn.ch (Andrew Lunn)\0" + "Subject\0[PATCH 09/10] ARM: mvebu: add Device Tree files for Armada 39x SoC and board\0" "Date\0Fri, 6 Feb 2015 18:21:53 +0100\0" - "To\0Thomas Petazzoni <thomas.petazzoni@free-electrons.com>\0" - "Cc\0Jason Cooper <jason@lakedaemon.net>" - Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - Gregory Clement <gregory.clement@free-electrons.com> - devicetree@vger.kernel.org - Rob Herring <robh+dt@kernel.org> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Kumar Gala <galak@codeaurora.org> - Mike Turquette <mturquette@linaro.org> - Stephen Boyd <sboyd@codeaurora.org> - Linus Walleij <linus.walleij@linaro.org> - linux-arm-kernel@lists.infradead.org - linux-gpio@vger.kernel.org - Tawfik Bayouk <tawfik@marvell.com> - Nadav Haklai <nadavh@marvell.com> - Lior Amsalem <alior@marvell.com> - Ezequiel Garcia <ezequiel.garcia@free-electrons.com> - " Maxime Ripard <maxime.ripard@free-electrons.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, Feb 06, 2015 at 04:57:55PM +0100, Thomas Petazzoni wrote:\n" @@ -133,7 +114,7 @@ "> +/ {\n" "> +\tsoc {\n" "> +\t\tinternal-regs {\n" - "> +\t\t\tpinctrl@18000 {\n" + "> +\t\t\tpinctrl at 18000 {\n" "> +\t\t\t\tcompatible = \"marvell,mv88f6920-pinctrl\";\n" "> +\t\t\t\treg = <0x18000 0x20>;\n" "> +\t\t\t};\n" @@ -217,14 +198,14 @@ "> +\t\t\t MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;\n" "> +\n" "> +\t\tinternal-regs {\n" - "> + i2c@11000 {\n" + "> + i2c at 11000 {\n" "> +\t\t\t\tpinctrl-0 = <&i2c0_pins>;\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" "> + status = \"okay\";\n" "> + clock-frequency = <100000>;\n" "> + };\n" "> +\n" - "> +\t\t\tserial@12000 {\n" + "> +\t\t\tserial at 12000 {\n" "> +\t\t\t\tpinctrl-0 = <&uart0_pins>;\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\t\tstatus = \"okay\";\n" @@ -233,13 +214,13 @@ "\n" "Tab vs space issue here somewhere? Probably the i2c node.\n" "\n" - "> +\t\t\tserial@12100 {\n" + "> +\t\t\tserial at 12100 {\n" "> +\t\t\t\tpinctrl-0 = <&uart1_pins>;\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tpinctrl@18000 {\n" + "> +\t\t\tpinctrl at 18000 {\n" "> +\t\t\t\tuart0_pins: uart0-pins {\n" "> +\t\t\t\t\tmarvell,pins = \"mpp0\", \"mpp1\";\n" "> +\t\t\t\t\tmarvell,function = \"ua0\";\n" @@ -262,15 +243,15 @@ "> +\t\tpcie-controller {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\tpcie@1,0 {\n" + "> +\t\t\tpcie at 1,0 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tpcie@2,0 {\n" + "> +\t\t\tpcie at 2,0 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tpcie@3,0 {\n" + "> +\t\t\tpcie at 3,0 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\t\t};\n" @@ -335,7 +316,7 @@ "> +\n" "> +\tsoc {\n" "> +\t\tinternal-regs {\n" - "> +\t\t\tpinctrl@18000 {\n" + "> +\t\t\tpinctrl at 18000 {\n" "> +\t\t\t\tcompatible = \"marvell,mv88f6928-pinctrl\";\n" "> +\t\t\t\treg = <0x18000 0x20>;\n" "> +\t\t\t};\n" @@ -409,12 +390,12 @@ "> +\t\t#size-cells = <0>;\n" "> +\t\tenable-method = \"marvell,armada-390-smp\";\n" "> +\n" - "> +\t\tcpu@0 {\n" + "> +\t\tcpu at 0 {\n" "> +\t\t\tdevice_type = \"cpu\";\n" "> +\t\t\tcompatible = \"arm,cortex-a9\";\n" "> +\t\t\treg = <0>;\n" "> +\t\t};\n" - "> +\t\tcpu@1 {\n" + "> +\t\tcpu at 1 {\n" "> +\t\t\tdevice_type = \"cpu\";\n" "> +\t\t\tcompatible = \"arm,cortex-a9\";\n" "> +\t\t\treg = <1>;\n" @@ -442,19 +423,19 @@ "> +\t\t\t#size-cells = <1>;\n" "> +\t\t\tranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;\n" "> +\n" - "> +\t\t\tscu@c000 {\n" + "> +\t\t\tscu at c000 {\n" "> +\t\t\t\tcompatible = \"arm,cortex-a9-scu\";\n" "> +\t\t\t\treg = <0xc000 0x100>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ttimer@c600 {\n" + "> +\t\t\ttimer at c600 {\n" "> +\t\t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> +\t\t\t\treg = <0xc600 0x20>;\n" "> +\t\t\t\tinterrupts = <GIC_PPI 13 (IRQ_TYPE_EDGE_RISING | GIC_CPU_MASK_SIMPLE(2))>;\n" "> +\t\t\t\tclocks = <&coreclk 2>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tgic: interrupt-controller@d000 {\n" + "> +\t\t\tgic: interrupt-controller at d000 {\n" "> +\t\t\t\tcompatible = \"arm,cortex-a9-gic\";\n" "> +\t\t\t\t#interrupt-cells = <3>;\n" "> +\t\t\t\t#size-cells = <0>;\n" @@ -463,7 +444,7 @@ "> +\t\t\t\t <0xc100 0x100>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c0: i2c@11000 {\n" + "> +\t\t\ti2c0: i2c at 11000 {\n" "> +\t\t\t\tcompatible = \"marvell,mv64xxx-i2c\";\n" "> +\t\t\t\treg = <0x11000 0x20>;\n" "> +\t\t\t\t#address-cells = <1>;\n" @@ -474,7 +455,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1: i2c@11100 {\n" + "> +\t\t\ti2c1: i2c at 11100 {\n" "> +\t\t\t\tcompatible = \"marvell,mv64xxx-i2c\";\n" "> +\t\t\t\treg = <0x11100 0x20>;\n" "> +\t\t\t\t#address-cells = <1>;\n" @@ -485,7 +466,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c2: i2c@11200 {\n" + "> +\t\t\ti2c2: i2c at 11200 {\n" "> +\t\t\t\tcompatible = \"marvell,mv64xxx-i2c\";\n" "> +\t\t\t\treg = <0x11200 0x20>;\n" "> +\t\t\t\t#address-cells = <1>;\n" @@ -496,7 +477,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c3: i2c@11300 {\n" + "> +\t\t\ti2c3: i2c at 11300 {\n" "> +\t\t\t\tcompatible = \"marvell,mv64xxx-i2c\";\n" "> +\t\t\t\treg = <0x11300 0x20>;\n" "> +\t\t\t\t#address-cells = <1>;\n" @@ -507,7 +488,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tserial@12000 {\n" + "> +\t\t\tserial at 12000 {\n" "> +\t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\t\treg = <0x12000 0x100>;\n" "> +\t\t\t\treg-shift = <2>;\n" @@ -517,7 +498,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tserial@12100 {\n" + "> +\t\t\tserial at 12100 {\n" "> +\t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\t\treg = <0x12100 0x100>;\n" "> +\t\t\t\treg-shift = <2>;\n" @@ -527,7 +508,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tserial@12200 {\n" + "> +\t\t\tserial at 12200 {\n" "> +\t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\t\treg = <0x12200 0x100>;\n" "> +\t\t\t\treg-shift = <2>;\n" @@ -537,7 +518,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tserial@12300 {\n" + "> +\t\t\tserial at 12300 {\n" "> +\t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\t\treg = <0x12300 0x100>;\n" "> +\t\t\t\treg-shift = <2>;\n" @@ -547,38 +528,38 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tpinctrl@18000 {\n" + "> +\t\t\tpinctrl at 18000 {\n" "> +\t\t\t\ti2c0_pins: i2c0-pins {\n" "> +\t\t\t\t\tmarvell,pins = \"mpp2\", \"mpp3\";\n" "> +\t\t\t\t\tmarvell,function = \"i2c0\";\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tsystem-controller@18200 {\n" + "> +\t\t\tsystem-controller at 18200 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-390-system-controller\",\n" "> +\t\t\t\t\t \"marvell,armada-370-xp-system-controller\";\n" "> +\t\t\t\treg = <0x18200 0x100>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tgateclk: clock-gating-control@18220 {\n" + "> +\t\t\tgateclk: clock-gating-control at 18220 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-390-gating-clock\";\n" "> +\t\t\t\treg = <0x18220 0x4>;\n" "> +\t\t\t\tclocks = <&coreclk 0>;\n" "> +\t\t\t\t#clock-cells = <1>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tcoreclk: mvebu-sar@18600 {\n" + "> +\t\t\tcoreclk: mvebu-sar at 18600 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-390-core-clock\";\n" "> +\t\t\t\treg = <0x18600 0x04>;\n" "> +\t\t\t\t#clock-cells = <1>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmbusc: mbus-controller@20000 {\n" + "> +\t\t\tmbusc: mbus-controller at 20000 {\n" "> +\t\t\t\tcompatible = \"marvell,mbus-controller\";\n" "> +\t\t\t\treg = <0x20000 0x100>, <0x20180 0x20>, <0x20250 0x8>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmpic: interrupt-controller@20000 {\n" + "> +\t\t\tmpic: interrupt-controller at 20000 {\n" "> +\t\t\t\tcompatible = \"marvell,mpic\";\n" "> +\t\t\t\treg = <0x20a00 0x2d0>, <0x21070 0x58>;\n" "> +\t\t\t\t#interrupt-cells = <1>;\n" @@ -588,7 +569,7 @@ "> +\t\t\t\tinterrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ttimer@20300 {\n" + "> +\t\t\ttimer at 20300 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-380-timer\",\n" "> +\t\t\t\t\t \"marvell,armada-xp-timer\";\n" "> +\t\t\t\treg = <0x20300 0x30>, <0x21040 0x30>;\n" @@ -602,12 +583,12 @@ "> +\t\t\t\tclock-names = \"nbclk\", \"fixed\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tcpurst@20800 {\n" + "> +\t\t\tcpurst at 20800 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-370-cpu-reset\";\n" "> +\t\t\t\treg = <0x20800 0x10>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tpmsu@22000 {\n" + "> +\t\t\tpmsu at 22000 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-390-pmsu\",\n" "> +\t\t\t\t\t \"marvell,armada-380-pmsu\";\n" "> +\t\t\t\treg = <0x22000 0x1000>;\n" @@ -642,9 +623,9 @@ "> +\t\t\t/*\n" "> +\t\t\t * This port can be either x4 or x1. When\n" "> +\t\t\t * configured in x4 by the bootloader, then\n" - "> +\t\t\t * pcie@4,0 is not available.\n" + "> +\t\t\t * pcie at 4,0 is not available.\n" "> +\t\t\t */\n" - "> +\t\t\tpcie@1,0 {\n" + "> +\t\t\tpcie at 1,0 {\n" "> +\t\t\t\tdevice_type = \"pci\";\n" "> +\t\t\t\tassigned-addresses = <0x82000800 0 0x80000 0 0x2000>;\n" "> +\t\t\t\treg = <0x0800 0 0 0 0>;\n" @@ -662,7 +643,7 @@ "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* x1 port */\n" - "> +\t\t\tpcie@2,0 {\n" + "> +\t\t\tpcie at 2,0 {\n" "> +\t\t\t\tdevice_type = \"pci\";\n" "> +\t\t\t\tassigned-addresses = <0x82000800 0 0x40000 0 0x2000>;\n" "> +\t\t\t\treg = <0x1000 0 0 0 0>;\n" @@ -680,7 +661,7 @@ "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* x1 port */\n" - "> +\t\t\tpcie@3,0 {\n" + "> +\t\t\tpcie at 3,0 {\n" "> +\t\t\t\tdevice_type = \"pci\";\n" "> +\t\t\t\tassigned-addresses = <0x82000800 0 0x44000 0 0x2000>;\n" "> +\t\t\t\treg = <0x1800 0 0 0 0>;\n" @@ -698,10 +679,10 @@ "> +\t\t\t};\n" "> +\n" "> +\t\t\t/*\n" - "> +\t\t\t * x1 port only available when pcie@1,0 is\n" + "> +\t\t\t * x1 port only available when pcie at 1,0 is\n" "> +\t\t\t * configured as a x1 port\n" "> +\t\t\t */\n" - "> +\t\t\tpcie@4,0 {\n" + "> +\t\t\tpcie at 4,0 {\n" "> +\t\t\t\tdevice_type = \"pci\";\n" "> +\t\t\t\tassigned-addresses = <0x82000800 0 0x48000 0 0x2000>;\n" "> +\t\t\t\treg = <0x2000 0 0 0 0>;\n" @@ -724,4 +705,4 @@ "> 2.1.0\n" > -d62a486fe26899b81051e306355854bfeee907f47cb5aa27e45376756566d17b +5dae5abde387e33ec9104db40fb36008381e715eda74de1b6357d839fffeb31b
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.