Skip to contentSkip to conversation

AM57xx: Fix bugs in device tree files

PATCH In review Kishon Vijay Abraham I 2 participants 5 messages Dec 17, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover AM57xx: Fix bugs in device tree files

This series
*) Removes gpio property from endpoint device tree node (since it's
used for driving PERST# line)
*) Fix gpio used for driving PERST# line in AM571x IDK *) Model 5V0 regulator which is used for deriving the regulator
connected to COMQ port in beagle x15

Kishon Vijay Abraham I (3):
ARM: dts: am57xx-beagle-x15/am57xx-idk: Remove "gpios" for endpoint
dt nodes
ARM: dts: am571x-idk: Fix gpios property to have the correct gpio
number
ARM: dts: beagle-x15-common: Model 5V0 regulator

 arch/arm/boot/dts/am571x-idk.dts              |  6 +----
 arch/arm/boot/dts/am572x-idk-common.dtsi      |  4 ---
 .../boot/dts/am57xx-beagle-x15-common.dtsi    | 25 ++++++++++++++++---
 3 files changed, 22 insertions(+), 13 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 ARM: dts: am57xx-beagle-x15/am57xx-idk: Remove "gpios" for endpoint dt nodes

PERST# line in the PCIE connector is driven by the host mode and not EP mode. The gpios property here is used for driving the PERST# line. Remove gpios property from all endpoint device tree nodes.

---
 arch/arm/boot/dts/am571x-idk.dts                | 4 ----
 arch/arm/boot/dts/am572x-idk-common.dtsi        | 4 ----
 arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 4 ----
 3 files changed, 12 deletions(-)
arch/arm/boot/dts/am571x-idk.dts +0 -4
index 820ce3b60bb6..67239f7c22b8 100644
@@ -170,10 +170,6 @@
 	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
 };
 
-&pcie1_ep {
-	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
-};
-
 &mmc1 {
 	pinctrl-names = "default", "hs";
 	pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;
arch/arm/boot/dts/am572x-idk-common.dtsi +0 -4
index a064f13b3880..ddf123620e96 100644
@@ -147,10 +147,6 @@
 	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
 };
 
-&pcie1_ep {
-	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
-};
-
 &mailbox5 {
 	status = "okay";
 	mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +0 -4
index bc76f1705c0f..9a94c96b0350 100644
@@ -547,10 +547,6 @@
 	gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
 };
 
-&pcie1_ep {
-	gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
-};
-
 &mcasp3 {
 	#sound-dai-cells = <0>;
 	assigned-clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/3 ARM: dts: am571x-idk: Fix gpios property to have the correct gpio number

In reply to Kishon Vijay Abraham I

commit d23f3839fe97d8dce03d ("ARM: dts: DRA7: Add pcie1 dt node for EP mode") while adding the dt node for EP mode for DRA7 platform, added rc node for am571x-idk and populated gpios property with "gpio3 23". However the GPIO_PCIE_SWRST line is actually connected to "gpio5 18". Fix it here. (The patch adding "gpio3 23" was tested with another am57x board in EP mode which doesn't rely on reset from host).

Fixes d23f3839fe97d8dce03d ("ARM: dts: DRA7: Add pcie1 dt node for

EP mode")
Cc: stable <[email protected]> # 4.14+

---
 arch/arm/boot/dts/am571x-idk.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/am571x-idk.dts +1 -1
index 67239f7c22b8..669559c9c95b 100644
@@ -167,7 +167,7 @@
 
 &pcie1_rc {
 	status = "okay";
-	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
+	gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>;
 };
 
 &mmc1 {
Signature · 1 line
2.17.1
#3 lore raw

PATCH 3/3 ARM: dts: beagle-x15-common: Model 5V0 regulator

In reply to Kishon Vijay Abraham I

On am57xx-beagle-x15, 5V0 is connected to P16, P17, P18 and P19 connectors. On am57xx-evm, 5V0 regulator is used to get 3V6 regulator which is connected to the COMQ port. Model 5V0 regulator here in order for it to be used in am57xx-evm to model 3V6 regulator.

---
 .../boot/dts/am57xx-beagle-x15-common.dtsi    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +21 -0
index 9a94c96b0350..a813a0cf3ff3 100644
@@ -29,6 +29,27 @@
 		reg = <0x0 0x80000000 0x0 0x80000000>;
 	};
 
+	main_12v0: fixedregulator-main_12v0 {
+		/* main supply */
+		compatible = "regulator-fixed";
+		regulator-name = "main_12v0";
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	evm_5v0: fixedregulator-evm_5v0 {
+		/* Output of TPS54531D */
+		compatible = "regulator-fixed";
+		regulator-name = "evm_5v0";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&main_12v0>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
 	vdd_3v3: fixedregulator-vdd_3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "vdd_3v3";
Signature · 1 line
2.17.1
#4 lore raw
In reply to Kishon Vijay Abraham I
Quoted 6 lines · Kishon Vijay Abraham I

This series
*) Removes gpio property from endpoint device tree node (since it's
used for driving PERST# line)
*) Fix gpio used for driving PERST# line in AM571x IDK *) Model 5V0 regulator which is used for deriving the regulator
connected to COMQ port in beagle x15

Thanks applying all into fixes.

Tony