]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - ti-linux-kernel/ti-linux-kernel-next.git/commit
Merge branch 'ti-linux-4.14.y-for-next' of git://git.ti.com/~vigneshr/ti-linux-kernel... ti-linux-4.14.y-next-20180729
authorLCPD Auto Merger <lcpd_integration@list.ti.com>
Sun, 29 Jul 2018 07:48:51 +0000 (02:48 -0500)
committerLCPD Auto Merger <lcpd_integration@list.ti.com>
Sun, 29 Jul 2018 07:48:51 +0000 (02:48 -0500)
commitadaa27e4fe72cf76b2fd1243013b5f36e356847a
treec355606b3cd83ee0786c9800c9e9eaf0e7b6ed48
parentf60d9a0914772d5092803d1086fd0602a77702c8
parent79f9e851ef9cce66e4cf900cbf919627347a5b64
Merge branch 'ti-linux-4.14.y-for-next' of git://git.ti.com/~vigneshr/ti-linux-kernel/vigneshr-ti-linux-kernel into ti-linux-4.14.y-next

TI-Feature: vignesh_next
TI-Tree: git://git.ti.com/~vigneshr/ti-linux-kernel/vigneshr-ti-linux-kernel.git
TI-Branch: ti-linux-4.14.y-for-next

* 'ti-linux-4.14.y-for-next' of git://git.ti.com/~vigneshr/ti-linux-kernel/vigneshr-ti-linux-kernel:
  ti_config_fragments/connectivity.cfg: Enable TSCADC
  arm64: dts: k3-am654-base-board: Enable ADCs
  arm64: dts: k3-am6: Add ADC DT nodes
  mfd: ti_am335x_tscadc: Provide unique name for child mfd cells
  dt-bindings: ti-tsc-adc: Document compatible properties for tscadc IP

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
arch/arm64/boot/dts/ti/k3-am6.dtsi
arch/arm64/boot/dts/ti/k3-am654-base-board.dts