mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: Prathamesh Shete <pshete@nvidia.com>,
	robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org,
	thierry.reding@gmail.com, jonathanh@nvidia.com,
	devicetree@vger.kernel.org, linux-tegra@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: smangipudi@nvidia.com, kyarlagadda@nvidia.com, anrao@nvidia.com
Subject: Re: [PATCH] arm64: tegra: Add Tegra234 SDMMC1 device tree node
Date: Fri, 7 Oct 2022 14:33:57 +0200	[thread overview]
Message-ID: <80d046b9-ff8c-58dc-d149-e984d509fe5a@linaro.org> (raw)
In-Reply-To: <20221007102605.15828-1-pshete@nvidia.com>

On 07/10/2022 12:26, Prathamesh Shete wrote:
> Add device tree node for Tegra234 SDMMC1 instance.
> Add and enable SD card instance in device tree.
> 
> Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
> ---
>  .../boot/dts/nvidia/tegra234-p3701-0000.dtsi  |  7 +++
>  arch/arm64/boot/dts/nvidia/tegra234.dtsi      | 59 +++++++++++++++++++
>  2 files changed, 66 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
> index 9e4d72cfa69f..fe52810e5b9d 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
> +++ b/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
> @@ -55,6 +55,13 @@
>  			};
>  		};
>  
> +		mmc@3400000 {
> +			status = "okay";
> +			bus-width = <4>;
> +			cd-gpios = <&gpio TEGRA234_MAIN_GPIO(G, 7) GPIO_ACTIVE_LOW>;
> +			disable-wp;
> +		};
> +
>  		mmc@3460000 {
>  			status = "okay";
>  			bus-width = <8>;
> diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> index 0170bfa8a467..87f6b8be79a5 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> +++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> @@ -7,6 +7,7 @@
>  #include <dt-bindings/memory/tegra234-mc.h>
>  #include <dt-bindings/power/tegra234-powergate.h>
>  #include <dt-bindings/reset/tegra234-reset.h>
> +#include <dt-bindings/pinctrl/pinctrl-tegra-io-pad.h>
>  
>  / {
>  	compatible = "nvidia,tegra234";
> @@ -895,6 +896,45 @@
>  			status = "disabled";
>  		};
>  
> +		mmc@3400000 {
> +			compatible = "nvidia,tegra194-sdhci", "nvidia,tegra234-sdhci";
> +			reg = <0x03400000 0x20000>;
> +			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&bpmp TEGRA234_CLK_SDMMC1>,
> +				 <&bpmp TEGRA234_CLK_SDMMC_LEGACY_TM>;
> +			clock-names = "sdhci", "tmclk";
> +			assigned-clocks = <&bpmp TEGRA234_CLK_SDMMC1>,
> +					<&bpmp TEGRA234_CLK_PLLC4_MUXED>;
> +			assigned-clock-parents =
> +					  <&bpmp TEGRA234_CLK_PLLC4_MUXED>,
> +					  <&bpmp TEGRA234_CLK_PLLC4_VCO_DIV2>;
> +			resets = <&bpmp TEGRA234_RESET_SDMMC1>;
> +			reset-names = "sdhci";
> +			interconnects = <&mc TEGRA234_MEMORY_CLIENT_SDMMCRA &emc>,
> +					<&mc TEGRA234_MEMORY_CLIENT_SDMMCWA &emc>;
> +			interconnect-names = "dma-mem", "write";
> +			iommus = <&smmu_niso1 TEGRA234_SID_SDMMC1A>;
> +			pinctrl-names = "sdmmc-3v3", "sdmmc-1v8";
> +			pinctrl-0 = <&sdmmc1_3v3>;
> +			pinctrl-1 = <&sdmmc1_1v8>;
> +			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 = <14>;
> +			nvidia,default-trim = <0x8>;
> +			sd-uhs-sdr25;
> +			sd-uhs-sdr50;
> +			sd-uhs-ddr50;
> +			sd-uhs-sdr104;
> +			status = "disabled";
> +		};
> +
>  		mmc@3460000 {
>  			compatible = "nvidia,tegra234-sdhci", "nvidia,tegra186-sdhci";
>  			reg = <0x03460000 0x20000>;
> @@ -1541,6 +1581,25 @@
>  
>  			#interrupt-cells = <2>;
>  			interrupt-controller;
> +			sdmmc1_3v3: sdmmc1-3v3 {
> +				pins = "sdmmc1-hv";
> +				power-source = <TEGRA_IO_PAD_VOLTAGE_3V3>;
> +			};
> +
> +			sdmmc1_1v8: sdmmc1-1v8 {
> +				pins = "sdmmc1-hv";
> +				power-source = <TEGRA_IO_PAD_VOLTAGE_1V8>;
> +			};
> +			sdmmc3_3v3: sdmmc3-3v3 {
> +				pins = "sdmmc3-hv";
> +				power-source = <TEGRA_IO_PAD_VOLTAGE_3V3>;
> +			};
> +
> +			sdmmc3_1v8: sdmmc3-1v8 {
> +				pins = "sdmmc3-hv";
> +				power-source = <TEGRA_IO_PAD_VOLTAGE_1V8>;
> +			};
> +

Wrong conflict resolution... blank line went into the wrong place.

>  		};
>  
>  		aon-fabric@c600000 {

Best regards,
Krzysztof


  reply	other threads:[~2022-10-07 12:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-07 10:26 Prathamesh Shete
2022-10-07 12:33 ` Krzysztof Kozlowski [this message]
2022-10-07 12:44   ` [PATCH v2] " Prathamesh Shete
2022-10-07 15:57     ` Krzysztof Kozlowski
2022-10-07 16:59       ` [PATCH v3] " Prathamesh Shete
2022-10-24 13:52         ` Thierry Reding
2022-10-07 20:18 ` [PATCH] " kernel test robot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=80d046b9-ff8c-58dc-d149-e984d509fe5a@linaro.org \
    --to=krzysztof.kozlowski@linaro.org \
    --cc=anrao@nvidia.com \
    --cc=devicetree@vger.kernel.org \
    --cc=jonathanh@nvidia.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=kyarlagadda@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=pshete@nvidia.com \
    --cc=robh+dt@kernel.org \
    --cc=smangipudi@nvidia.com \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®