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

* 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  net: prueth: Always inform the PRUs of PHY changes

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

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

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

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

:
  net: prueth: Always inform the PRUs of PHY changes

Signed-off-by: Dan Murphy <dmurphy@ti.com>

Currently if the PHY state change handler detects that the PHY state has
not changed we do not update the PHY status in the PRU memory. This state
change handler checks the new state against a saved version of the state
stored in host memory, but does not verify that the PRU's knowledge of
the current state has not changed. The PRU's knowledge of the PHY state
is set in PRU DRAM that may be reset when the associated interface state
is changed. This can lead to the PRUs internal PHY state becoming out of
sync with the host's. Fix this here by always updating the PHY state in
the PRU's memory.

Fixes: 14d7cba3

 ("net: prueth: Add TI PRUSS Ethernet driver")
Reported-by: Aparna Balasubramanian <aparnab@ti.com>
Signed-off-by: Andrew F. Davis <afd@ti.com>
Tested-by: Aparna Balasubramanian <aparnab@ti.com>
Acked-by: Roger Quadros <rogerq@ti.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.1.y

* 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  ARM: DTS: k2g-evm: Enable UART2 for communication to BMC
  ARM: dts: Keystone: Add new compatible string for UART
  serial: 8250: Add call to new Keystone serial init function
  serial: 8250: Add special initialization for Keystone 2 UART

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

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

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

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

:
  ARM: DTS: k2g-evm: Enable UART2 for communication to BMC
  ARM: dts: Keystone: Add new compatible string for UART
  serial: 8250: Add call to new Keystone serial init function
  serial: 8250: Add special initialization for Keystone 2 UART

Signed-off-by: Dan Murphy <dmurphy@ti.com>

K2G GP EVM has a Baseboard Management Controller (BMC) on board.
This controller handles things like setting the SoCs boot mode along
with controlling the on board character LCD display module.

Enable support for UART2 which helps communication with BMC. This
enables userspace applications to display something on the LCD
controlled by the BMC, for example.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

Add new compatible "ti,keystone-uart" for Keystone 2 devices. This
will enable Keystone 2 specific quirks in the UART 8250 driver.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>

The new keystone_serial8250_init call is required to enable the UART
transmitter and receiver in Keystone 2 devices. Make this call while
the 8250 driver is setting up the UART.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>

The UART IP within TI's Keystone 2 SOCs are 16550 compatible. However,
Keystone 2 devices also have a couple additional nonstandard UART
registers.

The UART Power Emulation and Management register must be written to for the
particular UART to be enabled. UART0 doesn't have this issue since this the
ROM or U-boot already handles this step. For other UARTs, writing to this
register is needed by the driver otherwise it won't work.

Create a new driver that will export a function that will be used by the
8250 core driver.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
[fcooper@ti.com: Slightly moved function calls around]
Signed-off-by: Franklin S Cooper Jr <fcooper@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.1.y

* 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  Revert "usb: hub: do not clear BOS field during reset device"

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

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

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

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

:
  Revert "usb: hub: do not clear BOS field during reset device"

Signed-off-by: Dan Murphy <dmurphy@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.1.y

* 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  Revert "media: ti-vpe: vip: Add scaler support"
  crypto: omap-des - Fix support for unequal lengths
  ti_config_fragments: Add SDK release defconfig options
  ti_config_fragments: Fix defconfig_map for dra7 builds

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

Merge branch 'platform-ti-linux-4.1.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-4.1.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.1.y

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

:
  crypto: omap-des - Fix support for unequal lengths

Signed-off-by: Dan Murphy <dmurphy@ti.com>

Merge branch 'audio-display-ti-linux-4.1.y' of git.ti.com:~darrene/ti-linux-kernel/audio-display-linux-feature-tree into ti-linux-4.1.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.1.y

* 'audio-display-ti-linux-4.1.y' of git.ti.com:~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
  Revert "media: ti-vpe: vip: Add scaler support"

Signed-off-by: Dan Murphy <dmurphy@ti.com>

commit e5bdfd50 upstream.

This reverts commit 522dc09c.

Tony writes:

This upstream commit is causing an oops:
d8f00cd6

 ("usb: hub: do not clear BOS field during reset device")

This patch has already been included in several -stable kernels.  Here
are the affected kernels:
4.5.0-rc4 (current git)
4.4.2
4.3.6 (currently in review)
4.1.18
3.18.27
3.14.61

