11 files changed, 53 insertions, 33 deletions
diff --git a/projects/linux/bsp-51x-non-target.yaml b/projects/linux/bsp-51x-non-target.yaml
index bfdfba9..f9f1c67 100644
--- a/projects/linux/bsp-51x-non-target.yaml
+++ b/projects/linux/bsp-51x-non-target.yaml
@@ -258,3 +258,4 @@ bsp51x:
  - 4ab73dd4c0afde038c15c7743a9f0326c281b6c9 # thermal: rcar_gen3_thermal: Correct the order of checking THSCP (torvalds: c3131bd5586d3e8b67dc69516e1734a7a03e19d7 # thermal: rcar_gen3_thermal: Read calibration from hardware)
  - 96cddacd9fc46a8228dce5120a7220ba9df830e2 # thermal: rcar_gen3_thermal: Use FUSE values if they are available (torvalds: c3131bd5586d3e8b67dc69516e1734a7a03e19d7 # thermal: rcar_gen3_thermal: Read calibration from hardware)
  - 8b7ae276d3c36947359596408a240f1d7d05b6b1 # rcar-vin: rcar-csi2: Don't bail out from probe on no ep (Probing of half the CSI-2 bus makes no sens)
+ - 47067db73db953fddbc032801c51526fbc716cbc # media: rcar-vin: Disable media-ctl on R8A77995 (All Gen3 platforms shall use MC, even D3 that only has a single port. There is no telling what connected to that port and MC maybe needed.  In a perfect world Gen2 shall move to only use MC.)
diff --git a/projects/linux/bsp-51x-upport-request.yaml b/projects/linux/bsp-51x-upport-request.yaml
index 04a3947..e0e452f 100644
--- a/projects/linux/bsp-51x-upport-request.yaml
+++ b/projects/linux/bsp-51x-upport-request.yaml
@@ -413,24 +413,6 @@ bsp51x:
  - 8a0ed3cd3115c985f84a622f8cabac2ffcb95df9 # media: i2c: adv7604: Add suspend and resume support
  - a7a27871ea493928a11feb3470ea984ac1308226 # media: i2c: adv7604: Enable decoder control register
  - f3f237d1d5caa20069619e5c3d25ebcce5b83011 # media: i2c: adv7604: Fix set_fmt function
- - 374a2cfe1d08e7d7fc8a63a28783f92aced67246 # media: rcar-vin: Add FIS bit check before reading VnMS register
- - a77a9c667689929069cf45f7b55000adc053622e # media: rcar-vin: Add INF bit check for R-Car Gen3
- - e00f8a1823e884585006471e7710f8a1fa782fd9 # media: rcar-vin: Add NV12 pixel format checking
- - 63db90a70eb9a4ab8d44973e29a773261be31202 # media: rcar-vin: Add callback function for cropcap
- - 6ee79c487c6621cb0ea228f179bad7bba19a53ab # media: rcar-vin: Add memory type of VB_USERPTR support
- - ced9a5f41f322c72dedbd1f9e5f521d940bf5833 # media: rcar-vin: Add overflow debug message option
- - 0cd3f10d5410cd5678baff899afd0b2b1f598368 # media: rcar-vin: Add power management support
- - f4f6b9db6c63bce14401986c1c9de13f57b9cdf2 # media: rcar-vin: Add scaling mode to R8A77990
- - a2e3b47e263228ee67fd567509d5c8f625064fc0 # media: rcar-vin: Add streaming count check when streming off
- - 47067db73db953fddbc032801c51526fbc716cbc # media: rcar-vin: Disable media-ctl on R8A77995
- - 5cd448e50758f632738799d5bd67a00aa6cdb7d9 # media: rcar-vin: Fix byte alignment for each format
- - 7b2dbfd2eb1dc473daab9da84f7e5f4bf8b17135 # media: rcar-vin: Fix checking format condition
- - 02fe8e76f8dbbc21c747b0e28cb8e5ae5cbc570c # media: rcar-vin: Fix clock control flow
- - e60a821757a4456a03b6ff696da811fae4d363f7 # media: rcar-vin: Fix procedure of clipping and scaling
- - 95e69e02d6370a13121c59f1a2ebe9e87905591a # media: rcar-vin: Fix the cropping function
- - 8b933cd2df94c32ae70aed2df562ffbefcd9fe03 # media: rcar-vin: Remove checking format condition
- - 7dbf7045f18d161a6ac95bae65cd015a90d480da # media: rcar-vin: clean-up workqueue
- - 218dbe477878e427f863703fd8e06b113bbd084d # media: rcar-vin: remove reset in stop stream
  - a832702dfe5e03a1139c6411e87709655c6c1565 # media: videodev2.h: Add new pixel format for R8A779A0
  - d1f86c4000772a09dfa895a23ce004d0c01adbaa # media: vsp1: Add setting for new pixel formats in R8A779A0
  - dea0476fc6d991429fbea367695f484498ca3d7a # media: vsp1: Add support for new pixel formats in R8A779A0
