diff for duplicates of <201205142037.08752.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index 2c73c9e..b1be14d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,16 +26,16 @@ index e14bb45,67c6511..0000000 + bus-width = <4>; }; - - sdhci@78000200 { + - sdhci at 78000200 { - status = "disable"; - }; - - - sdhci@78000400 { + - sdhci at 78000400 { - status = "disable"; - }; - - - sdhci@78000400 { - + sdhci@78000600 { + - sdhci at 78000400 { + + sdhci at 78000600 { + status = "okay"; support-8bit; + bus-width = <8>; @@ -71,26 +71,26 @@ index 6bcdad3,e9cae68..0000000 clock-frequency = <400000>; }; - - i2s@70002a00 { + - i2s at 70002a00 { - status = "disable"; + pmc { + nvidia,invert-interrupt; + }; + - + usb@c5000000 { + + usb at c5000000 { + status = "okay"; + }; + - + usb@c5004000 { + + usb at c5004000 { + status = "okay"; + nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ + }; + - + usb@c5008000 { + + usb at c5008000 { + status = "okay"; + }; + - + sdhci@c8000200 { + + sdhci at c8000200 { + status = "okay"; + cd-gpios = <&gpio 69 0>; /* gpio PI5 */ + wp-gpios = <&gpio 57 0>; /* gpio PH1 */ @@ -98,7 +98,7 @@ index 6bcdad3,e9cae68..0000000 ++ bus-width = <4>; + }; + - + sdhci@c8000600 { + + sdhci at c8000600 { + status = "okay"; + cd-gpios = <&gpio 58 0>; /* gpio PH2 */ + wp-gpios = <&gpio 59 0>; /* gpio PH3 */ @@ -116,22 +116,22 @@ index 15d8fdb,29e54c7..0000000 clock-frequency = <400000>; }; - - i2s@70002a00 { + - i2s at 70002a00 { - status = "disable"; - + usb@c5000000 { + + usb at c5000000 { + status = "okay"; + }; + - + usb@c5004000 { + + usb at c5004000 { + status = "okay"; + nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ + }; + - + usb@c5008000 { + + usb at c5008000 { + status = "okay"; + }; + - + sdhci@c8000400 { + + sdhci at c8000400 { + status = "okay"; + cd-gpios = <&gpio 69 0>; /* gpio PI5 */ + wp-gpios = <&gpio 57 0>; /* gpio PH1 */ @@ -139,7 +139,7 @@ index 15d8fdb,29e54c7..0000000 ++ bus-width = <4>; + }; + - + sdhci@c8000600 { + + sdhci at c8000600 { + status = "okay"; + support-8bit; ++ bus-width = <8>; @@ -152,12 +152,12 @@ index 6fc52af..9de5636 100644 +++ b/arch/arm/boot/dts/tegra-trimslice.dts @@ -288,12 +288,14 @@ - sdhci@c8000000 { + sdhci at c8000000 { status = "okay"; + bus-width = <4>; }; - sdhci@c8000600 { + sdhci at c8000600 { status = "okay"; cd-gpios = <&gpio 121 0>; /* gpio PP1 */ wp-gpios = <&gpio 122 0>; /* gpio PP2 */ @@ -176,7 +176,7 @@ index c417d67..26f4299 100644 + bus-width = <4>; }; - sdhci@c8000200 { + sdhci at c8000200 { @@ -221,6 +222,7 @@ reg = <0xc8000200 0x200>; interrupts = <0 15 0x04>; @@ -184,7 +184,7 @@ index c417d67..26f4299 100644 + bus-width = <4>; }; - sdhci@c8000400 { + sdhci at c8000400 { @@ -228,6 +230,7 @@ reg = <0xc8000400 0x200>; interrupts = <0 19 0x04>; @@ -192,7 +192,7 @@ index c417d67..26f4299 100644 + bus-width = <4>; }; - sdhci@c8000600 { + sdhci at c8000600 { @@ -235,6 +238,7 @@ reg = <0xc8000600 0x200>; interrupts = <0 31 0x04>; @@ -212,7 +212,7 @@ index 2dcc09e..95fa6e3c 100644 + bus-width = <4>; }; - sdhci@78000200 { + sdhci at 78000200 { @@ -245,6 +246,7 @@ reg = <0x78000200 0x200>; interrupts = <0 15 0x04>; @@ -220,7 +220,7 @@ index 2dcc09e..95fa6e3c 100644 + bus-width = <4>; }; - sdhci@78000400 { + sdhci at 78000400 { @@ -252,6 +254,7 @@ reg = <0x78000400 0x200>; interrupts = <0 19 0x04>; @@ -228,7 +228,7 @@ index 2dcc09e..95fa6e3c 100644 + bus-width = <4>; }; - sdhci@78000600 { + sdhci at 78000600 { @@ -259,6 +262,7 @@ reg = <0x78000600 0x200>; interrupts = <0 31 0x04>; diff --git a/a/content_digest b/N1/content_digest index b1aee89..13bff48 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,10 @@ "ref\01337016017-30537-1-git-send-email-swarren@wwwdotorg.org\0" "ref\0201205141854.34331.arnd@arndb.de\0" "ref\04FB1572D.90500@wwwdotorg.org\0" - "ref\04FB1572D.90500-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org\0" - "From\0Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\0" - "Subject\0Re: [GIT PULL] ARM: tegra: dt2 branch\0" + "From\0arnd@arndb.de (Arnd Bergmann)\0" + "Subject\0[GIT PULL] ARM: tegra: dt2 branch\0" "Date\0Mon, 14 May 2012 20:37:08 +0000\0" - "To\0Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>\0" - "Cc\0arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - " linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Monday 14 May 2012, Stephen Warren wrote:\n" @@ -39,16 +35,16 @@ "+ \t\tbus-width = <4>;\n" " \t};\n" " \n" - " -\tsdhci@78000200 {\n" + " -\tsdhci at 78000200 {\n" " -\t\tstatus = \"disable\";\n" " -\t};\n" " -\n" - " -\tsdhci@78000400 {\n" + " -\tsdhci at 78000400 {\n" " -\t\tstatus = \"disable\";\n" " -\t};\n" " -\n" - " -\tsdhci@78000400 {\n" - " +\tsdhci@78000600 {\n" + " -\tsdhci at 78000400 {\n" + " +\tsdhci at 78000600 {\n" " +\t\tstatus = \"okay\";\n" " \t\tsupport-8bit;\n" "+ \t\tbus-width = <8>;\n" @@ -84,26 +80,26 @@ " \t\tclock-frequency = <400000>;\n" " \t};\n" " \n" - " -\ti2s@70002a00 {\n" + " -\ti2s at 70002a00 {\n" " -\t\tstatus = \"disable\";\n" " +\tpmc {\n" " +\t\tnvidia,invert-interrupt;\n" " +\t};\n" " +\n" - " +\tusb@c5000000 {\n" + " +\tusb at c5000000 {\n" " +\t\tstatus = \"okay\";\n" " +\t};\n" " +\n" - " +\tusb@c5004000 {\n" + " +\tusb at c5004000 {\n" " +\t\tstatus = \"okay\";\n" " +\t\tnvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */\n" " +\t};\n" " +\n" - " +\tusb@c5008000 {\n" + " +\tusb at c5008000 {\n" " +\t\tstatus = \"okay\";\n" " +\t};\n" " +\n" - " +\tsdhci@c8000200 {\n" + " +\tsdhci at c8000200 {\n" " +\t\tstatus = \"okay\";\n" " +\t\tcd-gpios = <&gpio 69 0>; /* gpio PI5 */\n" " +\t\twp-gpios = <&gpio 57 0>; /* gpio PH1 */\n" @@ -111,7 +107,7 @@ "++\t\tbus-width = <4>;\n" " +\t};\n" " +\n" - " +\tsdhci@c8000600 {\n" + " +\tsdhci at c8000600 {\n" " +\t\tstatus = \"okay\";\n" " +\t\tcd-gpios = <&gpio 58 0>; /* gpio PH2 */\n" " +\t\twp-gpios = <&gpio 59 0>; /* gpio PH3 */\n" @@ -129,22 +125,22 @@ " \t\tclock-frequency = <400000>;\n" " \t};\n" " \n" - " -\ti2s@70002a00 {\n" + " -\ti2s at 70002a00 {\n" " -\t\tstatus = \"disable\";\n" - " +\tusb@c5000000 {\n" + " +\tusb at c5000000 {\n" " +\t\tstatus = \"okay\";\n" " +\t};\n" " +\n" - " +\tusb@c5004000 {\n" + " +\tusb at c5004000 {\n" " +\t\tstatus = \"okay\";\n" " +\t\tnvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */\n" " +\t};\n" " +\n" - " +\tusb@c5008000 {\n" + " +\tusb at c5008000 {\n" " +\t\tstatus = \"okay\";\n" " +\t};\n" " +\n" - " +\tsdhci@c8000400 {\n" + " +\tsdhci at c8000400 {\n" " +\t\tstatus = \"okay\";\n" " +\t\tcd-gpios = <&gpio 69 0>; /* gpio PI5 */\n" " +\t\twp-gpios = <&gpio 57 0>; /* gpio PH1 */\n" @@ -152,7 +148,7 @@ "++\t\tbus-width = <4>;\n" " +\t};\n" " +\n" - " +\tsdhci@c8000600 {\n" + " +\tsdhci at c8000600 {\n" " +\t\tstatus = \"okay\";\n" " +\t\tsupport-8bit;\n" "++\t\tbus-width = <8>;\n" @@ -165,12 +161,12 @@ "+++ b/arch/arm/boot/dts/tegra-trimslice.dts\n" "@@ -288,12 +288,14 @@\n" " \n" - " \tsdhci@c8000000 {\n" + " \tsdhci at c8000000 {\n" " \t\tstatus = \"okay\";\n" "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@c8000600 {\n" + " \tsdhci at c8000600 {\n" " \t\tstatus = \"okay\";\n" " \t\tcd-gpios = <&gpio 121 0>; /* gpio PP1 */\n" " \t\twp-gpios = <&gpio 122 0>; /* gpio PP2 */\n" @@ -189,7 +185,7 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@c8000200 {\n" + " \tsdhci at c8000200 {\n" "@@ -221,6 +222,7 @@\n" " \t\treg = <0xc8000200 0x200>;\n" " \t\tinterrupts = <0 15 0x04>;\n" @@ -197,7 +193,7 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@c8000400 {\n" + " \tsdhci at c8000400 {\n" "@@ -228,6 +230,7 @@\n" " \t\treg = <0xc8000400 0x200>;\n" " \t\tinterrupts = <0 19 0x04>;\n" @@ -205,7 +201,7 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@c8000600 {\n" + " \tsdhci at c8000600 {\n" "@@ -235,6 +238,7 @@\n" " \t\treg = <0xc8000600 0x200>;\n" " \t\tinterrupts = <0 31 0x04>;\n" @@ -225,7 +221,7 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@78000200 {\n" + " \tsdhci at 78000200 {\n" "@@ -245,6 +246,7 @@\n" " \t\treg = <0x78000200 0x200>;\n" " \t\tinterrupts = <0 15 0x04>;\n" @@ -233,7 +229,7 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@78000400 {\n" + " \tsdhci at 78000400 {\n" "@@ -252,6 +254,7 @@\n" " \t\treg = <0x78000400 0x200>;\n" " \t\tinterrupts = <0 19 0x04>;\n" @@ -241,7 +237,7 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@78000600 {\n" + " \tsdhci at 78000600 {\n" "@@ -259,6 +262,7 @@\n" " \t\treg = <0x78000600 0x200>;\n" " \t\tinterrupts = <0 31 0x04>;\n" @@ -251,4 +247,4 @@ " \n" " \tpmu {" -ff5b3b4075586bd5e1800b14ec8373ecb8e52930f1fe062c8132ff94b24f8f85 +9c9167255ce0a2b0194f1f2a97dbe27af4fbfa39c5c37ee64a6a65dd4f074a6a
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.