Merge branch 'for-3.5/gpio-pinmux' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/pinctrl

By Stephen Warren via Stephen Warren * 'for-3.5/gpio-pinmux' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: pinctrl: tegra: error reporting cleanup pinctrl: tegra: debugfs enhancements pinctrl: tegra: refactor probe handling ARM: dt: tegra20: add pinmux to device tree ARM: dt: tegra cardhu: add pinmux to device tree ARM: tegra: Remove pre-pinctrl pinmux driver ARM: tegra: Switch to new pinctrl driver gpio: tegra: Hide tegra_gpio_enable/disable() ARM: tegra: seaboard: Don't gpio_request() ISL29018_IRQ gpio: tegra: configure pins during irq_set_type ARM: tegra: Remove VBUS_GPIO handling from board files usb: ehci-tegra: Add vbus_gpio to platform data
author: Olof Johansson <olof@lixom.net> 2012-05-10 02:43:04 -0400
committer: Olof Johansson <olof@lixom.net> 2012-05-10 02:43:04 -0400
commit: 7488185d0777ef84be7b365b08037fc7213010f6 (patch)
tree: c23a3db331693f783228c2f5afb38fed26ac1205
parent: b664ae6ff92f7ba5c597d4f1b74d478d712c01c4 (diff)
parent: aef7704c6cc36db9618603b22194def441d30432 (diff)
33 files changed, 2055 insertions, 3334 deletions
diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts
index ac3fb7558459..0a9f34a2c3aa 100644
--- a/arch/arm/boot/dts/tegra-cardhu.dts
+++ b/arch/arm/boot/dts/tegra-cardhu.dts
@@ -10,6 +10,50 @@
                reg = < 0x80000000 0x40000000 >;
        };
+        pinmux@70000000 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&state_default>;
+                state_default: pinmux {
+                        sdmmc1_clk_pz0 {
+                                nvidia,pins = "sdmmc1_clk_pz0";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <0>;
+                                nvidia,tristate = <0>;
+                        };
+                        sdmmc1_cmd_pz1 {
+                                nvidia,pins =   "sdmmc1_cmd_pz1",
+                                                "sdmmc1_dat0_py7",
+                                                "sdmmc1_dat1_py6",
+                                                "sdmmc1_dat2_py5",
+                                                "sdmmc1_dat3_py4";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <2>;
+                                nvidia,tristate = <0>;
+                        };
+                        sdmmc4_clk_pcc4 {
+                                nvidia,pins =   "sdmmc4_clk_pcc4",
+                                                "sdmmc4_rst_n_pcc3";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <0>;
+                                nvidia,tristate = <0>;
+                        };
+                        sdmmc4_dat0_paa0 {
+                                nvidia,pins =   "sdmmc4_dat0_paa0",
+                                                "sdmmc4_dat1_paa1",
+                                                "sdmmc4_dat2_paa2",
+                                                "sdmmc4_dat3_paa3",
+                                                "sdmmc4_dat4_paa4",
+                                                "sdmmc4_dat5_paa5",
+                                                "sdmmc4_dat6_paa6",
+                                                "sdmmc4_dat7_paa7";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <2>;
+                                nvidia,tristate = <0>;
+                        };
+                };
+        };
        serial@70006000 {
                clock-frequency = < 408000000 >;
        };
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index 6e8447dc0202..1a0b1f182944 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -10,6 +10,230 @@
                reg = < 0x00000000 0x40000000 >;
        };
