On Thu, 10 Jan 2019 at 23:46, Sowjanya Komatineni
<skomatineni@xxxxxxxxxx> wrote:
>
> Add SDMMC initial pad offsets used by auto calibration process.
>
> Add SDMMC fixed drive strengths for Tegra210, Tegra186 and
> Tegra194 which are used when calibration timeouts.
>
> Fixed drive strengths are based on Pre SI Analysis of the pads.
>
> Signed-off-by: Sowjanya Komatineni <skomatineni@xxxxxxxxxx>
For clarity, I am leaving this one for arm-soc.
Kind regards
Uffe
> ---
> arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 ++
> arch/arm64/boot/dts/nvidia/tegra194.dtsi | 34 +++++++++++++++++++
> arch/arm64/boot/dts/nvidia/tegra210.dtsi | 57 ++++++++++++++++++++++++++++++--
> 3 files changed, 91 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
> index 22815db4a3ed..169aee59ceac 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi
> +++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
> @@ -315,6 +315,8 @@
> nvidia,pad-autocal-pull-down-offset-hs400 = <0x05>;
> nvidia,pad-autocal-pull-up-offset-1v8-timeout = <0x0a>;
> nvidia,pad-autocal-pull-down-offset-1v8-timeout = <0x0a>;
> + nvidia,pad-autocal-pull-up-offset-3v3-timeout = <0x0a>;
> + nvidia,pad-autocal-pull-down-offset-3v3-timeout = <0x0a>;
> nvidia,default-tap = <0x5>;
> nvidia,default-trim = <0x9>;
> nvidia,dqs-trim = <63>;
> diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
> index 6dfa1ca0b851..596a36705c0f 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi
> +++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
> @@ -303,6 +303,17 @@
> clock-names = "sdhci";
> resets = <&bpmp TEGRA194_RESET_SDMMC1>;
> reset-names = "sdhci";
> + nvidia,pad-autocal-pull-up-offset-3v3-timeout =
> + <0x07>;
> + nvidia,pad-autocal-pull-down-offset-3v3-timeout =
> + <0x07>;
> + nvidia,pad-autocal-pull-up-offset-1v8-timeout = <0x06>;
> + nvidia,pad-autocal-pull-down-offset-1v8-timeout =
> + <0x07>;
> + nvidia,pad-autocal-pull-up-offset-sdr104 = <0x00>;
> + nvidia,pad-autocal-pull-down-offset-sdr104 = <0x00>;
> + nvidia,default-tap = <0x9>;
> + nvidia,default-trim = <0x5>;
> status = "disabled";
> };
>
> @@ -314,6 +325,18 @@
> clock-names = "sdhci";
> resets = <&bpmp TEGRA194_RESET_SDMMC3>;
> reset-names = "sdhci";
> + nvidia,pad-autocal-pull-up-offset-1v8 = <0x00>;
> + nvidia,pad-autocal-pull-down-offset-1v8 = <0x7a>;
> + nvidia,pad-autocal-pull-up-offset-3v3-timeout = <0x07>;
> + nvidia,pad-autocal-pull-down-offset-3v3-timeout =
> + <0x07>;
> + nvidia,pad-autocal-pull-up-offset-1v8-timeout = <0x06>;
> + nvidia,pad-autocal-pull-down-offset-1v8-timeout =
> + <0x07>;
> + nvidia,pad-autocal-pull-up-offset-sdr104 = <0x00>;
> + nvidia,pad-autocal-pull-down-offset-sdr104 = <0x00>;
> + nvidia,default-tap = <0x9>;
> + nvidia,default-trim = <0x5>;
> status = "disabled";
> };
>
> @@ -325,6 +348,17 @@
> clock-names = "sdhci";
> resets = <&bpmp TEGRA194_RESET_SDMMC4>;
> reset-names = "sdhci";
> + nvidia,pad-autocal-pull-up-offset-hs400 = <0x00>;
> + nvidia,pad-autocal-pull-down-offset-hs400 = <0x00>;
> + nvidia,pad-autocal-pull-up-offset-1v8-timeout = <0x0a>;
> + nvidia,pad-autocal-pull-down-offset-1v8-timeout =
> + <0x0a>;
> + nvidia,pad-autocal-pull-up-offset-3v3-timeout = <0x0a>;
> + nvidia,pad-autocal-pull-down-offset-3v3-timeout =
> + <0x0a>;
> + nvidia,default-tap = <0x8>;
> + nvidia,default-trim = <0x14>;
> + nvidia,dqs-trim = <40>;
> status = "disabled";
> };
>
> diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
> index 2205d66b0443..41408df9d4e9 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
> +++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
> @@ -476,6 +476,48 @@
> compatible = "nvidia,tegra210-pinmux";
> reg = <0x0 0x700008d4 0x0 0x29c>, /* Pad control registers */
> <0x0 0x70003000 0x0 0x294>; /* Mux registers */
> + sdmmc1_3v3_drv: sdmmc1-3v3-drv {
> + sdmmc1 {
> + nvidia,pins = "drive_sdmmc1";
> + nvidia,pull-down-strength = <0x8>;
> + nvidia,pull-up-strength = <0x8>;
> + };
> + };
> + sdmmc1_1v8_drv: sdmmc1-1v8-drv {
> + sdmmc1 {
> + nvidia,pins = "drive_sdmmc1";
> + nvidia,pull-down-strength = <0x4>;
> + nvidia,pull-up-strength = <0x3>;
> + };
> + };
> + sdmmc2_1v8_drv: sdmmc2-1v8-drv {
> + sdmmc2 {
> + nvidia,pins = "drive_sdmmc2";
> + nvidia,pull-down-strength = <0x10>;
> + nvidia,pull-up-strength = <0x10>;
> + };
> + };
> + sdmmc3_3v3_drv: sdmmc3-3v3-drv {
> + sdmmc3 {
> + nvidia,pins = "drive_sdmmc3";
> + nvidia,pull-down-strength = <0x8>;
> + nvidia,pull-up-strength = <0x8>;
> + };
> + };
> + sdmmc3_1v8_drv: sdmmc3-1v8-drv {
> + sdmmc3 {
> + nvidia,pins = "drive_sdmmc3";
> + nvidia,pull-down-strength = <0x4>;
> + nvidia,pull-up-strength = <0x3>;
> + };
> + };
> + sdmmc4_1v8_drv: sdmmc4-1v8-drv {
> + sdmmc4 {
> + nvidia,pins = "drive_sdmmc4";
> + nvidia,pull-down-strength = <0x10>;
> + nvidia,pull-up-strength = <0x10>;
> + };
> + };
> };
>
> /*
> @@ -1050,9 +1092,12 @@
> clock-names = "sdhci";
> resets = <&tegra_car 14>;
> reset-names = "sdhci";
> - pinctrl-names = "sdmmc-3v3", "sdmmc-1v8";
> + pinctrl-names = "sdmmc-3v3", "sdmmc-1v8",
> + "sdmmc-3v3-drv", "sdmmc-1v8-drv";
> pinctrl-0 = <&sdmmc1_3v3>;
> pinctrl-1 = <&sdmmc1_1v8>;
> + pinctrl-2 = <&sdmmc1_3v3_drv>;
> + pinctrl-3 = <&sdmmc1_1v8_drv>;
> nvidia,pad-autocal-pull-up-offset-3v3 = <0x00>;
> nvidia,pad-autocal-pull-down-offset-3v3 = <0x7d>;
> nvidia,pad-autocal-pull-up-offset-1v8 = <0x7b>;
> @@ -1075,6 +1120,8 @@
> clock-names = "sdhci";
> resets = <&tegra_car 9>;
> reset-names = "sdhci";
> + pinctrl-names = "sdmmc-1v8-drv";
> + pinctrl-0 = <&sdmmc2_1v8_drv>;
> nvidia,pad-autocal-pull-up-offset-1v8 = <0x05>;
> nvidia,pad-autocal-pull-down-offset-1v8 = <0x05>;
> nvidia,default-tap = <0x8>;
> @@ -1090,9 +1137,12 @@
> clock-names = "sdhci";
> resets = <&tegra_car 69>;
> reset-names = "sdhci";
> - pinctrl-names = "sdmmc-3v3", "sdmmc-1v8";
> + pinctrl-names = "sdmmc-3v3", "sdmmc-1v8",
> + "sdmmc-3v3-drv", "sdmmc-1v8-drv";
> pinctrl-0 = <&sdmmc3_3v3>;
> pinctrl-1 = <&sdmmc3_1v8>;
> + pinctrl-2 = <&sdmmc3_3v3_drv>;
> + pinctrl-3 = <&sdmmc3_1v8_drv>;
> nvidia,pad-autocal-pull-up-offset-3v3 = <0x00>;
> nvidia,pad-autocal-pull-down-offset-3v3 = <0x7d>;
> nvidia,pad-autocal-pull-up-offset-1v8 = <0x7b>;
> @@ -1110,6 +1160,9 @@
> clock-names = "sdhci";
> resets = <&tegra_car 15>;
> reset-names = "sdhci";
> + pinctrl-names = "sdmmc-3v3-drv", "sdmmc-1v8-drv";
> + pinctrl-0 = <&sdmmc4_1v8_drv>;
> + pinctrl-1 = <&sdmmc4_1v8_drv>;
> nvidia,pad-autocal-pull-up-offset-1v8 = <0x05>;
> nvidia,pad-autocal-pull-down-offset-1v8 = <0x05>;
> nvidia,default-tap = <0x8>;
> --
> 2.7.4
>
