[PATCH 1/3] scripts/boards.sh: Fix M3-W identifier

[PATCH 1/3] scripts/boards.sh: Fix M3-W identifier

[Jacopo Mondi]

The M3-W SoC has been renamed to r8a77960, adjust the board.sh script to
identify it correctly.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 scripts/boards.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/boards.sh b/scripts/boards.sh
index 0ec2981..2069494 100644
--- a/scripts/boards.sh
+++ b/scripts/boards.sh
@@ -13,7 +13,7 @@ case $info in
         vins="0 1 2 3 4 5 6 7"
         csis="20 40 41"
         ;;
-    "Renesas Salvator-X board based on r8a7796" | \
+    "Renesas Salvator-X board based on r8a77960" | \
         "Renesas Salvator-X 2nd version board based on r8a77965")
         gen="gen3"
         vins="0 1 2 3 4 5 6 7"
-- 
2.27.0

Re: [PATCH 1/3] scripts/boards.sh: Fix M3-W identifier

[Kieran Bingham]

Hi Jacopo,

On 15/06/2020 13:19, Jacopo Mondi wrote:
> The M3-W SoC has been renamed to r8a77960, adjust the board.sh script to
> identify it correctly.
> 

We probably don't need to keep backwards compatibility indeed ...

> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
> ---
>  scripts/boards.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/boards.sh b/scripts/boards.sh
> index 0ec2981..2069494 100644
> --- a/scripts/boards.sh
> +++ b/scripts/boards.sh
> @@ -13,7 +13,7 @@ case $info in
>          vins="0 1 2 3 4 5 6 7"
>          csis="20 40 41"
>          ;;
> -    "Renesas Salvator-X board based on r8a7796" | \
> +    "Renesas Salvator-X board based on r8a77960" | \
>          "Renesas Salvator-X 2nd version board based on r8a77965")

But I wonder if this script should use more 'wildcard' matching.
It does seem awkward to match generically in some cases though, so
nothing wrong with keeping things explicit for now.

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

But now I've written that I see these patches are already integrated ...
never mind.
--
Kieran


>          gen="gen3"
>          vins="0 1 2 3 4 5 6 7"
> 

Re: [PATCH 1/3] scripts/boards.sh: Fix M3-W identifier

[Niklas Söderlund]

Hi Kieran,

On 2020-06-22 10:53:12 +0100, Kieran Bingham wrote:
> Hi Jacopo,
> 
> On 15/06/2020 13:19, Jacopo Mondi wrote:
> > The M3-W SoC has been renamed to r8a77960, adjust the board.sh script to
> > identify it correctly.
> > 
> 
> We probably don't need to keep backwards compatibility indeed ...

If the cost is low, as in this case I think backwards compatibility is 
nice. More often then not do I bisect over large ranges and then it's 
nice that things like this "just work" ;-)

> 
> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
> > ---
> >  scripts/boards.sh | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/scripts/boards.sh b/scripts/boards.sh
> > index 0ec2981..2069494 100644
> > --- a/scripts/boards.sh
> > +++ b/scripts/boards.sh
> > @@ -13,7 +13,7 @@ case $info in
> >          vins="0 1 2 3 4 5 6 7"
> >          csis="20 40 41"
> >          ;;
> > -    "Renesas Salvator-X board based on r8a7796" | \
> > +    "Renesas Salvator-X board based on r8a77960" | \
> >          "Renesas Salvator-X 2nd version board based on r8a77965")
> 
> But I wonder if this script should use more 'wildcard' matching.
> It does seem awkward to match generically in some cases though, so
> nothing wrong with keeping things explicit for now.
> 
> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> 
> But now I've written that I see these patches are already integrated ...
> never mind.
> --
> Kieran
> 
> 
> >          gen="gen3"
> >          vins="0 1 2 3 4 5 6 7"
> > 
> 

-- 
Regards,
Niklas Söderlund

Re: [PATCH 1/3] scripts/boards.sh: Fix M3-W identifier

[Kieran Bingham]

On 22/06/2020 11:34, Niklas Söderlund wrote:
> Hi Kieran,
> 
> On 2020-06-22 10:53:12 +0100, Kieran Bingham wrote:
>> Hi Jacopo,
>>
>> On 15/06/2020 13:19, Jacopo Mondi wrote:
>>> The M3-W SoC has been renamed to r8a77960, adjust the board.sh script to
>>> identify it correctly.
>>>
>>
>> We probably don't need to keep backwards compatibility indeed ...
> 
> If the cost is low, as in this case I think backwards compatibility is 
> nice. More often then not do I bisect over large ranges and then it's 
> nice that things like this "just work" ;-)

Ah yes, bisecting indeed would be useful here.


> 
>>
>>> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
>>> ---
>>>  scripts/boards.sh | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/scripts/boards.sh b/scripts/boards.sh
>>> index 0ec2981..2069494 100644
>>> --- a/scripts/boards.sh
>>> +++ b/scripts/boards.sh
>>> @@ -13,7 +13,7 @@ case $info in
>>>          vins="0 1 2 3 4 5 6 7"
>>>          csis="20 40 41"
>>>          ;;
>>> -    "Renesas Salvator-X board based on r8a7796" | \