How to reproduce the problem:
Boot kernel with slub debugging enabled (otherwise memory corruption
will cause random oopses later instead of immediately)
Plug in USB 3.0 disk to xhci USB 3.0 port
dd if=/dev/sdc of=/dev/null bs=65536
(where /dev/sdc is the USB 3.0 disk)
Unplug USB cable while dd is still going
Oops is immediate:

Reported-by: Tony Battersby <tonyb@cybernetics.com>
Cc: Du, Changbin <changbin.du@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

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

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

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

:
  ti_config_fragments: Add SDK release defconfig options
  ti_config_fragments: Fix defconfig_map for dra7 builds

Signed-off-by: Dan Murphy <dmurphy@ti.com>

This reverts commit b4397f83

.

Although the VIP scaler supports upscaling, any work being done
by the scaler is on the incoming line buffer. This means that
if the scaler is still processing by the time the next line
comes in you end up with distortion/shift of various severity
depending on the scaling factor in the vertical direction.

Scaling up horizontally is somewhat safer, but when the scaler
has to "generate" several lines for each incoming input lines
the data will most likely get overwritten while the scaler is
still busy with it.

The current patch does not prevent scaling up. Some extra logic
is needed to prevent these now known non working cases.

In the mean time it is safer and quicker to disable the
feature for now until we can solidify the use cases.

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

For cases where total length of an input SGs is not same as
length of the input data for encryption, omap-des driver
crashes. This happens in the case when IPsec is trying to use
omap-des driver.

To avoid this, we copy all the pages from the input SG list
into a contiguous buffer and prepare a single element SG list
for this buffer with length as the total bytes to crypt, which is
similar thing that is done in case of unaligned lengths.

Tested-by: Aparna Balasubramanian <aparnab@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

* integration-ti-linux-4.1.y-next:
  ti_config_fragments: Add SDK release defconfig options
  ti_config_fragments: Fix defconfig_map for dra7 builds

Add an option to create the release configurations for the
SDK.

Signed-off-by: Dan Murphy <dmurphy@ti.com>

Fix the defconfig_map.txt for dra7.  There is no dra7x_only.cfg
only dra7_only.cfg.  The script will ignore dra7 if it is chosen

Signed-off-by: Dan Murphy <dmurphy@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.1.y

* 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  ARM: dts: am572x-idk: Add pcie-reset-gpio property to control PCIE_RESETn
  usb: dwc3: Fix assignment of EP transfer resources
  usb: dwc3: gadget: don't send extra ZLP

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

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

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

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

:
  ARM: dts: am572x-idk: Add pcie-reset-gpio property to control PCIE_RESETn
  usb: dwc3: Fix assignment of EP transfer resources
  usb: dwc3: gadget: don't send extra ZLP

Signed-off-by: Dan Murphy <dmurphy@ti.com>

On AM572x IDK, GPIO3_23 is connected to the GPIO_PCIE_SWRSTn which in
turn is connected to PCIE_PERSTn through a non inverting buffer.

Add 'pcie-reset-gpio' property to pcie1 dt node and populate it with
GPIO3_23 in order to drive PCIE_RESETn high.

This gets PCIe cards to be detected in AM572X IDK board.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

commit c4509601 upstream.

The assignement of EP transfer resources was not handled properly in the
dwc3 driver. Commit aebda618 ("usb: dwc3: Reset the transfer
resource index on SET_INTERFACE") previously fixed one aspect of this
where resources may be exhausted with multiple calls to SET_INTERFACE.
However, it introduced an issue where composite devices with multiple
interfaces can be assigned the same transfer resources for different
endpoints. This patch solves both issues.

The assignment of transfer resources cannot perfectly follow the data
book due to the fact that the controller driver does not have all
knowledge of the configuration in advance. It is given this information
piecemeal by the composite gadget framework after every
SET_CONFIGURATION and SET_INTERFACE. Trying to follow the databook
programming model in this scenario can cause errors. For two reasons:

1) The databook says to do DEPSTARTCFG for every SET_CONFIGURATION and
SET_INTERFACE (8.1.5). This is incorrect in the scenario of multiple
interfaces.

2) The databook does not mention doing more DEPXFERCFG for new endpoint
on alt setting (8.1.6).

The following simplified method is used instead:

All hardware endpoints can be assigned a transfer resource and this
setting will stay persistent until either a core reset or hibernation.
So whenever we do a DEPSTARTCFG(0) we can go ahead and do DEPXFERCFG for
every hardware endpoint as well. We are guaranteed that there are as
many transfer resources as endpoints.

This patch triggers off of the calling dwc3_gadget_start_config() for
EP0-out, which always happens first, and which should only happen in one
of the above conditions.

