diff for duplicates of <1350626311-18131-1-git-send-email-markz@nvidia.com> diff --git a/a/1.txt b/N1/1.txt index 0392bf6..7776417 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ Define pinmux for DDC. The DDC pinmux in Ventana is 2 pins in I2C2. -Signed-off-by: Mark Zhang <markz-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> +Signed-off-by: Mark Zhang <markz@nvidia.com> --- arch/arm/boot/dts/tegra20-ventana.dts | 70 ++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 5 deletions(-) @@ -60,7 +60,7 @@ index bec8bb2..b6b3af4 100644 + }; }; - i2s@70002800 { + i2s at 70002800 { @@ -291,6 +319,38 @@ clock-frequency = <400000>; }; @@ -77,18 +77,18 @@ index bec8bb2..b6b3af4 100644 + pinctrl-1 = <&state_i2cmux_pta>; + pinctrl-2 = <&state_i2cmux_idle>; + -+ i2c@0 { ++ i2c at 0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + }; + -+ i2c@1 { ++ i2c at 1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + -+ smart-battery@b { ++ smart-battery at b { + compatible = "ti,bq24617", "smart-battery-1.1"; + reg = <0xb>; + ti,i2c-retry-count = <2>; @@ -97,7 +97,7 @@ index bec8bb2..b6b3af4 100644 + }; + }; + - i2c@7000c500 { + i2c at 7000c500 { status = "okay"; clock-frequency = <400000>; -- diff --git a/a/content_digest b/N1/content_digest index a5deada..18c1df4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,12 @@ - "From\0Mark Zhang <markz-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" + "From\0markz@nvidia.com (Mark Zhang)\0" "Subject\0[PATCH] ARM: dt: tegra: ventana: define pinmux for ddc\0" "Date\0Fri, 19 Oct 2012 13:58:31 +0800\0" - "To\0swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org" - " linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org\0" - "Cc\0linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " Mark Zhang <markz-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Define pinmux for DDC. The DDC pinmux in Ventana is 2 pins in I2C2.\n" "\n" - "Signed-off-by: Mark Zhang <markz-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n" + "Signed-off-by: Mark Zhang <markz@nvidia.com>\n" "---\n" " arch/arm/boot/dts/tegra20-ventana.dts | 70 ++++++++++++++++++++++++++++++---\n" " 1 file changed, 65 insertions(+), 5 deletions(-)\n" @@ -71,7 +66,7 @@ "+\t\t};\n" " \t};\n" " \n" - " \ti2s@70002800 {\n" + " \ti2s at 70002800 {\n" "@@ -291,6 +319,38 @@\n" " \t\tclock-frequency = <400000>;\n" " \t};\n" @@ -88,18 +83,18 @@ "+\t\tpinctrl-1 = <&state_i2cmux_pta>;\n" "+\t\tpinctrl-2 = <&state_i2cmux_idle>;\n" "+\n" - "+\t\ti2c@0 {\n" + "+\t\ti2c at 0 {\n" "+\t\t\treg = <0>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\t\t};\n" "+\n" - "+\t\ti2c@1 {\n" + "+\t\ti2c at 1 {\n" "+\t\t\treg = <1>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\tsmart-battery@b {\n" + "+\t\t\tsmart-battery at b {\n" "+\t\t\t\tcompatible = \"ti,bq24617\", \"smart-battery-1.1\";\n" "+\t\t\t\treg = <0xb>;\n" "+\t\t\t\tti,i2c-retry-count = <2>;\n" @@ -108,10 +103,10 @@ "+\t\t};\n" "+\t};\n" "+\n" - " \ti2c@7000c500 {\n" + " \ti2c at 7000c500 {\n" " \t\tstatus = \"okay\";\n" " \t\tclock-frequency = <400000>;\n" "-- \n" 1.7.9.5 -d848764345f7735e73baea9fa4f00668116427093ca781cab826733ca223bb1f +dc32ae224486c241d9f5b57a4502e4373c652e9b068978156a8687e815f4418f
diff --git a/a/1.txt b/N2/1.txt index 0392bf6..a1ed366 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,6 +1,6 @@ Define pinmux for DDC. The DDC pinmux in Ventana is 2 pins in I2C2. -Signed-off-by: Mark Zhang <markz-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> +Signed-off-by: Mark Zhang <markz@nvidia.com> --- arch/arm/boot/dts/tegra20-ventana.dts | 70 ++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/a/content_digest b/N2/content_digest index a5deada..1d05bb8 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,17 +1,17 @@ - "From\0Mark Zhang <markz-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" + "From\0Mark Zhang <markz@nvidia.com>\0" "Subject\0[PATCH] ARM: dt: tegra: ventana: define pinmux for ddc\0" "Date\0Fri, 19 Oct 2012 13:58:31 +0800\0" - "To\0swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org" - " linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org\0" - "Cc\0linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " Mark Zhang <markz-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" + "To\0<swarren@wwwdotorg.org>" + " <linux@arm.linux.org.uk>\0" + "Cc\0<linux-tegra@vger.kernel.org>" + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + " Mark Zhang <markz@nvidia.com>\0" "\00:1\0" "b\0" "Define pinmux for DDC. The DDC pinmux in Ventana is 2 pins in I2C2.\n" "\n" - "Signed-off-by: Mark Zhang <markz-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n" + "Signed-off-by: Mark Zhang <markz@nvidia.com>\n" "---\n" " arch/arm/boot/dts/tegra20-ventana.dts | 70 ++++++++++++++++++++++++++++++---\n" " 1 file changed, 65 insertions(+), 5 deletions(-)\n" @@ -114,4 +114,4 @@ "-- \n" 1.7.9.5 -d848764345f7735e73baea9fa4f00668116427093ca781cab826733ca223bb1f +72a7aeafa8cc4e6f627675830b29c928fd2b45657df8090e71133d20e6addfa0
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.