diff for duplicates of <55FB65E0.50407@gmail.com> diff --git a/a/1.txt b/N1/1.txt index bd8d31f..b91e3e3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -56,13 +56,13 @@ picking that up earlier. > > /include/ "bcm-cygnus-clock.dtsi" > -> - pinctrl: pinctrl at 0x0301d0c8 { +> - pinctrl: pinctrl@0x0301d0c8 { > - compatible = "brcm,cygnus-pinmux"; > - reg = <0x0301d0c8 0x30>, > - <0x0301d24c 0x2c>; > - }; > - -> - gpio_crmu: gpio at 03024800 { +> - gpio_crmu: gpio@03024800 { > - compatible = "brcm,cygnus-crmu-gpio"; > - reg = <0x03024800 0x50>, > - <0x03024008 0x18>; @@ -70,7 +70,7 @@ picking that up earlier. > - gpio-controller; > - }; > - -> - gpio_ccm: gpio at 1800a000 { +> - gpio_ccm: gpio@1800a000 { > - compatible = "brcm,cygnus-ccm-gpio"; > - reg = <0x1800a000 0x50>, > - <0x0301d164 0x20>; @@ -85,12 +85,12 @@ picking that up earlier. > + #address-cells = <1>; > + #size-cells = <1>; > -> - gpio_asiu: gpio at 180a5000 { +> - gpio_asiu: gpio@180a5000 { > - compatible = "brcm,cygnus-asiu-gpio"; > - reg = <0x180a5000 0x668>; > - #gpio-cells = <2>; > - gpio-controller; -> + timer at 19020200 { +> + timer@19020200 { > + compatible = "arm,cortex-a9-global-timer"; > + reg = <0x19020200 0x100>; > + interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; @@ -98,7 +98,7 @@ picking that up earlier. > + }; > > - pinmux = <&pinctrl>; -> + gic: interrupt-controller at 19021000 { +> + gic: interrupt-controller@19021000 { > + compatible = "arm,cortex-a9-gic"; > + #interrupt-cells = <3>; > + #address-cells = <0>; @@ -127,20 +127,20 @@ picking that up earlier. > - interrupt-parent = <&gic>; > - ranges; > -> - wdt at 18009000 { +> - wdt@18009000 { > - compatible = "arm,sp805" , "arm,primecell"; > - reg = <0x18009000 0x1000>; > - interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&axi81_clk>; > - clock-names = "apb_pclk"; -> + pinctrl: pinctrl at 0301d0c8 { +> + pinctrl: pinctrl@0301d0c8 { > + compatible = "brcm,cygnus-pinmux"; > + reg = <0x0301d0c8 0x30>, > + <0x0301d24c 0x2c>; > }; > - }; > -> - i2c0: i2c at 18008000 { +> - i2c0: i2c@18008000 { > - compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; > - reg = <0x18008000 0x100>; > - #address-cells = <1>; @@ -149,7 +149,7 @@ picking that up earlier. > - clock-frequency = <100000>; > - status = "disabled"; > - }; -> + gpio_crmu: gpio at 03024800 { +> + gpio_crmu: gpio@03024800 { > + compatible = "brcm,cygnus-crmu-gpio"; > + reg = <0x03024800 0x50>, > + <0x03024008 0x18>; @@ -157,7 +157,7 @@ picking that up earlier. > + gpio-controller; > + }; > -> - i2c1: i2c at 1800b000 { +> - i2c1: i2c@1800b000 { > - compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; > - reg = <0x1800b000 0x100>; > - #address-cells = <1>; @@ -166,7 +166,7 @@ picking that up earlier. > - clock-frequency = <100000>; > - status = "disabled"; > - }; -> + i2c0: i2c at 18008000 { +> + i2c0: i2c@18008000 { > + compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; > + reg = <0x18008000 0x100>; > + #address-cells = <1>; @@ -176,7 +176,7 @@ picking that up earlier. > + status = "disabled"; > + }; > + -> + wdt0: wdt at 18009000 { +> + wdt0: wdt@18009000 { > + compatible = "arm,sp805" , "arm,primecell"; > + reg = <0x18009000 0x1000>; > + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; @@ -184,10 +184,10 @@ picking that up earlier. > + clock-names = "apb_pclk"; > + }; > -> - pcie0: pcie at 18012000 { +> - pcie0: pcie@18012000 { > - compatible = "brcm,iproc-pcie"; > - reg = <0x18012000 0x1000>; -> + gpio_ccm: gpio at 1800a000 { +> + gpio_ccm: gpio@1800a000 { > + compatible = "brcm,cygnus-ccm-gpio"; > + reg = <0x1800a000 0x50>, > + <0x0301d164 0x20>; @@ -200,7 +200,7 @@ picking that up earlier. > - #interrupt-cells = <1>; > - interrupt-map-mask = <0 0 0 0>; > - interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>; -> + i2c1: i2c at 1800b000 { +> + i2c1: i2c@1800b000 { > + compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; > + reg = <0x1800b000 0x100>; > + #address-cells = <1>; @@ -211,7 +211,7 @@ picking that up earlier. > + }; > > - linux,pci-domain = <0>; -> + pcie0: pcie at 18012000 { +> + pcie0: pcie@18012000 { > + compatible = "brcm,iproc-pcie"; > + reg = <0x18012000 0x1000>; > @@ -231,7 +231,7 @@ picking that up earlier. > - }; > + bus-range = <0x00 0xff>; > -> - pcie1: pcie at 18013000 { +> - pcie1: pcie@18013000 { > - compatible = "brcm,iproc-pcie"; > - reg = <0x18013000 0x1000>; > + #address-cells = <3>; @@ -246,7 +246,7 @@ picking that up earlier. > + }; > > - linux,pci-domain = <1>; -> + pcie1: pcie at 18013000 { +> + pcie1: pcie@18013000 { > + compatible = "brcm,iproc-pcie"; > + reg = <0x18013000 0x1000>; > @@ -266,7 +266,7 @@ picking that up earlier. > - }; > + bus-range = <0x00 0xff>; > -> - uart0: serial at 18020000 { +> - uart0: serial@18020000 { > - compatible = "snps,dw-apb-uart"; > - reg = <0x18020000 0x100>; > - reg-shift = <2>; @@ -281,7 +281,7 @@ picking that up earlier. > + device_type = "pci"; > + ranges = <0x82000000 0 0x40000000 0x40000000 0 0x04000000>; > -> - uart1: serial at 18021000 { +> - uart1: serial@18021000 { > - compatible = "snps,dw-apb-uart"; > - reg = <0x18021000 0x100>; > - reg-shift = <2>; @@ -294,7 +294,7 @@ picking that up earlier. > + status = "disabled"; > + }; > -> - uart2: serial at 18022000 { +> - uart2: serial@18022000 { > - compatible = "snps,dw-apb-uart"; > - reg = <0x18020000 0x100>; > - reg-shift = <2>; @@ -304,7 +304,7 @@ picking that up earlier. > - clock-frequency = <100000000>; > - status = "disabled"; > - }; -> + uart0: serial at 18020000 { +> + uart0: serial@18020000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x18020000 0x100>; > + reg-shift = <2>; @@ -315,7 +315,7 @@ picking that up earlier. > + status = "disabled"; > + }; > -> - uart3: serial at 18023000 { +> - uart3: serial@18023000 { > - compatible = "snps,dw-apb-uart"; > - reg = <0x18023000 0x100>; > - reg-shift = <2>; @@ -325,7 +325,7 @@ picking that up earlier. > - clock-frequency = <100000000>; > - status = "disabled"; > - }; -> + uart1: serial at 18021000 { +> + uart1: serial@18021000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x18021000 0x100>; > + reg-shift = <2>; @@ -336,12 +336,12 @@ picking that up earlier. > + status = "disabled"; > + }; > -> - nand: nand at 18046000 { +> - nand: nand@18046000 { > - compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand"; > - reg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>; > - reg-names = "nand", "iproc-idm", "iproc-ext"; > - interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; -> + uart2: serial at 18022000 { +> + uart2: serial@18022000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x18020000 0x100>; > + reg-shift = <2>; @@ -354,7 +354,7 @@ picking that up earlier. > > - #address-cells = <1>; > - #size-cells = <0>; -> + uart3: serial at 18023000 { +> + uart3: serial@18023000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x18023000 0x100>; > + reg-shift = <2>; @@ -367,7 +367,7 @@ picking that up earlier. > > - brcm,nand-has-wp; > - }; -> + nand: nand at 18046000 { +> + nand: nand@18046000 { > + compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", > + "brcm,brcmnand"; > + reg = <0x18046000 0x600>, <0xf8105408 0x600>, @@ -375,7 +375,7 @@ picking that up earlier. > + reg-names = "nand", "iproc-idm", "iproc-ext"; > + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; > -> - gic: interrupt-controller at 19021000 { +> - gic: interrupt-controller@19021000 { > - compatible = "arm,cortex-a9-gic"; > - #interrupt-cells = <3>; > - #address-cells = <0>; @@ -395,13 +395,13 @@ picking that up earlier. > + brcm,nand-has-wp; > + }; > -> - timer at 19020200 { +> - timer@19020200 { > - compatible = "arm,cortex-a9-global-timer"; > - reg = <0x19020200 0x100>; > - interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&periph_clk>; > - }; -> + gpio_asiu: gpio at 180a5000 { +> + gpio_asiu: gpio@180a5000 { > + compatible = "brcm,cygnus-asiu-gpio"; > + reg = <0x180a5000 0x668>; > + #gpio-cells = <2>; @@ -431,7 +431,7 @@ picking that up earlier. > bootargs = "console=ttyS0,115200"; > }; > -> - uart3: serial at 18023000 { +> - uart3: serial@18023000 { > - status = "okay"; > - }; > - @@ -464,7 +464,7 @@ picking that up earlier. > }; > +}; > -> - uart3: serial at 18023000 { +> - uart3: serial@18023000 { > - status = "okay"; > - }; > +&uart3 { @@ -488,34 +488,34 @@ picking that up earlier. > }; > +}; > -> - pcie0: pcie at 18012000 { +> - pcie0: pcie@18012000 { > - status = "okay"; > - }; > +&pcie0 { > + status = "okay"; > +}; > -> - pcie1: pcie at 18013000 { +> - pcie1: pcie@18013000 { > - status = "okay"; > - }; > +&pcie1 { > + status = "okay"; > +}; > -> - uart3: serial at 18023000 { +> - uart3: serial@18023000 { > - status = "okay"; > - }; > +&uart3 { > + status = "okay"; > +}; > -> - nand: nand at 18046000 { -> - nandcs at 1 { +> - nand: nand@18046000 { +> - nandcs@1 { > - compatible = "brcm,nandcs"; > - reg = <0>; > - nand-on-flash-bbt; > +&nand { -> + nandcs at 1 { +> + nandcs@1 { > + compatible = "brcm,nandcs"; > + reg = <0>; > + nand-on-flash-bbt; @@ -553,7 +553,7 @@ picking that up earlier. > }; > +}; > -> - uart3: serial at 18023000 { +> - uart3: serial@18023000 { > - status = "okay"; > - }; > +&uart3 { diff --git a/a/content_digest b/N1/content_digest index ebf83b4..5ef4828 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,19 @@ "ref\01442534282-21356-1-git-send-email-rjui@broadcom.com\0" "ref\01442534282-21356-2-git-send-email-rjui@broadcom.com\0" - "From\0f.fainelli@gmail.com (Florian Fainelli)\0" - "Subject\0[PATCH 1/4] ARM: dts: clean up Cygnus DT files\0" + "From\0Florian Fainelli <f.fainelli@gmail.com>\0" + "Subject\0Re: [PATCH 1/4] ARM: dts: clean up Cygnus DT files\0" "Date\0Thu, 17 Sep 2015 18:16:16 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Ray Jui <rjui@broadcom.com>" + Florian Fainelli <f.fainelli@gmail.com> + " Rob Herring <robh+dt@kernel.org>\0" + "Cc\0Pawel Moll <pawel.moll@arm.com>" + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + bcm-kernel-feedback-list@broadcom.com + " devicetree@vger.kernel.org\0" "\00:1\0" "b\0" "On 17/09/15 16:57, Ray Jui wrote:\n" @@ -64,13 +74,13 @@ "> \n" "> \t/include/ \"bcm-cygnus-clock.dtsi\"\n" "> \n" - "> -\tpinctrl: pinctrl at 0x0301d0c8 {\n" + "> -\tpinctrl: pinctrl@0x0301d0c8 {\n" "> -\t\tcompatible = \"brcm,cygnus-pinmux\";\n" "> -\t\treg = <0x0301d0c8 0x30>,\n" "> -\t\t <0x0301d24c 0x2c>;\n" "> -\t};\n" "> -\n" - "> -\tgpio_crmu: gpio at 03024800 {\n" + "> -\tgpio_crmu: gpio@03024800 {\n" "> -\t\tcompatible = \"brcm,cygnus-crmu-gpio\";\n" "> -\t\treg = <0x03024800 0x50>,\n" "> -\t\t <0x03024008 0x18>;\n" @@ -78,7 +88,7 @@ "> -\t\tgpio-controller;\n" "> -\t};\n" "> -\n" - "> -\tgpio_ccm: gpio at 1800a000 {\n" + "> -\tgpio_ccm: gpio@1800a000 {\n" "> -\t\tcompatible = \"brcm,cygnus-ccm-gpio\";\n" "> -\t\treg = <0x1800a000 0x50>,\n" "> -\t\t <0x0301d164 0x20>;\n" @@ -93,12 +103,12 @@ "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <1>;\n" "> \n" - "> -\tgpio_asiu: gpio at 180a5000 {\n" + "> -\tgpio_asiu: gpio@180a5000 {\n" "> -\t\tcompatible = \"brcm,cygnus-asiu-gpio\";\n" "> -\t\treg = <0x180a5000 0x668>;\n" "> -\t\t#gpio-cells = <2>;\n" "> -\t\tgpio-controller;\n" - "> +\t\ttimer at 19020200 {\n" + "> +\t\ttimer@19020200 {\n" "> +\t\t\tcompatible = \"arm,cortex-a9-global-timer\";\n" "> +\t\t\treg = <0x19020200 0x100>;\n" "> +\t\t\tinterrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -106,7 +116,7 @@ "> +\t\t};\n" "> \n" "> -\t\tpinmux = <&pinctrl>;\n" - "> +\t\tgic: interrupt-controller at 19021000 {\n" + "> +\t\tgic: interrupt-controller@19021000 {\n" "> +\t\t\tcompatible = \"arm,cortex-a9-gic\";\n" "> +\t\t\t#interrupt-cells = <3>;\n" "> +\t\t\t#address-cells = <0>;\n" @@ -135,20 +145,20 @@ "> -\t\tinterrupt-parent = <&gic>;\n" "> -\t\tranges;\n" "> \n" - "> -\t\twdt at 18009000 {\n" + "> -\t\twdt@18009000 {\n" "> -\t\t\t compatible = \"arm,sp805\" , \"arm,primecell\";\n" "> -\t\t\t reg = <0x18009000 0x1000>;\n" "> -\t\t\t interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;\n" "> -\t\t\t clocks = <&axi81_clk>;\n" "> -\t\t\t clock-names = \"apb_pclk\";\n" - "> +\t\tpinctrl: pinctrl at 0301d0c8 {\n" + "> +\t\tpinctrl: pinctrl@0301d0c8 {\n" "> +\t\t\tcompatible = \"brcm,cygnus-pinmux\";\n" "> +\t\t\treg = <0x0301d0c8 0x30>,\n" "> +\t\t\t <0x0301d24c 0x2c>;\n" "> \t\t};\n" "> -\t};\n" "> \n" - "> -\ti2c0: i2c at 18008000 {\n" + "> -\ti2c0: i2c@18008000 {\n" "> -\t\tcompatible = \"brcm,cygnus-iproc-i2c\", \"brcm,iproc-i2c\";\n" "> -\t\treg = <0x18008000 0x100>;\n" "> -\t\t#address-cells = <1>;\n" @@ -157,7 +167,7 @@ "> -\t\tclock-frequency = <100000>;\n" "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" - "> +\t\tgpio_crmu: gpio at 03024800 {\n" + "> +\t\tgpio_crmu: gpio@03024800 {\n" "> +\t\t\tcompatible = \"brcm,cygnus-crmu-gpio\";\n" "> +\t\t\treg = <0x03024800 0x50>,\n" "> +\t\t\t <0x03024008 0x18>;\n" @@ -165,7 +175,7 @@ "> +\t\t\tgpio-controller;\n" "> +\t\t};\n" "> \n" - "> -\ti2c1: i2c at 1800b000 {\n" + "> -\ti2c1: i2c@1800b000 {\n" "> -\t\tcompatible = \"brcm,cygnus-iproc-i2c\", \"brcm,iproc-i2c\";\n" "> -\t\treg = <0x1800b000 0x100>;\n" "> -\t\t#address-cells = <1>;\n" @@ -174,7 +184,7 @@ "> -\t\tclock-frequency = <100000>;\n" "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" - "> +\t\ti2c0: i2c at 18008000 {\n" + "> +\t\ti2c0: i2c@18008000 {\n" "> +\t\t\tcompatible = \"brcm,cygnus-iproc-i2c\", \"brcm,iproc-i2c\";\n" "> +\t\t\treg = <0x18008000 0x100>;\n" "> +\t\t\t#address-cells = <1>;\n" @@ -184,7 +194,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\twdt0: wdt at 18009000 {\n" + "> +\t\twdt0: wdt@18009000 {\n" "> +\t\t\tcompatible = \"arm,sp805\" , \"arm,primecell\";\n" "> +\t\t\treg = <0x18009000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -192,10 +202,10 @@ "> +\t\t\tclock-names = \"apb_pclk\";\n" "> +\t\t};\n" "> \n" - "> -\tpcie0: pcie at 18012000 {\n" + "> -\tpcie0: pcie@18012000 {\n" "> -\t\tcompatible = \"brcm,iproc-pcie\";\n" "> -\t\treg = <0x18012000 0x1000>;\n" - "> +\t\tgpio_ccm: gpio at 1800a000 {\n" + "> +\t\tgpio_ccm: gpio@1800a000 {\n" "> +\t\t\tcompatible = \"brcm,cygnus-ccm-gpio\";\n" "> +\t\t\treg = <0x1800a000 0x50>,\n" "> +\t\t\t <0x0301d164 0x20>;\n" @@ -208,7 +218,7 @@ "> -\t\t#interrupt-cells = <1>;\n" "> -\t\tinterrupt-map-mask = <0 0 0 0>;\n" "> -\t\tinterrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>;\n" - "> +\t\ti2c1: i2c at 1800b000 {\n" + "> +\t\ti2c1: i2c@1800b000 {\n" "> +\t\t\tcompatible = \"brcm,cygnus-iproc-i2c\", \"brcm,iproc-i2c\";\n" "> +\t\t\treg = <0x1800b000 0x100>;\n" "> +\t\t\t#address-cells = <1>;\n" @@ -219,7 +229,7 @@ "> +\t\t};\n" "> \n" "> -\t\tlinux,pci-domain = <0>;\n" - "> +\t\tpcie0: pcie at 18012000 {\n" + "> +\t\tpcie0: pcie@18012000 {\n" "> +\t\t\tcompatible = \"brcm,iproc-pcie\";\n" "> +\t\t\treg = <0x18012000 0x1000>;\n" "> \n" @@ -239,7 +249,7 @@ "> -\t};\n" "> +\t\t\tbus-range = <0x00 0xff>;\n" "> \n" - "> -\tpcie1: pcie at 18013000 {\n" + "> -\tpcie1: pcie@18013000 {\n" "> -\t\tcompatible = \"brcm,iproc-pcie\";\n" "> -\t\treg = <0x18013000 0x1000>;\n" "> +\t\t\t#address-cells = <3>;\n" @@ -254,7 +264,7 @@ "> +\t\t};\n" "> \n" "> -\t\tlinux,pci-domain = <1>;\n" - "> +\t\tpcie1: pcie at 18013000 {\n" + "> +\t\tpcie1: pcie@18013000 {\n" "> +\t\t\tcompatible = \"brcm,iproc-pcie\";\n" "> +\t\t\treg = <0x18013000 0x1000>;\n" "> \n" @@ -274,7 +284,7 @@ "> -\t};\n" "> +\t\t\tbus-range = <0x00 0xff>;\n" "> \n" - "> -\tuart0: serial at 18020000 {\n" + "> -\tuart0: serial@18020000 {\n" "> -\t\tcompatible = \"snps,dw-apb-uart\";\n" "> -\t\treg = <0x18020000 0x100>;\n" "> -\t\treg-shift = <2>;\n" @@ -289,7 +299,7 @@ "> +\t\t\tdevice_type = \"pci\";\n" "> +\t\t\tranges = <0x82000000 0 0x40000000 0x40000000 0 0x04000000>;\n" "> \n" - "> -\tuart1: serial at 18021000 {\n" + "> -\tuart1: serial@18021000 {\n" "> -\t\tcompatible = \"snps,dw-apb-uart\";\n" "> -\t\treg = <0x18021000 0x100>;\n" "> -\t\treg-shift = <2>;\n" @@ -302,7 +312,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> \n" - "> -\tuart2: serial at 18022000 {\n" + "> -\tuart2: serial@18022000 {\n" "> -\t\tcompatible = \"snps,dw-apb-uart\";\n" "> -\t\treg = <0x18020000 0x100>;\n" "> -\t\treg-shift = <2>;\n" @@ -312,7 +322,7 @@ "> -\t\tclock-frequency = <100000000>;\n" "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" - "> +\t\tuart0: serial at 18020000 {\n" + "> +\t\tuart0: serial@18020000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x18020000 0x100>;\n" "> +\t\t\treg-shift = <2>;\n" @@ -323,7 +333,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> \n" - "> -\tuart3: serial at 18023000 {\n" + "> -\tuart3: serial@18023000 {\n" "> -\t\tcompatible = \"snps,dw-apb-uart\";\n" "> -\t\treg = <0x18023000 0x100>;\n" "> -\t\treg-shift = <2>;\n" @@ -333,7 +343,7 @@ "> -\t\tclock-frequency = <100000000>;\n" "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" - "> +\t\tuart1: serial at 18021000 {\n" + "> +\t\tuart1: serial@18021000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x18021000 0x100>;\n" "> +\t\t\treg-shift = <2>;\n" @@ -344,12 +354,12 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> \n" - "> -\tnand: nand at 18046000 {\n" + "> -\tnand: nand@18046000 {\n" "> -\t\tcompatible = \"brcm,nand-iproc\", \"brcm,brcmnand-v6.1\", \"brcm,brcmnand\";\n" "> -\t\treg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>;\n" "> -\t\treg-names = \"nand\", \"iproc-idm\", \"iproc-ext\";\n" "> -\t\tinterrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;\n" - "> +\t\tuart2: serial at 18022000 {\n" + "> +\t\tuart2: serial@18022000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x18020000 0x100>;\n" "> +\t\t\treg-shift = <2>;\n" @@ -362,7 +372,7 @@ "> \n" "> -\t\t#address-cells = <1>;\n" "> -\t\t#size-cells = <0>;\n" - "> +\t\tuart3: serial at 18023000 {\n" + "> +\t\tuart3: serial@18023000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x18023000 0x100>;\n" "> +\t\t\treg-shift = <2>;\n" @@ -375,7 +385,7 @@ "> \n" "> -\t\tbrcm,nand-has-wp;\n" "> -\t};\n" - "> +\t\tnand: nand at 18046000 {\n" + "> +\t\tnand: nand@18046000 {\n" "> +\t\t\tcompatible = \"brcm,nand-iproc\", \"brcm,brcmnand-v6.1\",\n" "> +\t\t\t\t \"brcm,brcmnand\";\n" "> +\t\t\treg = <0x18046000 0x600>, <0xf8105408 0x600>,\n" @@ -383,7 +393,7 @@ "> +\t\t\treg-names = \"nand\", \"iproc-idm\", \"iproc-ext\";\n" "> +\t\t\tinterrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;\n" "> \n" - "> -\tgic: interrupt-controller at 19021000 {\n" + "> -\tgic: interrupt-controller@19021000 {\n" "> -\t\tcompatible = \"arm,cortex-a9-gic\";\n" "> -\t\t#interrupt-cells = <3>;\n" "> -\t\t#address-cells = <0>;\n" @@ -403,13 +413,13 @@ "> +\t\t\tbrcm,nand-has-wp;\n" "> +\t\t};\n" "> \n" - "> -\ttimer at 19020200 {\n" + "> -\ttimer@19020200 {\n" "> -\t\tcompatible = \"arm,cortex-a9-global-timer\";\n" "> -\t\treg = <0x19020200 0x100>;\n" "> -\t\tinterrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;\n" "> -\t\tclocks = <&periph_clk>;\n" "> -\t};\n" - "> +\t\tgpio_asiu: gpio at 180a5000 {\n" + "> +\t\tgpio_asiu: gpio@180a5000 {\n" "> +\t\t\tcompatible = \"brcm,cygnus-asiu-gpio\";\n" "> +\t\t\treg = <0x180a5000 0x668>;\n" "> +\t\t\t#gpio-cells = <2>;\n" @@ -439,7 +449,7 @@ "> \t\tbootargs = \"console=ttyS0,115200\";\n" "> \t};\n" "> \n" - "> -\tuart3: serial at 18023000 {\n" + "> -\tuart3: serial@18023000 {\n" "> -\t\tstatus = \"okay\";\n" "> -\t};\n" "> -\n" @@ -472,7 +482,7 @@ "> \t};\n" "> +};\n" "> \n" - "> -\tuart3: serial at 18023000 {\n" + "> -\tuart3: serial@18023000 {\n" "> -\t\tstatus = \"okay\";\n" "> -\t};\n" "> +&uart3 {\n" @@ -496,34 +506,34 @@ "> \t};\n" "> +};\n" "> \n" - "> -\tpcie0: pcie at 18012000 {\n" + "> -\tpcie0: pcie@18012000 {\n" "> -\t\tstatus = \"okay\";\n" "> -\t};\n" "> +&pcie0 {\n" "> +\tstatus = \"okay\";\n" "> +};\n" "> \n" - "> -\tpcie1: pcie at 18013000 {\n" + "> -\tpcie1: pcie@18013000 {\n" "> -\t\tstatus = \"okay\";\n" "> -\t};\n" "> +&pcie1 {\n" "> +\tstatus = \"okay\";\n" "> +};\n" "> \n" - "> -\tuart3: serial at 18023000 {\n" + "> -\tuart3: serial@18023000 {\n" "> -\t\tstatus = \"okay\";\n" "> -\t};\n" "> +&uart3 {\n" "> +\tstatus = \"okay\";\n" "> +};\n" "> \n" - "> -\tnand: nand at 18046000 {\n" - "> -\t\tnandcs at 1 {\n" + "> -\tnand: nand@18046000 {\n" + "> -\t\tnandcs@1 {\n" "> -\t\t\tcompatible = \"brcm,nandcs\";\n" "> -\t\t\treg = <0>;\n" "> -\t\t\tnand-on-flash-bbt;\n" "> +&nand {\n" - "> +\tnandcs at 1 {\n" + "> +\tnandcs@1 {\n" "> +\t\tcompatible = \"brcm,nandcs\";\n" "> +\t\treg = <0>;\n" "> +\t\tnand-on-flash-bbt;\n" @@ -561,7 +571,7 @@ "> \t};\n" "> +};\n" "> \n" - "> -\tuart3: serial at 18023000 {\n" + "> -\tuart3: serial@18023000 {\n" "> -\t\tstatus = \"okay\";\n" "> -\t};\n" "> +&uart3 {\n" @@ -573,4 +583,4 @@ "-- \n" Florian -f692328b5188a170f693e58f199e64514809719212cb9cb846bf755ed774b7cc +b657aacf5c35abd2f2902690abf93495f512996eb63fd1b9f3708de4cb29c6a4
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.