Browse Source

Merge tag 'stm32-dt-for-v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/dt

STM32 DT updates for v4.20, round 1

Highlights:
----------

 - MCU platforms update:
  - Add missing clock node's lobel on stm32f429
  - Remove cd-inverted property for sdio nodes for all mcus
  - Fix stm32h7 rtc binding

 - MPU STM32MP157 platform update:
  - Enable display: CEC and DSI
  - Fix SPI node name to match with the new DTC

* tag 'stm32-dt-for-v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: Fix SPI controller node names
  ARM: dts: stm32: enable display on stm32mp157c-ev1 board
  ARM: dts: stm32: update rtc st,syscfg property on stm32h743
  ARM: dts: stm32: Remove cd-inverted property for stm32f746-disco
  ARM: dts: stm32: Remove cd-inverted property for stm32f769-disco
  ARM: dts: stm32: Remove cd-inverted property for stm32f469-disco
  ARM: dts: stm32: Remove cd-inverted property for stm32429i-eval
  ARM: dts: stm32: Add clk-lse node's label on stm32f429

Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson 6 years ago
parent
commit
45351fa32d

+ 1 - 2
arch/arm/boot/dts/stm32429i-eval.dts

@@ -264,8 +264,7 @@
 &sdio {
 &sdio {
 	status = "okay";
 	status = "okay";
 	vmmc-supply = <&mmc_vcard>;
 	vmmc-supply = <&mmc_vcard>;
-	cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_HIGH>;
-	cd-inverted;
+	cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_LOW>;
 	pinctrl-names = "default", "opendrain";
 	pinctrl-names = "default", "opendrain";
 	pinctrl-0 = <&sdio_pins>;
 	pinctrl-0 = <&sdio_pins>;
 	pinctrl-1 = <&sdio_pins_od>;
 	pinctrl-1 = <&sdio_pins_od>;

+ 1 - 1
arch/arm/boot/dts/stm32f429.dtsi

@@ -58,7 +58,7 @@
 			clock-frequency = <0>;
 			clock-frequency = <0>;
 		};
 		};
 
 
