TI-Feature: connectivity
TI-Branch: connectivity-ti-linux-5.4.y

* 'connectivity-ti-linux-5.4.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/connectivity

:
  arm64: dts: ti: k3-j7200-common-proc-board: Add USB support
  arm64: dts: ti: j7200-main: Add USB controller
  dt-bindings: usb: Add binding for the TI wrapper for Cadence USB3 controller
  usb: cdns3: Enable workaround for USB2.0 PHY Rx compliance test PHY lockup
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Enable USB0 port in high-speed (2.0) mode.
Signed-off-by: Roger Quadros <rogerq@ti.com>

j7200 has on USB controller instance. Add that.
Signed-off-by: Roger Quadros <rogerq@ti.com>

commit 4c48f236

 upstream.

TI platforms have a wrapper module around the Cadence USB3
controller. Add binding information for that.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Cc: Rob Herring <robh@kernel.org>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

USB2.0 PHY hangs in Rx Compliance test when the incoming packet
amplitude is varied below and above the Squelch Level of
Receiver during the active packet multiple times.

Version 1 of the controller allows PHY to be reset when RX fail condition
is detected to work around the above issue. This feature is
disabled by default and needs to be enabled using a bit from
the newly added PHYRST_CFG register. This patch enables the workaround.
Signed-off-by: Pawel Laszczak <pawell@cadence.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>

TI-Feature: connectivity
TI-Branch: connectivity-ti-linux-5.4.y

* 'connectivity-ti-linux-5.4.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/connectivity

:
  net: hsr/prp: fix semicolon.cocci warnings
  net: ti: prueth_core: remove unused variables
  net: ti: prueth_core: add description for function parameters
  net: ti: prueth_lre: make functions static to fix compilation warnings
  net: ethernet: ti: icss-iep: make icss_iep_probe() static
  net: ti: prueth_core: call kthread_destroy_worker() in ndo_stop()
  net: ti: prueth_core: assign lredev_ops only when CONFIG_HSR is enabled
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

  net: hsr/prp: fix semicolon.cocci warnings
  net: ti: prueth_core: remove unused variables
  net: ti: prueth_core: add description for function parameters
  net: ti: prueth_lre: make functions static to fix compilation warnings
  net: ethernet: ti: icss-iep: make icss_iep_probe() static
  net: ti: prueth_core: call kthread_destroy_worker() in ndo_stop()
  net: ti: prueth_core: assign lredev_ops only when CONFIG_HSR is enabled
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

TI-Feature: connectivity
TI-Branch: connectivity-ti-linux-5.4.y

* 'connectivity-ti-linux-5.4.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/connectivity

:
  arm64: dts: ti: k3-j7200-common-proc-board: Enable ADC instance
  arm64: dts: ti: k3-j7200-mcu-wakup: Add ADC DT node
  arm64: dts: ti: k3-j7200-som-p0: Add HyperFlash node
  arm64: dts: ti: k3-j7200: Add HyperBus node
  arm64: dts: ti: k3-j7200-common-proc-board: Add support for eMMC and SD card
  arm64: dts: ti: k3-j7200-main: Add support for MMC/SD controller nodes
  mmc: sdhci_am654: Add workaround for card detect debounce timer
  dt-bindings: mmc: sdhci-am654: Document bindings for the host controllers on TI's J7200 devices
  net: hsr: Add support for PTP over VLAN
  net: ti: prueth: Detect the vlan tagged skbs during prueth_ptp_ts_event_type detection
  net: ti: prueth: Use the ethertype in skb_redundant_info to detect hsr/prp
  net: ti: prueth: Use __skb_push/pull() for changing skb data
  net: ti: prueth: Fix clearing of hsr ptp related stuff during ndo stop
  net: ti: prueth: Free emac_ptp_tx_irq only if available
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Enable all 8 channels of ADC available on base board header pins
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

Add DT node for single ADC instance present in MCU domain.
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

J7200 SoM has a HyperFlash connected to HyperBus memory controller. But
HyperBus is muxed with OSPI, therefore keep HyperBus node disabled.
Bootloader will detect the mux and enable the node as required.
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

J7200 has a Flash SubSystem that has one OSPI and one HyperBus. Add
DT nodes for HyperBus controller for now.
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

  arm64: dts: ti: k3-j7200-common-proc-board: Add support for eMMC and SD card
  arm64: dts: ti: k3-j7200-main: Add support for MMC/SD controller nodes
  mmc: sdhci_am654: Add workaround for card detect debounce timer
  dt-bindings: mmc: sdhci-am654: Document bindings for the host controllers on TI's J7200 devices
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

