Re: [U-Boot] [PATCH v6 3/4] Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files
On 02/21/2013 09:45 AM, Tom Warren wrote: > 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). > v6: > - change ARCH_CPU_DTS to "tegra20.dtsi" Oh. That should be a separate patch, or part of patch 1. It has nothing to do with SDHCI. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 3/4] Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files
On Thursday 21 February 2013 09:45:44 Tom Warren wrote:
> 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).
>
> Signed-off-by: Tom Warren
> Tested-by: Thierry Reding
looks (and boots) fine now. Thanks!
Tested-by: Marc Dietrich
> ---
> 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
>
> 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 | 21 ++---
> board/compulab/dts/tegra20-trimslice.dts | 16 +++-
> 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/toradex/dts/tegra20-colibri_t20_iris.dts |9 -
> 13 files changed, 116 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi
> index d163ff8..3805750 100644
> --- a/arch/arm/dts/tegra20.dtsi
> +++ b/arch/arm/dts/tegra20.dtsi
> @@ -318,24 +318,32 @@
> sdhci@c800 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc800 0x200>;
> - interrupts = < 46 >;
> + interrupts = <0 14 0x04>;
> + clocks = <&tegra_car 14>;
> + status = "disabled";
> };
>
> sdhci@c8000200 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc8000200 0x200>;
> - interrupts = < 47 >;
> + interrupts = <0 15 0x04>;
> + clocks = <&tegra_car 9>;
> + status = "disabled";
> };
>
> sdhci@c8000400 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc8000400 0x200>;
> - interrupts = < 51 >;
> + interrupts = <0 19 0x04>;
> + clocks = <&tegra_car 69>;
> + status = "disabled";
> };
>
> sdhci@c8000600 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc8000600 0x200>;
> - interrupts = < 63 >;
> + interrupts = <0 31 0x04>;
> + clocks = <&tegra_car 15>;
> + status = "disabled";
> };
> };
> diff --git a/board/avionic-design/dts/tegra20-medcom-wide.dts
> b/board/avionic-design/dts/tegra20-medcom-wide.dts
> index 2acfbc1..a9a07f9 100644
> --- a/board/avionic-design/dts/tegra20-medcom-wide.dts
> +++ b/board/avionic-design/dts/tegra20-medcom-wide.dts
> @@ -8,6 +8,7 @@
>
> aliases {
> usb0 = "/usb@c5008000";
> + sdhci0 = "/sdhci@c8000600";
> };
>
> memory {
> diff --git a/board/avionic-design/dts/tegra20-plutux.dts
> b/board/avionic-design/dts/tegra20-plutux.dts
> index dba200d..20016f2 100644
> --- a/board/avionic-design/dts/tegra20-plutux.dts
> +++ b/board/avionic-design/dts/tegra20-plutux.dts
> @@ -8,6 +8,7 @@
>
> aliases {
> usb0 = "/usb@c5008000";
> + sdhci0 = "/sdhci@c8000600";
> };
>
> memory {
> diff --git a/board/avionic-design/dts/tegra20-tec.dts
> b/board/avionic-design/dts/tegra20-tec.dts
> index 04e6730..1d7cf89 100644
> --- a/board/avionic-design/dts/tegra20-tec.dts
> +++ b/board/avionic-design/dts/tegra20-tec.dts
> @@ -8,6 +8,7 @@
>
> aliases {
> usb0 = "/usb@c5008000";
> + sdhci0 = "/sdhci@c8000600";
> };
>
> memory {
> diff --git a/board/compal/dts/tegra20-paz00.dts
> b/board/compal/dts/tegra20-paz00.dts
> index b5580c9..780203c 100644
> --- a/board/compal/dts/tegra20-paz00.dts
> +++ b/board/compal/dts/tegra20-paz00.dts
> @@ -1,13 +1,15 @@
> /dts-v1/;
>
> -#include ARCH_CPU_DTS
> +#include "tegra20.dtsi"
>
> / {
> -model = "Toshiba AC100 / Dynabook AZ";
> -compatible = "compal,paz00", "nvidia,tegra20";
> + model = "Toshiba AC100 / Dynabook AZ";
> + compatible = "compal,paz00", "nvidia,tegra20";
>
> ali
Re: [U-Boot] [PATCH v6 3/4] Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files
I just noticed that I used 'tegra20.dtsi' in the tegra114.dtsi and
tegra30.dtsi files, which is obviously functionally wrong, but doesn't
break the build. I'll handle this when I apply this patchset to
u-boot-tegra/next (assuming it gets enough Acks). I'm also going to
submit a cleanup patch for the memreserve fields that Stephen pointed
out in Seaboard and Cardhu dts.
On Thu, Feb 21, 2013 at 9:45 AM, Tom Warren wrote:
> 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).
>
> Signed-off-by: Tom Warren
> Tested-by: Thierry Reding
> ---
> 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
>
> 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 | 21 ++---
> board/compulab/dts/tegra20-trimslice.dts | 16 +++-
> 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/toradex/dts/tegra20-colibri_t20_iris.dts |9 -
> 13 files changed, 116 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi
> index d163ff8..3805750 100644
> --- a/arch/arm/dts/tegra20.dtsi
> +++ b/arch/arm/dts/tegra20.dtsi
> @@ -318,24 +318,32 @@
> sdhci@c800 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc800 0x200>;
> - interrupts = < 46 >;
> + interrupts = <0 14 0x04>;
> + clocks = <&tegra_car 14>;
> + status = "disabled";
> };
>
> sdhci@c8000200 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc8000200 0x200>;
> - interrupts = < 47 >;
> + interrupts = <0 15 0x04>;
> + clocks = <&tegra_car 9>;
> + status = "disabled";
> };
>
> sdhci@c8000400 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc8000400 0x200>;
> - interrupts = < 51 >;
> + interrupts = <0 19 0x04>;
> + clocks = <&tegra_car 69>;
> + status = "disabled";
> };
>
> sdhci@c8000600 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc8000600 0x200>;
> - interrupts = < 63 >;
> + interrupts = <0 31 0x04>;
> + clocks = <&tegra_car 15>;
> + status = "disabled";
> };
> };
> diff --git a/board/avionic-design/dts/tegra20-medcom-wide.dts
> b/board/avionic-design/dts/tegra20-medcom-wide.dts
> index 2acfbc1..a9a07f9 100644
> --- a/board/avionic-design/dts/tegra20-medcom-wide.dts
> +++ b/board/avionic-design/dts/tegra20-medcom-wide.dts
> @@ -8,6 +8,7 @@
>
> aliases {
> usb0 = "/usb@c5008000";
> + sdhci0 = "/sdhci@c8000600";
> };
>
> memory {
> diff --git a/board/avionic-design/dts/tegra20-plutux.dts
> b/board/avionic-design/dts/tegra20-plutux.dts
> index dba200d..20016f2 100644
> --- a/board/avionic-design/dts/tegra20-plutux.dts
> +++ b/board/avionic-design/dts/tegra20-plutux.dts
> @@ -8,6 +8,7 @@
>
> aliases {
> usb0 = "/usb@c5008000";
> + sdhci0 = "/sdhci@c8000600";
> };
>
> memory {
> diff --git a/board/avionic-design/dts/tegra20-tec.dts
> b/board/avionic-design/dts/tegra20-tec.dts
> index 04e6730..1d7cf89 100644
> --- a/board/avionic-design/dts/tegra20-tec.dts
> +++ b/board/avionic-design/dts/tegra20-tec.dts
> @@ -8,6 +8,7 @@
>
> aliases {
> usb0 = "/usb@c5008000";
> + sdhci0 = "/sdhci@c8000600";
> };
>
> memory {
> diff --git a/board/compal/dts/tegra20-paz00.dts
> b/board/compal/dts/tegra20-paz00.dts
> index b5580c9..780203c 100644
> --- a/board/compal/dts/tegra20-p
[U-Boot] [PATCH v6 3/4] 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).
Signed-off-by: Tom Warren
Tested-by: Thierry Reding
---
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
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 | 21 ++---
board/compulab/dts/tegra20-trimslice.dts | 16 +++-
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/toradex/dts/tegra20-colibri_t20_iris.dts |9 -
13 files changed, 116 insertions(+), 19 deletions(-)
diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi
index d163ff8..3805750 100644
--- a/arch/arm/dts/tegra20.dtsi
+++ b/arch/arm/dts/tegra20.dtsi
@@ -318,24 +318,32 @@
sdhci@c800 {
compatible = "nvidia,tegra20-sdhci";
reg = <0xc800 0x200>;
- interrupts = < 46 >;
+ interrupts = <0 14 0x04>;
+ clocks = <&tegra_car 14>;
+ status = "disabled";
};
sdhci@c8000200 {
compatible = "nvidia,tegra20-sdhci";
reg = <0xc8000200 0x200>;
- interrupts = < 47 >;
+ interrupts = <0 15 0x04>;
+ clocks = <&tegra_car 9>;
+ status = "disabled";
};
sdhci@c8000400 {
compatible = "nvidia,tegra20-sdhci";
reg = <0xc8000400 0x200>;
- interrupts = < 51 >;
+ interrupts = <0 19 0x04>;
+ clocks = <&tegra_car 69>;
+ status = "disabled";
};
sdhci@c8000600 {
compatible = "nvidia,tegra20-sdhci";
reg = <0xc8000600 0x200>;
- interrupts = < 63 >;
+ interrupts = <0 31 0x04>;
+ clocks = <&tegra_car 15>;
+ status = "disabled";
};
};
diff --git a/board/avionic-design/dts/tegra20-medcom-wide.dts
b/board/avionic-design/dts/tegra20-medcom-wide.dts
index 2acfbc1..a9a07f9 100644
--- a/board/avionic-design/dts/tegra20-medcom-wide.dts
+++ b/board/avionic-design/dts/tegra20-medcom-wide.dts
@@ -8,6 +8,7 @@
aliases {
usb0 = "/usb@c5008000";
+ sdhci0 = "/sdhci@c8000600";
};
memory {
diff --git a/board/avionic-design/dts/tegra20-plutux.dts
b/board/avionic-design/dts/tegra20-plutux.dts
index dba200d..20016f2 100644
--- a/board/avionic-design/dts/tegra20-plutux.dts
+++ b/board/avionic-design/dts/tegra20-plutux.dts
@@ -8,6 +8,7 @@
aliases {
usb0 = "/usb@c5008000";
+ sdhci0 = "/sdhci@c8000600";
};
memory {
diff --git a/board/avionic-design/dts/tegra20-tec.dts
b/board/avionic-design/dts/tegra20-tec.dts
index 04e6730..1d7cf89 100644
--- a/board/avionic-design/dts/tegra20-tec.dts
+++ b/board/avionic-design/dts/tegra20-tec.dts
@@ -8,6 +8,7 @@
aliases {
usb0 = "/usb@c5008000";
+ sdhci0 = "/sdhci@c8000600";
};
memory {
diff --git a/board/compal/dts/tegra20-paz00.dts
b/board/compal/dts/tegra20-paz00.dts
index b5580c9..780203c 100644
--- a/board/compal/dts/tegra20-paz00.dts
+++ b/board/compal/dts/tegra20-paz00.dts
@@ -1,13 +1,15 @@
/dts-v1/;
-#include ARCH_CPU_DTS
+#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@c5008000";
+ sdhci0 = "/sdhci@c8000600";
+ sdhci1 = "/sdhci@c800";
};
memory {
@@ -53,6 +55,19 @@
status = "disabled";
};
+ sdhci@c800 {
+ status = "okay";
+
