[V6,2/7] arm64: tegra: Enable AHCI on Jetson TX1

Message ID 1515482234-24716-3-git-send-email-pchandru@nvidia.com
State Superseded
Headers show
Series
  • Refactor and add AHCI support for tegra210
Related show

Commit Message

Preetham Chandru Ramchandra Jan. 9, 2018, 7:17 a.m.
From: Preetham Ramchandra <pchandru@nvidia.com>

Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>
---
v4:
* Fixed missing space after 'AUX'
---
 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi |  6 ++++++
 arch/arm64/boot/dts/nvidia/tegra210.dtsi       | 16 ++++++++++++++++
 2 files changed, 22 insertions(+)

Comments

Mikko Perttunen Jan. 23, 2018, 3:34 p.m. | #1
I have usually split the change in chip .dtsi and board .dtsi/.dts in 
separate commits. I don't know if that's necessary though.

This does however require a commit message, like

   Add sata node to the Tegra210 device tree, and enable the device and
   assign board-specific properties on Jetson TX1.

Mikko

On 01/09/2018 09:17 AM, Preetham Chandru Ramchandra wrote:
> From: Preetham Ramchandra <pchandru@nvidia.com>
> 
> Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>
> ---
> v4:
> * Fixed missing space after 'AUX'
> ---
>   arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi |  6 ++++++
>   arch/arm64/boot/dts/nvidia/tegra210.dtsi       | 16 ++++++++++++++++
>   2 files changed, 22 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
> index d67ef4319f3b..2aa2979cd6b5 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
> +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
> @@ -1325,6 +1325,12 @@
>   		status = "okay";
>   	};
>   
> +	sata@70020000 {
> +		status = "okay";
> +		phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
> +		phy-names = "sata-0";
> +	};
> +
>   	padctl@7009f000 {
>   		status = "okay";
>   
> diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
> index 9c2402108772..bf72db5386a5 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
> +++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
> @@ -798,6 +798,22 @@
>   		#iommu-cells = <1>;
>   	};
>   
> +	sata@70020000 {
> +		compatible = "nvidia,tegra210-ahci";
> +		reg = <0x0 0x70027000 0x0 0x2000>, /* AHCI */
> +		      <0x0 0x70020000 0x0 0x7000>, /* SATA */
> +		      <0x0 0x70001100 0x0 0x1000>; /* SATA AUX */
> +		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&tegra_car TEGRA210_CLK_SATA>,
> +			<&tegra_car TEGRA210_CLK_SATA_OOB>;
> +		clock-names = "sata", "sata-oob";
> +		resets = <&tegra_car 124>,
> +			 <&tegra_car 123>,
> +			 <&tegra_car 129>;
> +		reset-names = "sata", "sata-oob", "sata-cold";
> +		status = "disabled";
> +	};
> +
>   	hda@70030000 {
>   		compatible = "nvidia,tegra210-hda", "nvidia,tegra30-hda";
>   		reg = <0x0 0x70030000 0x0 0x10000>;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Preetham Chandru Ramchandra Feb. 12, 2018, 5:06 p.m. | #2
Okay, will change the commit message for now as suggested

>-----Original Message-----

>From: Mikko Perttunen [mailto:cyndis@kapsi.fi]

>Sent: Tuesday, January 23, 2018 9:04 PM

>To: Preetham Chandru <pchandru@nvidia.com>; thierry.reding@gmail.com;

>tj@kernel.org

>Cc: preetham260@gmail.com; linux-tegra@vger.kernel.org; linux-

>ide@vger.kernel.org; Venu Byravarasu <vbyravarasu@nvidia.com>; Pavan

>Kunapuli <pkunapuli@nvidia.com>

>Subject: Re: [PATCH V6 2/7] arm64: tegra: Enable AHCI on Jetson TX1

>

>I have usually split the change in chip .dtsi and board .dtsi/.dts in separate

>commits. I don't know if that's necessary though.

>

>This does however require a commit message, like

>

>   Add sata node to the Tegra210 device tree, and enable the device and

>   assign board-specific properties on Jetson TX1.

>

>Mikko

>

>On 01/09/2018 09:17 AM, Preetham Chandru Ramchandra wrote:

>> From: Preetham Ramchandra <pchandru@nvidia.com>

>>

>> Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>

>> ---

>> v4:

>> * Fixed missing space after 'AUX'

>> ---

>>   arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi |  6 ++++++

>>   arch/arm64/boot/dts/nvidia/tegra210.dtsi       | 16 ++++++++++++++++

>>   2 files changed, 22 insertions(+)

>>

>> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi

>> b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi

>> index d67ef4319f3b..2aa2979cd6b5 100644

>> --- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi

>> +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi

>> @@ -1325,6 +1325,12 @@

>>   		status = "okay";

>>   	};

>>

>> +	sata@70020000 {

>> +		status = "okay";

>> +		phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;

>> +		phy-names = "sata-0";

>> +	};

>> +

>>   	padctl@7009f000 {

>>   		status = "okay";

>>

>> diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi

>> b/arch/arm64/boot/dts/nvidia/tegra210.dtsi

>> index 9c2402108772..bf72db5386a5 100644

>> --- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi

>> +++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi

>> @@ -798,6 +798,22 @@

>>   		#iommu-cells = <1>;

>>   	};

>>

>> +	sata@70020000 {

>> +		compatible = "nvidia,tegra210-ahci";

>> +		reg = <0x0 0x70027000 0x0 0x2000>, /* AHCI */

>> +		      <0x0 0x70020000 0x0 0x7000>, /* SATA */

>> +		      <0x0 0x70001100 0x0 0x1000>; /* SATA AUX */

>> +		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

>> +		clocks = <&tegra_car TEGRA210_CLK_SATA>,

>> +			<&tegra_car TEGRA210_CLK_SATA_OOB>;

>> +		clock-names = "sata", "sata-oob";

>> +		resets = <&tegra_car 124>,

>> +			 <&tegra_car 123>,

>> +			 <&tegra_car 129>;

>> +		reset-names = "sata", "sata-oob", "sata-cold";

>> +		status = "disabled";

>> +	};

>> +

>>   	hda@70030000 {

>>   		compatible = "nvidia,tegra210-hda", "nvidia,tegra30-hda";

>>   		reg = <0x0 0x70030000 0x0 0x10000>;

>>

Patch

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
index d67ef4319f3b..2aa2979cd6b5 100644
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
@@ -1325,6 +1325,12 @@ 
 		status = "okay";
 	};
 
+	sata@70020000 {
+		status = "okay";
+		phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
+		phy-names = "sata-0";
+	};
+
 	padctl@7009f000 {
 		status = "okay";
 
diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
index 9c2402108772..bf72db5386a5 100644
--- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
@@ -798,6 +798,22 @@ 
 		#iommu-cells = <1>;
 	};
 
+	sata@70020000 {
+		compatible = "nvidia,tegra210-ahci";
+		reg = <0x0 0x70027000 0x0 0x2000>, /* AHCI */
+		      <0x0 0x70020000 0x0 0x7000>, /* SATA */
+		      <0x0 0x70001100 0x0 0x1000>; /* SATA AUX */
+		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&tegra_car TEGRA210_CLK_SATA>,
+			<&tegra_car TEGRA210_CLK_SATA_OOB>;
+		clock-names = "sata", "sata-oob";
+		resets = <&tegra_car 124>,
+			 <&tegra_car 123>,
+			 <&tegra_car 129>;
+		reset-names = "sata", "sata-oob", "sata-cold";
+		status = "disabled";
+	};
+
 	hda@70030000 {
 		compatible = "nvidia,tegra210-hda", "nvidia,tegra30-hda";
 		reg = <0x0 0x70030000 0x0 0x10000>;