Commit 686191a7 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

Merge branch 'ib-ti-eqep-5.4-rc1' into togreg

Immutable branch being merged in.  Created as this also involves
moving some dependencies around, outside of the counter subsystem.
It's possible it will want to be pulled into other trees.
parents a7118662 f213729f
Loading
Loading
Loading
Loading
+50 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
%YAML 1.2
---
$id: http://devicetree.org/schemas/counter/ti-eqep.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Texas Instruments Enhanced Quadrature Encoder Pulse (eQEP) Module

maintainers:
  - David Lechner <david@lechnology.com>

properties:
  compatible:
    const: ti,am3352-eqep

  reg:
    maxItems: 1

  interrupts:
    description: The eQEP event interrupt
    maxItems: 1

  clocks:
    description: The clock that determines the SYSCLKOUT rate for the eQEP
      peripheral.
    maxItems: 1

  clock-names:
    const: sysclkout

required:
  - compatible
  - reg
  - interrupts
  - clocks
  - clock-names

additionalProperties: false

examples:
  - |
    eqep0: counter@180 {
        compatible = "ti,am3352-eqep";
        reg = <0x180 0x80>;
        clocks = <&l4ls_gclk>;
        clock-names = "sysclkout";
        interrupts = <79>;
    };

...
+6 −0
Original line number Diff line number Diff line
@@ -16215,6 +16215,12 @@ S: Maintained
F:	drivers/media/platform/davinci/
F:	include/media/davinci/
TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
R:	David Lechner <david@lechnology.com>
L:	linux-iio@vger.kernel.org
F:	Documentation/devicetree/bindings/counter/ti-eqep.yaml
F:	drivers/counter/ti-eqep.c
TI ETHERNET SWITCH DRIVER (CPSW)
R:	Grygorii Strashko <grygorii.strashko@ti.com>
L:	linux-omap@vger.kernel.org
+9 −0
Original line number Diff line number Diff line
@@ -150,6 +150,15 @@ config TEGRA_GMI
	  Driver for the Tegra Generic Memory Interface bus which can be used
	  to attach devices such as NOR, UART, FPGA and more.

config  TI_PWMSS
	bool
	default y if (ARCH_OMAP2PLUS) && (PWM_TIECAP || PWM_TIEHRPWM || TI_EQEP)
	help
	  PWM Subsystem driver support for AM33xx SOC.

	  PWM submodules require PWM config space access from submodule
	  drivers and require common parent driver support.

config TI_SYSC
	bool "TI sysc interconnect target module driver"
	depends on ARCH_OMAP2PLUS
+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ obj-$(CONFIG_SUNXI_RSB) += sunxi-rsb.o
obj-$(CONFIG_SIMPLE_PM_BUS)	+= simple-pm-bus.o
obj-$(CONFIG_TEGRA_ACONNECT)	+= tegra-aconnect.o
obj-$(CONFIG_TEGRA_GMI)		+= tegra-gmi.o
obj-$(CONFIG_TI_PWMSS)		+= ti-pwmss.o
obj-$(CONFIG_TI_SYSC)		+= ti-sysc.o
obj-$(CONFIG_TS_NBUS)		+= ts-nbus.o
obj-$(CONFIG_UNIPHIER_SYSTEM_BUS)	+= uniphier-system-bus.o
+0 −0

File moved.

Loading