120 lines
3.3 KiB
Diff
120 lines
3.3 KiB
Diff
From f30f869d9bb396c6981fc2800149c373d21586de Mon Sep 17 00:00:00 2001
|
|
From: christophe montaud <christophe.montaud@st.com>
|
|
Date: Wed, 16 Jan 2019 17:52:31 +0100
|
|
Subject: [PATCH 57/58] ARM stm32mp1 r0 rc4 hotfix w903.3 DEVICETREE
|
|
|
|
---
|
|
arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 30 ++++++++++++++++++++++++++++++
|
|
arch/arm/boot/dts/stm32mp157a-dk1.dts | 12 +++++++++++-
|
|
arch/arm/boot/dts/stm32mp157c-dk2.dts | 2 +-
|
|
arch/arm/boot/dts/stm32mp157c-ed1.dts | 2 +-
|
|
4 files changed, 43 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
|
|
index 183d7ba..474e7e3 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
|
|
+++ b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
|
|
@@ -1413,6 +1413,36 @@
|
|
};
|
|
};
|
|
|
|
+ uart7_pins_a: uart7-0 {
|
|
+ pins1 {
|
|
+ pinmux = <STM32_PINMUX('E', 8, AF7)>; /* USART7_TX */
|
|
+ bias-disable;
|
|
+ drive-push-pull;
|
|
+ slew-rate = <0>;
|
|
+ };
|
|
+ pins2 {
|
|
+ pinmux = <STM32_PINMUX('E', 7, AF7)>; /* USART7_RX */
|
|
+ bias-disable;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ uart7_idle_pins_a: uart7-idle-0 {
|
|
+ pins1 {
|
|
+ pinmux = <STM32_PINMUX('E', 8, ANALOG)>; /* USART7_TX */
|
|
+ };
|
|
+ pins2 {
|
|
+ pinmux = <STM32_PINMUX('E', 7, AF7)>; /* USART7_RX */
|
|
+ bias-disable;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ uart7_sleep_pins_a: uart7-sleep-0 {
|
|
+ pins {
|
|
+ pinmux = <STM32_PINMUX('E', 8, ANALOG)>, /* USART7_TX */
|
|
+ <STM32_PINMUX('E', 7, ANALOG)>; /* USART7_RX */
|
|
+ };
|
|
+ };
|
|
+
|
|
usart2_pins_a: usart2-0 {
|
|
pins1 {
|
|
pinmux = <STM32_PINMUX('D', 5, AF7)>, /* USART2_TX */
|
|
diff --git a/arch/arm/boot/dts/stm32mp157a-dk1.dts b/arch/arm/boot/dts/stm32mp157a-dk1.dts
|
|
index 28017e4..467c226 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157a-dk1.dts
|
|
+++ b/arch/arm/boot/dts/stm32mp157a-dk1.dts
|
|
@@ -20,6 +20,8 @@
|
|
aliases {
|
|
ethernet0 = ðernet0;
|
|
serial0 = &uart4;
|
|
+ serial1 = &usart3;
|
|
+ serial2 = &uart7;
|
|
};
|
|
|
|
chosen {
|
|
@@ -310,7 +312,7 @@
|
|
|
|
st,main-control-register = <0x04>;
|
|
st,vin-control-register = <0xc0>;
|
|
- st,usb-control-register = <0x30>;
|
|
+ st,usb-control-register = <0x20>;
|
|
|
|
regulators {
|
|
compatible = "st,stpmic1-regulators";
|
|
@@ -671,6 +673,14 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&uart7 {
|
|
+ pinctrl-names = "default", "sleep", "idle";
|
|
+ pinctrl-0 = <&uart7_pins_a>;
|
|
+ pinctrl-1 = <&uart7_sleep_pins_a>;
|
|
+ pinctrl-2 = <&uart7_idle_pins_a>;
|
|
+ status = "disabled";
|
|
+};
|
|
+
|
|
&usart3 {
|
|
pinctrl-names = "default", "sleep", "idle";
|
|
pinctrl-0 = <&usart3_pins_b>;
|
|
diff --git a/arch/arm/boot/dts/stm32mp157c-dk2.dts b/arch/arm/boot/dts/stm32mp157c-dk2.dts
|
|
index 340e022..4da15cd 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157c-dk2.dts
|
|
+++ b/arch/arm/boot/dts/stm32mp157c-dk2.dts
|
|
@@ -14,7 +14,7 @@
|
|
compatible = "st,stm32mp157c-dk2", "st,stm32mp157";
|
|
|
|
aliases {
|
|
- serial1 = &usart2;
|
|
+ serial3 = &usart2;
|
|
};
|
|
|
|
wifi_pwrseq: wifi-pwrseq {
|
|
diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
|
|
index cf2750e..6d49f21 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
|
|
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
|
|
@@ -188,7 +188,7 @@
|
|
|
|
st,main-control-register = <0x04>;
|
|
st,vin-control-register = <0xc0>;
|
|
- st,usb-control-register = <0x30>;
|
|
+ st,usb-control-register = <0x20>;
|
|
|
|
regulators {
|
|
compatible = "st,stpmic1-regulators";
|
|
--
|
|
2.7.4
|
|
|