TI-Feature: ti_linux_base_rt
TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.9.y

* 'ti-linux-4.9.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  Revert "TEMP: remoteproc/pru: use different firmware names for ethernet"
  Revert "TEMP: remoteproc/pru: enable ethernet fw for PRUSS1 on AM571x IDK"
  Revert "TEMP: remoteproc/pru: enable ethernet fw for PRUSSs on K2G ICE EVM"
  remoteproc/pru: switch to client-driven boot methodology

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

TI-Feature: rpmsg
TI-Tree: git://git.ti.com/rpmsg/rpmsg.git
TI-Branch: rpmsg-ti-linux-4.9.y-intg

* 'rpmsg-ti-linux-4.9.y-intg' of git://git.ti.com/rpmsg/rpmsg

:
  Revert "TEMP: remoteproc/pru: use different firmware names for ethernet"
  Revert "TEMP: remoteproc/pru: enable ethernet fw for PRUSS1 on AM571x IDK"
  Revert "TEMP: remoteproc/pru: enable ethernet fw for PRUSSs on K2G ICE EVM"
  remoteproc/pru: switch to client-driven boot methodology

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Signed-off-by: Suman Anna <s-anna@ti.com>

TI-Feature: ti_linux_base_rt
TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.9.y

* 'ti-linux-4.9.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  net: prueth: add logic to set firmware names
  ARM: davinci_all_defconfig: Enable CPPI 4.1 USB OTG DMA
  ARM: dts: da850: Add CPPI 4.1 DMA to USB OTG controller
  usb: musb: musb_cppi41: Defer probe only if DMA is not ready
  usb: musb: musb_cppi41: Workaround DMA stall issue during teardown
  usb: musb: Add support of CPPI 4.1 DMA controller to DA8xx
  usb: musb: Use shared irq
  ARM: davinci: Add clock for CPPI 4.1 DMA engine
  dmaengine: cppi41: Fix an Oops happening in cppi41_dma_probe()
  dmaengine: cppi: fix build error due to bad variable
  dmaengine: cppi41: use managed functions devm_*()
  dmaengine: cppi41: fix cppi41_dma_tx_status() logic

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Pull in the updated remoteproc feature branch that adds switches the PRU
remoteproc driver to a client-driven boot methodology and reverts the logic
in the driver to boot PRU Ethernet specific firmwares on various TI IDK and
ICE boards supporting PRU Ethernet ports. The PRU Ethernet driver will
supply these firmware names going forward.

* 'rproc-linux-4.9.y' of git://git.ti.com/rpmsg/remoteproc

:
  Revert "TEMP: remoteproc/pru: use different firmware names for ethernet"
  Revert "TEMP: remoteproc/pru: enable ethernet fw for PRUSS1 on AM571x IDK"
  Revert "TEMP: remoteproc/pru: enable ethernet fw for PRUSSs on K2G ICE EVM"
  remoteproc/pru: switch to client-driven boot methodology

Signed-off-by: Suman Anna <s-anna@ti.com>

This reverts commit dced756b.

The PRU Ethernet driver will use the rproc_set_firmware() API to
configure the appropriate firmware names to be used by the remoteproc
core for loading and booting the PRU remoteprocs. Undo the changes
added previously in PRU remoteproc driver in commit dced756b
("TEMP: remoteproc/pru: use different firmware names for ethernet")
to perform the same, the auto-boot code logic is already handled
and so is not reverted.

TODO:
The internal pinmux programming added in commit a67dccf1
("HACK: remoteproc/pru: allow device tree to configure GP_MUX_SEL")
and required for AM571x-IDK and K2G-ICE boards is still in place,
and needs to be moved into PRU Ethernet driver.

Signed-off-by: Suman Anna <s-anna@ti.com>

This reverts commit 2f7dc44e.

The PRU Ethernet driver will use the rproc_set_firmware() API to
configure the appropriate firmware names to be used by the remoteproc
core for loading and booting the PRU remoteprocs. Undo the changes
added previously in PRU remoteproc driver in commit 2f7dc44e
("TEMP: remoteproc/pru: enable ethernet fw for PRUSS1 on AM571x IDK")
to perform the same. The AM571x IDK vs AM572x IDK differences will
be inherent due to the presence/absence of the corresponding prueth
DT nodes.

NOTE:
The internal pinmux programming required for AM571x IDK is still in
place in the PRU remoteproc driver.

Signed-off-by: Suman Anna <s-anna@ti.com>

This reverts commit 8eabf447.