Add support for the eMMC and SD card connected on the common
processor board

sdhci0 is connected to an eMMC while sdhci1 is connected to the
micro SD slot. Also add support for two regulators to power cycle
and switch voltage to the SD card respectively
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>

Add support for MMC/SD controller nodes present on TI's j7200 SoCs.

There are two nodes:
        1. sdhci0 (8 bit bus width, 200 MHz, HS200, 400 MBps)
        2. sdhci1 (4 bit bus width, 100 MHz, SDR50, 50 MBps)
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>

There is a one time delay because of a card detect debounce timer in the
controller IP. This timer runs as soon as power is applied to the module
regardless of whether a card is present or not and any writes to
SDHCI_POWER_ON will return 0 before it expires. This timeout has been
measured to be about 1 second in am654x and j721e.

Write-and-read-back in a loop on SDHCI_POWER_ON for a maximum of
1.5 seconds to make sure that the controller actually powers on.
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>

Add binding documentation for mmc host controllers present on
TI's J7200 SOC
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>

Support PTP over VLAN by checking for VLAN tag when looking for HSR/PTP
header offsets in packet data.
Signed-off-by: Aaron Kramer <a-kramer@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

ptp_class_raw doesn't have support for detecting ptp_type for HSR tagged
skbs. So to workaround this, prueth_ptp_ts_event_type subtract HSR tag
length and pass updated skb to ptp_class_raw. But this is failing for
VLAN tangged skbs as HSR is tagged after VLAN tag. Subtract VLAN_HLEN
for vlan tagged buffers so that ptp type can be detected correctly for
HSR and VLAN tagged buffers.
Reviewed-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

prueth_ptp_ts_event_type is using eth_hdr(skb)->h_proto type to detect
hsr and prp. But with the VLAN tag the ethernet type is not populated
correctly. The ethertype in skb_redundant_info is populated correctly by
the hsr core layer. Use it for detecting hsr and prp type.

Fixes: 3b9b5f34

 ("net: ti: prueth: hsr: Add support for timestamping tx packets")
Reviewed-by: Murali Karicheri <m-karicheri2@ti.com>
Reviewed-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

__skb_push/pull() apis are available for updating the skb data pointers
and length. Use these apis instead of updating the data pointers directly.
Also replace the hardcoded hsr tag length with ICSS_LRE_TAG_RCT_SIZE.
Tested-by: Murali Karicheri <m-karicheri2@ti.com>
Suggested-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

Following ptp related stuff is not cleared during ndo stop:
- hsr ptp irq
- state of ptp rx and tx timestamping
- un processed socket buffers

Due to this protocol switch from hsr to prp fails. So do a proper clean in ndo stop

Fixes: 3b9b5f34

 ("net: ti: prueth: hsr: Add support for timestamping tx packets")
Tested-by: Murali Karicheri <m-karicheri2@ti.com>
Reviewed-by: Murali Karicheri <m-karicheri2@ti.com>
Reported-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

PTP support for Dual emac is optional and the irqs need not be passed from
DT. When PTP is not enabled emac_ndo_stop throws a warning as emac_ptp_tx_irq
are freed unconditionally. So, do a free_irq only when emac_ptp_tx_irq is
available.
Tested-by: Murali Karicheri <m-karicheri2@ti.com>
Fixes: 4d8bd9f0

 ("net: ti: prueth: dual_emac: Add support for timestamping tx packets")
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

Remove unneeded semicolon.

Generated by: scripts/coccinelle/misc/semicolon.cocci

net/hsr/hsr_device.c:507:3-4: Unneeded semicolon
net/hsr/hsr_device.c:534:3-4: Unneeded semicolon

Fixes: commit 3647b8e7

 ("net: hsr/prp: add vlan ctag filter support")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

Following compilation warning seen when using W=1 :-

Example: "warning: variable ‘status_o’ set but not used"

Fixes: commit 7368a2a6

 ("net: ti: prueth_core: add HSR/PRP firmware specific init functions")
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

Following compilation warning seen:-

"Function parameter .....not described in". Add description for
function parameter to fix the issue.

Fixes : commit 1358df1a ("net: prueth: Add TI PRUSS Ethernet driver")
Fixes : commit 0c8d2c36

 ("net: ti: prueth_core: hsr/prp: add ethtool command to switch Ethenet type")
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

Fix compilation warning of the type 'warning: no previous prototype for'
by making the related functions static as they are only used within
the file.

Fixes: commit 0ec7a6a2

 ("net: ti: prueth_core: add helper functions to support lre offload")
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

Fix below compilation warning when compiled with W=1 by making
icss_iep_probe() static.