@@ -464,7 +446,6 @@ bsp51x:
  - 54c35458feb3e9988ba99cace515bb7738572457 # ravb: Fix register define for Gen3
  - 83d05115cc80815ad5af268c63322c91165b90c6 # ravb: fix ravb_ptp_interrupt result value overwrite
  - 542e840b126d3dc690d7eb536f6163378aa75e84 # rcar-fcp: Add FCPVD reset sequence for VSPD
- - be9841cc237432fc89fb997f27117076ead1736c # rcar-vin: add support for UDS (Up Down Scaler)
  - 22518bc9001dfe37a6271eec9ac67f533c9b529c # sched/core: Disable SD_ASYM_CPUCAPACITY for root_domains without asymmetry
  - bc263dc878a3974d1e77be675478fbfbaee69aa3 # serial: sh-sci: Use pm_runtime_get/put when resume
  - 7358fe65fe45d494e5ed37cbab9e67c90e4c206e # serial: sh-sci: Use pm_runtime_get/put when suspend
diff --git a/projects/linux/mm/bsp41x_vin_add_uds.yaml b/projects/linux/mm/bsp41x_vin_add_uds.yaml
deleted file mode 100644
index f04f5d5..0000000
--- a/projects/linux/mm/bsp41x_vin_add_uds.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-title: "BSP 4.1.x upport support for UDS"
-team: MM
-key: fa3b67b4-8360-11eb-89fa-5b0494be20e0
-status: New
-assignee: Niklas
-
-bsp41x:
- - 46399ec41d5f613a9185641371d464af476318c6 # media: rcar-vin: Add each V4L2 callback cropcap function
- - 2e1ceef491bbcb35d5925c067aa47dec2f9899e7 # media: rcar-vin: Add UDS function support
diff --git a/projects/linux/mm/bsp41x_vin_add_debug_interface.yaml b/projects/linux/mm/bsp51x_vin_add_debug_interface.yaml
index 0d53f57..154b91b 100644
--- a/projects/linux/mm/bsp41x_vin_add_debug_interface.yaml
+++ b/projects/linux/mm/bsp51x_vin_add_debug_interface.yaml
@@ -1,4 +1,4 @@
-title: "BSP 4.1.x upport vin debug interface"
+title: "BSP 5.1.x upport vin debug interface"
 team: MM
 key: 91407f7e-8572-11eb-b38e-b31ac354d554
 status: New
@@ -6,5 +6,8 @@ status: New
 bsp41x:
  - 4568e417cab6193eb709de39ba009174252aa00d # media: rcar-vin: Add overflow debug message option
 
+bsp51x:
+ - ced9a5f41f322c72dedbd1f9e5f521d940bf5833 # media: rcar-vin: Add overflow debug message option
+
 comments:
   - The BSp patch should probably be turned into a debugsfs interface.
diff --git a/projects/linux/mm/bsp41x_vin_add_inf_check.yaml b/projects/linux/mm/bsp51x_vin_add_inf_check.yaml
index 52b9a8f..5be6b77 100644
--- a/projects/linux/mm/bsp41x_vin_add_inf_check.yaml
+++ b/projects/linux/mm/bsp51x_vin_add_inf_check.yaml
@@ -1,4 +1,4 @@
-title: "BSP 4.1.x upport INF bit check for Gen3"
+title: "BSP 5.1.x upport INF bit check for Gen3"
 team: MM
 key: 01b4c3fc-e16e-4ce9-bb54-4d850cf4e99d
 status: Active