+        pinmux@70000000 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&state_default>;
+                state_default: pinmux {
+                        ata {
+                                nvidia,pins = "ata";
+                                nvidia,function = "ide";
+                        };
+                        atb {
+                                nvidia,pins = "atb", "gma", "gme";
+                                nvidia,function = "sdio4";
+                        };
+                        atc {
+                                nvidia,pins = "atc";
+                                nvidia,function = "nand";
+                        };
+                        atd {
+                                nvidia,pins = "atd", "ate", "gmb", "gmd", "gpu",
+                                        "spia", "spib", "spic";
+                                nvidia,function = "gmi";
+                        };
+                        cdev1 {
+                                nvidia,pins = "cdev1";
+                                nvidia,function = "plla_out";
+                        };
+                        cdev2 {
+                                nvidia,pins = "cdev2";
+                                nvidia,function = "pllp_out4";
+                        };
+                        crtp {
+                                nvidia,pins = "crtp";
+                                nvidia,function = "crt";
+                        };
+                        csus {
+                                nvidia,pins = "csus";
+                                nvidia,function = "vi_sensor_clk";
+                        };
+                        dap1 {
+                                nvidia,pins = "dap1";
+                                nvidia,function = "dap1";
+                        };
+                        dap2 {
+                                nvidia,pins = "dap2";
+                                nvidia,function = "dap2";
+                        };
+                        dap3 {
+                                nvidia,pins = "dap3";
+                                nvidia,function = "dap3";
+                        };
+                        dap4 {
+                                nvidia,pins = "dap4";
+                                nvidia,function = "dap4";
+                        };
+                        ddc {
+                                nvidia,pins = "ddc";
+                                nvidia,function = "i2c2";
+                        };
+                        dta {
+                                nvidia,pins = "dta", "dtd";
+                                nvidia,function = "sdio2";
+                        };
+                        dtb {
+                                nvidia,pins = "dtb", "dtc", "dte";
+                                nvidia,function = "rsvd1";
+                        };
+                        dtf {
+                                nvidia,pins = "dtf";
+                                nvidia,function = "i2c3";
+                        };
author	Olof Johansson <olof@lixom.net>	2012-05-10 02:43:04 -0400
committer	Olof Johansson <olof@lixom.net>	2012-05-10 02:43:04 -0400
commit	7488185d0777ef84be7b365b08037fc7213010f6 (patch)
tree	c23a3db331693f783228c2f5afb38fed26ac1205
parent	b664ae6ff92f7ba5c597d4f1b74d478d712c01c4 (diff)
parent	aef7704c6cc36db9618603b22194def441d30432 (diff)

diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts index ac3fb7558459..0a9f34a2c3aa 100644 --- a/arch/arm/boot/dts/tegra-cardhu.dts +++ b/arch/arm/boot/dts/tegra-cardhu.dts
@@ -10,6 +10,50 @@
10	reg = < 0x80000000 0x40000000 >;	10	reg = < 0x80000000 0x40000000 >;
11	};	11	};
12		12
		13	pinmux@70000000 {
		14	pinctrl-names = "default";
		15	pinctrl-0 = <&state_default>;
		16
		17	state_default: pinmux {
		18	sdmmc1_clk_pz0 {
		19	nvidia,pins = "sdmmc1_clk_pz0";
		20	nvidia,function = "sdmmc1";
		21	nvidia,pull = <0>;
		22	nvidia,tristate = <0>;
		23	};
		24	sdmmc1_cmd_pz1 {
		25	nvidia,pins = "sdmmc1_cmd_pz1",
		26	"sdmmc1_dat0_py7",
		27	"sdmmc1_dat1_py6",
		28	"sdmmc1_dat2_py5",
		29	"sdmmc1_dat3_py4";
		30	nvidia,function = "sdmmc1";
		31	nvidia,pull = <2>;
		32	nvidia,tristate = <0>;
		33	};
		34	sdmmc4_clk_pcc4 {
		35	nvidia,pins = "sdmmc4_clk_pcc4",
		36	"sdmmc4_rst_n_pcc3";
		37	nvidia,function = "sdmmc4";
		38	nvidia,pull = <0>;
		39	nvidia,tristate = <0>;
		40	};
		41	sdmmc4_dat0_paa0 {
		42	nvidia,pins = "sdmmc4_dat0_paa0",
		43	"sdmmc4_dat1_paa1",
		44	"sdmmc4_dat2_paa2",
		45	"sdmmc4_dat3_paa3",
		46	"sdmmc4_dat4_paa4",
		47	"sdmmc4_dat5_paa5",
		48	"sdmmc4_dat6_paa6",
		49	"sdmmc4_dat7_paa7";
		50	nvidia,function = "sdmmc4";
		51	nvidia,pull = <2>;
		52	nvidia,tristate = <0>;
		53	};
		54	};
		55	};
		56
13	serial@70006000 {	57	serial@70006000 {
14	clock-frequency = < 408000000 >;	58	clock-frequency = < 408000000 >;
15	};	59	};


diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts index 6e8447dc0202..1a0b1f182944 100644 --- a/arch/arm/boot/dts/tegra-harmony.dts +++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -10,6 +10,230 @@
10	reg = < 0x00000000 0x40000000 >;	10	reg = < 0x00000000 0x40000000 >;
11	};	11	};
12		12
		13	pinmux@70000000 {
		14	pinctrl-names = "default";
		15	pinctrl-0 = <&state_default>;
		16
		17	state_default: pinmux {
		18	ata {
		19	nvidia,pins = "ata";
		20	nvidia,function = "ide";
		21	};
		22	atb {
		23	nvidia,pins = "atb", "gma", "gme";
		24	nvidia,function = "sdio4";
		25	};
		26	atc {
		27	nvidia,pins = "atc";
		28	nvidia,function = "nand";
		29	};
		30	atd {
		31	nvidia,pins = "atd", "ate", "gmb", "gmd", "gpu",
		32	"spia", "spib", "spic";
		33	nvidia,function = "gmi";
		34	};
		35	cdev1 {
		36	nvidia,pins = "cdev1";
		37	nvidia,function = "plla_out";
		38	};
		39	cdev2 {
		40	nvidia,pins = "cdev2";
		41	nvidia,function = "pllp_out4";
		42	};
		43	crtp {
		44	nvidia,pins = "crtp";
		45	nvidia,function = "crt";
		46	};
		47	csus {
		48	nvidia,pins = "csus";
		49	nvidia,function = "vi_sensor_clk";
		50	};
		51	dap1 {
		52	nvidia,pins = "dap1";
		53	nvidia,function = "dap1";
		54	};
		55	dap2 {
		56	nvidia,pins = "dap2";
		57	nvidia,function = "dap2";
		58	};
		59	dap3 {
		60	nvidia,pins = "dap3";
		61	nvidia,function = "dap3";
		62	};
		63	dap4 {
		64	nvidia,pins = "dap4";
		65	nvidia,function = "dap4";
		66	};
		67	ddc {
		68	nvidia,pins = "ddc";
		69	nvidia,function = "i2c2";
		70	};
		71	dta {
		72	nvidia,pins = "dta", "dtd";
		73	nvidia,function = "sdio2";
		74	};
		75	dtb {
		76	nvidia,pins = "dtb", "dtc", "dte";
		77	nvidia,function = "rsvd1";
		78	};
		79	dtf {
		80	nvidia,pins = "dtf";
		81	nvidia,function = "i2c3";
		82	};