diff for duplicates of <541C2120.5070805@atmel.com> diff --git a/a/1.txt b/N1/1.txt index ef032cc..6c85980 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -95,7 +95,7 @@ On 15/09/2014 18:15, Alexandre Belloni : > + #size-cells = <1>; > + ranges; > + -> + main_clock: clock at 0 { +> + main_clock: clock@0 { > + compatible = "atmel,osc", "fixed-clock"; > + clock-frequency = <12000000>; > + }; @@ -111,56 +111,56 @@ On 15/09/2014 18:15, Alexandre Belloni : > + > + ahb { > + apb { -> + lcd_bus at f0000000 { +> + lcd_bus@f0000000 { > + status = "okay"; > + -> + lcd at f0000000 { +> + lcd@f0000000 { > + status = "okay"; > + }; > + -> + lcdovl1 at f0000140 { +> + lcdovl1@f0000140 { > + status = "okay"; > + }; > + -> + lcdovl2 at f0000240 { +> + lcdovl2@f0000240 { > + status = "okay"; > + }; > + -> + lcdheo1 at f0000340 { +> + lcdheo1@f0000340 { > + status = "okay"; > + }; > + }; > + -> + adc0: adc at fc034000 { +> + adc0: adc@fc034000 { > + /* The vref depends on JP22 of EK. If connect 1-2 then use 3.3V. connect 2-3 use 3.0V */ > + atmel,adc-vref = <3300>; > + /*atmel,adc-ts-wires = <4>;*/ /* Set up ADC touch screen */ > + status = "okay"; /* Enable ADC IIO support */ > + }; > + -> + mmc0: mmc at f8000000 { +> + mmc0: mmc@f8000000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_cd>; -> + slot at 1 { +> + slot@1 { > + reg = <1>; > + bus-width = <4>; > + cd-gpios = <&pioE 5 0>; > + }; > + }; > + -> + spi0: spi at f8010000 { +> + spi0: spi@f8010000 { > + cs-gpios = <&pioC 3 0>, <0>, <0>, <0>; > + status = "okay"; -> + m25p80 at 0 { +> + m25p80@0 { > + compatible = "atmel,at25df321a"; > + spi-max-frequency = <50000000>; > + reg = <0>; > + }; > + }; > + -> + i2c0: i2c at f8014000 { +> + i2c0: i2c@f8014000 { > + status = "okay"; -> + pmic: act8865 at 5b { +> + pmic: act8865@5b { > + compatible = "active-semi,act8865"; I remove the PMIC entry here because of the issues with this component @@ -222,39 +222,39 @@ Thanks, bye. > + }; > + }; > + -> + macb0: ethernet at f8020000 { +> + macb0: ethernet@f8020000 { > + phy-mode = "rmii"; > + status = "okay"; > + }; > + -> + mmc1: mmc at fc000000 { +> + mmc1: mmc@fc000000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>; > + status = "okay"; -> + slot at 0 { +> + slot@0 { > + reg = <0>; > + bus-width = <4>; > + cd-gpios = <&pioE 6 0>; > + }; > + }; > + -> + usart2: serial at fc008000 { +> + usart2: serial@fc008000 { > + status = "okay"; > + }; > + -> + usart3: serial at fc00c000 { +> + usart3: serial@fc00c000 { > + status = "okay"; > + }; > + -> + usart4: serial at fc010000 { +> + usart4: serial@fc010000 { > + status = "okay"; > + }; > + -> + watchdog at fc068640 { +> + watchdog@fc068640 { > + status = "okay"; > + }; > + -> + pinctrl at fc06a000 { +> + pinctrl@fc06a000 { > + board { > + pinctrl_mmc0_cd: mmc0_cd { > + atmel,pins = @@ -276,14 +276,14 @@ Thanks, bye. > + }; > + }; > + -> + usb0: gadget at 00400000 { +> + usb0: gadget@00400000 { > + atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usba_vbus>; > + status = "okay"; > + }; > + -> + usb1: ohci at 00500000 { +> + usb1: ohci@00500000 { > + num-ports = <3>; > + atmel,vbus-gpio = <0 /* &pioE 10 GPIO_ACTIVE_LOW */ > + &pioE 11 GPIO_ACTIVE_LOW @@ -292,43 +292,43 @@ Thanks, bye. > + status = "okay"; > + }; > + -> + usb2: ehci at 00600000 { +> + usb2: ehci@00600000 { > + status = "okay"; > + }; > + -> + nand0: nand at 80000000 { +> + nand0: nand@80000000 { > + nand-bus-width = <8>; > + nand-ecc-mode = "hw"; > + nand-on-flash-bbt; > + atmel,has-pmecc; > + status = "okay"; > + -> + at91bootstrap at 0 { +> + at91bootstrap@0 { > + label = "at91bootstrap"; > + reg = <0x0 0x40000>; > + }; > + -> + bootloader at 40000 { +> + bootloader@40000 { > + label = "bootloader"; > + reg = <0x40000 0x80000>; > + }; > + -> + bootloaderenv at c0000 { +> + bootloaderenv@c0000 { > + label = "bootloader env"; > + reg = <0xc0000 0xc0000>; > + }; > + -> + dtb at 180000 { +> + dtb@180000 { > + label = "device tree"; > + reg = <0x180000 0x80000>; > + }; > + -> + kernel at 200000 { +> + kernel@200000 { > + label = "kernel"; > + reg = <0x200000 0x600000>; > + }; > + -> + rootfs at 800000 { +> + rootfs@800000 { > + label = "rootfs"; > + reg = <0x800000 0x0f800000>; > + }; diff --git a/a/content_digest b/N1/content_digest index c99c785..a6ee175 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,14 @@ "ref\01410797759-18675-1-git-send-email-alexandre.belloni@free-electrons.com\0" "ref\01410797759-18675-6-git-send-email-alexandre.belloni@free-electrons.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCHv3 5/7] ARM: at91: dt: add device tree file for SAMA5D4ek board\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCHv3 5/7] ARM: at91: dt: add device tree file for SAMA5D4ek board\0" "Date\0Fri, 19 Sep 2014 14:27:12 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" + "Cc\0Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>" + Boris Brezillon <boris.brezillon@free-electrons.com> + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + " Josh Wu <josh.wu@atmel.com>\0" "\00:1\0" "b\0" "On 15/09/2014 18:15, Alexandre Belloni :\n" @@ -103,7 +108,7 @@ "> +\t\t#size-cells = <1>;\n" "> +\t\tranges;\n" "> +\n" - "> +\t\tmain_clock: clock at 0 {\n" + "> +\t\tmain_clock: clock@0 {\n" "> +\t\t\tcompatible = \"atmel,osc\", \"fixed-clock\";\n" "> +\t\t\tclock-frequency = <12000000>;\n" "> +\t\t};\n" @@ -119,56 +124,56 @@ "> +\n" "> +\tahb {\n" "> +\t\tapb {\n" - "> +\t\t\tlcd_bus at f0000000 {\n" + "> +\t\t\tlcd_bus@f0000000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\t\tlcd at f0000000 {\n" + "> +\t\t\t\tlcd@f0000000 {\n" "> +\t\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tlcdovl1 at f0000140 {\n" + "> +\t\t\t\tlcdovl1@f0000140 {\n" "> +\t\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tlcdovl2 at f0000240 {\n" + "> +\t\t\t\tlcdovl2@f0000240 {\n" "> +\t\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tlcdheo1 at f0000340 {\n" + "> +\t\t\t\tlcdheo1@f0000340 {\n" "> +\t\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tadc0: adc at fc034000 {\n" + "> +\t\t\tadc0: adc@fc034000 {\n" "> +\t\t\t\t/* The vref depends on JP22 of EK. If connect 1-2 then use 3.3V. connect 2-3 use 3.0V */\n" "> +\t\t\t\tatmel,adc-vref = <3300>;\n" "> +\t\t\t\t/*atmel,adc-ts-wires = <4>;*/\t/* Set up ADC touch screen */\n" "> +\t\t\t\tstatus = \"okay\";\t\t/* Enable ADC IIO support */\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc0: mmc at f8000000 {\n" + "> +\t\t\tmmc0: mmc@f8000000 {\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\t\tpinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_cd>;\n" - "> +\t\t\t\tslot at 1 {\n" + "> +\t\t\t\tslot@1 {\n" "> +\t\t\t\t\treg = <1>;\n" "> +\t\t\t\t\tbus-width = <4>;\n" "> +\t\t\t\t\tcd-gpios = <&pioE 5 0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tspi0: spi at f8010000 {\n" + "> +\t\t\tspi0: spi@f8010000 {\n" "> +\t\t\t\tcs-gpios = <&pioC 3 0>, <0>, <0>, <0>;\n" "> +\t\t\t\tstatus = \"okay\";\n" - "> +\t\t\t\tm25p80 at 0 {\n" + "> +\t\t\t\tm25p80@0 {\n" "> +\t\t\t\t\tcompatible = \"atmel,at25df321a\";\n" "> +\t\t\t\t\tspi-max-frequency = <50000000>;\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c0: i2c at f8014000 {\n" + "> +\t\t\ti2c0: i2c@f8014000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" - "> +\t\t\t\tpmic: act8865 at 5b {\n" + "> +\t\t\t\tpmic: act8865@5b {\n" "> +\t\t\t\t\tcompatible = \"active-semi,act8865\";\n" "\n" "I remove the PMIC entry here because of the issues with this component\n" @@ -230,39 +235,39 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmacb0: ethernet at f8020000 {\n" + "> +\t\t\tmacb0: ethernet@f8020000 {\n" "> +\t\t\t\tphy-mode = \"rmii\";\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc1: mmc at fc000000 {\n" + "> +\t\t\tmmc1: mmc@fc000000 {\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\t\tpinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;\n" "> +\t\t\t\tstatus = \"okay\";\n" - "> +\t\t\t\tslot at 0 {\n" + "> +\t\t\t\tslot@0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\tbus-width = <4>;\n" "> +\t\t\t\t\tcd-gpios = <&pioE 6 0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart2: serial at fc008000 {\n" + "> +\t\t\tusart2: serial@fc008000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart3: serial at fc00c000 {\n" + "> +\t\t\tusart3: serial@fc00c000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart4: serial at fc010000 {\n" + "> +\t\t\tusart4: serial@fc010000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\twatchdog at fc068640 {\n" + "> +\t\t\twatchdog@fc068640 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tpinctrl at fc06a000 {\n" + "> +\t\t\tpinctrl@fc06a000 {\n" "> +\t\t\t\tboard {\n" "> +\t\t\t\t\tpinctrl_mmc0_cd: mmc0_cd {\n" "> +\t\t\t\t\t\tatmel,pins =\n" @@ -284,14 +289,14 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb0: gadget at 00400000 {\n" + "> +\t\tusb0: gadget@00400000 {\n" "> +\t\t\tatmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\tpinctrl-0 = <&pinctrl_usba_vbus>;\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb1: ohci at 00500000 {\n" + "> +\t\tusb1: ohci@00500000 {\n" "> +\t\t\tnum-ports = <3>;\n" "> +\t\t\tatmel,vbus-gpio = <0 /* &pioE 10 GPIO_ACTIVE_LOW */\n" "> +\t\t\t\t\t &pioE 11 GPIO_ACTIVE_LOW\n" @@ -300,43 +305,43 @@ "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb2: ehci at 00600000 {\n" + "> +\t\tusb2: ehci@00600000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tnand0: nand at 80000000 {\n" + "> +\t\tnand0: nand@80000000 {\n" "> +\t\t\tnand-bus-width = <8>;\n" "> +\t\t\tnand-ecc-mode = \"hw\";\n" "> +\t\t\tnand-on-flash-bbt;\n" "> +\t\t\tatmel,has-pmecc;\n" "> +\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\tat91bootstrap at 0 {\n" + "> +\t\t\tat91bootstrap@0 {\n" "> +\t\t\t\tlabel = \"at91bootstrap\";\n" "> +\t\t\t\treg = <0x0 0x40000>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tbootloader at 40000 {\n" + "> +\t\t\tbootloader@40000 {\n" "> +\t\t\t\tlabel = \"bootloader\";\n" "> +\t\t\t\treg = <0x40000 0x80000>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tbootloaderenv at c0000 {\n" + "> +\t\t\tbootloaderenv@c0000 {\n" "> +\t\t\t\tlabel = \"bootloader env\";\n" "> +\t\t\t\treg = <0xc0000 0xc0000>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tdtb at 180000 {\n" + "> +\t\t\tdtb@180000 {\n" "> +\t\t\t\tlabel = \"device tree\";\n" "> +\t\t\t\treg = <0x180000 0x80000>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tkernel at 200000 {\n" + "> +\t\t\tkernel@200000 {\n" "> +\t\t\t\tlabel = \"kernel\";\n" "> +\t\t\t\treg = <0x200000 0x600000>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\trootfs at 800000 {\n" + "> +\t\t\trootfs@800000 {\n" "> +\t\t\t\tlabel = \"rootfs\";\n" "> +\t\t\t\treg = <0x800000 0x0f800000>;\n" "> +\t\t\t};\n" @@ -365,4 +370,4 @@ "-- \n" Nicolas Ferre -9164bdb969503a31cd475f90b7944582d9fdd7bfae6d7af7d417da240972c7d1 +f084b1461ac7bb80313b54be144c187672c148286cf79123a5d8f24fb1f480a2
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.