Tegra: MMC: Add DT support for MMC to T20 boards
Subsystems (4)
v7 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
v4: Additional changes as per Stephen/Lucas/Thierry/Simon
v5: Additional changes as per Stephen/Lucas/Andy
v6: Additional changes requested by Stephen/Thierry
v7: Additional changes requested by Stephen
Tom Warren (4):
Tegra: fdt: Change /include/ to #include for C preprocessor
Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux
Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files
Tegra: MMC: Add DT support to MMC driver for all T20 boards
arch/arm/dts/tegra114.dtsi | 2 +- arch/arm/dts/tegra20.dtsi | 18 +- arch/arm/dts/tegra30.dtsi | 2 +- 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 | 21 +- board/compal/paz00/paz00.c | 26 +- board/compulab/dts/tegra20-trimslice.dts | 16 +- board/compulab/trimslice/trimslice.c | 23 +- board/nvidia/common/board.c | 25 + board/nvidia/dts/tegra114-dalmore.dts | 2 +- board/nvidia/dts/tegra20-harmony.dts | 20 +- board/nvidia/dts/tegra20-seaboard.dts | 14 +- board/nvidia/dts/tegra20-ventana.dts | 17 +- board/nvidia/dts/tegra20-whistler.dts | 15 +- board/nvidia/dts/tegra30-cardhu.dts | 2 +- 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 | 9 +- drivers/mmc/tegra_mmc.c | 179 +++++--- dts/Makefile | 3 +- include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 30 files changed, 786 insertions(+), 234 deletions(-) create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi
PATCH v7 1/4 Tegra: fdt: Change /include/ to #include for C preprocessor
dts Makefile has the arch & board include paths added to DTS_CPPFLAGS. This allows the use of '#include "xyz"' in the dts/dtsi file which helps the C preprocessor find common dtsi include files.
---
---
v4: new
v5: add dts/dtsi paths to DTS_CPPFLAGS instead of DTC command line
v6: change all DT files to use #include instead of /include/
v7: change ARCH_CPU_DTS to "tegra20.dtsi" in T20 dts files
arch/arm/dts/tegra114.dtsi | 2 +- arch/arm/dts/tegra20.dtsi | 2 +- arch/arm/dts/tegra30.dtsi | 2 +- board/avionic-design/dts/tegra20-medcom-wide.dts | 2 +- board/avionic-design/dts/tegra20-plutux.dts | 2 +- board/avionic-design/dts/tegra20-tec.dts | 2 +- board/compal/dts/tegra20-paz00.dts | 2 +- board/compulab/dts/tegra20-trimslice.dts | 2 +- board/nvidia/dts/tegra114-dalmore.dts | 2 +- board/nvidia/dts/tegra20-harmony.dts | 2 +- board/nvidia/dts/tegra20-seaboard.dts | 2 +- board/nvidia/dts/tegra20-ventana.dts | 2 +- board/nvidia/dts/tegra20-whistler.dts | 2 +- board/nvidia/dts/tegra30-cardhu.dts | 2 +- board/toradex/dts/tegra20-colibri_t20_iris.dts | 2 +- dts/Makefile | 3 ++- 16 files changed, 17 insertions(+), 16 deletions(-)
arch/arm/dts/tegra114.dtsi +1 -1
@@ -1,4 +1,4 @@ -/include/ "skeleton.dtsi" +#include "skeleton.dtsi" / { compatible = "nvidia,tegra114";
arch/arm/dts/tegra20.dtsi +1 -1
@@ -1,4 +1,4 @@ -/include/ "skeleton.dtsi" +#include "skeleton.dtsi" / { compatible = "nvidia,tegra20";
arch/arm/dts/tegra30.dtsi +1 -1
@@ -1,4 +1,4 @@ -/include/ "skeleton.dtsi" +#include "skeleton.dtsi" / { compatible = "nvidia,tegra30";
board/avionic-design/dts/tegra20-medcom-wide.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -/include/ ARCH_CPU_DTS +#include "tegra20.dtsi" / { model = "Avionic Design Medcom-Wide";
board/avionic-design/dts/tegra20-plutux.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -/include/ ARCH_CPU_DTS +#include "tegra20.dtsi" / { model = "Avionic Design Plutux";
board/avionic-design/dts/tegra20-tec.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -/include/ ARCH_CPU_DTS +#include "tegra20.dtsi" / { model = "Avionic Design Tamonten Evaluation Carrier";
board/compal/dts/tegra20-paz00.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -/include/ ARCH_CPU_DTS +#include "tegra20.dtsi" / { model = "Toshiba AC100 / Dynabook AZ";
board/compulab/dts/tegra20-trimslice.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -/include/ ARCH_CPU_DTS +#include "tegra20.dtsi" / { model = "Compulab TrimSlice board";
board/nvidia/dts/tegra114-dalmore.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -/include/ ARCH_CPU_DTS +#include ARCH_CPU_DTS / { model = "NVIDIA Dalmore";
board/nvidia/dts/tegra20-harmony.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -/include/ ARCH_CPU_DTS +#include "tegra20.dtsi" / { model = "NVIDIA Tegra20 Harmony evaluation board";
board/nvidia/dts/tegra20-seaboard.dts +1 -1
@@ -1,7 +1,7 @@ /dts-v1/; /memreserve/ 0x1c000000 0x04000000; -/include/ ARCH_CPU_DTS +#include "tegra20.dtsi" / { model = "NVIDIA Seaboard";
board/nvidia/dts/tegra20-ventana.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -/include/ ARCH_CPU_DTS +#include "tegra20.dtsi" / { model = "NVIDIA Tegra20 Ventana evaluation board";
board/nvidia/dts/tegra20-whistler.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -/include/ ARCH_CPU_DTS +#include "tegra20.dtsi" / { model = "NVIDIA Tegra20 Whistler evaluation board";
board/nvidia/dts/tegra30-cardhu.dts +1 -1
@@ -1,7 +1,7 @@ /dts-v1/; /memreserve/ 0x1c000000 0x04000000; -/include/ ARCH_CPU_DTS +#include ARCH_CPU_DTS / { model = "NVIDIA Cardhu";
board/toradex/dts/tegra20-colibri_t20_iris.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -/include/ ARCH_CPU_DTS +#include "tegra20.dtsi" / { model = "Toradex Colibri T20";
dts/Makefile +2 -1
@@ -38,7 +38,8 @@ Please define CONFIG_ARCH_DEVICE_TREE)) # We preprocess the device tree file provide a useful define DTS_CPPFLAGS := -x assembler-with-cpp \ -DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" \ - -DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\" + -DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\" \ + -I$(SRCTREE)/board/$(VENDOR)/dts -I$(SRCTREE)/arch/$(ARCH)/dts all: $(obj).depend $(LIB)
Signature · 1 line
1.7.0.4
PATCH v7 2/4 Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux
In reply to Tom WarrenTamonten boards (medcom-wide, plutux, and tec) use a different/new dtsi file w/common settings.
---
v3: new
v4: no change
v5: change /include/ to #include
v6: change AD DT files ARCH_CPU_DTS to "tegra20-tamonten.dtsi"
v7: change ARCH_CPU_DTS to "tegra20.dtsi" in tegra20-tamonten.dtsi
board/avionic-design/dts/tegra20-medcom-wide.dts | 2 +- board/avionic-design/dts/tegra20-plutux.dts | 2 +- board/avionic-design/dts/tegra20-tamonten.dtsi | 489 ++++++++++++++++++++++ board/avionic-design/dts/tegra20-tec.dts | 2 +- 4 files changed, 492 insertions(+), 3 deletions(-) create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi
board/avionic-design/dts/tegra20-medcom-wide.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -#include "tegra20.dtsi" +#include "tegra20-tamonten.dtsi" / { model = "Avionic Design Medcom-Wide";
board/avionic-design/dts/tegra20-plutux.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -#include "tegra20.dtsi" +#include "tegra20-tamonten.dtsi" / { model = "Avionic Design Plutux";
board/avionic-design/dts/tegra20-tamonten.dtsi new file +489 -0
489 lines not on this page · raw message
board/avionic-design/dts/tegra20-tec.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -#include "tegra20.dtsi" +#include "tegra20-tamonten.dtsi" / { model = "Avionic Design Tamonten Evaluation Carrier";
Signature · 1 line
1.7.0.4
PATCH v7 3/4 Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files
In reply to Tom WarrenLinux 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
v4:
- move dts Makefile change to separate patch
v5:
- change /include/ to #include, allows C preprocessor to find files v6:
- change ARCH_CPU_DTS to "tegra20.dtsi"
- change cd-gpios flags to 1, active-low
v7:
- negate change from ARCH_CPU_DTS to "tegra20.dtsi", since it has
- already been done in the preceding patch
arch/arm/dts/tegra20.dtsi | 16 ++++++++++++---- board/avionic-design/dts/tegra20-medcom-wide.dts | 1 + board/avionic-design/dts/tegra20-plutux.dts | 1 + board/avionic-design/dts/tegra20-tec.dts | 1 + board/compal/dts/tegra20-paz00.dts | 19 +++++++++++++++++-- board/compulab/dts/tegra20-trimslice.dts | 14 ++++++++++++++ board/nvidia/dts/tegra114-dalmore.dts | 2 +- board/nvidia/dts/tegra20-harmony.dts | 18 ++++++++++++++++++ board/nvidia/dts/tegra20-seaboard.dts | 12 ++++++++---- board/nvidia/dts/tegra20-ventana.dts | 15 +++++++++++++++ board/nvidia/dts/tegra20-whistler.dts | 13 +++++++++++++ board/nvidia/dts/tegra30-cardhu.dts | 2 +- board/toradex/dts/tegra20-colibri_t20_iris.dts | 7 +++++++ 13 files changed, 109 insertions(+), 12 deletions(-)
arch/arm/dts/tegra20.dtsi +12 -4
@@ -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 +1 -0
@@ -8,6 +8,7 @@ aliases { usb0 = "/usb at c5008000"; + sdhci0 = "/sdhci at c8000600"; }; memory {
board/avionic-design/dts/tegra20-plutux.dts +1 -0
@@ -8,6 +8,7 @@ aliases { usb0 = "/usb at c5008000"; + sdhci0 = "/sdhci at c8000600"; }; memory {
board/avionic-design/dts/tegra20-tec.dts +1 -0
@@ -8,6 +8,7 @@ aliases { usb0 = "/usb at c5008000"; + sdhci0 = "/sdhci at c8000600"; }; memory {
board/compal/dts/tegra20-paz00.dts +17 -2
@@ -3,11 +3,13 @@ #include "tegra20.dtsi" / { - 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 1>; /* 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
@@ -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 1>; /* gpio PP1 */ + wp-gpios = <&gpio 122 0>; /* gpio PP2 */ + bus-width = <4>; + }; };
board/nvidia/dts/tegra114-dalmore.dts +1 -1
@@ -1,6 +1,6 @@ /dts-v1/; -#include ARCH_CPU_DTS +#include "tegra114.dtsi" / { model = "NVIDIA Dalmore";
board/nvidia/dts/tegra20-harmony.dts +18 -0
@@ -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 1>; /* 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 1>; /* 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 +8 -4
@@ -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 { - cd-gpios = <&gpio 69 0>; /* gpio PI5 */ + status = "okay"; + cd-gpios = <&gpio 69 1>; /* 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
@@ -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 1>; /* 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
@@ -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/nvidia/dts/tegra30-cardhu.dts +1 -1
@@ -1,7 +1,7 @@ /dts-v1/; /memreserve/ 0x1c000000 0x04000000; -#include ARCH_CPU_DTS +#include "tegra30.dtsi" / { model = "NVIDIA Cardhu";
board/toradex/dts/tegra20-colibri_t20_iris.dts +7 -0
@@ -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 1>; /* gpio PC7 */ + bus-width = <4>; + }; };
Signature · 1 line
1.7.0.4
PATCH v7 4/4 Tegra: MMC: Add DT support to MMC driver for all T20 boards
In reply to Tom Warrentegra_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 v4:
- remove #ifdef CONFIG_TEGRA_MMC from trimslice.c
- fix minor whitespace issue in board/nvidia/common/board.c
- remove marking of used node_list entries in MMC driver, not needed v5:
- restore previous debug statements, remove any new ones
- fix pwr_gpio/cd_gpio initialization in do_mmc_init
- update copyright to 2013
v6:
- change tegra_mmc_getcd to reflect new cd-gpios polarity (active-low) v7:
- no change
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 | 23 +--- board/nvidia/common/board.c | 25 +++ 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 | 179 ++++++++++++++------- include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 13 files changed, 173 insertions(+), 208 deletions(-)
arch/arm/include/asm/arch-tegra/mmc.h +1 -1
@@ -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
@@ -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
@@ -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
@@ -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 +1 -22
@@ -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 ) {
@@ -52,7 +48,7 @@ void pin_mux_spi(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_SDMMC1 ,FUNCMUX_SDMMC1_SDIO1_4BIT );funcmux_select (PERIPH_ID_SDMMC4 ,FUNCMUX_SDMMC4_ATB_GMA_4_BIT );
@@ -60,20 +56,3 @@ 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 ; -}
board/nvidia/common/board.c +25 -0
@@ -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"
@@ -221,3 +224,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
@@ -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
@@ -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
@@ -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
@@ -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 +121 -58
239 lines not on this page · raw message
include/fdtdec.h +1 -0
@@ -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
@@ -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
v7 cover Tegra: MMC: Add DT support for MMC to T20 boards
In reply to Tom WarrenQuoted 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.
Just to be explicit, this latest series/version,
Quoted 6 lines
v2: Changes as per Stephen's & Simon's review
v3: Changes as per Stephen/Lucas/Thierry/Simon's feedback
v4: Additional changes as per Stephen/Lucas/Thierry/Simon
v5: Additional changes as per Stephen/Lucas/Andy
v6: Additional changes requested by Stephen/Thierry
v7: Additional changes requested by Stephen
You've explicitly mentioned the changes in the individual patches, so I'd be inclined to just leave out the list here. If you keep it, it'd be useful to cut/paste all the changes from the individual patches, or summarize them explicitly; simply listing who requested the changes isn't that useful.