The PRU Ethernet driver will use the rproc_set_firmware() API to
configure the appropriate firmware names to be used by the remoteproc
core for loading and booting the PRU remoteprocs. Undo the changes
added previously in PRU remoteproc driver in commit 8eabf447
("TEMP: remoteproc/pru: enable ethernet fw for PRUSSs on K2G ICE EVM")
to perform the same.

NOTE:
The internal pinmux programming required for K2G-ICE is still in
place in the PRU remoteproc driver.

Signed-off-by: Suman Anna <s-anna@ti.com>

The PRU remoteproc driver currently supports a hybrid boot methodology
- it supports auto-boot only for non PRU-Ethernet firmwares/usecases
and no auto-boot for PRU-Ethernet usecases in which the PRU Ethernet
driver is responsible for booting the PRUs. This is made possible due
to a short-term/temporary solution by using a module parameter and
specific PRU capabilities based on board detection in the driver. This
is not a scalable solution as the driver leveraged specific board
compatibles.

The PRU remoteproc driver is now modified to _not_ support auto-boot
by default for all use-cases so that the PRU load and boot is dictated
by the corresponding client drivers. This allows flexibility for the
client drivers/applications to set a firmware name (if needed) based
on their desired functionality and boot the PRU. The sysfs bind and
unbind attributes have also been suppressed so that the PRU devices
cannot be unbound and thereby shutdown a PRU from underneath a PRU
client driver.

Signed-off-by: Suman Anna <s-anna@ti.com>

Merge branch 'connectivity-ti-linux-4.9.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-4.9.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-4.9.y

* 'connectivity-ti-linux-4.9.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel

:
  net: prueth: add logic to set firmware names
  ARM: davinci_all_defconfig: Enable CPPI 4.1 USB OTG DMA
  ARM: dts: da850: Add CPPI 4.1 DMA to USB OTG controller
  usb: musb: musb_cppi41: Defer probe only if DMA is not ready
  usb: musb: musb_cppi41: Workaround DMA stall issue during teardown
  usb: musb: Add support of CPPI 4.1 DMA controller to DA8xx
  usb: musb: Use shared irq
  ARM: davinci: Add clock for CPPI 4.1 DMA engine
  dmaengine: cppi41: Fix an Oops happening in cppi41_dma_probe()
  dmaengine: cppi: fix build error due to bad variable
  dmaengine: cppi41: use managed functions devm_*()
  dmaengine: cppi41: fix cppi41_dma_tx_status() logic

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

The PRU Ethernet driver has relied so far on the PRU remoteproc
driver having the knowledge about the Ethernet-specific firmware
names. This was previously required to be in the PRU remoteproc
driver on previous kernels because of the two-phase resource table
parsing and loading sequence performed in the remoteproc core.

This sequence is no longer valid on 4.9+ kernels, and the PRU
Ethernet driver has been enhanced to set the firmware name using
the newly added rproc_set_firmware() API before booting a PRU
remoteproc device. This design improves the scalability of both
the PRU remoteproc and PRU Ethernet drivers. The latter driver
can also now be further enhanced to support different Ethernet
protocols using different firmwares.

Note that there is no firmware name context saving in the remoteproc
core, so each application is supposed to configure its firmware
name before booting a PRU remote processor.

Signed-off-by: Suman Anna <s-anna@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

CPPI 4.1 DMA is now supported on AM18xx.
Update the config to use it instead of PIO mode.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

This adds CPPI 4.1 DMA controller to USB OTG controller.

Changes since v2:
- Fixed the the property reg-names (had glue register defined)
- Removed few useless property

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

If dma_request_slave_channel() failed to return a channel,
then the driver will print an error and request to defer probe,
regardless of the cause of the failure.
Defer if the DMA is not ready yet otherwise print an error.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

commit 593bc462 upstream.

The DMA may hang up if a teardown is initiated while an endpoint is still
active (Advisory 2.3.27 of DA8xx errata).
To workaround this issue, add a delay before to initiate the teardown.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

commit d6299b6e upstream.

Currently, only the PIO mode is supported.
This add support of CPPI 4.1 to DA8xx.
As in DA8xx the CPPI 4.1 DMA is a part of the USBSS, create the CPPI 4.1
device as a child of USB.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
[b-liu@ti.com: minor tweak in the commit log]
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Sekhar Nori <nsekhar@ti.com>

commit aa2fb886 upstream.

In the DA8xx, USB and CPPI 4.1 are sharing the same interrupt line.
Update the driver to request a shared irq.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

commit 398dbc77 upstream.

The CPPI 4.1 DMA in USB subsystem shares its clock with the
USB OTG, and most of the time, the clock will be enabled by
USB.  But during the init of the DMA, USB is not enabled
(waiting for DMA), and then we must enable the DMA clock
before doing anything.