-		clk-lse {
+		clk_lse: clk-lse {
 			#clock-cells = <0>;
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			compatible = "fixed-clock";
 			clock-frequency = <32768>;
 			clock-frequency = <32768>;

+ 1 - 2
arch/arm/boot/dts/stm32f469-disco.dts

@@ -210,8 +210,7 @@
 &sdio {
 &sdio {
 	status = "okay";
 	status = "okay";
 	vmmc-supply = <&mmc_vcard>;
 	vmmc-supply = <&mmc_vcard>;
-	cd-gpios = <&gpiog 2 GPIO_ACTIVE_HIGH>;
-	cd-inverted;
+	cd-gpios = <&gpiog 2 GPIO_ACTIVE_LOW>;
 	broken-cd;
 	broken-cd;
 	pinctrl-names = "default", "opendrain";
 	pinctrl-names = "default", "opendrain";
 	pinctrl-0 = <&sdio_pins>;
 	pinctrl-0 = <&sdio_pins>;

+ 1 - 2
arch/arm/boot/dts/stm32f746-disco.dts

@@ -101,8 +101,7 @@
 &sdio1 {
 &sdio1 {
 	status = "okay";
 	status = "okay";
 	vmmc-supply = <&mmc_vcard>;
 	vmmc-supply = <&mmc_vcard>;
-	cd-gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>;
-	cd-inverted;
+	cd-gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
 	pinctrl-names = "default", "opendrain";
 	pinctrl-names = "default", "opendrain";
 	pinctrl-0 = <&sdio_pins_a>;
 	pinctrl-0 = <&sdio_pins_a>;
 	pinctrl-1 = <&sdio_pins_od_a>;
 	pinctrl-1 = <&sdio_pins_od_a>;

+ 1 - 2
arch/arm/boot/dts/stm32f769-disco.dts

@@ -126,8 +126,7 @@
 &sdio2 {
 &sdio2 {
 	status = "okay";
 	status = "okay";
 	vmmc-supply = <&mmc_vcard>;
 	vmmc-supply = <&mmc_vcard>;
-	cd-gpios = <&gpioi 15 GPIO_ACTIVE_HIGH>;
-	cd-inverted;
+	cd-gpios = <&gpioi 15 GPIO_ACTIVE_LOW>;
 	broken-cd;
 	broken-cd;
 	pinctrl-names = "default", "opendrain";
 	pinctrl-names = "default", "opendrain";
 	pinctrl-0 = <&sdio_pins_b>;
 	pinctrl-0 = <&sdio_pins_b>;

+ 1 - 1
arch/arm/boot/dts/stm32h743.dtsi

@@ -472,7 +472,7 @@
 			interrupt-parent = <&exti>;
 			interrupt-parent = <&exti>;
 			interrupts = <17 IRQ_TYPE_EDGE_RISING>;
 			interrupts = <17 IRQ_TYPE_EDGE_RISING>;
 			interrupt-names = "alarm";
 			interrupt-names = "alarm";
-			st,syscfg = <&pwrcfg>;
+			st,syscfg = <&pwrcfg 0x00 0x100>;
 			status = "disabled";
 			status = "disabled";
 		};
 		};
 
 

+ 67 - 6
arch/arm/boot/dts/stm32mp157c-ev1.dts

@@ -6,6 +6,7 @@
 /dts-v1/;
 /dts-v1/;
 
 
 #include "stm32mp157c-ed1.dts"
 #include "stm32mp157c-ed1.dts"
+#include <dt-bindings/gpio/gpio.h>
 
 
 / {
 / {
 	model = "STMicroelectronics STM32MP157C eval daughter on eval mother";
 	model = "STMicroelectronics STM32MP157C eval daughter on eval mother";
@@ -19,6 +20,58 @@
 		serial0 = &uart4;
 		serial0 = &uart4;
 		ethernet0 = &ethernet0;
 		ethernet0 = &ethernet0;
 	};
 	};
+
+	panel_backlight: panel-backlight {
+		compatible = "gpio-backlight";
+		gpios = <&gpiod 13 GPIO_ACTIVE_LOW>;
+		default-on;
+		status = "okay";
+	};
+};
+
+&cec {
+	pinctrl-names = "default";
+	pinctrl-0 = <&cec_pins_a>;
+	status = "okay";
+};
+
+&dsi {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+			reg = <0>;
+			dsi_in: endpoint {
+				remote-endpoint = <&ltdc_ep0_out>;
+			};
+		};
+
+		port@1 {
+			reg = <1>;
+			dsi_out: endpoint {
+				remote-endpoint = <&dsi_panel_in>;
+			};
+		};
+	};
+
+	panel-dsi@0 {
+		compatible = "raydium,rm68200";
+		reg = <0>;
+		reset-gpios = <&gpiof 15 GPIO_ACTIVE_LOW>;
+		backlight = <&panel_backlight>;
+		status = "okay";
+
+		port {
+			dsi_panel_in: endpoint {
+				remote-endpoint = <&dsi_out>;
+			};
+		};
+	};
 };
 };
 
 
 &ethernet0 {
 &ethernet0 {
@@ -40,12 +93,6 @@
 	};
 	};
 };
 };
 
 
-&cec {
-	pinctrl-names = "default";
-	pinctrl-0 = <&cec_pins_a>;
-	status = "okay";
-};
-
 &i2c2 {
 &i2c2 {
 	pinctrl-names = "default";
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c2_pins_a>;
 	pinctrl-0 = <&i2c2_pins_a>;
@@ -62,6 +109,20 @@
 	status = "okay";
 	status = "okay";
 };
 };
 
 
+&ltdc {
+	status = "okay";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		ltdc_ep0_out: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&dsi_in>;
+		};
+	};
+};
+
 &m_can1 {
 &m_can1 {
 	pinctrl-names = "default";
 	pinctrl-names = "default";
 	pinctrl-0 = <&m_can1_pins_a>;
 	pinctrl-0 = <&m_can1_pins_a>;

+ 1 - 1
arch/arm/boot/dts/stm32mp157c.dtsi

@@ -947,7 +947,7 @@
 			dma-requests = <48>;
 			dma-requests = <48>;
 		};
 		};
 
 
-		qspi: qspi@58003000 {
+		qspi: spi@58003000 {
 			compatible = "st,stm32f469-qspi";
 			compatible = "st,stm32f469-qspi";
 			reg = <0x58003000 0x1000>, <0x70000000 0x10000000>;
 			reg = <0x58003000 0x1000>, <0x70000000 0x10000000>;
 			reg-names = "qspi", "qspi_mm";
 			reg-names = "qspi", "qspi_mm";