Commit 6c7b8412 authored by Vikas Manocha's avatar Vikas Manocha Committed by Greg Kroah-Hartman
Browse files

Arm: dts: stm32: remove extra compatible string from DT & driver 



This patch remove the extra compatibility string "st,stm32-usart" from
driver & device tree.

Signed-off-by: default avatarVikas Manocha <vikas.manocha@st.com>
Reviewed-by: default avatarPatrice Chotard <patrice.chotard@st.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0dc262f4

arch/arm/boot/dts/stm32f429.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ 
		};



		usart2: serial@40004400 {

			compatible = "st,stm32-usart", "st,stm32-uart";

			compatible = "st,stm32-uart";

			reg = <0x40004400 0x400>;

			interrupts = <38>;

			clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART2)>;
@@ -323,7 +323,7 @@ 
		};



		usart3: serial@40004800 {

			compatible = "st,stm32-usart", "st,stm32-uart";

			compatible = "st,stm32-uart";

			reg = <0x40004800 0x400>;

			interrupts = <39>;

			clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART3)>;
@@ -387,7 +387,7 @@ 
		};



		usart7: serial@40007800 {

			compatible = "st,stm32-usart", "st,stm32-uart";

			compatible = "st,stm32-uart";

			reg = <0x40007800 0x400>;

			interrupts = <82>;

			clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART7)>;
@@ -395,7 +395,7 @@ 
		};



		usart8: serial@40007c00 {

			compatible = "st,stm32-usart", "st,stm32-uart";

			compatible = "st,stm32-uart";

			reg = <0x40007c00 0x400>;

			interrupts = <83>;

			clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART8)>;
@@ -445,7 +445,7 @@ 
		};



		usart1: serial@40011000 {

			compatible = "st,stm32-usart", "st,stm32-uart";

			compatible = "st,stm32-uart";

			reg = <0x40011000 0x400>;

			interrupts = <37>;

			clocks = <&rcc 0 STM32F4_APB2_CLOCK(USART1)>;
@@ -456,7 +456,7 @@ 
		};



		usart6: serial@40011400 {

			compatible = "st,stm32-usart", "st,stm32-uart";

			compatible = "st,stm32-uart";

			reg = <0x40011400 0x400>;

			interrupts = <71>;

			clocks = <&rcc 0 STM32F4_APB2_CLOCK(USART6)>;

arch/arm/boot/dts/stm32f746.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ 
		};



		usart2: serial@40004400 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			compatible = "st,stm32f7-uart";

			reg = <0x40004400 0x400>;

			interrupts = <38>;

			clocks = <&rcc 1 CLK_USART2>;
@@ -144,7 +144,7 @@ 
		};



		usart3: serial@40004800 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			compatible = "st,stm32f7-uart";

			reg = <0x40004800 0x400>;

			interrupts = <39>;

			clocks = <&rcc 1 CLK_USART3>;
@@ -177,7 +177,7 @@ 
		};



		usart7: serial@40007800 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			compatible = "st,stm32f7-uart";

			reg = <0x40007800 0x400>;

			interrupts = <82>;

			clocks = <&rcc 1 CLK_UART7>;
@@ -185,7 +185,7 @@ 
		};



		usart8: serial@40007c00 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			compatible = "st,stm32f7-uart";

			reg = <0x40007c00 0x400>;

			interrupts = <83>;

			clocks = <&rcc 1 CLK_UART8>;
@@ -193,7 +193,7 @@ 
		};



		usart1: serial@40011000 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			compatible = "st,stm32f7-uart";

			reg = <0x40011000 0x400>;

			interrupts = <37>;

			clocks = <&rcc 1 CLK_USART1>;
@@ -201,7 +201,7 @@ 
		};



		usart6: serial@40011400 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			compatible = "st,stm32f7-uart";

			reg = <0x40011400 0x400>;

			interrupts = <71>;

			clocks = <&rcc 1 CLK_USART6>;

arch/arm/boot/dts/stm32h743.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
		};



		usart2: serial@40004400 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			compatible = "st,stm32f7-uart";

			reg = <0x40004400 0x400>;

			interrupts = <38>;

			status = "disabled";
@@ -99,7 +99,7 @@ 
		};



		usart1: serial@40011000 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			compatible = "st,stm32f7-uart";

			reg = <0x40011000 0x400>;

			interrupts = <37>;

			status = "disabled";

drivers/tty/serial/stm32-usart.c

+0 −3
Original line number Diff line number Diff line
@@ -736,11 +736,8 @@ static struct stm32_port *stm32_of_get_stm32_port(struct platform_device *pdev) 


#ifdef CONFIG_OF

static const struct of_device_id stm32_match[] = {

	{ .compatible = "st,stm32-usart", .data = &stm32f4_info},

	{ .compatible = "st,stm32-uart", .data = &stm32f4_info},

	{ .compatible = "st,stm32f7-usart", .data = &stm32f7_info},

	{ .compatible = "st,stm32f7-uart", .data = &stm32f7_info},

	{ .compatible = "st,stm32h7-usart", .data = &stm32h7_info},

	{ .compatible = "st,stm32h7-uart", .data = &stm32h7_info},

	{},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE