* [PATCH 0/3] AM57xx: Fix bugs in device tree files
@ 2019-12-17 8:51 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2019-12-17 8:51 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren
Cc: Rob Herring, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-omap
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(-)
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/3] ARM: dts: am57xx-beagle-x15/am57xx-idk: Remove "gpios" for endpoint dt nodes
2019-12-17 8:51 ` Kishon Vijay Abraham I
@ 2019-12-17 8:51 ` Kishon Vijay Abraham I
-1 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2019-12-17 8:51 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren
Cc: Rob Herring, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-omap
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.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
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(-)
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index 820ce3b60bb6..67239f7c22b8 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -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>;
diff --git a/arch/arm/boot/dts/am572x-idk-common.dtsi b/arch/arm/boot/dts/am572x-idk-common.dtsi
index a064f13b3880..ddf123620e96 100644
--- a/arch/arm/boot/dts/am572x-idk-common.dtsi
+++ b/arch/arm/boot/dts/am572x-idk-common.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index bc76f1705c0f..9a94c96b0350 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -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>;
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 1/3] ARM: dts: am57xx-beagle-x15/am57xx-idk: Remove "gpios" for endpoint dt nodes
@ 2019-12-17 8:51 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2019-12-17 8:51 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren
Cc: Rob Herring, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-omap
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.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
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(-)
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index 820ce3b60bb6..67239f7c22b8 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -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>;
diff --git a/arch/arm/boot/dts/am572x-idk-common.dtsi b/arch/arm/boot/dts/am572x-idk-common.dtsi
index a064f13b3880..ddf123620e96 100644
--- a/arch/arm/boot/dts/am572x-idk-common.dtsi
+++ b/arch/arm/boot/dts/am572x-idk-common.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index bc76f1705c0f..9a94c96b0350 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -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>;
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] ARM: dts: am571x-idk: Fix gpios property to have the correct gpio number
2019-12-17 8:51 ` Kishon Vijay Abraham I
@ 2019-12-17 8:51 ` Kishon Vijay Abraham I
-1 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2019-12-17 8:51 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren
Cc: Rob Herring, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-omap, stable
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 <stable@vger.kernel.org> # 4.14+
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/am571x-idk.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index 67239f7c22b8..669559c9c95b 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -167,7 +167,7 @@
&pcie1_rc {
status = "okay";
- gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>;
};
&mmc1 {
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/3] ARM: dts: am571x-idk: Fix gpios property to have the correct gpio number
@ 2019-12-17 8:51 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2019-12-17 8:51 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren
Cc: Rob Herring, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-omap, stable
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 <stable@vger.kernel.org> # 4.14+
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/am571x-idk.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index 67239f7c22b8..669559c9c95b 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -167,7 +167,7 @@
&pcie1_rc {
status = "okay";
- gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>;
};
&mmc1 {
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] ARM: dts: beagle-x15-common: Model 5V0 regulator
2019-12-17 8:51 ` Kishon Vijay Abraham I
@ 2019-12-17 8:51 ` Kishon Vijay Abraham I
-1 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2019-12-17 8:51 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren
Cc: Rob Herring, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-omap
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.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
.../boot/dts/am57xx-beagle-x15-common.dtsi | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index 9a94c96b0350..a813a0cf3ff3 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -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";
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/3] ARM: dts: beagle-x15-common: Model 5V0 regulator
@ 2019-12-17 8:51 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2019-12-17 8:51 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren
Cc: Rob Herring, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-omap
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.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
.../boot/dts/am57xx-beagle-x15-common.dtsi | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index 9a94c96b0350..a813a0cf3ff3 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -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";
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] AM57xx: Fix bugs in device tree files
2019-12-17 8:51 ` Kishon Vijay Abraham I
` (3 preceding siblings ...)
(?)
@ 2019-12-17 18:23 ` Tony Lindgren
-1 siblings, 0 replies; 9+ messages in thread
From: Tony Lindgren @ 2019-12-17 18:23 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: Benoît Cousson, Rob Herring, devicetree, linux-kernel,
linux-omap
* Kishon Vijay Abraham I <kishon@ti.com> [191217 00:50]:
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread