187 lines
5.9 KiB
Diff
187 lines
5.9 KiB
Diff
From 56b9c52ec61df693bd997e3ef1465230a6cb1834 Mon Sep 17 00:00:00 2001
|
|
From: christophe montaud <christophe.montaud@st.com>
|
|
Date: Thu, 24 Jan 2019 10:52:11 +0100
|
|
Subject: [PATCH 60/60] ARM stm32mp1 r0 rc4 hotfix w904.3 DEVICETREE
|
|
|
|
---
|
|
arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 43 +++++++++++++++++++++++++++++++
|
|
arch/arm/boot/dts/stm32mp157a-dk1.dts | 2 +-
|
|
arch/arm/boot/dts/stm32mp157c-dk2.dts | 4 +--
|
|
arch/arm/boot/dts/stm32mp157c-ed1.dts | 2 +-
|
|
arch/arm/boot/dts/stm32mp157c.dtsi | 22 +++++++---------
|
|
5 files changed, 57 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
|
|
index 474e7e3..6e4e5c9 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
|
|
+++ b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
|
|
@@ -1249,6 +1249,49 @@
|
|
};
|
|
};
|
|
|
|
+ sdmmc2_b4_pins_b: sdmmc2-b4-1 {
|
|
+ pins1 {
|
|
+ pinmux = <STM32_PINMUX('B', 14, AF9)>, /* SDMMC2_D0 */
|
|
+ <STM32_PINMUX('B', 15, AF9)>, /* SDMMC2_D1 */
|
|
+ <STM32_PINMUX('B', 3, AF9)>, /* SDMMC2_D2 */
|
|
+ <STM32_PINMUX('B', 4, AF9)>, /* SDMMC2_D3 */
|
|
+ <STM32_PINMUX('G', 6, AF10)>; /* SDMMC2_CMD */
|
|
+ slew-rate = <1>;
|
|
+ drive-push-pull;
|
|
+ bias-disable;
|
|
+ };
|
|
+ pins2 {
|
|
+ pinmux = <STM32_PINMUX('E', 3, AF9)>; /* SDMMC2_CK */
|
|
+ slew-rate = <2>;
|
|
+ drive-push-pull;
|
|
+ bias-disable;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ sdmmc2_b4_od_pins_b: sdmmc2-b4-od-1 {
|
|
+ pins1 {
|
|
+ pinmux = <STM32_PINMUX('B', 14, AF9)>, /* SDMMC2_D0 */
|
|
+ <STM32_PINMUX('B', 15, AF9)>, /* SDMMC2_D1 */
|
|
+ <STM32_PINMUX('B', 3, AF9)>, /* SDMMC2_D2 */
|
|
+ <STM32_PINMUX('B', 4, AF9)>; /* SDMMC2_D3 */
|
|
+ slew-rate = <1>;
|
|
+ drive-push-pull;
|
|
+ bias-disable;
|
|
+ };
|
|
+ pins2 {
|
|
+ pinmux = <STM32_PINMUX('E', 3, AF9)>; /* SDMMC2_CK */
|
|
+ slew-rate = <2>;
|
|
+ drive-push-pull;
|
|
+ bias-disable;
|
|
+ };
|
|
+ pins3 {
|
|
+ pinmux = <STM32_PINMUX('G', 6, AF10)>; /* SDMMC2_CMD */
|
|
+ slew-rate = <1>;
|
|
+ drive-open-drain;
|
|
+ bias-disable;
|
|
+ };
|
|
+ };
|
|
+
|
|
sdmmc2_d47_pins_a: sdmmc2-d47-0 {
|
|
pins {
|
|
pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
|
|
diff --git a/arch/arm/boot/dts/stm32mp157a-dk1.dts b/arch/arm/boot/dts/stm32mp157a-dk1.dts
|
|
index 467c226..e3a36d3 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157a-dk1.dts
|
|
+++ b/arch/arm/boot/dts/stm32mp157a-dk1.dts
|
|
@@ -325,7 +325,7 @@
|
|
|
|
vddcore: buck1 {
|
|
regulator-name = "vddcore";
|
|
- regulator-min-microvolt = <800000>;
|
|
+ regulator-min-microvolt = <1200000>;
|
|
regulator-max-microvolt = <1350000>;
|
|
regulator-always-on;
|
|
regulator-initial-mode = <0>;
|
|
diff --git a/arch/arm/boot/dts/stm32mp157c-dk2.dts b/arch/arm/boot/dts/stm32mp157c-dk2.dts
|
|
index 4da15cd..20a86f1 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157c-dk2.dts
|
|
+++ b/arch/arm/boot/dts/stm32mp157c-dk2.dts
|
|
@@ -108,8 +108,8 @@
|
|
&sdmmc2 {
|
|
arm,primecell-periphid = <0x10153180>;
|
|
pinctrl-names = "default", "opendrain", "sleep";
|
|
- pinctrl-0 = <&sdmmc2_b4_pins_a>;
|
|
- pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
|
|
+ pinctrl-0 = <&sdmmc2_b4_pins_b>;
|
|
+ pinctrl-1 = <&sdmmc2_b4_od_pins_b>;
|
|
pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>;
|
|
non-removable;
|
|
st,neg-edge;
|
|
diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
|
|
index 6d49f21..780c992 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
|
|
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
|
|
@@ -203,7 +203,7 @@
|
|
|
|
vddcore: buck1 {
|
|
regulator-name = "vddcore";
|
|
- regulator-min-microvolt = <800000>;
|
|
+ regulator-min-microvolt = <1200000>;
|
|
regulator-max-microvolt = <1350000>;
|
|
regulator-always-on;
|
|
regulator-initial-mode = <0>;
|
|
diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi
|
|
index b09ef8b..694e6e0 100644
|
|
--- a/arch/arm/boot/dts/stm32mp157c.dtsi
|
|
+++ b/arch/arm/boot/dts/stm32mp157c.dtsi
|
|
@@ -430,8 +430,8 @@
|
|
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&rcc SPI2_K>;
|
|
resets = <&rcc SPI2_R>;
|
|
- dmas = <&dmamux1 39 0x400 0x05>,
|
|
- <&dmamux1 40 0x400 0x05>;
|
|
+ dmas = <&dmamux1 39 0x400 0x01>,
|
|
+ <&dmamux1 40 0x400 0x01>;
|
|
dma-names = "rx", "tx";
|
|
power-domains = <&pd_core>;
|
|
status = "disabled";
|
|
@@ -456,8 +456,8 @@
|
|
interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&rcc SPI3_K>;
|
|
resets = <&rcc SPI3_R>;
|
|
- dmas = <&dmamux1 61 0x400 0x05>,
|
|
- <&dmamux1 62 0x400 0x05>;
|
|
+ dmas = <&dmamux1 61 0x400 0x01>,
|
|
+ <&dmamux1 62 0x400 0x01>;
|
|
dma-names = "rx", "tx";
|
|
power-domains = <&pd_core>;
|
|
status = "disabled";
|
|
@@ -756,8 +756,8 @@
|
|
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&rcc SPI1_K>;
|
|
resets = <&rcc SPI1_R>;
|
|
- dmas = <&dmamux1 37 0x400 0x05>,
|
|
- <&dmamux1 38 0x400 0x05>;
|
|
+ dmas = <&dmamux1 37 0x400 0x01>,
|
|
+ <&dmamux1 38 0x400 0x01>;
|
|
dma-names = "rx", "tx";
|
|
power-domains = <&pd_core>;
|
|
status = "disabled";
|
|
@@ -782,8 +782,8 @@
|
|
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&rcc SPI4_K>;
|
|
resets = <&rcc SPI4_R>;
|
|
- dmas = <&dmamux1 83 0x400 0x05>,
|
|
- <&dmamux1 84 0x400 0x05>;
|
|
+ dmas = <&dmamux1 83 0x400 0x01>,
|
|
+ <&dmamux1 84 0x400 0x01>;
|
|
dma-names = "rx", "tx";
|
|
power-domains = <&pd_core>;
|
|
status = "disabled";
|
|
@@ -870,8 +870,8 @@
|
|
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&rcc SPI5_K>;
|
|
resets = <&rcc SPI5_R>;
|
|
- dmas = <&dmamux1 85 0x400 0x05>,
|
|
- <&dmamux1 86 0x400 0x05>;
|
|
+ dmas = <&dmamux1 85 0x400 0x01>,
|
|
+ <&dmamux1 86 0x400 0x01>;
|
|
dma-names = "rx", "tx";
|
|
power-domains = <&pd_core>;
|
|
status = "disabled";
|
|
@@ -1770,7 +1770,6 @@
|
|
clocks = <&rcc USBH>;
|
|
resets = <&rcc USBH_R>;
|
|
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
|
|
- power-domains = <&pd_core>;
|
|
status = "disabled";
|
|
};
|
|
|
|
@@ -1781,7 +1780,6 @@
|
|
resets = <&rcc USBH_R>;
|
|
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
|
|
companion = <&usbh_ohci>;
|
|
- power-domains = <&pd_core>;
|
|
status = "disabled";
|
|
};
|
|
|
|
--
|
|
2.7.4
|
|
|