diff for duplicates of <1469362260-20066-4-git-send-email-johan@kernel.org> diff --git a/a/1.txt b/N1/1.txt index a17ee96..d274297 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ The gpmc ranges property for NAND at CS0 was being overridden by later includes that defined gpmc ethernet nodes, effectively breaking NAND on these systems: - omap-gpmc 6e000000.gpmc: /ocp/gpmc@6e000000/nand@0,0 has + omap-gpmc 6e000000.gpmc: /ocp/gpmc at 6e000000/nand at 0,0 has malformed 'reg' property Instead of redefining the NAND range in every such dtsi, define all @@ -31,7 +31,7 @@ index b15c435439fb..3e946cac55f3 100644 + <4 0 0x2b000000 0x1000000>, /* CS4 */ + <5 0 0x2c000000 0x1000000>; /* CS5 */ - nand@0,0 { + nand at 0,0 { compatible = "ti,omap2-nand"; diff --git a/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi b/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi index 7df27926ead2..4f4c6efbd518 100644 @@ -43,7 +43,7 @@ index 7df27926ead2..4f4c6efbd518 100644 &gpmc { - ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */ - - ethernet@gpmc { + ethernet at gpmc { reg = <5 0 0xff>; interrupt-parent = <&gpio6>; diff --git a/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi @@ -56,7 +56,7 @@ index 9e24b6a1d07b..1b304e2f1bd2 100644 &gpmc { - ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */ - - ethernet@gpmc { + ethernet at gpmc { reg = <5 0 0xff>; interrupt-parent = <&gpio6>; diff --git a/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi b/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi @@ -70,7 +70,7 @@ index 334109e14613..82e98ee3023a 100644 - ranges = <4 0 0x2b000000 0x1000000>, /* CS4 */ - <5 0 0x2c000000 0x1000000>; /* CS5 */ - - smsc1: ethernet@gpmc { + smsc1: ethernet at gpmc { reg = <5 0 0xff>; interrupt-parent = <&gpio6>; -- diff --git a/a/content_digest b/N1/content_digest index 22343f7..053190d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,26 +1,15 @@ "ref\01469362260-20066-1-git-send-email-johan@kernel.org\0" - "From\0Johan Hovold <johan@kernel.org>\0" + "From\0johan@kernel.org (Johan Hovold)\0" "Subject\0[PATCH 3/3] ARM: dts: overo: fix gpmc nand on boards with ethernet\0" "Date\0Sun, 24 Jul 2016 14:11:00 +0200\0" - "To\0Tony Lindgren <tony@atomide.com>\0" - "Cc\0Beno\303\256t Cousson <bcousson@baylibre.com>" - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Russell King <linux@armlinux.org.uk> - Roger Quadros <rogerq@ti.com> - linux-omap@vger.kernel.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - stable@vger.kernel.org - " Johan Hovold <johan@kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The gpmc ranges property for NAND at CS0 was being overridden by later\n" "includes that defined gpmc ethernet nodes, effectively breaking NAND on\n" "these systems:\n" "\n" - "\tomap-gpmc 6e000000.gpmc: /ocp/gpmc@6e000000/nand@0,0 has\n" + "\tomap-gpmc 6e000000.gpmc: /ocp/gpmc at 6e000000/nand at 0,0 has\n" "\tmalformed 'reg' property\n" "\n" "Instead of redefining the NAND range in every such dtsi, define all\n" @@ -49,7 +38,7 @@ "+\t\t <4 0 0x2b000000 0x1000000>,\t/* CS4 */\n" "+\t\t <5 0 0x2c000000 0x1000000>;\t/* CS5 */\n" " \n" - " \tnand@0,0 {\n" + " \tnand at 0,0 {\n" " \t\tcompatible = \"ti,omap2-nand\";\n" "diff --git a/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi b/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi\n" "index 7df27926ead2..4f4c6efbd518 100644\n" @@ -61,7 +50,7 @@ " &gpmc {\n" "-\tranges = <5 0 0x2c000000 0x1000000>;\t/* CS5 */\n" "-\n" - " \tethernet@gpmc {\n" + " \tethernet at gpmc {\n" " \t\treg = <5 0 0xff>;\n" " \t\tinterrupt-parent = <&gpio6>;\n" "diff --git a/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi\n" @@ -74,7 +63,7 @@ " &gpmc {\n" "-\tranges = <5 0 0x2c000000 0x1000000>;\t/* CS5 */\n" "-\n" - " \tethernet@gpmc {\n" + " \tethernet at gpmc {\n" " \t\treg = <5 0 0xff>;\n" " \t\tinterrupt-parent = <&gpio6>;\n" "diff --git a/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi b/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi\n" @@ -88,10 +77,10 @@ "-\tranges = <4 0 0x2b000000 0x1000000>,\t/* CS4 */\n" "-\t\t <5 0 0x2c000000 0x1000000>;\t/* CS5 */\n" "-\n" - " \tsmsc1: ethernet@gpmc {\n" + " \tsmsc1: ethernet at gpmc {\n" " \t\treg = <5 0 0xff>;\n" " \t\tinterrupt-parent = <&gpio6>;\n" "-- \n" 2.7.3 -08190ada13cb9a86806da3fa81fce2839a210dc0a309a149bf642edb1af18cb0 +e7db0d062cb77644da5cbb86e01c6d1885e9a73bf4f87cf25d4a35a3a7e11589
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.