drivers/net/ethernet/ti/icss_iep.c:518:5: warning: no previous prototype
for ‘icss_iep_probe’ [-Wmissing-prototypes]
int icss_iep_probe(struct platform_device *pdev)

Fixes: commit 8c2782d9

 ("net: ethernet: ti: icss-iep: Make icss-iep a separate driver")
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

Currently the kthread worker that is doing node table management is
is left running when interface is brought down. Fix this by calling
kthread_destroy_worker() in emac_ndo_stop()

Fixes: commit 0ec7a6a2

 ("net: ti: prueth_core: add helper functions to support lre offload")
Reported-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

Currently prueth driver throws below compilation error when CONFIG_HSR is
disabled

drivers/net/ethernet/ti/prueth_core.c:2883:9: error: ‘struct net_device’
has no member named ‘lredev_ops’; did you mean ‘netdev_ops’?
 2883 |   ndev->lredev_ops = &prueth_lredev_ops;
      |         ^~~~~~~~~~
      |         netdev_ops

Fix this by doing assignment only when CONFIG_HSR is enabled

Fixes: commit 093bb5ea

 ("net: ti: prueth_core: hsr/prp: update for ethtool stats support")
Reported-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

TI-Feature: platform_base
TI-Branch: platform-ti-linux-5.4.y

* 'platform-ti-linux-5.4.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/platform

:
  arm64: dts: ti: k3-j7200-common-proc-board: Disable unused gpio modules
  arm64: dts: ti: k3-j7200: Add gpio nodes in wakeup domain
  arm64: dts: ti: k3-j7200-main: Add gpio nodes in main domain
  arm64: dts: ti: k3-j7200: Add GPIO interrupt routers
  dmaengine: ti: k3-udma-glue: Fix parameters for rx ring pair request
  arm64: dts: ti: k3-j721e-main: Fix crypto node to use lower-case hex
  arm64: dts: ti: k3-am65-main: Fix crypto node to use lower-case hex
  arm64: dts: ti: k3-j721e: Fix interconnect node names
  arm64: dts: ti: k3-am65: Fix interconnect node names
Signed-off-by: Dan Murphy <dmurphy@ti.com>

# Conflicts:
#	arch/arm64/boot/dts/ti/k3-j7200-main.dtsi

TI-Feature: rpmsg
TI-Branch: rpmsg-ti-linux-5.4.y-intg

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

:
  TEMP: arm64: dts: ti: k3-j7200: Add aliases for R5F rproc nodes
  arm64: dts: ti: k3-j7200-som-p0: Reserve memory for IPC between RTOS cores
  arm64: dts: ti: k3-j7200-som-p0: Add DDR carveout memory nodes for R5Fs
  arm64: dts: ti: k3-j7200-common-proc-board: Add mailboxes to R5Fs
  arm64: dts: ti: k3-j7200-main: Add MAIN domain R5F cluster node
  arm64: dts: ti: k3-j7200-mcu: Add MCU domain R5F cluster node
  arm64: dts: ti: k3-j7200-common-proc-board: Add IPC sub-mailbox nodes
  arm64: dts: ti: k3-j7200-main: Add mailbox cluster nodes
  arm64: dts: ti: k3-j7200-main: Add hwspinlock node
  remoteproc: k3-r5: Adjust TCM sizes in Split-mode on J7200 SoCs
  remoteproc: k3-r5: Extend support to R5F clusters on J7200 SoCs
  dt-bindings: remoteproc: k3-r5f: Update bindings for J7200 SoCs
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Add aliases for all the R5F remoteproc processor cores present
within the MCU domain and MAIN domain and common to all the K3
J7200 boards. The aliases uses the stem "rproc". Note that each
of the R5F1 cores and their corresponding aliases are uniquely
identified and used only if the corresponding R5F cluster/subsystem
is running in Split (non-LockStep) mode.

The aliases can be overridden, if needed, in the respective
derivative board dts files.
Signed-off-by: Suman Anna <s-anna@ti.com>

Add a reserved memory node to reserve a portion of the DDR memory to be
used for performing inter-processor communication between all the remote
processors running RTOS on the TI J7200 EVM boards. 8 MB of memory is
reserved for this purpose, and this accounts for all the vrings and vring
buffers between all the possible pairs of remote processors.

NOTE:
The J7200 SoCs has no DSPs and one less R5F cluster compared to J721E
SoCs. So, while the carveout memories reserved for the R5F clusters
present on the SoC match to those on J721E, the overall memory map
reserved for firmwares is quite different.
Signed-off-by: Suman Anna <s-anna@ti.com>