Add clock for the CPPI 4.1 DMA engine.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
[nsekhar@ti.com: minor commit message tweaks]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

Signed-off-by: Sekhar Nori <nsekhar@ti.com>

commit eda6f4e8 upstream.

This fix an Oops happening on all platforms using the old dt bindings
(all platforms but da8xx).
This update cppi41_dma_probe() to use the index variable which is
required to keep compatibility between old and new dt bindings.

Fixes: 8e3ba95f ("dmaengine: cppi41: use managed functions devm_*()")
Reported-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

commit d7fd724e upstream.

Commit 8e3ba95f ("dmaengine: cppi41: use managed functions devm_*()")
moved the code to devm_* but erranously changed a varible name, so fix it.

drivers/dma/cppi41.c:1052:5: error: 'struct cppi41_dd' has no member named 'qmrg_mem'
  cdd->qmrg_mem = devm_ioremap_resource(dev, mem);
     ^
drivers/dma/cppi41.c:1053:16: error: 'struct cppi41_dd' has no member named 'qmrg_mem'
  if (IS_ERR(cdd->qmrg_mem))
                ^
drivers/dma/cppi41.c:1054:21: error: 'struct cppi41_dd' has no member named 'qmrg_mem'
   return PTR_ERR(cdd->qmrg_mem);
                     ^

Fixes: 8e3ba95f ("dmaengine: cppi41: use managed functions devm_*()")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

commit 8e3ba95f upstream.

This makes the error handling much more simpler than open-coding
everything and in addition makes the probe function smaller an tidier.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

commit a08f2673 upstream.

It makes sense to set residue when channel is in progress. Otherwise it
should be 0 since transfer is completed. Meanwhile this patch doesn't
prevent to set residue value anyway.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

TI-Feature: ti_linux_base_rt
TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.9.y

* 'ti-linux-4.9.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  remoteproc: update sysfs firmware_store() to use rproc_set_firmware()
  remoteproc: add a rproc_set_firmware() API

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

TI-Feature: rpmsg
TI-Tree: git://git.ti.com/rpmsg/rpmsg.git
TI-Branch: rpmsg-ti-linux-4.9.y-intg

* 'rpmsg-ti-linux-4.9.y-intg' of git://git.ti.com/rpmsg/rpmsg

:
  remoteproc: update sysfs firmware_store() to use rproc_set_firmware()
  remoteproc: add a rproc_set_firmware() API

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Signed-off-by: Suman Anna <s-anna@ti.com>

Pull in the updated remoteproc feature branch that adds a new remoteproc
kernel API to allow a remoteproc user to configure the firmware name for
a remote processor. The logic is reused between sysfs and remoteproc client
drivers.

* 'rproc-linux-4.9.y' of git://git.ti.com/rpmsg/remoteproc

:
  remoteproc: update sysfs firmware_store() to use rproc_set_firmware()
  remoteproc: add a rproc_set_firmware() API

Signed-off-by: Suman Anna <s-anna@ti.com>

Update the firmware_store() function that provides a sysfs interface
to set a new firmware name for a remote processor to reuse the newly
added rproc_set_firmware() function. This avoids code duplication.

Signed-off-by: Suman Anna <s-anna@ti.com>

A new API, rproc_set_firmware() is added to allow the remoteproc client
drivers to be able to configure a custom firmware name that is different
from the default name registered by a remoteproc platform driver. This
function is being introduced to provide a kernel-level equivalent of
the current sysfs interface, so as to allow these kernel-drivers to
choose different firmwares based on their functional feature it is
implementing using the remote processor.

Signed-off-by: Suman Anna <s-anna@ti.com>

TI-Feature: ti_linux_base_rt
TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.9.y

* 'ti-linux-4.9.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  davinci: vpif_capture: fix default pixel format for BT.656/BT.1120 video
  HACK: UAPI: Fix VIDEO_MAX_FRAME/VB2_MAX_FRAME kbuild issue

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Merge branch 'audio-display-ti-linux-4.9.y' of git.ti.com:~darrene/ti-linux-kernel/audio-display-linux-feature-tree into ti-linux-4.9.y

TI-Feature: audio-display
TI-Tree: git@git.ti.com:~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-4.9.y

* 'audio-display-ti-linux-4.9.y' of git.ti.com:~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
  davinci: vpif_capture: fix default pixel format for BT.656/BT.1120 video
  HACK: UAPI: Fix VIDEO_MAX_FRAME/VB2_MAX_FRAME kbuild issue

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Merge branch 'for17.02.00.01' of git.ti.com:~bparrot/ti-linux-kernel/bp-ti-linux into audio-display-ti-linux-4.9.y

Capture for 17.02.00

* 'for17.02.00.01' of git.ti.com:~bparrot/ti-linux-kernel/bp-ti-linux:
  davinci: vpif_capture: fix default pixel format for BT.656/BT.1120 video
  HACK: UAPI: Fix VIDEO_MAX_FRAME/VB2_MAX_FRAME kbuild issue

TI-Feature: ti_linux_base_rt
TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.9.y

* 'ti-linux-4.9.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  genpd: k2g: Add security accelerator device ID
  dmaengine: ti-dma-crossbar: Fix event mapping for TPCC_EVT_MUX_60_63
  dmaengine: ti-dma-crossbar: Correct am335x/am43xx mux value type
  ARM: davinci: PM: Do not free useful resources in normal path in 'davinci_pm_init'
  ARM: davinci: PM: Free resources in error handling path in 'davinci_pm_init'

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Merge branch 'platform-ti-linux-4.9.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-4.9.y

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-4.9.y

* 'platform-ti-linux-4.9.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree

:
  genpd: k2g: Add security accelerator device ID
  dmaengine: ti-dma-crossbar: Fix event mapping for TPCC_EVT_MUX_60_63
  dmaengine: ti-dma-crossbar: Correct am335x/am43xx mux value type
  ARM: davinci: PM: Do not free useful resources in normal path in 'davinci_pm_init'
  ARM: davinci: PM: Free resources in error handling path in 'davinci_pm_init'

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

For both BT.656 and BT.1120 video, the pixel format
used by VPIF is Y/CbCr 4:2:2 in semi-planar format
(Luma in one plane and Chroma in another). This
corresponds to NV16 pixel format.

This is documented in section 36.2.3 of OMAP-L138
Technical Reference Manual, SPRUH77A.

The VPIF driver incorrectly sets the default format
to V4L2_PIX_FMT_YUV422P. Fix it.

Reported-by: Alejandro Hernandez <ajhernandez@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Kevin Hilman <khilman@baylibre.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Benoit Parrot <bparrot@ti.com>

0-DAY kernel test infrastructure reported the following issue:

All errors (new ones prefixed by >>):

   In file included from drivers/media/pci/zoran/zoran_procfs.c:49:0:
>> drivers/media/pci/zoran/zoran.h:68:5:
		error: #error "Too many video frame buffers to handle"
    #   error   "Too many video frame buffers to handle"
        ^~~~~
   In file included from drivers/media/pci/zoran/zoran_procfs.c:49:0:
>> drivers/media/pci/zoran/zoran.h:330:15:
		error: 'V4L_MAX_FRAME' undeclared here (not in a function)
     int v4l_pend[V4L_MAX_FRAME];
                  ^~~~~~~~~~~~~
===========

The VIDEO_MAX_FRAME/VB2_MAX_FRAME updated value are only applicable
to our platform.
To prevent this compile issue we only allow the new VIDEO_MAX_FRAME
VB2_MAX_FRAME values when both VIDEO_TI_VPE and SOC_DRA7XX are enabled.

Signed-off-by: Benoit Parrot <bparrot@ti.com>

Add the security accelarator device ID. The pmmc firmware is also
expected to be updated to reflect the SA0 device instance.

Signed-off-by: Keerthy <j-keerthy@ti.com>

Register layout of a typical TPCC_EVT_MUX_M_N register is such that the
lowest numbered event is at the lowest byte address and highest numbered
event at highest byte address. But TPCC_EVT_MUX_60_63 register layout is
different,  in that the lowest numbered event is at the highest address
and highest numbered event is at the lowest address. Therefore, modify
ti_am335x_xbar_write() to handle TPCC_EVT_MUX_60_63 register
accordingly.

Signed-off-by: Vignesh R <vigneshr@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

The used 0x1f mask is only valid for am335x family of SoC, different family
using this type of crossbar might have different number of electable
events. In case of am43xx family 0x3f mask should have been used for
example.
Instead of trying to handle each family's mask, just use u8 type to store
the mux value since the event offsets are aligned to byte offset.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

TI-Feature: ti_linux_base_rt
TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.9.y

* 'ti-linux-4.9.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  drm/omap: Enable COLOR_ENCODING and COLOR_RANGE properties for planes
  drm/omap: cleanup color space conversion
  drm: Add optional COLOR_ENCODING and COLOR_RANGE properties to drm_plane
  drm: drm_color_mgmt.h needs struct drm_crtc declaration
  drm: Add const to name field declaration in struct drm_prop_enum_list
  drm/color: un-inline drm_color_lut_extract()
  drm/omap: Implement CTM property for CRTC using OVL managers CPR matrix

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>