Fixes: aebda618

 ("usb: dwc3: Reset the transfer resource index on SET_INTERFACE")
Cc: <stable@vger.kernel.org> # v3.2+
Reported-by: Ravi Babu <ravibabu@ti.com>
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

commit d9261898 upstream.

If the request->length is zero, a ZLP should already be sent due to that
and another ZLP is not needed to terminate the transfer.

Fixes: 04c03d10

 ("usb: dwc3: gadget: handle request->zero")
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.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.1.y

* 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  ARM: dts: K2G: Use the correct DCAN clock
  ARM: OMAP2: Fix up interconnect barrier initialization for DRA7

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

Merge branch 'platform-ti-linux-4.1.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-4.1.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.1.y

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

:
  ARM: dts: K2G: Use the correct DCAN clock
  ARM: OMAP2: Fix up interconnect barrier initialization for DRA7

Signed-off-by: Dan Murphy <dmurphy@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.1.y

* 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  ASoC: davinci-mcasp: Fix dai runtime reconfiguration

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

Merge branch 'audio-display-ti-linux-4.1.y' of git.ti.com:~darrene/ti-linux-kernel/audio-display-linux-feature-tree into ti-linux-4.1.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.1.y

* 'audio-display-ti-linux-4.1.y' of git.ti.com:~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
  ASoC: davinci-mcasp: Fix dai runtime reconfiguration

Signed-off-by: Dan Murphy <dmurphy@ti.com>

We need to configure the DAI format as a first step in hw_params() since
the setup code needs to know if McASP is slave or not for synchronous
operation.

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

The clock index for DCAN is currently set to 0 which references
the DCAN's VBUS clk which runs at 100 MHz. However, what we really
want is the DCAN's CAN clk which runs at 24 MHz.

Correct this so that the DCAN driver gets the proper clock rate. Also
instead of just giving a number use the proper define so its clear exactly
what clock we wanted to use.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>

The following commits:
commit 3fa60975 ("ARM: omap2: restore OMAP4 barrier behaviour")
commit f746929f ("Revert "ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688"")
and
commit ea827ad5 ("ARM: DRA7: Provide proper IO map table")
came in around the same time, unfortunately this seem to have missed
initializing the barrier for DRA7 platforms - omap5_map_io was reused
for dra7 till it was split out by the last patch. barrier_init
needs to be hence carried forward as it is valid for DRA7 family of
processors as they are for OMAP5.

Fixes: ea827ad5

 ("ARM: DRA7: Provide proper IO map table")
Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nishanth Menon <nm@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.1.y

* 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  ARM: dts: am571x-idk: Add reset to PRU2 ethernet PHYs
  ARM: dts: am572x-idk: Add reset to PRU2 ethernet PHYs
  net: davinci_mdio: add GPIO reset logic
  net: netcp: fix the Ethernet receive issue on 2U switch

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

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

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

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

:
  ARM: dts: am571x-idk: Add reset to PRU2 ethernet PHYs
  ARM: dts: am572x-idk: Add reset to PRU2 ethernet PHYs
  net: davinci_mdio: add GPIO reset logic
  net: netcp: fix the Ethernet receive issue on 2U switch

Signed-off-by: Dan Murphy <dmurphy@ti.com>

The PRU2 ethernet PHYs are in invalid state during system
reset due to incorrect pin states of the MII bus.

We need to reset the PHY after the PHY pins have been brought to
the right state to make sure the PHY is in a good state
else it causes unreliability issues like PHY link not working
or PHY not being detected on MDIO bus.

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

The PRU2 ethernet PHYs are in invalid state during system
reset due to incorrect pin states of the MII bus.

We need to reset the PHY after the PHY pins have been brought to
the right state to make sure the PHY is in a good state
else it causes unreliability issues like PHY link not working
or PHY not being detected on MDIO bus.

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

Some boards [1] leave the PHYs at an invalid state
during system power-up or reset thus causing unreliability
issues with the PHY like not being detected by the mdio bus
or link not functional. To work around these boards have
a GPIO connected to the PHY's reset pin.

Implement GPIO reset handling for such cases.

[1] - am572x-idk, am571x-idk, a437x-idk.

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

For the newer version of the switch such as NU and 2U, map
all of the vlan priorities to zero as the packet DMA is enabled
to receive only flow id 0 which maps to priority zero. Without
this, the switch gets into a rx fifo overrun at the slave interface.
This patch fixes this issue.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.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.1.y

* 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  ARM: dts: AM57xx: EVM/X15: MMC: Fix IOdelay values for SDR104 mode
  net: prueth: Fix saved OCMC RAM size

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