@@ -6,3 +6,6 @@ assignee: Niklas
 
 bsp41x:
  - 3f54be3d05c2f547d9dabe0115e1605e38d6e511 # media: rcar-vin: Add INF bit check for R-Car Gen3
+
+bsp51x:
+ - a77a9c667689929069cf45f7b55000adc053622e # media: rcar-vin: Add INF bit check for R-Car Gen3
diff --git a/projects/linux/mm/bsp51x_vin_add_uds.yaml b/projects/linux/mm/bsp51x_vin_add_uds.yaml
new file mode 100644
index 0000000..7011059
--- /dev/null
+++ b/projects/linux/mm/bsp51x_vin_add_uds.yaml
@@ -0,0 +1,19 @@
+title: "BSP 5.1.x upport support for UDS"
+team: MM
+key: fa3b67b4-8360-11eb-89fa-5b0494be20e0
+status: New
+assignee: Niklas
+
+bsp41x:
+ - 46399ec41d5f613a9185641371d464af476318c6 # media: rcar-vin: Add each V4L2 callback cropcap function
+ - 2e1ceef491bbcb35d5925c067aa47dec2f9899e7 # media: rcar-vin: Add UDS function support
+
+bsp51x:
+ - 63db90a70eb9a4ab8d44973e29a773261be31202 # media: rcar-vin: Add callback function for cropcap
+ - be9841cc237432fc89fb997f27117076ead1736c # rcar-vin: add support for UDS (Up Down Scaler)
+ - e00f8a1823e884585006471e7710f8a1fa782fd9 # media: rcar-vin: Add NV12 pixel format checking
+ - f4f6b9db6c63bce14401986c1c9de13f57b9cdf2 # media: rcar-vin: Add scaling mode to R8A77990
+ - 7b2dbfd2eb1dc473daab9da84f7e5f4bf8b17135 # media: rcar-vin: Fix checking format condition
+ - e60a821757a4456a03b6ff696da811fae4d363f7 # media: rcar-vin: Fix procedure of clipping and scaling
+ - 95e69e02d6370a13121c59f1a2ebe9e87905591a # media: rcar-vin: Fix the cropping function
+ - 8b933cd2df94c32ae70aed2df562ffbefcd9fe03 # media: rcar-vin: Remove checking format condition
diff --git a/projects/linux/mm/bsp41x_vin_check_irq_status.yaml b/projects/linux/mm/bsp51x_vin_check_irq_status.yaml
index f06413a..50a69a6 100644
--- a/projects/linux/mm/bsp41x_vin_check_irq_status.yaml
+++ b/projects/linux/mm/bsp51x_vin_check_irq_status.yaml
@@ -1,4 +1,4 @@
-title: "BSP 4.1.x upport FIS check in irq"
+title: "BSP 5.1.x upport FIS check in irq"
 team: MM
 key: c005282c-8366-11eb-8a9b-7ff765ca3363
 status: Active
@@ -6,3 +6,6 @@ assignee: Niklas
 
 bsp41x:
  - d2dedddc818d176ea566f6d0d106d59749404c53 # media: rcar-vin: Add FIS bit check before reading VnMS register
+
+bsp51x:
+ - 374a2cfe1d08e7d7fc8a63a28783f92aced67246 # media: rcar-vin: Add FIS bit check before reading VnMS register
diff --git a/projects/linux/mm/bsp41x_vin_fix_alignment.yaml b/projects/linux/mm/bsp51x_vin_fix_alignment.yaml
index 88a484c..9af5791 100644
--- a/projects/linux/mm/bsp41x_vin_fix_alignment.yaml
+++ b/projects/linux/mm/bsp51x_vin_fix_alignment.yaml
@@ -1,4 +1,4 @@
-title: "BSP 4.1.x upport format alignment correction"
+title: "BSP 5.1.x upport format alignment correction"
 team: MM
 key: b61002de-a254-4b81-a24f-e374b2b1c21e
 status: Active
@@ -6,3 +6,6 @@ assignee: Niklas
 
 bsp41x:
  - 0b806d78eb074c58c904d15080a45666eb102a51 # media: rcar-vin: Fix byte alignment for each format
+
+bsp51x:
+ - 5cd448e50758f632738799d5bd67a00aa6cdb7d9 # media: rcar-vin: Fix byte alignment for each format
diff --git a/projects/linux/mm/bsp51x_vin_move_pm_to_stream.yaml b/projects/linux/mm/bsp51x_vin_move_pm_to_stream.yaml
new file mode 100644
index 0000000..8f792d2
--- /dev/null
+++ b/projects/linux/mm/bsp51x_vin_move_pm_to_stream.yaml
@@ -0,0 +1,8 @@
+title: "BSP 5.1.x upport align om PM to s_stream"
+team: MM
+key: f6ffa557-92a9-4b16-ac09-95a5da36e431
+status: New
+
+bsp51x:
+  - 02fe8e76f8dbbc21c747b0e28cb8e5ae5cbc570c # media: rcar-vin: Fix clock control flow
+  - 218dbe477878e427f863703fd8e06b113bbd084d # media: rcar-vin: remove reset in stop stream
diff --git a/projects/linux/mm/bsp41x_vin_support_userptr.yaml b/projects/linux/mm/bsp51x_vin_support_userptr.yaml
index 2c8fa25..01027ed 100644
--- a/projects/linux/mm/bsp41x_vin_support_userptr.yaml
+++ b/projects/linux/mm/bsp51x_vin_support_userptr.yaml
@@ -1,4 +1,4 @@
-title: "BSP 4.1.x upport support for VB_USERPTR"
+title: "BSP 5.1.x upport support for VB_USERPTR"
 team: MM
 key: 523cb0b2-8366-11eb-978c-7f72806f0eed
 status: New
@@ -6,6 +6,9 @@ status: New
 bsp41x:
  - 5bb00c5751ba0041df56bbdde86301959fffbeba # media: rcar-vin: Add memory type of VB_USERPTR support
 
+bsp51x:
+ - 6ee79c487c6621cb0ea228f179bad7bba19a53ab # media: rcar-vin: Add memory type of VB_USERPTR support
+
 comments:
   - This have been discussed in the past, see wiki/Chat_log/20180405-mm-chatlog.
   - The conclusion in 2018 was there are not many use-cases for this that are not better served by DMABUF. We would like to know more about this use-case before upporting this if possible.
diff --git a/projects/linux/mm/done/bsp41x_vin_suspend_and_resume.yaml b/projects/linux/mm/done/bsp41x_vin_suspend_and_resume.yaml
index 1742170..e581a3d 100644
--- a/projects/linux/mm/done/bsp41x_vin_suspend_and_resume.yaml
+++ b/projects/linux/mm/done/bsp41x_vin_suspend_and_resume.yaml
@@ -9,6 +9,11 @@ bsp41x:
  - f9306e8756ae9115c6a605e6f726cc3ef019fb0b # media: rcar-vin: Add power management support
  - 55fb8b9d056b920717816864bf102fb3b0f19159 # media: rcar-vin: Add streaming count check when streming off
 
+bsp51x:
+ - 0cd3f10d5410cd5678baff899afd0b2b1f598368 # media: rcar-vin: Add power management suppor
+ - a2e3b47e263228ee67fd567509d5c8f625064fc0 # media: rcar-vin: Add streaming count check when streming off
+ - 7dbf7045f18d161a6ac95bae65cd015a90d480da # media: rcar-vin: clean-up workqueue
+
 upstream:
  - torvalds: 90ed57851eef0d60320cf2c24536de9ab3183e0f # media: rcar-vin: Use scratch buffer when not in running state
  - torvalds: b83a18cca8924a11eb3317354de30a5a4220aec9 # media: rcar-vin: Remove handling of user-space buffers when stopping