diff mbox

arm64: tegra: Add missing Smaug revision

Message ID 20160629085229.31350-1-acourbot@nvidia.com (mailing list archive)
State New, archived
Headers show

Commit Message

Alexandre Courbot June 29, 2016, 8:52 a.m. UTC
The "google,smaug-rev2" string is missing from the compatible list of
Smaug's DT. The differences of rev2 are not relevant at our current
level of support and it boots just fine, so add it.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jon Hunter June 29, 2016, 9:02 a.m. UTC | #1
On 29/06/16 09:52, Alexandre Courbot wrote:
> The "google,smaug-rev2" string is missing from the compatible list of
> Smaug's DT. The differences of rev2 are not relevant at our current
> level of support and it boots just fine, so add it.
> 
> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
> ---
>  arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
> index 431266a48e9c..82a96bd27bc8 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
> +++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
> @@ -11,7 +11,8 @@
>  	compatible = "google,smaug-rev8", "google,smaug-rev7",
>  		     "google,smaug-rev6", "google,smaug-rev5",
>  		     "google,smaug-rev4", "google,smaug-rev3",
> -		     "google,smaug-rev1", "google,smaug", "nvidia,tegra210";
> +		     "google,smaug-rev2", "google,smaug-rev1",
> +		     "google,smaug", "nvidia,tegra210";
>  
>  	aliases {
>  		serial0 = &uarta;

Acked-by: Jon Hunter <jonathanh@nvidia.com>

Olof, let us know if you have any comments on this? Looks like I missed
this initially because the rev2 support had been broken out in the
chrome-os kernel tree to support some specific features for this board.
However, I think for now it is ok to include rev2 here as well for mainline.

Cheers
Jon
Alexandre Courbot June 30, 2016, 6:04 a.m. UTC | #2
On Wed, Jun 29, 2016 at 6:02 PM, Jon Hunter <jonathanh@nvidia.com> wrote:
>
> On 29/06/16 09:52, Alexandre Courbot wrote:
>> The "google,smaug-rev2" string is missing from the compatible list of
>> Smaug's DT. The differences of rev2 are not relevant at our current
>> level of support and it boots just fine, so add it.
>>
>> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
>> ---
>>  arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
>> index 431266a48e9c..82a96bd27bc8 100644
>> --- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
>> +++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
>> @@ -11,7 +11,8 @@
>>       compatible = "google,smaug-rev8", "google,smaug-rev7",
>>                    "google,smaug-rev6", "google,smaug-rev5",
>>                    "google,smaug-rev4", "google,smaug-rev3",
>> -                  "google,smaug-rev1", "google,smaug", "nvidia,tegra210";
>> +                  "google,smaug-rev2", "google,smaug-rev1",
>> +                  "google,smaug", "nvidia,tegra210";
>>
>>       aliases {
>>               serial0 = &uarta;
>
> Acked-by: Jon Hunter <jonathanh@nvidia.com>
>
> Olof, let us know if you have any comments on this? Looks like I missed
> this initially because the rev2 support had been broken out in the
> chrome-os kernel tree to support some specific features for this board.
> However, I think for now it is ok to include rev2 here as well for mainline.

This should be perfectly safe. If I run a diff between
tegra210-smaug-p1.dts and tegra210-smaug-p2.dts in the ChromeOS tree,
the only node that differs is sysedp-batmon-calc. The other node in
these files (spiflash) is identical.

Besides I don't think there are that many rev2s out there. :)
Andrew Bresticker June 30, 2016, 4:15 p.m. UTC | #3
On Wed, Jun 29, 2016 at 1:52 AM, Alexandre Courbot <acourbot@nvidia.com> wrote:
> The "google,smaug-rev2" string is missing from the compatible list of
> Smaug's DT. The differences of rev2 are not relevant at our current
> level of support and it boots just fine, so add it.
>
> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>

Acked-by: Andrew Bresticker <abrestic@chromium.org>

> ---
>  arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
> index 431266a48e9c..82a96bd27bc8 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
> +++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
> @@ -11,7 +11,8 @@
>         compatible = "google,smaug-rev8", "google,smaug-rev7",
>                      "google,smaug-rev6", "google,smaug-rev5",
>                      "google,smaug-rev4", "google,smaug-rev3",
> -                    "google,smaug-rev1", "google,smaug", "nvidia,tegra210";
> +                    "google,smaug-rev2", "google,smaug-rev1",
> +                    "google,smaug", "nvidia,tegra210";
>
>         aliases {
>                 serial0 = &uarta;
> --
> 2.9.0
>
> --
> 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
Alexandre Courbot Sept. 16, 2016, 8:19 a.m. UTC | #4
Not seeing this patch in -next, can someone pick it?

On Fri, Jul 1, 2016 at 1:15 AM, Andrew Bresticker <abrestic@chromium.org> wrote:
> On Wed, Jun 29, 2016 at 1:52 AM, Alexandre Courbot <acourbot@nvidia.com> wrote:
>> The "google,smaug-rev2" string is missing from the compatible list of
>> Smaug's DT. The differences of rev2 are not relevant at our current
>> level of support and it boots just fine, so add it.
>>
>> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
>
> Acked-by: Andrew Bresticker <abrestic@chromium.org>
>
>> ---
>>  arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
>> index 431266a48e9c..82a96bd27bc8 100644
>> --- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
>> +++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
>> @@ -11,7 +11,8 @@
>>         compatible = "google,smaug-rev8", "google,smaug-rev7",
>>                      "google,smaug-rev6", "google,smaug-rev5",
>>                      "google,smaug-rev4", "google,smaug-rev3",
>> -                    "google,smaug-rev1", "google,smaug", "nvidia,tegra210";
>> +                    "google,smaug-rev2", "google,smaug-rev1",
>> +                    "google,smaug", "nvidia,tegra210";
>>
>>         aliases {
>>                 serial0 = &uarta;
>> --
>> 2.9.0
>>
>> --
>> 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
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
index 431266a48e9c..82a96bd27bc8 100644
--- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
@@ -11,7 +11,8 @@ 
 	compatible = "google,smaug-rev8", "google,smaug-rev7",
 		     "google,smaug-rev6", "google,smaug-rev5",
 		     "google,smaug-rev4", "google,smaug-rev3",
-		     "google,smaug-rev1", "google,smaug", "nvidia,tegra210";
+		     "google,smaug-rev2", "google,smaug-rev1",
+		     "google,smaug", "nvidia,tegra210";
 
 	aliases {
 		serial0 = &uarta;