diff for duplicates of <524298FE.4090200@newflow.co.uk> diff --git a/a/1.txt b/N1/1.txt index 67de353..b161035 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,19 +44,19 @@ diff --git a/MAINTAINERS b/MAINTAINERS index e61c2e8..8a4c9d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -6062,6 +6062,12 @@ L: linux-omap@vger.kernel.org +@@ -6062,6 +6062,12 @@ L: linux-omap at vger.kernel.org S: Maintained F: drivers/gpio/gpio-omap.c +OMAP/NEWFLOW NANOBONE MACHINE SUPPORT +M: Mark Jackson <mpfj@newflow.co.uk> -+L: linux-omap@vger.kernel.org ++L: linux-omap at vger.kernel.org +S: Maintained +F: arch/arm/boot/dts/am335x-nano.dts + OMFS FILESYSTEM M: Bob Copeland <me@bobcopeland.com> - L: linux-karma-devel@lists.sourceforge.net + L: linux-karma-devel at lists.sourceforge.net diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index e95af3f..543e837 100644 --- a/arch/arm/boot/dts/Makefile @@ -91,7 +91,7 @@ index 0000000..9907b49 + compatible = "ti,am33xx"; + + cpus { -+ cpu@0 { ++ cpu at 0 { + cpu0-supply = <&dcdc2_reg>; + }; + }; @@ -104,7 +104,7 @@ index 0000000..9907b49 + leds { + compatible = "gpio-leds"; + -+ led@0 { ++ led at 0 { + label = "nanobone:green:usr1"; + gpios = <&gpio1 5 0>; + default-state = "off"; @@ -289,22 +289,22 @@ index 0000000..9907b49 + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + -+ gpio@20 { ++ gpio at 20 { + compatible = "mcp,mcp23017"; + reg = <0x20>; + }; + -+ tps: tps@24 { ++ tps: tps at 24 { + reg = <0x24>; + }; + -+ eeprom@53 { ++ eeprom at 53 { + compatible = "mcp,24c02"; + reg = <0x53>; + pagesize = <8>; + }; + -+ rtc@68 { ++ rtc at 68 { + compatible = "dallas,ds1307"; + reg = <0x68>; + }; @@ -326,7 +326,7 @@ index 0000000..9907b49 + #size-cells = <1>; + ranges = <0 0 0x08000000 0x08000000>; /* CS0: NOR 128M */ + -+ nor@0,0 { ++ nor at 0,0 { + reg = <0 0x00000000 0x08000000>; + compatible = "cfi-flash"; + linux,mtd-name = "spansion,s29gl010p11t"; @@ -382,37 +382,37 @@ index 0000000..9907b49 + | | + +------------+-->0x08000000-> NOR end (Free end) + */ -+ partition@0 { ++ partition at 0 { + label = "boot"; + reg = <0x00000000 0x000c0000>; /* 768KB */ + }; + -+ partition@1 { ++ partition at 1 { + label = "env1"; + reg = <0x000c0000 0x00020000>; /* 128KB */ + }; + -+ partition@2 { ++ partition at 2 { + label = "env2"; + reg = <0x000e0000 0x00020000>; /* 128KB */ + }; + -+ partition@3 { ++ partition at 3 { + label = "kernel"; + reg = <0x00100000 0x00400000>; /* 4MB */ + }; + -+ partition@4 { ++ partition at 4 { + label = "rootfs"; + reg = <0x00500000 0x01000000>; /* 16MB */ + }; + -+ partition@5 { ++ partition at 5 { + label = "user"; + reg = <0x01500000 0x02b00000>; /* 43MB */ + }; + -+ partition@6 { ++ partition at 6 { + label = "data"; + reg = <0x04000000 0x04000000>; /* 64MB */ + }; @@ -447,16 +447,16 @@ index 0000000..9907b49 + +&tps { + regulators { -+ dcdc1_reg: regulator@0 { -+ /* +1.5V voltage with ±4% tolerance */ ++ dcdc1_reg: regulator at 0 { ++ /* +1.5V voltage with ??4% tolerance */ + regulator-min-microvolt = <1450000>; + regulator-max-microvolt = <1550000>; + regulator-boot-on; + regulator-always-on; + }; + -+ dcdc2_reg: regulator@1 { -+ /* VDD_MPU voltage limits 0.95V - 1.1V with ±4% tolerance */ ++ dcdc2_reg: regulator at 1 { ++ /* VDD_MPU voltage limits 0.95V - 1.1V with ??4% tolerance */ + regulator-name = "vdd_mpu"; + regulator-min-microvolt = <915000>; + regulator-max-microvolt = <1140000>; @@ -464,8 +464,8 @@ index 0000000..9907b49 + regulator-always-on; + }; + -+ dcdc3_reg: regulator@2 { -+ /* VDD_CORE voltage limits 0.95V - 1.1V with ±4% tolerance */ ++ dcdc3_reg: regulator at 2 { ++ /* VDD_CORE voltage limits 0.95V - 1.1V with ??4% tolerance */ + regulator-name = "vdd_core"; + regulator-min-microvolt = <915000>; + regulator-max-microvolt = <1140000>; @@ -473,32 +473,32 @@ index 0000000..9907b49 + regulator-always-on; + }; + -+ ldo1_reg: regulator@3 { -+ /* +1.8V voltage with ±4% tolerance */ ++ ldo1_reg: regulator at 3 { ++ /* +1.8V voltage with ??4% tolerance */ + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <1870000>; + regulator-boot-on; + regulator-always-on; + }; + -+ ldo2_reg: regulator@4 { -+ /* +3.3V voltage with ±4% tolerance */ ++ ldo2_reg: regulator at 4 { ++ /* +3.3V voltage with ??4% tolerance */ + regulator-min-microvolt = <3175000>; + regulator-max-microvolt = <3430000>; + regulator-boot-on; + regulator-always-on; + }; + -+ ldo3_reg: regulator@5 { -+ /* +1.8V voltage with ±4% tolerance */ ++ ldo3_reg: regulator at 5 { ++ /* +1.8V voltage with ??4% tolerance */ + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <1870000>; + regulator-boot-on; + regulator-always-on; + }; + -+ ldo4_reg: regulator@6 { -+ /* +3.3V voltage with ±4% tolerance */ ++ ldo4_reg: regulator at 6 { ++ /* +3.3V voltage with ??4% tolerance */ + regulator-min-microvolt = <3175000>; + regulator-max-microvolt = <3430000>; + regulator-boot-on; diff --git a/a/content_digest b/N1/content_digest index cc5df11..f4c5a01 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,7 @@ - "From\0Mark Jackson <mpfj-list@newflow.co.uk>\0" + "From\0mpfj-list@newflow.co.uk (Mark Jackson)\0" "Subject\0[PATCH v3] Add support for Newflow NanoBone board\0" "Date\0Wed, 25 Sep 2013 09:04:14 +0100\0" - "To\0linux-omap@vger.kernel.org <linux-omap@vger.kernel.org>\0" - "Cc\0Russell King <linux@arm.linux.org.uk>" - Benoit Cousson <bcousson@baylibre.com> - Javier Martinez Canillas <martinez.javier@gmail.com> - device-tree <devicetree-discuss@lists.ozlabs.org> - lkml <linux-kernel@vger.kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - " Tony Lindgren <tony@atomide.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "NanoBone Specification:\n" @@ -57,19 +50,19 @@ "index e61c2e8..8a4c9d9 100644\n" "--- a/MAINTAINERS\n" "+++ b/MAINTAINERS\n" - "@@ -6062,6 +6062,12 @@ L:\tlinux-omap@vger.kernel.org\n" + "@@ -6062,6 +6062,12 @@ L:\tlinux-omap at vger.kernel.org\n" " S:\tMaintained\n" " F:\tdrivers/gpio/gpio-omap.c\n" " \n" "+OMAP/NEWFLOW NANOBONE MACHINE SUPPORT\n" "+M:\tMark Jackson <mpfj@newflow.co.uk>\n" - "+L:\tlinux-omap@vger.kernel.org\n" + "+L:\tlinux-omap at vger.kernel.org\n" "+S:\tMaintained\n" "+F:\tarch/arm/boot/dts/am335x-nano.dts\n" "+\n" " OMFS FILESYSTEM\n" " M:\tBob Copeland <me@bobcopeland.com>\n" - " L:\tlinux-karma-devel@lists.sourceforge.net\n" + " L:\tlinux-karma-devel at lists.sourceforge.net\n" "diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile\n" "index e95af3f..543e837 100644\n" "--- a/arch/arm/boot/dts/Makefile\n" @@ -104,7 +97,7 @@ "+\tcompatible = \"ti,am33xx\";\n" "+\n" "+\tcpus {\n" - "+\t\tcpu@0 {\n" + "+\t\tcpu at 0 {\n" "+\t\t\tcpu0-supply = <&dcdc2_reg>;\n" "+\t\t};\n" "+\t};\n" @@ -117,7 +110,7 @@ "+\tleds {\n" "+\t\tcompatible = \"gpio-leds\";\n" "+\n" - "+\t\tled@0 {\n" + "+\t\tled at 0 {\n" "+\t\t\tlabel = \"nanobone:green:usr1\";\n" "+\t\t\tgpios = <&gpio1 5 0>;\n" "+\t\t\tdefault-state = \"off\";\n" @@ -302,22 +295,22 @@ "+\tpinctrl-names = \"default\";\n" "+\tpinctrl-0 = <&i2c0_pins>;\n" "+\n" - "+\tgpio@20 {\n" + "+\tgpio at 20 {\n" "+\t\tcompatible = \"mcp,mcp23017\";\n" "+\t\treg = <0x20>;\n" "+\t};\n" "+\n" - "+\ttps: tps@24 {\n" + "+\ttps: tps at 24 {\n" "+\t\treg = <0x24>;\n" "+\t};\n" "+\n" - "+\teeprom@53 {\n" + "+\teeprom at 53 {\n" "+\t\tcompatible = \"mcp,24c02\";\n" "+\t\treg = <0x53>;\n" "+\t\tpagesize = <8>;\n" "+\t};\n" "+\n" - "+\trtc@68 {\n" + "+\trtc at 68 {\n" "+\t\tcompatible = \"dallas,ds1307\";\n" "+\t\treg = <0x68>;\n" "+\t};\n" @@ -339,7 +332,7 @@ "+\t#size-cells = <1>;\n" "+\tranges = <0 0 0x08000000 0x08000000>;\t/* CS0: NOR 128M */\n" "+\n" - "+\tnor@0,0 {\n" + "+\tnor at 0,0 {\n" "+\t\treg = <0 0x00000000 0x08000000>;\n" "+\t\tcompatible = \"cfi-flash\";\n" "+\t\tlinux,mtd-name = \"spansion,s29gl010p11t\";\n" @@ -395,37 +388,37 @@ "+\t\t| |\n" "+\t\t+------------+-->0x08000000-> NOR end (Free end)\n" "+\t\t*/\n" - "+\t\tpartition@0 {\n" + "+\t\tpartition at 0 {\n" "+\t\t\tlabel = \"boot\";\n" "+\t\t\treg = <0x00000000 0x000c0000>; /* 768KB */\n" "+\t\t};\n" "+\n" - "+\t\tpartition@1 {\n" + "+\t\tpartition at 1 {\n" "+\t\t\tlabel = \"env1\";\n" "+\t\t\treg = <0x000c0000 0x00020000>; /* 128KB */\n" "+\t\t};\n" "+\n" - "+\t\tpartition@2 {\n" + "+\t\tpartition at 2 {\n" "+\t\t\tlabel = \"env2\";\n" "+\t\t\treg = <0x000e0000 0x00020000>; /* 128KB */\n" "+\t\t};\n" "+\n" - "+\t\tpartition@3 {\n" + "+\t\tpartition at 3 {\n" "+\t\t\tlabel = \"kernel\";\n" "+\t\t\treg = <0x00100000 0x00400000>; /* 4MB */\n" "+\t\t};\n" "+\n" - "+\t\tpartition@4 {\n" + "+\t\tpartition at 4 {\n" "+\t\t\tlabel = \"rootfs\";\n" "+\t\t\treg = <0x00500000 0x01000000>; /* 16MB */\n" "+\t\t};\n" "+\n" - "+\t\tpartition@5 {\n" + "+\t\tpartition at 5 {\n" "+\t\t\tlabel = \"user\";\n" "+\t\t\treg = <0x01500000 0x02b00000>; /* 43MB */\n" "+\t\t};\n" "+\n" - "+\t\tpartition@6 {\n" + "+\t\tpartition at 6 {\n" "+\t\t\tlabel = \"data\";\n" "+\t\t\treg = <0x04000000 0x04000000>; /* 64MB */\n" "+\t\t};\n" @@ -460,16 +453,16 @@ "+\n" "+&tps {\n" "+\tregulators {\n" - "+\t\tdcdc1_reg: regulator@0 {\n" - "+\t\t\t/* +1.5V voltage with \303\202\302\2614% tolerance */\n" + "+\t\tdcdc1_reg: regulator at 0 {\n" + "+\t\t\t/* +1.5V voltage with ??4% tolerance */\n" "+\t\t\tregulator-min-microvolt = <1450000>;\n" "+\t\t\tregulator-max-microvolt = <1550000>;\n" "+\t\t\tregulator-boot-on;\n" "+\t\t\tregulator-always-on;\n" "+\t\t};\n" "+\n" - "+\t\tdcdc2_reg: regulator@1 {\n" - "+\t\t\t/* VDD_MPU voltage limits 0.95V - 1.1V with \303\202\302\2614% tolerance */\n" + "+\t\tdcdc2_reg: regulator at 1 {\n" + "+\t\t\t/* VDD_MPU voltage limits 0.95V - 1.1V with ??4% tolerance */\n" "+\t\t\tregulator-name = \"vdd_mpu\";\n" "+\t\t\tregulator-min-microvolt = <915000>;\n" "+\t\t\tregulator-max-microvolt = <1140000>;\n" @@ -477,8 +470,8 @@ "+\t\t\tregulator-always-on;\n" "+\t\t};\n" "+\n" - "+\t\tdcdc3_reg: regulator@2 {\n" - "+\t\t\t/* VDD_CORE voltage limits 0.95V - 1.1V with \303\202\302\2614% tolerance */\n" + "+\t\tdcdc3_reg: regulator at 2 {\n" + "+\t\t\t/* VDD_CORE voltage limits 0.95V - 1.1V with ??4% tolerance */\n" "+\t\t\tregulator-name = \"vdd_core\";\n" "+\t\t\tregulator-min-microvolt = <915000>;\n" "+\t\t\tregulator-max-microvolt = <1140000>;\n" @@ -486,32 +479,32 @@ "+\t\t\tregulator-always-on;\n" "+\t\t};\n" "+\n" - "+\t\tldo1_reg: regulator@3 {\n" - "+\t\t\t/* +1.8V voltage with \303\202\302\2614% tolerance */\n" + "+\t\tldo1_reg: regulator at 3 {\n" + "+\t\t\t/* +1.8V voltage with ??4% tolerance */\n" "+\t\t\tregulator-min-microvolt = <1750000>;\n" "+\t\t\tregulator-max-microvolt = <1870000>;\n" "+\t\t\tregulator-boot-on;\n" "+\t\t\tregulator-always-on;\n" "+\t\t};\n" "+\n" - "+\t\tldo2_reg: regulator@4 {\n" - "+\t\t\t/* +3.3V voltage with \303\202\302\2614% tolerance */\n" + "+\t\tldo2_reg: regulator at 4 {\n" + "+\t\t\t/* +3.3V voltage with ??4% tolerance */\n" "+\t\t\tregulator-min-microvolt = <3175000>;\n" "+\t\t\tregulator-max-microvolt = <3430000>;\n" "+\t\t\tregulator-boot-on;\n" "+\t\t\tregulator-always-on;\n" "+\t\t};\n" "+\n" - "+\t\tldo3_reg: regulator@5 {\n" - "+\t\t\t/* +1.8V voltage with \303\202\302\2614% tolerance */\n" + "+\t\tldo3_reg: regulator at 5 {\n" + "+\t\t\t/* +1.8V voltage with ??4% tolerance */\n" "+\t\t\tregulator-min-microvolt = <1750000>;\n" "+\t\t\tregulator-max-microvolt = <1870000>;\n" "+\t\t\tregulator-boot-on;\n" "+\t\t\tregulator-always-on;\n" "+\t\t};\n" "+\n" - "+\t\tldo4_reg: regulator@6 {\n" - "+\t\t\t/* +3.3V voltage with \303\202\302\2614% tolerance */\n" + "+\t\tldo4_reg: regulator at 6 {\n" + "+\t\t\t/* +3.3V voltage with ??4% tolerance */\n" "+\t\t\tregulator-min-microvolt = <3175000>;\n" "+\t\t\tregulator-max-microvolt = <3430000>;\n" "+\t\t\tregulator-boot-on;\n" @@ -522,4 +515,4 @@ "-- \n" 1.7.9.5 -207611575c12079e32adea59c4e7238ef82940f51fe1585a6c87addf593341e6 +6ea3ae7aabf173fb2a354c470fc2999439c6bb1a579b84862fae1a29fdecc2b1
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.