diff for duplicates of <53972B57.6010802@epfl.ch> diff --git a/a/1.txt b/N1/1.txt index 76c7e51..7428ad8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,13 +19,13 @@ On 06/06/2014 10:51 PM, Ash Charles wrote: > index 51ebb77..d44e2e3 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS -> @@ -6427,6 +6427,12 @@ L: linux-omap@vger.kernel.org +> @@ -6427,6 +6427,12 @@ L: linux-omap at vger.kernel.org > S: Maintained > F: arch/arm/boot/dts/am335x-nano.dts > > +OMAP/GUMSTIX PEPPER MACHINE SUPPORT > +M: Ash Charles <ashcharles@gmail.com> -> +L: linux-omap@vger.kernel.org +> +L: linux-omap at vger.kernel.org > +S: Maintained > +F: arch/arm/boot/dts/am335x-pepper.dts > + @@ -37,7 +37,7 @@ and properly handle this case. > 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 a81a24c..9e0352f 100644 > --- a/arch/arm/boot/dts/Makefile @@ -74,7 +74,7 @@ and properly handle this case. > + compatible = "gumstix,am335x-pepper", "ti,am33xx"; > + > + cpus { -> + cpu@0 { +> + cpu at 0 { > + cpu0-supply = <&dcdc3_reg>; > + }; > + }; @@ -106,15 +106,15 @@ read. > + compatible = "ti,da830-evm-audio"; > + }; > + -> + vbat: fixedregulator@0 { +> + vbat: fixedregulator at 0 { > + compatible = "regulator-fixed"; > + }; > + -> + v3v3c_reg: fixedregulator@1 { +> + v3v3c_reg: fixedregulator at 1 { > + compatible = "regulator-fixed"; > + }; > + -> + vdd5_reg: fixedregulator@2 { +> + vdd5_reg: fixedregulator at 2 { > + compatible = "regulator-fixed"; > + }; > +}; @@ -127,21 +127,21 @@ read. > + > + clock-frequency = <400000>; > + -> + tps: tps@24 { +> + tps: tps at 24 { > + reg = <0x24>; > + }; > + -> + eeprom: eeprom@50 { +> + eeprom: eeprom at 50 { > + compatible = "at,24c256"; > + reg = <0x50>; > + }; > + -> + audio_codec: tlv320aic3106@1b { +> + audio_codec: tlv320aic3106 at 1b { > + compatible = "ti,tlv320aic3106"; > + reg = <0x1b>; > + }; > + -> + accel: lis331dlh@1d { +> + accel: lis331dlh at 1d { > + compatible = "st,lis3lv02d"; > + reg = <0x1d>; > + }; @@ -516,12 +516,12 @@ superfluous. > + }; > + > + regulators { -> + dcdc1_reg: regulator@0 { +> + dcdc1_reg: regulator at 0 { > + /* VDD_1V8 system supply */ > + regulator-always-on; > + }; > + -> + dcdc2_reg: regulator@1 { +> + dcdc2_reg: regulator at 1 { > + /* VDD_CORE voltage limits 0.95V - 1.26V with +/-4% tolerance */ > + regulator-name = "vdd_core"; > + regulator-min-microvolt = <925000>; @@ -530,7 +530,7 @@ superfluous. > + regulator-always-on; > + }; > + -> + dcdc3_reg: regulator@2 { +> + dcdc3_reg: regulator at 2 { > + /* VDD_MPU voltage limits 0.95V - 1.1V with +/-4% tolerance */ > + regulator-name = "vdd_mpu"; > + regulator-min-microvolt = <925000>; @@ -539,24 +539,24 @@ superfluous. > + regulator-always-on; > + }; > + -> + ldo1_reg: regulator@3 { +> + ldo1_reg: regulator at 3 { > + /* VRTC 1.8V always-on supply */ > + regulator-always-on; > + }; > + -> + ldo2_reg: regulator@4 { +> + ldo2_reg: regulator at 4 { > + /* 3.3V rail */ > + regulator-always-on; > + }; > + -> + ldo3_reg: regulator@5 { +> + ldo3_reg: regulator at 5 { > + /* VDD_3V3A 3.3V rail */ > + regulator-always-on; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + }; > + -> + ldo4_reg: regulator@6 { +> + ldo4_reg: regulator at 6 { > + /* VDD_3V3B 3.3V rail */ > + regulator-always-on; > + }; @@ -682,14 +682,14 @@ automatically if you have correct dependencies, shouldn't they? > + pinctrl-names = "default"; > + pinctrl-0 = <&user_leds_pins>; > + -> + led@0 { +> + led at 0 { > + label = "pepper:user0:blue"; > + gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>; > + linux,default-trigger = "none"; > + default-state = "off"; > + }; > + -> + led@1 { +> + led at 1 { > + label = "pepper:user1:red"; > + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; > + linux,default-trigger = "none"; @@ -703,7 +703,7 @@ automatically if you have correct dependencies, shouldn't they? > + #address-cells = <1>; > + #size-cells = <0>; > + -> + button@0 { +> + button at 0 { > + label = "home"; > + linux,code = <102>; @@ -713,7 +713,7 @@ You can use the key codes defined in <dt-bindings/input/input.h>. > + gpio-key,wakeup; > + }; > + -> + button@1 { +> + button at 1 { > + label = "menu"; > + linux,code = <139>; @@ -723,7 +723,7 @@ KEY_MENU > + gpio-key,wakeup; > + }; > + -> + buttons@2 { +> + buttons at 2 { > + label = "power"; > + linux,code = <116>; diff --git a/a/content_digest b/N1/content_digest index 1c919d5..a9d65aa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,8 @@ "ref\01402087916-14857-1-git-send-email-ashcharles@gmail.com\0" - "From\0Florian Vaussard <florian.vaussard@epfl.ch>\0" - "Subject\0Re: [PATCH] omap: Add devicetree for Gumstix Pepper board\0" + "From\0florian.vaussard@epfl.ch (Florian Vaussard)\0" + "Subject\0[PATCH] omap: Add devicetree for Gumstix Pepper board\0" "Date\0Tue, 10 Jun 2014 17:59:19 +0200\0" - "To\0Ash Charles <ashcharles@gmail.com>" - Tony Lindgren <tony@atomide.com> - " Beno\303\256t Cousson <bcousson@baylibre.com>\0" - "Cc\0linux-omap@vger.kernel.org" - devicetree@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Ash,\n" @@ -31,13 +26,13 @@ "> index 51ebb77..d44e2e3 100644\n" "> --- a/MAINTAINERS\n" "> +++ b/MAINTAINERS\n" - "> @@ -6427,6 +6427,12 @@ L:\tlinux-omap@vger.kernel.org\n" + "> @@ -6427,6 +6427,12 @@ L:\tlinux-omap at vger.kernel.org\n" "> S:\tMaintained\n" "> F:\tarch/arm/boot/dts/am335x-nano.dts\n" "> \n" "> +OMAP/GUMSTIX PEPPER MACHINE SUPPORT\n" "> +M:\tAsh Charles <ashcharles@gmail.com>\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-pepper.dts\n" "> +\n" @@ -49,7 +44,7 @@ "\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 a81a24c..9e0352f 100644\n" "> --- a/arch/arm/boot/dts/Makefile\n" @@ -86,7 +81,7 @@ "> +\tcompatible = \"gumstix,am335x-pepper\", \"ti,am33xx\";\n" "> +\n" "> +\tcpus {\n" - "> +\t\tcpu@0 {\n" + "> +\t\tcpu at 0 {\n" "> +\t\t\tcpu0-supply = <&dcdc3_reg>;\n" "> +\t\t};\n" "> +\t};\n" @@ -118,15 +113,15 @@ "> +\t\tcompatible = \"ti,da830-evm-audio\";\n" "> +\t};\n" "> +\n" - "> +\tvbat: fixedregulator@0 {\n" + "> +\tvbat: fixedregulator at 0 {\n" "> +\t\tcompatible = \"regulator-fixed\";\n" "> +\t};\n" "> +\n" - "> +\tv3v3c_reg: fixedregulator@1 {\n" + "> +\tv3v3c_reg: fixedregulator at 1 {\n" "> +\t\tcompatible = \"regulator-fixed\";\n" "> +\t};\n" "> +\n" - "> +\tvdd5_reg: fixedregulator@2 {\n" + "> +\tvdd5_reg: fixedregulator at 2 {\n" "> +\t\tcompatible = \"regulator-fixed\";\n" "> +\t};\n" "> +};\n" @@ -139,21 +134,21 @@ "> +\n" "> +\tclock-frequency = <400000>;\n" "> +\n" - "> +\ttps: tps@24 {\n" + "> +\ttps: tps at 24 {\n" "> +\t\treg = <0x24>;\n" "> +\t};\n" "> +\n" - "> +\teeprom: eeprom@50 {\n" + "> +\teeprom: eeprom at 50 {\n" "> +\t\tcompatible = \"at,24c256\";\n" "> +\t\treg = <0x50>;\n" "> +\t};\n" "> +\n" - "> +\taudio_codec: tlv320aic3106@1b {\n" + "> +\taudio_codec: tlv320aic3106 at 1b {\n" "> +\t\tcompatible = \"ti,tlv320aic3106\";\n" "> +\t\treg = <0x1b>;\n" "> +\t};\n" "> +\n" - "> +\taccel: lis331dlh@1d {\n" + "> +\taccel: lis331dlh at 1d {\n" "> +\t\tcompatible = \"st,lis3lv02d\";\n" "> +\t\treg = <0x1d>;\n" "> +\t};\n" @@ -528,12 +523,12 @@ "> +\t};\n" "> +\n" "> +\tregulators {\n" - "> +\t\tdcdc1_reg: regulator@0 {\n" + "> +\t\tdcdc1_reg: regulator at 0 {\n" "> +\t\t\t/* VDD_1V8 system supply */\n" "> +\t\t\tregulator-always-on;\n" "> +\t\t};\n" "> +\n" - "> +\t\tdcdc2_reg: regulator@1 {\n" + "> +\t\tdcdc2_reg: regulator at 1 {\n" "> +\t\t\t/* VDD_CORE voltage limits 0.95V - 1.26V with +/-4% tolerance */\n" "> +\t\t\tregulator-name = \"vdd_core\";\n" "> +\t\t\tregulator-min-microvolt = <925000>;\n" @@ -542,7 +537,7 @@ "> +\t\t\tregulator-always-on;\n" "> +\t\t};\n" "> +\n" - "> +\t\tdcdc3_reg: regulator@2 {\n" + "> +\t\tdcdc3_reg: regulator at 2 {\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 = <925000>;\n" @@ -551,24 +546,24 @@ "> +\t\t\tregulator-always-on;\n" "> +\t\t};\n" "> +\n" - "> +\t\tldo1_reg: regulator@3 {\n" + "> +\t\tldo1_reg: regulator at 3 {\n" "> +\t\t\t/* VRTC 1.8V always-on supply */\n" "> +\t\t\tregulator-always-on;\n" "> +\t\t};\n" "> +\n" - "> +\t\tldo2_reg: regulator@4 {\n" + "> +\t\tldo2_reg: regulator at 4 {\n" "> +\t\t\t/* 3.3V rail */\n" "> +\t\t\tregulator-always-on;\n" "> +\t\t};\n" "> +\n" - "> +\t\tldo3_reg: regulator@5 {\n" + "> +\t\tldo3_reg: regulator at 5 {\n" "> +\t\t\t/* VDD_3V3A 3.3V rail */\n" "> +\t\t\tregulator-always-on;\n" "> +\t\t\tregulator-min-microvolt = <3300000>;\n" "> +\t\t\tregulator-max-microvolt = <3300000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tldo4_reg: regulator@6 {\n" + "> +\t\tldo4_reg: regulator at 6 {\n" "> +\t\t\t/* VDD_3V3B 3.3V rail */\n" "> +\t\t\tregulator-always-on;\n" "> +\t\t};\n" @@ -694,14 +689,14 @@ "> +\tpinctrl-names = \"default\";\n" "> +\tpinctrl-0 = <&user_leds_pins>;\n" "> +\n" - "> +\tled@0 {\n" + "> +\tled at 0 {\n" "> +\t\tlabel = \"pepper:user0:blue\";\n" "> +\t\tgpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;\n" "> +\t\tlinux,default-trigger = \"none\";\n" "> +\t\tdefault-state = \"off\";\n" "> +\t};\n" "> +\n" - "> +\tled@1 {\n" + "> +\tled at 1 {\n" "> +\t\tlabel = \"pepper:user1:red\";\n" "> +\t\tgpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;\n" "> +\t\tlinux,default-trigger = \"none\";\n" @@ -715,7 +710,7 @@ "> +\t#address-cells = <1>;\n" "> +\t#size-cells = <0>;\n" "> +\n" - "> +\tbutton@0 {\n" + "> +\tbutton at 0 {\n" "> +\t\tlabel = \"home\";\n" "> +\t\tlinux,code = <102>;\n" "\n" @@ -725,7 +720,7 @@ "> +\t\tgpio-key,wakeup;\n" "> +\t};\n" "> +\n" - "> +\tbutton@1 {\n" + "> +\tbutton at 1 {\n" "> +\t\tlabel = \"menu\";\n" "> +\t\tlinux,code = <139>;\n" "\n" @@ -735,7 +730,7 @@ "> +\t\tgpio-key,wakeup;\n" "> +\t};\n" "> +\n" - "> +\tbuttons@2 {\n" + "> +\tbuttons at 2 {\n" "> +\t\tlabel = \"power\";\n" "> +\t\tlinux,code = <116>;\n" "\n" @@ -772,4 +767,4 @@ "\n" Florian -3395b27edd4f91c333dd95e35b3b75761d9ccc79d40112f80006133ff6f5ec42 +cb5ca4abcb1f15f52b2241fc5018c010d919576d9b70640f1cbe60298319b8fa
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.