So perhaps this line should be re-added, or the fields updated for
wildcards some how, or a better form of matching the target.

Things like the H3 could be tricky though where the ES1 and ES2
revisions (I think from what I recall) might have subtle differences.

I guess in that case it's harder to make a catch-all match, but that's
just a per-target thing to consider.

--
Kieran


>>> +    "Renesas Salvator-X board based on r8a77960" | \
>>>          "Renesas Salvator-X 2nd version board based on r8a77965")
>>
>> But I wonder if this script should use more 'wildcard' matching.
>> It does seem awkward to match generically in some cases though, so
>> nothing wrong with keeping things explicit for now.
>>
>> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>>
>> But now I've written that I see these patches are already integrated ...
>> never mind.
>> --
>> Kieran
>>
>>
>>>          gen="gen3"
>>>          vins="0 1 2 3 4 5 6 7"
>>>
>>
> 

[PATCH 2/3] scripts/boards.sh: Add support for M3-W+ SoC

[Jacopo Mondi]

Identify the M3-W+ R8A77961 SoC in scripts/boards.sh.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 scripts/boards.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/boards.sh b/scripts/boards.sh
index 2069494..84361d9 100644
--- a/scripts/boards.sh
+++ b/scripts/boards.sh
@@ -14,6 +14,7 @@ case $info in
         csis="20 40 41"
         ;;
     "Renesas Salvator-X board based on r8a77960" | \
+        "Renesas Salvator-X 2nd version board based on r8a77961" | \
         "Renesas Salvator-X 2nd version board based on r8a77965")
         gen="gen3"
         vins="0 1 2 3 4 5 6 7"
-- 
2.27.0

[PATCH 3/3] scripts/boards.sh: Add support for E3 SoC

[Jacopo Mondi]

Add support for R-Car E3 R8A77990 SoC in scripts/boards.sh.

The E3 SoC features VIN4 and VIN5 instances only, so add them to
yavta-hdmi and yavta-cvbs to support capture from there.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 scripts/boards.sh | 15 ++++++++++++---
 yavta-cvbs        | 10 ++++++++++
 yavta-hdmi        | 10 ++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/scripts/boards.sh b/scripts/boards.sh
index 84361d9..69a4d77 100644
--- a/scripts/boards.sh
+++ b/scripts/boards.sh
@@ -3,6 +3,11 @@
 info=$(strings /proc/device-tree/model)
 
 case $info in
+    "Renesas Ebisu board based on r8a77990")
+        gen="gen3"
+        vins="4 5"
+        csis="40"
+        ;;
     "Renesas Salvator-X board based on r8a7795 ES1.x")
         gen="gen3"
         vins="0 1 2 3 4 5 6 7"
@@ -65,17 +70,21 @@ if [[ "$gen" == "gen3" ]]; then
         esac
     done
 
-    if [[ "$info" == "Renesas Eagle board based on r8a77970" ]]; then
+    case "$info" in
+    "Renesas Eagle board based on r8a77970" | \
+    "Renesas Ebisu board based on r8a77990")
         cvbsname="adv748x 0-0070 afe"
         hdminame="adv748x 0-0070 hdmi"
 
         txaname="adv748x 0-0070 txa"
         txbname="adv748x 0-0070 txb"
-    else
+        ;;
+    *)
         cvbsname="adv748x 4-0070 afe"
         hdminame="adv748x 4-0070 hdmi"
 
         txaname="adv748x 4-0070 txa"
         txbname="adv748x 4-0070 txb"
-    fi
+        ;;
+    esac
 fi
diff --git a/yavta-cvbs b/yavta-cvbs
index 823db48..c32df1c 100755
--- a/yavta-cvbs
+++ b/yavta-cvbs
@@ -33,6 +33,16 @@ case $vc in
         dev=/dev/$vin3
         csipad=4
         ;;
+    4)
+        vinname=$vinname4
+        dev=/dev/$vin4
+        csipad=1
+        ;;
+    5)
+        vinname=$vinname5
+        dev=/dev/$vin5
+        csipad=2
+        ;;
     *)
         echo "Unkown VC '$vc'"
         exit 1
diff --git a/yavta-hdmi b/yavta-hdmi
index b371d3b..62adf00 100755
--- a/yavta-hdmi
+++ b/yavta-hdmi
@@ -33,6 +33,16 @@ case $vc in
         dev=/dev/$vin3
         csipad=4
         ;;
+    4)
+        vinname=$vinname4
+        dev=/dev/$vin4
+        csipad=1
+        ;;
+    5)
+        vinname=$vinname5
+        dev=/dev/$vin5
+        csipad=2
+        ;;
     *)
         echo "Unkown VC '$vc'"
         exit 1
-- 
2.27.0