redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAly0pfQRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXNM3BAAvrQsjq1NTq6k7L5yZuInYtP+L7isRTz3
 M7AWpMOjXex+a3GoZ8a8qrRVc6IqohAid75y8Y1qDvFVi9QEMrCsYlRwlYl048UM
 o5Ry4CePIY9XvUurRIemisT5/RQ4jzz9BBPogIJeQHl9r4qKbZEzTllmHnE7D78i
 Eh52IHQKScyO5MmUxZErH2f2StPHINjvO5WeuUUGcDcg7pcRlnbgLDtx26deewbl
 qMCh/3u71vd0g1JyEScOSq/QkeASpDx0sJifCLeWOmRZyarQGg5SduxVnQ6OJo8U
 xqiQ5dNYEn4BASOZ6BFGmSyqjvQWgmA0RnxkGB9nYPk9s9Lafq+gWgFNrI99Eavm
 BERMXlsrOJ/y5STjx+wmZ/IEeUceNqHK44xr8hcYweiu1Duv8+lfRRLLOdj2besh
 SPYsomoqY1yQKvr3k7YcuCddsFQZ9RtcaLVjlJmNlDE078jI1f/v9ZLXY8K8ZF3G
 gm07S/HtuX7xWM/fRveXrP2YQ+OREoyo5cTeDAyZmk/bY3sqVwgRuicgXAqu0Zdg
 AJQCnNda4UAIohtC98RHS1MB5BuwTyv431iAsxaAvK2cAR8NnV3qr5AmBbgP1iMP
 /oLeXA6OpfT+JHk/tGQ0TG9LrqNqW9DyZZOqfXCGYTiRJd06qUxvPIZOsUQFnJho
 jIsDaa4YQjc=
 =uc0c
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
hifive-unleashed-5.2
Olof Johansson 2019-04-28 12:32:38 -07:00
parent 1c3a454083 bcbb63b802
commit 6d918e0933
13 changed files with 128 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/devicetree/bindings/arm/omap/omap.txt
View File

@ -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"

11
arch/arm/boot/dts/am43x-epos-evm.dts
View File

@ -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 {

32
arch/arm/boot/dts/am5718.dtsi 100644
View File

@ -0,0 +1,32 @@
// 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";
};

2
arch/arm/boot/dts/am571x-idk.dts
View File

@ -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"

33
arch/arm/boot/dts/am5728.dtsi 100644
View File

@ -0,0 +1,33 @@
// 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";
};

5
arch/arm/boot/dts/am572x-idk.dts
View File

@ -8,15 +8,14 @@
/dts-v1/;
#include "dra74x.dtsi"
#include "am5728.dtsi"
#include "dra7-mmc-iodelay.dtsi"
#include "dra74x-mmc-iodelay.dtsi"
#include "am572x-idk-common.dtsi"
/ {
model = "TI AM5728 IDK";
compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74",
"ti,dra7";
compatible = "ti,am5728-idk", "ti,am5728", "ti,dra7";
};
&mmc1 {

33
arch/arm/boot/dts/am5748.dtsi 100644
View File

@ -0,0 +1,33 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
*/
#include "dra76x.dtsi"
/ {
compatible = "ti,am5748", "ti,dra762", "ti,dra7";
};
/*
* These modules are not present on AM5748
*
* EVE1, EVE2
* ATL
* VCP1, VCP2
* MLB
* ISS
* USB3, USB4
*/
&usb3_tm {
status = "disabled";
};
&usb4_tm {
status = "disabled";
};
&atl_tm {
status = "disabled";
};

4
arch/arm/boot/dts/am574x-idk.dts
View File

@ -6,14 +6,14 @@
/dts-v1/;
#include "dra76x.dtsi"
#include "am5748.dtsi"
#include "dra7-mmc-iodelay.dtsi"
#include "dra76x-mmc-iodelay.dtsi"
#include "am572x-idk-common.dtsi"
/ {
model = "TI AM5748 IDK";
compatible = "ti,am5728-idk", "ti,dra762", "ti,dra7";
compatible = "ti,am5748-idk", "ti,am5748", "ti,dra762", "ti,dra7";
};
&qspi {

2
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
View File

@ -7,7 +7,7 @@
*/
/dts-v1/;
#include "dra74x.dtsi"
#include "am5728.dtsi"
#include "am57xx-commercial-grade.dtsi"
#include "dra74x-mmc-iodelay.dtsi"
#include <dt-bindings/gpio/gpio.h>

2
arch/arm/boot/dts/am57xx-cl-som-am57x.dts
View File

@ -13,7 +13,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include "dra74x.dtsi"
#include "am5728.dtsi"
/ {
model = "CompuLab CL-SOM-AM57x";

6
arch/arm/boot/dts/dra7-l4.dtsi
View File

@ -2499,7 +2499,7 @@
ranges = <0x0 0x3a000 0x1000>;
};
target-module@3c000 { /* 0x4843c000, ap 23 08.0 */
atl_tm: target-module@3c000 { /* 0x4843c000, ap 23 08.0 */
compatible = "ti,sysc-omap4", "ti,sysc";
reg = <0x3c000 0x4>;
reg-names = "rev";
@ -4099,7 +4099,7 @@
};
};
target-module@100000 { /* 0x48900000, ap 85 04.0 */
usb3_tm: target-module@100000 { /* 0x48900000, ap 85 04.0 */
compatible = "ti,sysc-omap4", "ti,sysc";
ti,hwmods = "usb_otg_ss3";
reg = <0x100000 0x4>,
@ -4148,7 +4148,7 @@
};
};
target-module@140000 { /* 0x48940000, ap 75 3c.0 */
usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */
compatible = "ti,sysc-omap4", "ti,sysc";
ti,hwmods = "usb_otg_ss4";
reg = <0x140000 0x4>,

2
arch/arm/boot/dts/dra7.dtsi
View File

@ -193,6 +193,7 @@
ti,hwmods = "pcie1";
phys = <&pcie1_phy>;
phy-names = "pcie-phy0";
ti,syscon-lane-sel = <&scm_conf_pcie 0x18>;
interrupt-map-mask = <0 0 0 7>;
interrupt-map = <0 0 0 1 &pcie1_intc 1>,
<0 0 0 2 &pcie1_intc 2>,
@ -218,6 +219,7 @@
phys = <&pcie1_phy>;
phy-names = "pcie-phy0";
ti,syscon-unaligned-access = <&scm_conf1 0x14 1>;
ti,syscon-lane-sel = <&scm_conf_pcie 0x18>;
status = "disabled";
};
};

2
arch/arm/boot/dts/omap2420-n810.dts
View File

@ -48,7 +48,7 @@
pinctrl-names = "default";
pinctrl-0 = <&aic33_pins>;
gpio-reset = <&gpio4 22 GPIO_ACTIVE_LOW>; /* gpio118 */
reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; /* gpio118 */
ai3x-gpio-func = <
10 /* AIC3X_GPIO1_FUNC_DIGITAL_MIC_MODCLK */