Skip to contentSkip to conversation

Tegra: MMC: Add DT support for MMC to T20 boards

PATCH Superseded Tom Warren 5 participants 19 messages Feb 13, 2013 – Feb 20, 2013

Subsystems (4)

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Tom Warren

author
#0 lore raw

v3 cover Tegra: MMC: Add DT support for MMC to T20 boards

This patchset adds device-tree support to the Tegra MMC driver. All device config is done via properties in the DT files instead of hard-coded config options/function arguments.

I've tested this on my Seaboard and everything works fine, including card detect. For the other T20 boards, I've used the Linux kernel DTS files for the sdhci nodes where there wasn't one already, or expanded the info that was already there. Everything builds fine, but I haven't tested anything but Seaboard.

v2: Changes as per Stephen's & Simon's review
v3: Changes as per Stephen/Lucas/Thierry/Simon's feedback

Tom Warren (3):
Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files
Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux
Tegra: MMC: Add DT support to MMC driver for all T20 boards

 arch/arm/dts/tegra20.dtsi                         |   16 +-
 arch/arm/include/asm/arch-tegra/mmc.h             |    2 +-
 arch/arm/include/asm/arch-tegra/tegra_mmc.h       |   13 +-
 board/avionic-design/common/tamonten.c            |   19 +-
 board/avionic-design/dts/tegra20-medcom-wide.dts  |    3 +-
 board/avionic-design/dts/tegra20-plutux.dts       |    3 +-
 board/avionic-design/dts/tegra20-tamonten.dtsi    |  489 +++++++++++++++++++++
 board/avionic-design/dts/tegra20-tec.dts          |    3 +-
 board/compal/dts/tegra20-paz00.dts                |   19 +-
 board/compal/paz00/paz00.c                        |   26 +-
 board/compulab/dts/tegra20-trimslice.dts          |   14 +
 board/compulab/trimslice/trimslice.c              |   25 +-
 board/nvidia/common/board.c                       |   26 +-
 board/nvidia/dts/tegra20-harmony.dts              |   18 +
 board/nvidia/dts/tegra20-seaboard.dts             |   10 +-
 board/nvidia/dts/tegra20-ventana.dts              |   15 +
 board/nvidia/dts/tegra20-whistler.dts             |   13 +
 board/nvidia/harmony/harmony.c                    |   26 +-
 board/nvidia/seaboard/seaboard.c                  |   25 +-
 board/nvidia/whistler/whistler.c                  |   30 +-
 board/toradex/colibri_t20_iris/colibri_t20_iris.c |   11 +-
 board/toradex/dts/tegra20-colibri_t20_iris.dts    |    7 +
 drivers/mmc/tegra_mmc.c                           |  259 +++++++----
 dts/Makefile                                      |    2 +-
 include/fdtdec.h                                  |    1 +
 lib/fdtdec.c                                      |    1 +
 26 files changed, 815 insertions(+), 261 deletions(-)
 create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi
author
#1 lore raw

PATCH v3 1/3 Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files

Linux dts files were used for those boards that didn't already have sdhci info populated. Tamonten has their own dtsi file with common sdhci nodes (sourced from Linux).

---
v2:
- cleanup comments in dts files/match w/kernel files
- add sdhci aliases in all dts files
- use tegra20-tamonten.dtsi from the kernel for AD boards v3:
- include tamonten.dtsi file directly in AD dts files
- fix Seaboard power-gpios flags
- add cd-gpios for Colibri T20 Iris
- add include paths to DTC command

 arch/arm/dts/tegra20.dtsi                        |   16 ++++++++++++----
 board/avionic-design/dts/tegra20-medcom-wide.dts |    3 ++-
 board/avionic-design/dts/tegra20-plutux.dts      |    3 ++-
 board/avionic-design/dts/tegra20-tec.dts         |    3 ++-
 board/compal/dts/tegra20-paz00.dts               |   19 +++++++++++++++++--
 board/compulab/dts/tegra20-trimslice.dts         |   14 ++++++++++++++
 board/nvidia/dts/tegra20-harmony.dts             |   18 ++++++++++++++++++
 board/nvidia/dts/tegra20-seaboard.dts            |   10 +++++++---
 board/nvidia/dts/tegra20-ventana.dts             |   15 +++++++++++++++
 board/nvidia/dts/tegra20-whistler.dts            |   13 +++++++++++++
 board/toradex/dts/tegra20-colibri_t20_iris.dts   |    7 +++++++
 dts/Makefile                                     |    2 +-
 12 files changed, 110 insertions(+), 13 deletions(-)
arch/arm/dts/tegra20.dtsi +12 -4
index 9a89685..982a070 100644
@@ -318,24 +318,32 @@
 	sdhci at c8000000 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000000 0x200>;
-		interrupts = < 46 >;
+		interrupts = <0 14 0x04>;
+		clocks = <&tegra_car 14>;
+		status = "disabled";
 	};
 
 	sdhci at c8000200 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000200 0x200>;
-		interrupts = < 47 >;
+		interrupts = <0 15 0x04>;
+		clocks = <&tegra_car 9>;
+		status = "disabled";
 	};
 
 	sdhci at c8000400 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000400 0x200>;
-		interrupts = < 51 >;
+		interrupts = <0 19 0x04>;
+		clocks = <&tegra_car 69>;
+		status = "disabled";
 	};
 
 	sdhci at c8000600 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000600 0x200>;
-		interrupts = < 63 >;
+		interrupts = <0 31 0x04>;
+		clocks = <&tegra_car 15>;
+		status = "disabled";
 	};
 };
board/avionic-design/dts/tegra20-medcom-wide.dts +2 -1
index e46afbe..01a4451 100644
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ ARCH_CPU_DTS
+/include/ "tegra20-tamonten.dtsi"
 
 / {
 	model = "Avionic Design Medcom-Wide";
@@ -8,6 +8,7 @@
 
 	aliases {
 		usb0 = "/usb at c5008000";
+		sdhci0 = "/sdhci at c8000600";
 	};
 
 	memory {
board/avionic-design/dts/tegra20-plutux.dts +2 -1
index 3e6cce0..f574542 100644
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ ARCH_CPU_DTS
+/include/ "tegra20-tamonten.dtsi"
 
 / {
 	model = "Avionic Design Plutux";
@@ -8,6 +8,7 @@
 
 	aliases {
 		usb0 = "/usb at c5008000";
+		sdhci0 = "/sdhci at c8000600";
 	};
 
 	memory {
board/avionic-design/dts/tegra20-tec.dts +2 -1
index bf3ff1d..376d279 100644
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ ARCH_CPU_DTS
+/include/ "tegra20-tamonten.dtsi"
 
 / {
 	model = "Avionic Design Tamonten Evaluation Carrier";
@@ -8,6 +8,7 @@
 
 	aliases {
 		usb0 = "/usb at c5008000";
+		sdhci0 = "/sdhci at c8000600";
 	};
 
 	memory {
board/compal/dts/tegra20-paz00.dts +17 -2
index 31b064d..6476940 100644
@@ -3,11 +3,13 @@
 /include/ ARCH_CPU_DTS
 
 / {
-        model = "Toshiba AC100 / Dynabook AZ";
-        compatible = "compal,paz00", "nvidia,tegra20";
+	model = "Toshiba AC100 / Dynabook AZ";
+	compatible = "compal,paz00", "nvidia,tegra20";
 
 	aliases {
 		usb0 = "/usb at c5008000";
+		sdhci0 = "/sdhci at c8000600";
+		sdhci1 = "/sdhci at c8000000";
 	};
 
 	memory {
@@ -53,6 +55,19 @@
 		status = "disabled";
 	};
 
+	sdhci at c8000000 {
+		status = "okay";
+		cd-gpios = <&gpio 173 0>; /* gpio PV5 */
+		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
+		power-gpios = <&gpio 169 0>; /* gpio PV1 */
+		bus-width = <4>;
+	};
+
+	sdhci at c8000600 {
+		status = "okay";
+		bus-width = <8>;
+	};
+
 	lcd_panel: panel {
 		/* PAZ00 has 1024x600 */
 		clock = <54030000>;
board/compulab/dts/tegra20-trimslice.dts +14 -0
index 7aeed67..2957f45 100644
@@ -9,6 +9,8 @@
 	aliases {
 		usb0 = "/usb at c5008000";
 		usb1 = "/usb at c5000000";
+		sdhci0 = "/sdhci at c8000600";
+		sdhci1 = "/sdhci at c8000000";
 	};
 
 	memory {
@@ -47,4 +49,16 @@
 	usb at c5004000 {
 		status = "disabled";
 	};
+
+	sdhci at c8000000 {
+		status = "okay";
+		bus-width = <4>;
+	};
+
+	sdhci at c8000600 {
+		status = "okay";
+		cd-gpios = <&gpio 121 0>; /* gpio PP1 */
+		wp-gpios = <&gpio 122 0>; /* gpio PP2 */
+		bus-width = <4>;
+	};
 };
board/nvidia/dts/tegra20-harmony.dts +18 -0
index aeda3a1..593885d 100644
@@ -9,6 +9,8 @@
 	aliases {
 		usb0 = "/usb at c5008000";
 		usb1 = "/usb at c5004000";
+		sdhci0 = "/sdhci at c8000600";
+		sdhci1 = "/sdhci at c8000200";
 	};
 
 	memory {
@@ -52,4 +54,20 @@
 	usb at c5004000 {
 		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
 	};
+
+	sdhci at c8000200 {
+		status = "okay";
+		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
+		power-gpios = <&gpio 155 0>; /* gpio PT3 */
+		bus-width = <4>;
+	};
+
+	sdhci at c8000600 {
+		status = "okay";
+		cd-gpios = <&gpio 58 0>; /* gpio PH2 */
+		wp-gpios = <&gpio 59 0>; /* gpio PH3 */
+		power-gpios = <&gpio 70 0>; /* gpio PI6 */
+		bus-width = <8>;
+	};
 };
board/nvidia/dts/tegra20-seaboard.dts +7 -3
index 527a296..4c10631 100644
@@ -12,14 +12,15 @@
 	};
 
 	aliases {
-		/* This defines the order of our USB ports */
+		/* This defines the order of our ports */
 		usb0 = "/usb at c5008000";
 		usb1 = "/usb at c5000000";
-
 		i2c0 = "/i2c at 7000d000";
 		i2c1 = "/i2c at 7000c000";
 		i2c2 = "/i2c at 7000c400";
 		i2c3 = "/i2c at 7000c500";
+		sdhci0 = "/sdhci at c8000600";
+		sdhci1 = "/sdhci at c8000400";
 	};
 
 	memory {
@@ -156,13 +157,16 @@
 	};
 
 	sdhci at c8000400 {
+		status = "okay";
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 		power-gpios = <&gpio 70 0>; /* gpio PI6 */
+		bus-width = <4>;
 	};
 
 	sdhci at c8000600 {
-		support-8bit;
+		status = "okay";
+		bus-width = <8>;
 	};
 
 	lcd_panel: panel {
board/nvidia/dts/tegra20-ventana.dts +15 -0
index 3e5e39d..0423595 100644
@@ -8,6 +8,8 @@
 
 	aliases {
 		usb0 = "/usb at c5008000";
+		sdhci0 = "/sdhci at c8000600";
+		sdhci1 = "/sdhci at c8000400";
 	};
 
 	memory {
@@ -41,4 +43,17 @@
 	usb at c5004000 {
 		status = "disabled";
 	};
+
+	sdhci at c8000400 {
+		status = "okay";
+		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
+		power-gpios = <&gpio 70 0>; /* gpio PI6 */
+		bus-width = <4>;
+	};
+
+	sdhci at c8000600 {
+		status = "okay";
+		bus-width = <8>;
+	};
 };
board/nvidia/dts/tegra20-whistler.dts +13 -0
index 4579557..2d0a2ab 100644
@@ -9,6 +9,8 @@
 	aliases {
 		i2c0 = "/i2c at 7000d000";
 		usb0 = "/usb at c5008000";
+		sdhci0 = "/sdhci at c8000600";
+		sdhci1 = "/sdhci at c8000400";
 	};
 
 	memory {
@@ -57,4 +59,15 @@
 	usb at c5004000 {
 		status = "disabled";
 	};
+
+	sdhci at c8000400 {
+		status = "okay";
+		wp-gpios = <&gpio 173 0>; /* gpio PV5 */
+		bus-width = <8>;
+	};
+
+	sdhci at c8000600 {
+		status = "okay";
+		bus-width = <8>;
+	};
 };
board/toradex/dts/tegra20-colibri_t20_iris.dts +7 -0
index c29b43a..a2c5a0e 100644
@@ -10,6 +10,7 @@
 		usb0 = "/usb at c5008000";
 		usb1 = "/usb at c5000000";
 		usb2 = "/usb at c5004000";
+		sdhci0 = "/sdhci at c8000600";
 	};
 
 	usb at c5000000 {
@@ -35,4 +36,10 @@
 			compatible = "nand-flash";
 		};
 	};
+
+	sdhci at c8000600 {
+		status = "okay";
+		cd-gpios = <&gpio 23 0>; /* gpio PC7 */
+		bus-width = <4>;
+	};
 };
dts/Makefile +1 -1
index 922c78c..2ef31e9 100644
@@ -50,7 +50,7 @@ DT_BIN	:= $(obj)dt.dtb
 $(DT_BIN): $(TOPDIR)/board/$(VENDOR)/dts/$(DEVICE_TREE).dts
 	rc=$$( \
 		cat $< | $(CPP) -P $(DTS_CPPFLAGS) - | \
-		{ { $(DTC) -R 4 -p 0x1000 -O dtb -o ${DT_BIN} - 2>&1 ; \
+		{ { $(DTC) -R 4 -p 0x1000 -i $(TOPDIR)/board/$(VENDOR)/dts -i $(TOPDIR)/arch/$(ARCH)/dts -O dtb -o ${DT_BIN} - 2>&1 ; \
 		    echo $$? >&3 ; } | \
 		  grep -v '^DTC: dts->dtb  on file' ; \
 	        } 3>&1 1>&2 ) ; \
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH v3 1/3 Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files

Quoted 9 lines · Tom Warren

Linux dts files were used for those boards that didn't already have sdhci info populated. Tamonten has their own dtsi file with common sdhci nodes (sourced from Linux).

dts/Makefile +0 -0
index 922c78c..2ef31e9 100644

dts/Makefile DT_BIN := $(obj)dt.dtb · line 56

Quoted 8 lines
dts/Makefile +1 -1
@@ -50,7 +50,7 @@ DT_BIN	:= $(obj)dt.dtb
 $(DT_BIN): $(TOPDIR)/board/$(VENDOR)/dts/$(DEVICE_TREE).dts
 	rc=$$( \
 		cat $< | $(CPP) -P $(DTS_CPPFLAGS) - | \
-		{ { $(DTC) -R 4 -p 0x1000 -O dtb -o ${DT_BIN} - 2>&1 ; \
+		{ { $(DTC) -R 4 -p 0x1000 -i $(TOPDIR)/board/$(VENDOR)/dts -i $(TOPDIR)/arch/$(ARCH)/dts -O dtb -o ${DT_BIN} - 2>&1 ; \
 		    echo $$? >&3 ; } | \
 		  grep -v '^DTC: dts->dtb  on file' ; \
 	        } 3>&1 1>&2 ) ; \

Shouldn't this be a separate patch?

The one issue with this is that only newer versions of dtc support the -i option. The version packaged with most distros won't support it. That'll mean something like "MAKEALL -a arm" is going to fail for a lot of people without some kind of explicit action (i.e. manually installing a newer version of dtc).

That's why I suggested switching from /include/ to #include, and adding the include path to the cpp command rather than dtc.

author
#3 lore raw

PATCH v3 1/3 Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files

Stephen,

Quoted 5 lines · Stephen Warren
Quoted 3 lines · Tom Warren

Linux dts files were used for those boards that didn't already have sdhci info populated. Tamonten has their own dtsi file with common sdhci nodes (sourced from Linux).

Quoted 15 lines

dts/Makefile DT_BIN := $(obj)dt.dtb · line 56

Quoted 13 lines
dts/Makefile +1 -1
index 922c78c..2ef31e9 100644
@@ -50,7 +50,7 @@ DT_BIN      := $(obj)dt.dtb
 $(DT_BIN): $(TOPDIR)/board/$(VENDOR)/dts/$(DEVICE_TREE).dts
      rc=$$( \
              cat $< | $(CPP) -P $(DTS_CPPFLAGS) - | \
-             { { $(DTC) -R 4 -p 0x1000 -O dtb -o ${DT_BIN} - 2>&1 ; \
+             { { $(DTC) -R 4 -p 0x1000 -i $(TOPDIR)/board/$(VENDOR)/dts -i $(TOPDIR)/arch/$(ARCH)/dts -O dtb -o ${DT_BIN} - 2>&1 ; \
                  echo $$? >&3 ; } | \
                grep -v '^DTC: dts->dtb  on file' ; \
              } 3>&1 1>&2 ) ; \

Shouldn't this be a separate patch?

I can move it into a separate patch in v4.

Quoted 9 lines

The one issue with this is that only newer versions of dtc support the -i option. The version packaged with most distros won't support it. That'll mean something like "MAKEALL -a arm" is going to fail for a lot of people without some kind of explicit action (i.e. manually installing a newer version of dtc).

That's why I suggested switching from /include/ to #include, and adding the include path to the cpp command rather than dtc.

I tried using '#include, and added the 2 dts paths to the DTS_CPPFLAGS so gcc could find the files, but I got a 'couldn't open 'skeleton.dtsi' error. I didn't want to change tegra20.dtsi to #include "skeleton.dtsi', and all the other board dts files to #include ARCH_CPU_DTS, just so we can support the common tamonten dtsi, so I went back to the DTC include path changes.

There was talk at one time of putting an up-to-date DTC binary in the U-Boot tools area so everyone would have a consistent level of DT support. With the small number of boards using DT at this time, I think we can live with letting people know where to find the latest DTC release until then.

If someone has a better approach, let me know. Otherwise, I want to get this into a v4 patch (with the DTC include path changes in it's own patch so it can be reworked later if needed) today as I'll be gone until next Weds.

Tom

#4 lore raw

PATCH v3 1/3 Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files

Quoted 36 lines · Tom Warren

Stephen,

Quoted 5 lines · Stephen Warren
Quoted 3 lines · Tom Warren

Linux dts files were used for those boards that didn't already have sdhci info populated. Tamonten has their own dtsi file with common sdhci nodes (sourced from Linux).

Quoted 15 lines

dts/Makefile DT_BIN := $(obj)dt.dtb · line 56

Quoted 13 lines
dts/Makefile +1 -1
index 922c78c..2ef31e9 100644
@@ -50,7 +50,7 @@ DT_BIN      := $(obj)dt.dtb
 $(DT_BIN): $(TOPDIR)/board/$(VENDOR)/dts/$(DEVICE_TREE).dts
      rc=$$( \
              cat $< | $(CPP) -P $(DTS_CPPFLAGS) - | \
-             { { $(DTC) -R 4 -p 0x1000 -O dtb -o ${DT_BIN} - 2>&1 ; \
+             { { $(DTC) -R 4 -p 0x1000 -i $(TOPDIR)/board/$(VENDOR)/dts -i $(TOPDIR)/arch/$(ARCH)/dts -O dtb -o ${DT_BIN} - 2>&1 ; \
                  echo $$? >&3 ; } | \
                grep -v '^DTC: dts->dtb  on file' ; \
              } 3>&1 1>&2 ) ; \

Shouldn't this be a separate patch?

I can move it into a separate patch in v4.

Quoted 9 lines

The one issue with this is that only newer versions of dtc support the -i option. The version packaged with most distros won't support it. That'll mean something like "MAKEALL -a arm" is going to fail for a lot of people without some kind of explicit action (i.e. manually installing a newer version of dtc).

That's why I suggested switching from /include/ to #include, and adding the include path to the cpp command rather than dtc.

Quoted 6 lines

I tried using '#include, and added the 2 dts paths to the DTS_CPPFLAGS so gcc could find the files, but I got a 'couldn't open 'skeleton.dtsi' error. I didn't want to change tegra20.dtsi to #include "skeleton.dtsi', and all the other board dts files to #include ARCH_CPU_DTS, just so we can support the common tamonten dtsi, so I went back to the DTC include path changes.

I think that's exactly where we should end up though. It's certainly the way the kernel is also heading.

Right now, the Avionic Design boards might be the only place this problem crops up, but as we support more features on Cardhu, we'll hit exactly the same issue, so have to solve it there too.

Quoted 3 lines

There was talk at one time of putting an up-to-date DTC binary in the U-Boot tools area so everyone would have a consistent level of DT support.

I think Wolfgang nak'd that.

With the small number of boards using DT at this time, I

Quoted 2 lines

think we can live with letting people know where to find the latest DTC release until then.

But he also nak'd the idea of relying on a newer dtc:-(

I think we had better raise the question again.

#5 lore raw

PATCH v3 1/3 Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files

Am Donnerstag, den 14.02.2013, 13:24 -0700 schrieb Stephen Warren:
[...]

Quoted 17 lines
Quoted 10 lines
Quoted 9 lines

The one issue with this is that only newer versions of dtc support the -i option. The version packaged with most distros won't support it. That'll mean something like "MAKEALL -a arm" is going to fail for a lot of people without some kind of explicit action (i.e. manually installing a newer version of dtc).

That's why I suggested switching from /include/ to #include, and adding the include path to the cpp command rather than dtc.

Quoted 6 lines

I tried using '#include, and added the 2 dts paths to the DTS_CPPFLAGS so gcc could find the files, but I got a 'couldn't open 'skeleton.dtsi' error. I didn't want to change tegra20.dtsi to #include "skeleton.dtsi', and all the other board dts files to #include ARCH_CPU_DTS, just so we can support the common tamonten dtsi, so I went back to the DTC include path changes.

Quoted 7 lines

I think that's exactly where we should end up though. It's certainly the way the kernel is also heading.

Right now, the Avionic Design boards might be the only place this problem crops up, but as we support more features on Cardhu, we'll hit exactly the same issue, so have to solve it there too.

Right now the AD boards might be the only ones with this problem, but it will certainly hit the Toradex Tegra designs also.

I'm planning on doing support for the Colibri Evaluation Carrier for the next release cycle. So I need to split up the DTS between Colibri and Carrier board, same as is done in the Linux Kernel dts.

Quoted 6 lines
Quoted 3 lines

There was talk at one time of putting an up-to-date DTC binary in the U-Boot tools area so everyone would have a consistent level of DT support.

I think Wolfgang nak'd that.

Quoted 7 lines

With the small number of boards using DT at this time, I

Quoted 2 lines

think we can live with letting people know where to find the latest DTC release until then.

But he also nak'd the idea of relying on a newer dtc:-(

I think we had better raise the question again.

Yes, this has to be resolved one way or the other.

author
#6 lore raw

PATCH v3 1/3 Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files

Lucas/Stephen/etc.

Quoted 39 lines · Lucas Stach

Am Donnerstag, den 14.02.2013, 13:24 -0700 schrieb Stephen Warren:
[...]

Quoted 17 lines
Quoted 10 lines
Quoted 9 lines

The one issue with this is that only newer versions of dtc support the -i option. The version packaged with most distros won't support it. That'll mean something like "MAKEALL -a arm" is going to fail for a lot of people without some kind of explicit action (i.e. manually installing a newer version of dtc).

That's why I suggested switching from /include/ to #include, and adding the include path to the cpp command rather than dtc.

Quoted 6 lines

I tried using '#include, and added the 2 dts paths to the DTS_CPPFLAGS so gcc could find the files, but I got a 'couldn't open 'skeleton.dtsi' error. I didn't want to change tegra20.dtsi to #include "skeleton.dtsi', and all the other board dts files to #include ARCH_CPU_DTS, just so we can support the common tamonten dtsi, so I went back to the DTC include path changes.

Quoted 7 lines

I think that's exactly where we should end up though. It's certainly the way the kernel is also heading.

Right now, the Avionic Design boards might be the only place this problem crops up, but as we support more features on Cardhu, we'll hit exactly the same issue, so have to solve it there too.

Right now the AD boards might be the only ones with this problem, but it will certainly hit the Toradex Tegra designs also.

I'm planning on doing support for the Colibri Evaluation Carrier for the next release cycle. So I need to split up the DTS between Colibri and Carrier board, same as is done in the Linux Kernel dts.

Quoted 7 lines
Quoted 3 lines

There was talk at one time of putting an up-to-date DTC binary in the U-Boot tools area so everyone would have a consistent level of DT support.

I think Wolfgang nak'd that.

With the small number of boards using DT at this time, I

Quoted 10 lines
Quoted 6 lines
Quoted 2 lines

think we can live with letting people know where to find the latest DTC release until then.

But he also nak'd the idea of relying on a newer dtc:-(

I think we had better raise the question again.

Yes, this has to be resolved one way or the other.

OK, I'll change all of the Tegra .DTS an .DTSI files to use #include "xyz", and put the include path in the DTS_CPPFLAGS in dts/Makefile instead of adding the include path to the DTC tool. This'll be in v5 of the patchset.

Tom

author
#7 lore raw

PATCH v3 2/3 Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux

In reply to Tom Warren

Tamonten boards (medcom-wide, plutux, and tec) use a different/new dtsi file w/common settings.

---
v3: new

 board/avionic-design/dts/tegra20-tamonten.dtsi |  489 ++++++++++++++++++++++++
 1 files changed, 489 insertions(+), 0 deletions(-)
 create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi
board/avionic-design/dts/tegra20-tamonten.dtsi new file +489 -0
new file mode 100644
index 0000000..4766aba
@@ -0,0 +1,489 @@
+/include/ "tegra20.dtsi"
+
+/ {
+	model = "Avionic Design Tamonten SOM";
+	compatible = "ad,tamonten", "nvidia,tegra20";
+
+	memory {
+		reg = <0x00000000 0x20000000>;
+	};
+
+	host1x {
+		hdmi {
+			vdd-supply = <&hdmi_vdd_reg>;
+			pll-supply = <&hdmi_pll_reg>;
+
+			nvidia,ddc-i2c-bus = <&hdmi_ddc>;
+			nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+		};
+	};
+
+	pinmux {
+		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";
+			};
+			dta {
+				nvidia,pins = "dta", "dtd";
+				nvidia,function = "sdio2";
+			};
+			dtb {
+				nvidia,pins = "dtb", "dtc", "dte";
+				nvidia,function = "rsvd1";
+			};
+			dtf {
+				nvidia,pins = "dtf";
+				nvidia,function = "i2c3";
+			};
+			gmc {
+				nvidia,pins = "gmc";
+				nvidia,function = "uartd";
+			};
+			gpu7 {
+				nvidia,pins = "gpu7";
+				nvidia,function = "rtck";
+			};
+			gpv {
+				nvidia,pins = "gpv", "slxa", "slxk";
+				nvidia,function = "pcie";
+			};
+			hdint {
+				nvidia,pins = "hdint";
+				nvidia,function = "hdmi";
+			};
+			i2cp {
+				nvidia,pins = "i2cp";
+				nvidia,function = "i2cp";
+			};
+			irrx {
+				nvidia,pins = "irrx", "irtx";
+				nvidia,function = "uarta";
+			};
+			kbca {
+				nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
+					"kbce", "kbcf";
+				nvidia,function = "kbc";
+			};
+			lcsn {
+				nvidia,pins = "lcsn", "ld0", "ld1", "ld2",
+					"ld3", "ld4", "ld5", "ld6", "ld7",
+					"ld8", "ld9", "ld10", "ld11", "ld12",
+					"ld13", "ld14", "ld15", "ld16", "ld17",
+					"ldc", "ldi", "lhp0", "lhp1", "lhp2",
+					"lhs", "lm0", "lm1", "lpp", "lpw0",
+					"lpw1", "lpw2", "lsc0", "lsc1", "lsck",
+					"lsda", "lsdi", "lspi", "lvp0", "lvp1",
+					"lvs";
+				nvidia,function = "displaya";
+			};
+			owc {
+				nvidia,pins = "owc", "spdi", "spdo", "uac";
+				nvidia,function = "rsvd2";
+			};
+			pmc {
+				nvidia,pins = "pmc";
+				nvidia,function = "pwr_on";
+			};
+			rm {
+				nvidia,pins = "rm";
+				nvidia,function = "i2c1";
+			};
+			sdb {
+				nvidia,pins = "sdb", "sdc", "sdd";
+				nvidia,function = "pwm";
+			};
+			sdio1 {
+				nvidia,pins = "sdio1";
+				nvidia,function = "sdio1";
+			};
+			slxc {
+				nvidia,pins = "slxc", "slxd";
+				nvidia,function = "spdif";
+			};
+			spid {
+				nvidia,pins = "spid", "spie", "spif";
+				nvidia,function = "spi1";
+			};
+			spig {
+				nvidia,pins = "spig", "spih";
+				nvidia,function = "spi2_alt";
+			};
+			uaa {
+				nvidia,pins = "uaa", "uab", "uda";
+				nvidia,function = "ulpi";
+			};
+			uad {
+				nvidia,pins = "uad";
+				nvidia,function = "irda";
+			};
+			uca {
+				nvidia,pins = "uca", "ucb";
+				nvidia,function = "uartc";
+			};
+			conf_ata {
+				nvidia,pins = "ata", "atb", "atc", "atd", "ate",
+					"cdev1", "cdev2", "dap1", "dtb", "gma",
+					"gmb", "gmc", "gmd", "gme", "gpu7",
+					"gpv", "i2cp", "pta", "rm", "slxa",
+					"slxk", "spia", "spib", "uac";
+				nvidia,pull = <0>;
+				nvidia,tristate = <0>;
+			};
+			conf_ck32 {
+				nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
+					"pmcc", "pmcd", "pmce", "xm2c", "xm2d";
+				nvidia,pull = <0>;
+			};
+			conf_csus {
+				nvidia,pins = "csus", "spid", "spif";
+				nvidia,pull = <1>;
+				nvidia,tristate = <1>;
+			};
+			conf_crtp {
+				nvidia,pins = "crtp", "dap2", "dap3", "dap4",
+					"dtc", "dte", "dtf", "gpu", "sdio1",
+					"slxc", "slxd", "spdi", "spdo", "spig",
+					"uda";
+				nvidia,pull = <0>;
+				nvidia,tristate = <1>;
+			};
+			conf_ddc {
+				nvidia,pins = "ddc", "dta", "dtd", "kbca",
+					"kbcb", "kbcc", "kbcd", "kbce", "kbcf",
+					"sdc";
+				nvidia,pull = <2>;
+				nvidia,tristate = <0>;
+			};
+			conf_hdint {
+				nvidia,pins = "hdint", "lcsn", "ldc", "lm1",
+					"lpw1", "lsc1", "lsck", "lsda", "lsdi",
+					"lvp0", "owc", "sdb";
+				nvidia,tristate = <1>;
+			};
+			conf_irrx {
+				nvidia,pins = "irrx", "irtx", "sdd", "spic",
+					"spie", "spih", "uaa", "uab", "uad",
+					"uca", "ucb";
+				nvidia,pull = <2>;
+				nvidia,tristate = <1>;
+			};
+			conf_lc {
+				nvidia,pins = "lc", "ls";
+				nvidia,pull = <2>;
+			};
+			conf_ld0 {
+				nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
+					"ld5", "ld6", "ld7", "ld8", "ld9",
+					"ld10", "ld11", "ld12", "ld13", "ld14",
+					"ld15", "ld16", "ld17", "ldi", "lhp0",
+					"lhp1", "lhp2", "lhs", "lm0", "lpp",
+					"lpw0", "lpw2", "lsc0", "lspi", "lvp1",
+					"lvs", "pmc";
+				nvidia,tristate = <0>;
+			};
+			conf_ld17_0 {
+				nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
+					"ld23_22";
+				nvidia,pull = <1>;
+			};
+		};
+
+		state_i2cmux_ddc: pinmux_i2cmux_ddc {
+			ddc {
+				nvidia,pins = "ddc";
+				nvidia,function = "i2c2";
+			};
+			pta {
+				nvidia,pins = "pta";
+				nvidia,function = "rsvd4";
+			};
+		};
+
+		state_i2cmux_pta: pinmux_i2cmux_pta {
+			ddc {
+				nvidia,pins = "ddc";
+				nvidia,function = "rsvd4";
+			};
+			pta {
+				nvidia,pins = "pta";
+				nvidia,function = "i2c2";
+			};
+		};
+
+		state_i2cmux_idle: pinmux_i2cmux_idle {
+			ddc {
+				nvidia,pins = "ddc";
+				nvidia,function = "rsvd4";
+			};
+			pta {
+				nvidia,pins = "pta";
+				nvidia,function = "rsvd4";
+			};
+		};
+	};
+
+	i2s at 70002800 {
+		status = "okay";
+	};
+
+	serial at 70006300 {
+		status = "okay";
+	};
+
+	i2c at 7000c000 {
+		clock-frequency = <400000>;
+		status = "okay";
+	};
+
+	i2c at 7000c400 {
+		clock-frequency = <100000>;
+		status = "okay";
+	};
+
+	i2cmux {
+		compatible = "i2c-mux-pinctrl";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		i2c-parent = <&{/i2c@7000c400}>;
+
+		pinctrl-names = "ddc", "pta", "idle";
+		pinctrl-0 = <&state_i2cmux_ddc>;
+		pinctrl-1 = <&state_i2cmux_pta>;
+		pinctrl-2 = <&state_i2cmux_idle>;
+
+		hdmi_ddc: i2c at 0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		i2c at 1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
+
+	i2c at 7000d000 {
+		clock-frequency = <400000>;
+		status = "okay";
+
+		pmic: tps6586x at 34 {
+			compatible = "ti,tps6586x";
+			reg = <0x34>;
+			interrupts = <0 86 0x4>;
+
+			ti,system-power-controller;
+
+			#gpio-cells = <2>;
+			gpio-controller;
+
+			sys-supply = <&vdd_5v0_reg>;
+			vin-sm0-supply = <&sys_reg>;
+			vin-sm1-supply = <&sys_reg>;
+			vin-sm2-supply = <&sys_reg>;
+			vinldo01-supply = <&sm2_reg>;
+			vinldo23-supply = <&sm2_reg>;
+			vinldo4-supply = <&sm2_reg>;
+			vinldo678-supply = <&sm2_reg>;
+			vinldo9-supply = <&sm2_reg>;
+
+			regulators {
+				sys_reg: sys {
+					regulator-name = "vdd_sys";
+					regulator-always-on;
+				};
+
+				sm0 {
+					regulator-name = "vdd_sys_sm0,vdd_core";
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <1200000>;
+					regulator-always-on;
+				};
+
+				sm1 {
+					regulator-name = "vdd_sys_sm1,vdd_cpu";
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1000000>;
+					regulator-always-on;
+				};
+
+				sm2_reg: sm2 {
+					regulator-name = "vdd_sys_sm2,vin_ldo*";
+					regulator-min-microvolt = <3700000>;
+					regulator-max-microvolt = <3700000>;
+					regulator-always-on;
+				};
+
+				ldo0 {
+					regulator-name = "vdd_ldo0,vddio_pex_clk";
+					regulator-min-microvolt = <3300000>;
+					regulator-max-microvolt = <3300000>;
+				};
+
+				ldo1 {
+					regulator-name = "vdd_ldo1,avdd_pll*";
+					regulator-min-microvolt = <1100000>;
+					regulator-max-microvolt = <1100000>;
+					regulator-always-on;
+				};
+
+				ldo2 {
+					regulator-name = "vdd_ldo2,vdd_rtc";
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <1200000>;
+				};
+
+				ldo3 {
+					regulator-name = "vdd_ldo3,avdd_usb*";
+					regulator-min-microvolt = <3300000>;
+					regulator-max-microvolt = <3300000>;
+					regulator-always-on;
+				};
+
+				ldo4 {
+					regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-always-on;
+				};
+
+				ldo5 {
+					regulator-name = "vdd_ldo5,vcore_mmc";
+					regulator-min-microvolt = <2850000>;
+					regulator-max-microvolt = <2850000>;
+				};
+
+				ldo6 {
+					regulator-name = "vdd_ldo6,avdd_vdac";
+					/*
+					 * According to the Tegra 2 Automotive
+					 * DataSheet, a typical value for this
+					 * would be 2.8V, but the PMIC only
+					 * supports 2.85V.
+					 */
+					regulator-min-microvolt = <2850000>;
+					regulator-max-microvolt = <2850000>;
+				};
+
+				hdmi_vdd_reg: ldo7 {
+					regulator-name = "vdd_ldo7,avdd_hdmi";
+					regulator-min-microvolt = <3300000>;
+					regulator-max-microvolt = <3300000>;
+				};
+
+				hdmi_pll_reg: ldo8 {
+					regulator-name = "vdd_ldo8,avdd_hdmi_pll";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+				};
+
+				ldo9 {
+					regulator-name = "vdd_ldo9,vdd_ddr_rx,avdd_cam";
+					/*
+					 * According to the Tegra 2 Automotive
+					 * DataSheet, a typical value for this
+					 * would be 2.8V, but the PMIC only
+					 * supports 2.85V.
+					 */
+					regulator-min-microvolt = <2850000>;
+					regulator-max-microvolt = <2850000>;
+					regulator-always-on;
+				};
+
+				ldo_rtc {
+					regulator-name = "vdd_rtc_out";
+					regulator-min-microvolt = <3300000>;
+					regulator-max-microvolt = <3300000>;
+					regulator-always-on;
+				};
+			};
+		};
+
+		temperature-sensor at 4c {
+			compatible = "onnn,nct1008";
+			reg = <0x4c>;
+		};
+	};
+
+	pmc {
+		nvidia,invert-interrupt;
+	};
+
+	usb at c5008000 {
+		status = "okay";
+	};
+
+	sdhci at c8000600 {
+		cd-gpios = <&gpio 58 0>; /* gpio PH2 */
+		wp-gpios = <&gpio 59 0>; /* gpio PH3 */
+		bus-width = <4>;
+		status = "okay";
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		vdd_5v0_reg: regulator at 0 {
+			compatible = "regulator-fixed";
+			reg = <0>;
+			regulator-name = "vdd_5v0";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			regulator-always-on;
+		};
+	};
+};
Signature · 1 line
1.7.0.4
#9 lore raw

PATCH v3 2/3 Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux

In reply to Tom Warren
Quoted 18 lines · Tom Warren

Tamonten boards (medcom-wide, plutux, and tec) use a different/new dtsi file w/common settings.

---
v3: new

 board/avionic-design/dts/tegra20-tamonten.dtsi |  489 ++++++++++++++++++++++++
 1 files changed, 489 insertions(+), 0 deletions(-)
 create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi
board/avionic-design/dts/tegra20-tamonten.dtsi new file +0 -0
new file mode 100644
index 0000000..4766aba

board/avionic-design/dts/tegra20-tamonten.dtsi line 1

Quoted 1 line
board/avionic-design/dts/tegra20-tamonten.dtsi new file +1 -0
@@ -0,0 +1,489 @@
+/include/ "tegra20.dtsi"

It's a bit unfortunate that this can't use ARCH_CPU_DTS anymore because it isn't run through the preprocessor. With the Tegra30 Tamonten coming up I thought it might have been nice to share some parts of it, but given the amount of changes between Tegra20 and Tegra30 Tamonten I don't think that will be much of an option anyway.

So this is fine with me.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130214/68c25d78/attachment.pgp>

author
#10 lore raw

PATCH v3 3/3 Tegra: MMC: Add DT support to MMC driver for all T20 boards

In reply to Tom Warren

tegra_mmc_init() now parses the DT info for bus width, WP/CD GPIOs, etc. Tested on Seaboard, fully functional.

Tamonten boards (medcom-wide, plutux, and tec) use a different/new dtsi file w/common settings.

---
v2:
- all boards now call tegra_mmc_init once, w/no params
- count MMC controllers, not aliases
- AD boards (medcom/plutux/tec) use common tegra20-tamonten.dtsi v3:
- move any power init inside board's pin_mux_mmc function, and/or create pin_mux_mmc function if necessary.
- move board_mmc_init out of each board file and into ../common/board.c

 arch/arm/include/asm/arch-tegra/mmc.h             |    2 +-
 arch/arm/include/asm/arch-tegra/tegra_mmc.h       |   13 +-
 board/avionic-design/common/tamonten.c            |   19 +--
 board/compal/paz00/paz00.c                        |   26 +--
 board/compulab/trimslice/trimslice.c              |   25 +--
 board/nvidia/common/board.c                       |   26 ++-
 board/nvidia/harmony/harmony.c                    |   26 +--
 board/nvidia/seaboard/seaboard.c                  |   25 +--
 board/nvidia/whistler/whistler.c                  |   30 +--
 board/toradex/colibri_t20_iris/colibri_t20_iris.c |   11 +-
 drivers/mmc/tegra_mmc.c                           |  259 +++++++++++++--------
 include/fdtdec.h                                  |    1 +
 lib/fdtdec.c                                      |    1 +
 13 files changed, 216 insertions(+), 248 deletions(-)
arch/arm/include/asm/arch-tegra/mmc.h +1 -1
index 5c95047..71ad407 100644
@@ -22,6 +22,6 @@
 #ifndef _TEGRA_MMC_H_
 #define _TEGRA_MMC_H_
 
-int tegra_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio);
+void tegra_mmc_init(void);
 
 #endif /* _TEGRA_MMC_H_ */
arch/arm/include/asm/arch-tegra/tegra_mmc.h +9 -4
index dd746ca..bd18f5f 100644
@@ -27,6 +27,8 @@
 #define TEGRA_SDMMC3_BASE	0xC8000400
 #define TEGRA_SDMMC4_BASE	0xC8000600
 
+#define MAX_HOSTS		4	/* Max number of 'hosts'/controllers */
+
 #ifndef __ASSEMBLY__
 struct tegra_mmc {
 	unsigned int	sysad;		/* _SYSTEM_ADDRESS_0 */
@@ -119,12 +121,15 @@ struct tegra_mmc {
 
 struct mmc_host {
 	struct tegra_mmc *reg;
+	int id;			/* device id/number, 0-3 */
+	int enabled;		/* 1 to enable, 0 to disable */
+	int width;		/* Bus Width, 1, 4 or 8 */
+	enum periph_id mmc_id;	/* Peripheral ID: PERIPH_ID_... */
+	struct fdt_gpio_state cd_gpio;		/* Change Detect GPIO */
+	struct fdt_gpio_state pwr_gpio;		/* Power GPIO */
+	struct fdt_gpio_state wp_gpio;		/* Write Protect GPIO */
 	unsigned int version;	/* SDHCI spec. version */
 	unsigned int clock;	/* Current clock (MHz) */
-	unsigned int base;	/* Base address, SDMMC1/2/3/4 */
-	enum periph_id mmc_id;	/* Peripheral ID: PERIPH_ID_... */
-	int pwr_gpio;		/* Power GPIO */
-	int cd_gpio;		/* Change Detect GPIO */
 };
 
 #endif	/* __ASSEMBLY__ */
board/avionic-design/common/tamonten.c +1 -18
index e6a932e..ea95e43 100644
@@ -33,13 +33,8 @@
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/board.h>
 #include <asm/arch-tegra/clk_rst.h>
-#include <asm/arch-tegra/mmc.h>
 #include <asm/arch-tegra/sys_proto.h>
 #include <asm/arch-tegra/uart.h>
-#ifdef CONFIG_TEGRA_MMC
-#include <mmc.h>
-#endif
-
 
 #ifdef CONFIG_BOARD_EARLY_INIT_F
 void gpio_early_init(void)
@@ -54,7 +49,7 @@ void gpio_early_init(void)
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
  */
-static void pin_mux_mmc(void)
+void pin_mux_mmc(void)
 {
 	funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_GME_8_BIT);
 	/* for write-protect GPIO PI6 */
@@ -62,16 +57,4 @@ static void pin_mux_mmc(void)
 	/* for CD GPIO PH2 */
 	pinmux_tristate_disable(PINGRP_ATD);
 }
-
-/* this is a weak define that we are overriding */
-int board_mmc_init(bd_t *bd)
-{
-	/* Enable muxes, etc. for SDMMC controllers */
-	pin_mux_mmc();
-
-	/* init dev 0, SD slot, with 4-bit bus */
-	tegra_mmc_init(0, 4, GPIO_PI6, GPIO_PH2);
-
-	return 0;
-}
 #endif
board/compal/paz00/paz00.c +1 -25
index 1447f47..d6e5c37 100644
@@ -18,19 +18,14 @@
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch/pinmux.h>
-#include <asm/arch-tegra/mmc.h>
 #include <asm/gpio.h>
-#ifdef CONFIG_TEGRA_MMC
-#include <mmc.h>
-#endif
-
 
 #ifdef CONFIG_TEGRA_MMC
 /*
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
  */
-static void pin_mux_mmc(void)
+void pin_mux_mmc(void)
 {
 	/* SDMMC4: config 3, x8 on 2nd set of pins */
 	pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
@@ -51,25 +46,6 @@ static void pin_mux_mmc(void)
 	/* For CD GPIO PV5 */
 	pinmux_tristate_disable(PINGRP_GPV);
 }
-
-/* this is a weak define that we are overriding */
-int board_mmc_init(bd_t *bd)
-{
-	debug("board_mmc_init called\n");
-
-	/* Enable muxes, etc. for SDMMC controllers */
-	pin_mux_mmc();
-
-	debug("board_mmc_init: init eMMC\n");
-	/* init dev 0, eMMC chip, with 8-bit bus */
-	tegra_mmc_init(0, 8, -1, -1);
-
-	debug("board_mmc_init: init SD slot\n");
-	/* init dev 3, SD slot, with 4-bit bus */
-	tegra_mmc_init(3, 4, GPIO_PV1, GPIO_PV5);
-
-	return 0;
-}
 #endif
 
 #ifdef CONFIG_LCD
board/compulab/trimslice/trimslice.c +3 -22
index 8f4dd09..244a2a1 100644
@@ -27,12 +27,8 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
-#include <asm/arch-tegra/mmc.h>
 #include <asm/gpio.h>
 #include <i2c.h>
-#ifdef CONFIG_TEGRA_MMC
-#include <mmc.h>
-#endif
 
 void pin_mux_usb(void)
 {
@@ -48,11 +44,12 @@ void pin_mux_spi(void)
 	funcmux_select(PERIPH_ID_SPI1, FUNCMUX_SPI1_GMC_GMD);
 }
 
+#ifdef	CONFIG_TEGRA_MMC
 /*
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
  */
-static void pin_mux_mmc(void)
+void pin_mux_mmc(void)
 {
 	funcmux_select(PERIPH_ID_SDMMC1, FUNCMUX_SDMMC1_SDIO1_4BIT);
 	funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT);
@@ -60,20 +57,4 @@ static void pin_mux_mmc(void)
 	/* For CD GPIO PP1 */
 	pinmux_tristate_disable(PINGRP_DAP3);
 }
-
-/* this is a weak define that we are overriding */
-int board_mmc_init(bd_t *bd)
-{
-	debug("board_mmc_init called\n");
-
-	/* Enable muxes, etc. for SDMMC controllers */
-	pin_mux_mmc();
-
-	/* init dev 0 (SDMMC4), (micro-SD slot) with 4-bit bus */
-	tegra_mmc_init(0, 4, -1, GPIO_PP1);
-
-	/* init dev 3 (SDMMC1), (SD slot) with 4-bit bus */
-	tegra_mmc_init(3, 4, -1, -1);
-
-	return 0;
-}
+#endif
board/nvidia/common/board.c +25 -1
index d1d8a29..db0b5bd 100644
@@ -48,6 +48,9 @@
 #ifdef CONFIG_USB_EHCI_TEGRA
 #include <asm/arch/usb.h>
 #endif
+#ifdef CONFIG_TEGRA_MMC
+#include <asm/arch-tegra/mmc.h>
+#endif
 #include <i2c.h>
 #include <spi.h>
 #include "emc.h"
@@ -184,7 +187,6 @@ int board_init(void)
 	/* prepare the WB code to LP0 location */
 	warmboot_prepare_code(TEGRA_LP0_ADDR, TEGRA_LP0_SIZE);
 #endif
-
 	return 0;
 }
 
@@ -221,3 +223,25 @@ int board_late_init(void)
 #endif
 	return 0;
 }
+
+#if defined(CONFIG_TEGRA_MMC)
+void __pin_mux_mmc(void)
+{
+}
+
+void pin_mux_mmc(void) __attribute__((weak, alias("__pin_mux_mmc")));
+
+/* this is a weak define that we are overriding */
+int board_mmc_init(bd_t *bd)
+{
+	debug("%s called\n", __func__);
+
+	/* Enable muxes, etc. for SDMMC controllers */
+	pin_mux_mmc();
+
+	debug("%s: init MMC\n", __func__);
+	tegra_mmc_init();
+
+	return 0;
+}
+#endif
board/nvidia/harmony/harmony.c +1 -25
index 93430ed..3122441 100644
@@ -27,19 +27,14 @@
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/tegra.h>
-#include <asm/arch-tegra/mmc.h>
 #include <asm/gpio.h>
-#ifdef CONFIG_TEGRA_MMC
-#include <mmc.h>
-#endif
-
 
 #ifdef CONFIG_TEGRA_MMC
 /*
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
  */
-static void pin_mux_mmc(void)
+void pin_mux_mmc(void)
 {
 	funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_GME_8_BIT);
 	funcmux_select(PERIPH_ID_SDMMC2, FUNCMUX_SDMMC2_DTA_DTD_8BIT);
@@ -54,25 +49,6 @@ static void pin_mux_mmc(void)
 	/* For CD GPIO PI5 */
 	pinmux_tristate_disable(PINGRP_ATC);
 }
-
-/* this is a weak define that we are overriding */
-int board_mmc_init(bd_t *bd)
-{
-	debug("board_mmc_init called\n");
-
-	/* Enable muxes, etc. for SDMMC controllers */
-	pin_mux_mmc();
-
-	debug("board_mmc_init: init SD slot J26\n");
-	/* init dev 0, SD slot J26, with 8-bit bus */
-	tegra_mmc_init(0, 8, GPIO_PI6, GPIO_PH2);
-
-	debug("board_mmc_init: init SD slot J5\n");
-	/* init dev 2, SD slot J5, with 4-bit bus */
-	tegra_mmc_init(2, 4, GPIO_PT3, GPIO_PI5);
-
-	return 0;
-}
 #endif
 
 void pin_mux_usb(void)
board/nvidia/seaboard/seaboard.c +1 -24
index 3e33da0..e581fdd 100644
@@ -28,11 +28,7 @@
 #include <asm/arch/funcmux.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
-#include <asm/arch-tegra/mmc.h>
 #include <asm/gpio.h>
-#ifdef CONFIG_TEGRA_MMC
-#include <mmc.h>
-#endif
 
 /* TODO: Remove this code when the SPI switch is working */
 #if !defined(CONFIG_SPI_UART_SWITCH) && (CONFIG_MACH_TYPE != MACH_TYPE_VENTANA)
@@ -51,7 +47,7 @@ void gpio_early_init_uart(void)
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
  */
-static void pin_mux_mmc(void)
+void pin_mux_mmc(void)
 {
 	funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_GME_8_BIT);
 	funcmux_select(PERIPH_ID_SDMMC3, FUNCMUX_SDMMC3_SDB_4BIT);
@@ -61,25 +57,6 @@ static void pin_mux_mmc(void)
 	/* For CD GPIO PI5 */
 	pinmux_tristate_disable(PINGRP_ATC);
 }
-
-/* this is a weak define that we are overriding */
-int board_mmc_init(bd_t *bd)
-{
-	debug("board_mmc_init called\n");
-
-	/* Enable muxes, etc. for SDMMC controllers */
-	pin_mux_mmc();
-
-	debug("board_mmc_init: init eMMC\n");
-	/* init dev 0, eMMC chip, with 8-bit bus */
-	tegra_mmc_init(0, 8, -1, -1);
-
-	debug("board_mmc_init: init SD slot\n");
-	/* init dev 1, SD slot, with 4-bit bus */
-	tegra_mmc_init(1, 4, GPIO_PI6, GPIO_PI5);
-
-	return 0;
-}
 #endif
 
 void pin_mux_usb(void)
board/nvidia/whistler/whistler.c +5 -25
index 592cd6b..f18aa27 100644
@@ -27,32 +27,19 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
-#include <asm/arch-tegra/mmc.h>
 #include <asm/gpio.h>
 #include <i2c.h>
-#ifdef CONFIG_TEGRA_MMC
-#include <mmc.h>
-#endif
-
 
+#ifdef CONFIG_TEGRA_MMC
 /*
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
  */
-static void pin_mux_mmc(void)
-{
-	funcmux_select(PERIPH_ID_SDMMC3, FUNCMUX_SDMMC3_SDB_SLXA_8BIT);
-	funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATC_ATD_8BIT);
-}
-
-/* this is a weak define that we are overriding */
-int board_mmc_init(bd_t *bd)
+void pin_mux_mmc(void)
 {
 	uchar val;
 	int ret;
 
-	debug("board_mmc_init called\n");
-
 	/* Turn on MAX8907B LDO12 to 2.8V for J40 power */
 	ret = i2c_set_bus_num(0);
 	if (ret)
@@ -70,17 +57,10 @@ int board_mmc_init(bd_t *bd)
 	if (ret)
 		printf("i2c_write 0 0x3c 0x44 failed: %d\n", ret);
 
-	/* Enable muxes, etc. for SDMMC controllers */
-	pin_mux_mmc();
-
-	/* init dev 0 (SDMMC4), (J29 "HSMMC") with 8-bit bus */
-	tegra_mmc_init(0, 8, -1, -1);
-
-	/* init dev 1 (SDMMC3), (J40 "SDIO3") with 8-bit bus */
-	tegra_mmc_init(1, 8, -1, -1);
-
-	return 0;
+	funcmux_select(PERIPH_ID_SDMMC3, FUNCMUX_SDMMC3_SDB_SLXA_8BIT);
+	funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATC_ATD_8BIT);
 }
+#endif
 
 /* this is a weak define that we are overriding */
 void pin_mux_usb(void)
board/toradex/colibri_t20_iris/colibri_t20_iris.c +5 -6
index e40a986..aa76f65 100644
@@ -19,7 +19,6 @@
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/board.h>
-#include <asm/arch-tegra/mmc.h>
 
 #include "../colibri_t20-common/colibri_t20-common.h"
 
@@ -34,13 +33,13 @@ void pin_mux_usb(void)
 #endif
 
 #ifdef CONFIG_TEGRA_MMC
-int board_mmc_init(bd_t *bd)
+/*
+ * Routine: pin_mux_mmc
+ * Description: setup the pin muxes/tristate values for the SDMMC(s)
+ */
+void pin_mux_mmc(void)
 {
 	funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT);
 	pinmux_tristate_disable(PINGRP_GMB);
-
-	tegra_mmc_init(0, 4, -1, GPIO_PC7);
-
-	return 0;
 }
 #endif
drivers/mmc/tegra_mmc.c +162 -97

457 lines not on this page · raw message

include/fdtdec.h +1 -0
index 77f244f..4f9dbcf 100644
@@ -70,6 +70,7 @@ enum fdt_compat_id {
 	COMPAT_NVIDIA_TEGRA20_NAND,	/* Tegra2 NAND controller */
 	COMPAT_NVIDIA_TEGRA20_PWM,	/* Tegra 2 PWM controller */
 	COMPAT_NVIDIA_TEGRA20_DC,	/* Tegra 2 Display controller */
+	COMPAT_NVIDIA_TEGRA20_SDMMC,	/* Tegra SDMMC controller */
 	COMPAT_NVIDIA_TEGRA20_SFLASH,	/* Tegra 2 SPI flash controller */
 	COMPAT_NVIDIA_TEGRA20_SLINK,	/* Tegra 2 SPI SLINK controller */
 	COMPAT_SMSC_LAN9215,		/* SMSC 10/100 Ethernet LAN9215 */
lib/fdtdec.c +1 -0
index 3ae348d..57e552c 100644
@@ -45,6 +45,7 @@ static const char * const compat_names[COMPAT_COUNT] = {
 	COMPAT(NVIDIA_TEGRA20_NAND, "nvidia,tegra20-nand"),
 	COMPAT(NVIDIA_TEGRA20_PWM, "nvidia,tegra20-pwm"),
 	COMPAT(NVIDIA_TEGRA20_DC, "nvidia,tegra20-dc"),
+	COMPAT(NVIDIA_TEGRA20_SDMMC, "nvidia,tegra20-sdhci"),
 	COMPAT(NVIDIA_TEGRA20_SFLASH, "nvidia,tegra20-sflash"),
 	COMPAT(NVIDIA_TEGRA20_SLINK, "nvidia,tegra20-slink"),
 	COMPAT(SMSC_LAN9215, "smsc,lan9215"),
Signature · 1 line
1.7.0.4
#11 lore raw

PATCH v3 3/3 Tegra: MMC: Add DT support to MMC driver for all T20 boards

board/compulab/trimslice/trimslice.c

Quoted 9 lines · Tom Warren

tegra_mmc_init() now parses the DT info for bus width, WP/CD GPIOs, etc. Tested on Seaboard, fully functional.

Tamonten boards (medcom-wide, plutux, and tec) use a different/new dtsi file w/common settings.

board/compulab/trimslice/trimslice.c +1 -0
 
+#ifdef	CONFIG_TEGRA_MMC

It seems a little odd to add this ifdef when it's know that config option is enabled in the trimslice config file. I can somewhat understand leaving the ifdef in any other board files that already had it, but actively adding it here seems strange.

board/nvidia/common/board.c int board_init(void) · line 191

Quoted 9 lines
board/nvidia/common/board.c +0 -1
@@ -184,7 +187,6 @@ int board_init(void)
 	/* prepare the WB code to LP0 location */
 	warmboot_prepare_code(TEGRA_LP0_ADDR, TEGRA_LP0_SIZE);
 #endif
-
 	return 0;
 }

Unrelated change?

drivers/mmc/tegra_mmc.c int tegra_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio) · line 635

Quoted 5 lines
drivers/mmc/tegra_mmc.c +3 -0
+static int process_nodes(const void *blob, int node_list[], int count)
 
+		/* Mark position as used */
+		node_list[i] = -1;

Is this actually necessary?

I'll try and test these patches on all the Tegra20 boards I have tomorrow.

#12 lore raw

PATCH v3 3/3 Tegra: MMC: Add DT support to MMC driver for all T20 boards

Hi,

Quoted 28 lines · Stephen Warren

board/compulab/trimslice/trimslice.c

Quoted 9 lines · Tom Warren

tegra_mmc_init() now parses the DT info for bus width, WP/CD GPIOs, etc. Tested on Seaboard, fully functional.

Tamonten boards (medcom-wide, plutux, and tec) use a different/new dtsi file w/common settings.

board/compulab/trimslice/trimslice.c +1 -0
 
+#ifdef       CONFIG_TEGRA_MMC

It seems a little odd to add this ifdef when it's know that config option is enabled in the trimslice config file. I can somewhat understand leaving the ifdef in any other board files that already had it, but actively adding it here seems strange.

board/nvidia/common/board.c int board_init(void) · line 191

Quoted 9 lines
board/nvidia/common/board.c +0 -1
@@ -184,7 +187,6 @@ int board_init(void)
      /* prepare the WB code to LP0 location */
      warmboot_prepare_code(TEGRA_LP0_ADDR, TEGRA_LP0_SIZE);
 #endif
-
      return 0;
 }

Unrelated change?

Quoted 7 lines

drivers/mmc/tegra_mmc.c int tegra_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio) · line 635

Quoted 5 lines
drivers/mmc/tegra_mmc.c +3 -0
+static int process_nodes(const void *blob, int node_list[], int count)
 
+             /* Mark position as used */
+             node_list[i] = -1;

Is this actually necessary?

I don't think it is in this case. It is useful when adding aliases from multiple compatible IDs, to mark those positions that are already taken. We don't do that here.

Quoted 6 lines

I'll try and test these patches on all the Tegra20 boards I have tomorrow.
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Regards,
Simon

author
#13 lore raw

PATCH v3 3/3 Tegra: MMC: Add DT support to MMC driver for all T20 boards

In reply to Stephen Warren

Stephen,

Quoted 7 lines · Stephen Warren
Quoted 5 lines · Tom Warren

tegra_mmc_init() now parses the DT info for bus width, WP/CD GPIOs, etc. Tested on Seaboard, fully functional.

Tamonten boards (medcom-wide, plutux, and tec) use a different/new dtsi file w/common settings.

Quoted 8 lines

board/compulab/trimslice/trimslice.c

Quoted 3 lines
board/compulab/trimslice/trimslice.c +1 -0
 
+#ifdef       CONFIG_TEGRA_MMC

It seems a little odd to add this ifdef when it's know that config option is enabled in the trimslice config file. I can somewhat understand leaving the ifdef in any other board files that already had it, but actively adding it here seems strange.

Well, I was trying to be consistent when check all the board files for a pin_mux_mmc() function, and thought that adding the ifdef to the only board file that didn't have it would be the correct thing to do. In the original code (before moving to DT MMC), if you disabled SD/MMC in the trimslice config file, you'd get a build error. That's no longer true w/these patches, but I'm a better-safe-than-sorry guy.

I'll remove it in v4

Quoted 12 lines

board/nvidia/common/board.c int board_init(void) · line 191

Quoted 10 lines
board/nvidia/common/board.c +0 -1
@@ -184,7 +187,6 @@ int board_init(void)
      /* prepare the WB code to LP0 location */
      warmboot_prepare_code(TEGRA_LP0_ADDR, TEGRA_LP0_SIZE);
 #endif
-
      return 0;
 }

Unrelated change?

Yep, due to fast-and-furious cut&pasting. I'll clean it up in v4.

Quoted 8 lines

drivers/mmc/tegra_mmc.c int tegra_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio) · line 635

Quoted 6 lines
drivers/mmc/tegra_mmc.c +3 -0
+static int process_nodes(const void *blob, int node_list[], int count)
 
+             /* Mark position as used */
+             node_list[i] = -1;

Is this actually necessary?

As Simon says in his response, it's used when there're multiple compatible IDs, like the I2C code I pulled it from. I'll remove it for MMC in v4.

Quoted 2 lines

I'll try and test these patches on all the Tegra20 boards I have tomorrow.

Thanks

Tom

#14 lore raw

v3 cover Tegra: MMC: Add DT support for MMC to T20 boards

In reply to Tom Warren
Quoted 39 lines · Tom Warren

This patchset adds device-tree support to the Tegra MMC driver. All device config is done via properties in the DT files instead of hard-coded config options/function arguments.

I've tested this on my Seaboard and everything works fine, including card detect. For the other T20 boards, I've used the Linux kernel DTS files for the sdhci nodes where there wasn't one already, or expanded the info that was already there. Everything builds fine, but I haven't tested anything but Seaboard.

v2: Changes as per Stephen's & Simon's review
v3: Changes as per Stephen/Lucas/Thierry/Simon's feedback

Tom Warren (3):
Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files
Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux
Tegra: MMC: Add DT support to MMC driver for all T20 boards

 arch/arm/dts/tegra20.dtsi                         |   16 +-
 arch/arm/include/asm/arch-tegra/mmc.h             |    2 +-
 arch/arm/include/asm/arch-tegra/tegra_mmc.h       |   13 +-
 board/avionic-design/common/tamonten.c            |   19 +-
 board/avionic-design/dts/tegra20-medcom-wide.dts  |    3 +-
 board/avionic-design/dts/tegra20-plutux.dts       |    3 +-
 board/avionic-design/dts/tegra20-tamonten.dtsi    |  489 +++++++++++++++++++++
 board/avionic-design/dts/tegra20-tec.dts          |    3 +-
 board/compal/dts/tegra20-paz00.dts                |   19 +-
 board/compal/paz00/paz00.c                        |   26 +-
 board/compulab/dts/tegra20-trimslice.dts          |   14 +
 board/compulab/trimslice/trimslice.c              |   25 +-
 board/nvidia/common/board.c                       |   26 +-
 board/nvidia/dts/tegra20-harmony.dts              |   18 +
 board/nvidia/dts/tegra20-seaboard.dts             |   10 +-
 board/nvidia/dts/tegra20-ventana.dts              |   15 +
 board/nvidia/dts/tegra20-whistler.dts             |   13 +
 board/nvidia/harmony/harmony.c                    |   26 +-
 board/nvidia/seaboard/seaboard.c                  |   25 +-
 board/nvidia/whistler/whistler.c                  |   30 +-
Quoted 8 lines
 board/toradex/colibri_t20_iris/colibri_t20_iris.c |   11 +-
 board/toradex/dts/tegra20-colibri_t20_iris.dts    |    7 +
 drivers/mmc/tegra_mmc.c                           |  259 +++++++----
 dts/Makefile                                      |    2 +-
 include/fdtdec.h                                  |    1 +
 lib/fdtdec.c                                      |    1 +
 26 files changed, 815 insertions(+), 261 deletions(-)
 create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi

The series,

on TEC and Medcom-Wide. I don't currently have access to a Plutux, but it should be fine too.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130214/89aa45b7/attachment.pgp>

author
#15 lore raw

v3 cover Tegra: MMC: Add DT support for MMC to T20 boards

Thanks!

Quoted 57 lines · Thierry Reding
Quoted 39 lines · Tom Warren

This patchset adds device-tree support to the Tegra MMC driver. All device config is done via properties in the DT files instead of hard-coded config options/function arguments.

I've tested this on my Seaboard and everything works fine, including card detect. For the other T20 boards, I've used the Linux kernel DTS files for the sdhci nodes where there wasn't one already, or expanded the info that was already there. Everything builds fine, but I haven't tested anything but Seaboard.

v2: Changes as per Stephen's & Simon's review
v3: Changes as per Stephen/Lucas/Thierry/Simon's feedback

Tom Warren (3):
Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files
Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux
Tegra: MMC: Add DT support to MMC driver for all T20 boards

 arch/arm/dts/tegra20.dtsi                         |   16 +-
 arch/arm/include/asm/arch-tegra/mmc.h             |    2 +-
 arch/arm/include/asm/arch-tegra/tegra_mmc.h       |   13 +-
 board/avionic-design/common/tamonten.c            |   19 +-
 board/avionic-design/dts/tegra20-medcom-wide.dts  |    3 +-
 board/avionic-design/dts/tegra20-plutux.dts       |    3 +-
 board/avionic-design/dts/tegra20-tamonten.dtsi    |  489 +++++++++++++++++++++
 board/avionic-design/dts/tegra20-tec.dts          |    3 +-
 board/compal/dts/tegra20-paz00.dts                |   19 +-
 board/compal/paz00/paz00.c                        |   26 +-
 board/compulab/dts/tegra20-trimslice.dts          |   14 +
 board/compulab/trimslice/trimslice.c              |   25 +-
 board/nvidia/common/board.c                       |   26 +-
 board/nvidia/dts/tegra20-harmony.dts              |   18 +
 board/nvidia/dts/tegra20-seaboard.dts             |   10 +-
 board/nvidia/dts/tegra20-ventana.dts              |   15 +
 board/nvidia/dts/tegra20-whistler.dts             |   13 +
 board/nvidia/harmony/harmony.c                    |   26 +-
 board/nvidia/seaboard/seaboard.c                  |   25 +-
 board/nvidia/whistler/whistler.c                  |   30 +-
Quoted 8 lines
 board/toradex/colibri_t20_iris/colibri_t20_iris.c |   11 +-
 board/toradex/dts/tegra20-colibri_t20_iris.dts    |    7 +
 drivers/mmc/tegra_mmc.c                           |  259 +++++++----
 dts/Makefile                                      |    2 +-
 include/fdtdec.h                                  |    1 +
 lib/fdtdec.c                                      |    1 +
 26 files changed, 815 insertions(+), 261 deletions(-)
 create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi

The series,

on TEC and Medcom-Wide. I don't currently have access to a Plutux, but it should be fine too.

Thierry

#16 lore raw

v3 cover Tegra: MMC: Add DT support for MMC to T20 boards

In reply to Thierry Reding
Quoted 49 lines · Thierry Reding
Quoted 39 lines · Tom Warren

This patchset adds device-tree support to the Tegra MMC driver. All device config is done via properties in the DT files instead of hard-coded config options/function arguments.

I've tested this on my Seaboard and everything works fine, including card detect. For the other T20 boards, I've used the Linux kernel DTS files for the sdhci nodes where there wasn't one already, or expanded the info that was already there. Everything builds fine, but I haven't tested anything but Seaboard.

v2: Changes as per Stephen's & Simon's review
v3: Changes as per Stephen/Lucas/Thierry/Simon's feedback

Tom Warren (3):
Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files
Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux
Tegra: MMC: Add DT support to MMC driver for all T20 boards

 arch/arm/dts/tegra20.dtsi                         |   16 +-
 arch/arm/include/asm/arch-tegra/mmc.h             |    2 +-
 arch/arm/include/asm/arch-tegra/tegra_mmc.h       |   13 +-
 board/avionic-design/common/tamonten.c            |   19 +-
 board/avionic-design/dts/tegra20-medcom-wide.dts  |    3 +-
 board/avionic-design/dts/tegra20-plutux.dts       |    3 +-
 board/avionic-design/dts/tegra20-tamonten.dtsi    |  489 +++++++++++++++++++++
 board/avionic-design/dts/tegra20-tec.dts          |    3 +-
 board/compal/dts/tegra20-paz00.dts                |   19 +-
 board/compal/paz00/paz00.c                        |   26 +-
 board/compulab/dts/tegra20-trimslice.dts          |   14 +
 board/compulab/trimslice/trimslice.c              |   25 +-
 board/nvidia/common/board.c                       |   26 +-
 board/nvidia/dts/tegra20-harmony.dts              |   18 +
 board/nvidia/dts/tegra20-seaboard.dts             |   10 +-
 board/nvidia/dts/tegra20-ventana.dts              |   15 +
 board/nvidia/dts/tegra20-whistler.dts             |   13 +
 board/nvidia/harmony/harmony.c                    |   26 +-
 board/nvidia/seaboard/seaboard.c                  |   25 +-
 board/nvidia/whistler/whistler.c                  |   30 +-
Quoted 8 lines
 board/toradex/colibri_t20_iris/colibri_t20_iris.c |   11 +-
 board/toradex/dts/tegra20-colibri_t20_iris.dts    |    7 +
 drivers/mmc/tegra_mmc.c                           |  259 +++++++----
 dts/Makefile                                      |    2 +-
 include/fdtdec.h                                  |    1 +
 lib/fdtdec.c                                      |    1 +
 26 files changed, 815 insertions(+), 261 deletions(-)
 create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi
Quoted 6 lines

The series,

on TEC and Medcom-Wide. I don't currently have access to a Plutux, but it should be fine too.

I managed to talk a co-worker into trying this out on Plutux and there were no issues there either. All Tamonten-boards work fine with these patches applied.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130214/85ab88b3/attachment.pgp>

#17 lore raw

v3 cover Tegra: MMC: Add DT support for MMC to T20 boards

In reply to Tom Warren
Quoted 10 lines · Tom Warren

This patchset adds device-tree support to the Tegra MMC driver. All device config is done via properties in the DT files instead of hard-coded config options/function arguments.

I've tested this on my Seaboard and everything works fine, including card detect. For the other T20 boards, I've used the Linux kernel DTS files for the sdhci nodes where there wasn't one already, or expanded the info that was already there. Everything builds fine, but I haven't tested anything but Seaboard.

With the incremental patch below applied,

On: Harmony, Seaboard(really Springbank), Ventana, Whistler, Paz00/AC100, TrimSlice.

Quoted 37 lines

commit a5be5907d77eb4ca18dd9a11dd09183148c9d1b2

Author: Stephen Warren <[email protected]>
Date:   Thu Feb 14 16:02:24 2013 -0700

Fix MMC DT rework

drivers/mmc/tegra_mmc.c +2 -4
index e8e8512..630f6bd 100644
@@ -497,7 +497,6 @@ static int do_mmc_init(int dev_index)
        struct mmc_host *host;
        char gpusage[12]; /* "SD/MMCn PWR" or "SD/MMCn CD" */
        struct mmc *mmc;
-       int card_det = 0;
 
        /* DT should have been read & host config filled in */
        host = &mmc_host[dev_index];
@@ -514,16 +513,15 @@ static int do_mmc_init(int dev_index)
        if (fdt_gpio_isvalid(&host->pwr_gpio)) {
                sprintf(gpusage, "SD/MMC%d PWR", dev_index);
                gpio_request(host->pwr_gpio.gpio, gpusage);
-               fdtdec_set_gpio(&host->pwr_gpio, 1);
+               gpio_direction_output(host->pwr_gpio.gpio, 1);
                debug(" Power GPIO name = %s\n", host->pwr_gpio.name);
        }
 
        if (fdt_gpio_isvalid(&host->cd_gpio)) {
                sprintf(gpusage, "SD/MMC%d CD", dev_index);
                gpio_request(host->cd_gpio.gpio, gpusage);
-               card_det = fdtdec_get_gpio(&host->cd_gpio);
+               gpio_direction_input(host->cd_gpio.gpio);
                debug(" CD GPIO name = %s\n", host->cd_gpio.name);
-               debug("%s: CD state = %d\n", __func__, card_det);
        }
 
        mmc = &mmc_dev[dev_index];
author
#18 lore raw

v3 cover Tegra: MMC: Add DT support for MMC to T20 boards

Stephen,

Quoted 54 lines · Stephen Warren
Quoted 10 lines · Tom Warren

This patchset adds device-tree support to the Tegra MMC driver. All device config is done via properties in the DT files instead of hard-coded config options/function arguments.

I've tested this on my Seaboard and everything works fine, including card detect. For the other T20 boards, I've used the Linux kernel DTS files for the sdhci nodes where there wasn't one already, or expanded the info that was already there. Everything builds fine, but I haven't tested anything but Seaboard.

With the incremental patch below applied,

On: Harmony, Seaboard(really Springbank), Ventana, Whistler, Paz00/AC100, TrimSlice.

Quoted 36 lines

commit a5be5907d77eb4ca18dd9a11dd09183148c9d1b2

Author: Stephen Warren <[email protected]>
Date:   Thu Feb 14 16:02:24 2013 -0700

Fix MMC DT rework

drivers/mmc/tegra_mmc.c +2 -4
index e8e8512..630f6bd 100644
@@ -497,7 +497,6 @@ static int do_mmc_init(int dev_index)
        struct mmc_host *host;
        char gpusage[12]; /* "SD/MMCn PWR" or "SD/MMCn CD" */
        struct mmc *mmc;
-       int card_det = 0;
 
        /* DT should have been read & host config filled in */
        host = &mmc_host[dev_index];
@@ -514,16 +513,15 @@ static int do_mmc_init(int dev_index)
        if (fdt_gpio_isvalid(&host->pwr_gpio)) {
                sprintf(gpusage, "SD/MMC%d PWR", dev_index);
                gpio_request(host->pwr_gpio.gpio, gpusage);
-               fdtdec_set_gpio(&host->pwr_gpio, 1);
+               gpio_direction_output(host->pwr_gpio.gpio, 1);
                debug(" Power GPIO name = %s\n", host->pwr_gpio.name);
        }
 
        if (fdt_gpio_isvalid(&host->cd_gpio)) {
                sprintf(gpusage, "SD/MMC%d CD", dev_index);
                gpio_request(host->cd_gpio.gpio, gpusage);
-               card_det = fdtdec_get_gpio(&host->cd_gpio);
+               gpio_direction_input(host->cd_gpio.gpio);
                debug(" CD GPIO name = %s\n", host->cd_gpio.name);
-               debug("%s: CD state = %d\n", __func__, card_det);
        }
 
Quoted 2 lines

drivers/mmc/tegra_mmc.c static int do_mmc_init(int dev_index) · line 527

Quoted 1 line
drivers/mmc/tegra_mmc.c +0 -0
        mmc = &mmc_dev[dev_index];

Thanks. I'll look at merging this w/my v4 patchset when I get back from Kansas on Weds.

Tom