Commit 6d918e09 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.2/dt-signed' of... 

Merge tag 'omap-for-v5.2/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Devicetree changes for omap variants

This series of changes configures dra7 pcie x2 lane mode, configures
am43xx-epos-evm regulators and keypad wakeup source, and uses standard
reset-gpios instead of gpio-reset for n810.

We also need to split dra7 dtsi files for properly supporting dra76x
and am576 as some of the devices are different such as usb and pruss.

* tag 'omap-for-v5.2/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: dra7: Separate AM57 dtsi files
  dt-binding: arm: omap: Add information for AM5748
  ARM: dts: omap2420-n810: Use new CODEC reset pin name
  ARM: dts: am43xx-epos-evm: Add matrix keypad as wakeup source
  ARM: dts: am43xx-epos-evm: Keep DCDC3 regulator on in suspend to memory
  ARM: dts: am43xx-epos-evm: Keep DCDC5 and DCDC6 always on
  ARM: dts: dra7: Add properties to enable PCIe x2 lane mode

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1c3a4540 bcbb63b8

Documentation/devicetree/bindings/arm/omap/omap.txt

+6 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ SoCs: 
- DRA718

  compatible = "ti,dra718", "ti,dra722", "ti,dra72", "ti,dra7"



- AM5748

  compatible = "ti,am5748", "ti,dra762", "ti,dra7"



- AM5728

  compatible = "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"
@@ -184,6 +187,9 @@ Boards: 
- AM57XX SBC-AM57x

  compatible = "compulab,sbc-am57x", "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"



- AM5748 IDK

  compatible = "ti,am5748-idk", "ti,am5748", "ti,dra762", "ti,dra7";



- AM5728 IDK

  compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"

arch/arm/boot/dts/am43x-epos-evm.dts

+11 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 
		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&matrix_keypad_default>;

		pinctrl-1 = <&matrix_keypad_sleep>;

		wakeup-source;



		row-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH		/* Bank0, pin12 */

			     &gpio0 13 GPIO_ACTIVE_HIGH		/* Bank0, pin13 */
@@ -620,6 +621,12 @@ 
			regulator-name = "vdcdc3";

			regulator-boot-on;

			regulator-always-on;

			regulator-state-mem {

				regulator-on-in-suspend;

			};

			regulator-state-disk {

				regulator-off-in-suspend;

			};

		};



		dcdc4: regulator-dcdc4 {
@@ -634,12 +641,16 @@ 
			regulator-name = "v1_0bat";

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

			regulator-boot-on;

			regulator-always-on;

		};



		dcdc6: regulator-dcdc6 {

			regulator-name = "v1_8bat";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-boot-on;

			regulator-always-on;

		};



		ldo1: regulator-ldo1 {

arch/arm/boot/dts/am5718.dtsi

0 → 100644
+32 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/

 */



#include "dra72x.dtsi"



/ {

	compatible = "ti,am5718", "ti,dra7";

};



/*

 * These modules are not present on AM5718

 *

 * ATL

 * VCP1, VCP2

 * MLB

 * ISS

 * USB3, USB4

 */



&usb3_tm {

	status = "disabled";

};



&usb4_tm {

	status = "disabled";

};



&atl_tm {

	status = "disabled";

};

arch/arm/boot/dts/am571x-idk.dts

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 */

/dts-v1/;



#include "dra72x.dtsi"

#include "am5718.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include "dra7-mmc-iodelay.dtsi"

arch/arm/boot/dts/am5728.dtsi

0 → 100644
+33 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/

 */



#include "dra74x.dtsi"



/ {

	compatible = "ti,am5728", "ti,dra7";

};



/*

 * These modules are not present on AM5728

 *

 * EVE1, EVE2

 * ATL

 * VCP1, VCP2

 * MLB

 * ISS

 * USB3, USB4

 */



&usb3_tm {

	status = "disabled";

};



&usb4_tm {

	status = "disabled";

};



&atl_tm {

	status = "disabled";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE