118 lines
3.3 KiB
Diff
118 lines
3.3 KiB
Diff
From 5648392b05ff7bb1f513ad9e9eb27b5420ce745d Mon Sep 17 00:00:00 2001
|
|
From: christophe montaud <christophe.montaud@st.com>
|
|
Date: Mon, 14 Jan 2019 17:19:51 +0100
|
|
Subject: [PATCH 54/55] ARM stm32mp1 r0 rc4 hotfix-w903.1 DEVICETREE
|
|
|
|
---
|
|
arch/arm/boot/dts/stm32mp157a-dk1.dts | 13 +++++++++++++
|
|
arch/arm/boot/dts/stm32mp157c-dk2.dts | 1 +
|
|
arch/arm/boot/dts/stm32mp157c.dtsi | 14 ++++++++++++++
|
|
3 files changed, 28 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/stm32mp157a-dk1.dts b/arch/arm/boot/dts/stm32mp157a-dk1.dts
|
|
index 7e911f3..28017e4 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157a-dk1.dts
|
|
+++ b/arch/arm/boot/dts/stm32mp157a-dk1.dts
|
|
@@ -287,6 +287,19 @@
|
|
/delete-property/dmas;
|
|
/delete-property/dma-names;
|
|
|
|
+ typec: stusb1600@28 {
|
|
+ compatible = "st,stusb1600";
|
|
+ reg = <0x28>;
|
|
+ status = "okay";
|
|
+
|
|
+ typec_con: connector {
|
|
+ compatible = "usb-c-connector";
|
|
+ label = "USB-C";
|
|
+ power-role = "sink";
|
|
+ power-opmode = "default";
|
|
+ };
|
|
+ };
|
|
+
|
|
pmic: stpmic@33 {
|
|
compatible = "st,stpmic1";
|
|
reg = <0x33>;
|
|
diff --git a/arch/arm/boot/dts/stm32mp157c-dk2.dts b/arch/arm/boot/dts/stm32mp157c-dk2.dts
|
|
index c276c59..340e022 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157c-dk2.dts
|
|
+++ b/arch/arm/boot/dts/stm32mp157c-dk2.dts
|
|
@@ -106,6 +106,7 @@
|
|
|
|
/* Wifi */
|
|
&sdmmc2 {
|
|
+ arm,primecell-periphid = <0x10153180>;
|
|
pinctrl-names = "default", "opendrain", "sleep";
|
|
pinctrl-0 = <&sdmmc2_b4_pins_a>;
|
|
pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
|
|
diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi
|
|
index 4de499e..b09ef8b 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157c.dtsi
|
|
+++ b/arch/arm/boot/dts/stm32mp157c.dtsi
|
|
@@ -892,6 +892,8 @@
|
|
|
|
compatible = "st,stm32-sai-sub-a";
|
|
reg = <0x4 0x1c>;
|
|
+ clocks = <&rcc SAI1_K>;
|
|
+ clock-names = "sai_ck";
|
|
dmas = <&dmamux1 87 0x400 0x01>;
|
|
status = "disabled";
|
|
};
|
|
@@ -900,6 +902,8 @@
|
|
#sound-dai-cells = <0>;
|
|
compatible = "st,stm32-sai-sub-b";
|
|
reg = <0x24 0x1c>;
|
|
+ clocks = <&rcc SAI1_K>;
|
|
+ clock-names = "sai_ck";
|
|
dmas = <&dmamux1 88 0x400 0x01>;
|
|
status = "disabled";
|
|
};
|
|
@@ -919,6 +923,8 @@
|
|
#sound-dai-cells = <0>;
|
|
compatible = "st,stm32-sai-sub-a";
|
|
reg = <0x4 0x1c>;
|
|
+ clocks = <&rcc SAI2_K>;
|
|
+ clock-names = "sai_ck";
|
|
dmas = <&dmamux1 89 0x400 0x01>;
|
|
status = "disabled";
|
|
};
|
|
@@ -927,6 +933,8 @@
|
|
#sound-dai-cells = <0>;
|
|
compatible = "st,stm32-sai-sub-b";
|
|
reg = <0x24 0x1c>;
|
|
+ clocks = <&rcc SAI2_K>;
|
|
+ clock-names = "sai_ck";
|
|
dmas = <&dmamux1 90 0x400 0x01>;
|
|
status = "disabled";
|
|
};
|
|
@@ -946,6 +954,8 @@
|
|
#sound-dai-cells = <0>;
|
|
compatible = "st,stm32-sai-sub-a";
|
|
reg = <0x04 0x1c>;
|
|
+ clocks = <&rcc SAI3_K>;
|
|
+ clock-names = "sai_ck";
|
|
dmas = <&dmamux1 113 0x400 0x01>;
|
|
status = "disabled";
|
|
};
|
|
@@ -954,6 +964,8 @@
|
|
#sound-dai-cells = <0>;
|
|
compatible = "st,stm32-sai-sub-b";
|
|
reg = <0x24 0x1c>;
|
|
+ clocks = <&rcc SAI3_K>;
|
|
+ clock-names = "sai_ck";
|
|
dmas = <&dmamux1 114 0x400 0x01>;
|
|
status = "disabled";
|
|
};
|
|
@@ -1442,6 +1454,8 @@
|
|
#sound-dai-cells = <0>;
|
|
compatible = "st,stm32-sai-sub-b";
|
|
reg = <0x24 0x1c>;
|
|
+ clocks = <&rcc SAI4_K>;
|
|
+ clock-names = "sai_ck";
|
|
dmas = <&dmamux1 100 0x400 0x01>;
|
|
status = "disabled";
|
|
};
|
|
--
|
|
2.7.4
|
|
|