* [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string
@ 2017-09-28 22:51 Vikas Manocha
2017-09-28 22:51 ` Vikas Manocha
` (3 more replies)
0 siblings, 4 replies; 15+ messages in thread
From: Vikas Manocha @ 2017-09-28 22:51 UTC (permalink / raw)
To: linux-kernel; +Cc: Vikas Manocha, alexandre.torgue, patrice.chotard
stm32 uart driver is using two compatible strings "st,stm32-usart"
& "st,stm32-uart". One can be removed safely to save some space & time.
Vikas Manocha (3):
Arm: dts: stm32: remove extra compatible string for uart
Arm: dts: stm32: remove extra compatible string from DT & driver
ARM: dts: stm32h7: correct uart nodes compatible string
Documentation/devicetree/bindings/dma/stm32-dma.txt | 2 +-
Documentation/devicetree/bindings/serial/st,stm32-usart.txt | 10 +++-------
arch/arm/boot/dts/stm32f429.dtsi | 12 ++++++------
arch/arm/boot/dts/stm32f746.dtsi | 12 ++++++------
arch/arm/boot/dts/stm32h743.dtsi | 4 ++--
drivers/tty/serial/stm32-usart.c | 3 ---
6 files changed, 18 insertions(+), 25 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 1/3] Arm: dts: stm32: remove extra compatible string for uart 2017-09-28 22:51 [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha @ 2017-09-28 22:51 ` Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha 2017-10-05 16:01 ` [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string Alexandre Torgue 3 siblings, 0 replies; 15+ messages in thread From: Vikas Manocha @ 2017-09-28 22:51 UTC (permalink / raw) To: linux-kernel Cc: Vikas Manocha, alexandre.torgue, patrice.chotard, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, Greg Kroah-Hartman, moderated list:ARM/STM32 ARCHITECTURE, open list:SERIAL DRIVERS, Mark Rutland, Maxime Coquelin, Rob Herring, Vinod Koul This patch removes the extra compatibility string "st,stm32-usart" to avoid confusion, save some time & space. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com> --- Documentation/devicetree/bindings/dma/stm32-dma.txt | 2 +- Documentation/devicetree/bindings/serial/st,stm32-usart.txt | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/stm32-dma.txt b/Documentation/devicetree/bindings/dma/stm32-dma.txt index 4408af6..6f44df9 100644 --- a/Documentation/devicetree/bindings/dma/stm32-dma.txt +++ b/Documentation/devicetree/bindings/dma/stm32-dma.txt @@ -71,7 +71,7 @@ channel: a phandle to the DMA controller plus the following four integer cells: Example: usart1: serial@40011000 { - compatible = "st,stm32-usart", "st,stm32-uart"; + compatible = "st,stm32-uart"; reg = <0x40011000 0x400>; interrupts = <37>; clocks = <&clk_pclk2>; diff --git a/Documentation/devicetree/bindings/serial/st,stm32-usart.txt b/Documentation/devicetree/bindings/serial/st,stm32-usart.txt index 3657f9f..d150b04 100644 --- a/Documentation/devicetree/bindings/serial/st,stm32-usart.txt +++ b/Documentation/devicetree/bindings/serial/st,stm32-usart.txt @@ -2,14 +2,10 @@ Required properties: - compatible: can be either: - - "st,stm32-usart", - "st,stm32-uart", - - "st,stm32f7-usart", - "st,stm32f7-uart", - - "st,stm32h7-usart" - "st,stm32h7-uart". - depending on whether the device supports synchronous mode - and is compatible with stm32(f4), stm32f7 or stm32h7. + depending is compatible with stm32(f4), stm32f7 or stm32h7. - reg: The address and length of the peripheral registers space - interrupts: - The interrupt line for the USART instance, @@ -33,7 +29,7 @@ usart4: serial@40004c00 { }; usart2: serial@40004400 { - compatible = "st,stm32-usart", "st,stm32-uart"; + compatible = "st,stm32-uart"; reg = <0x40004400 0x400>; interrupts = <38>; clocks = <&clk_pclk1>; @@ -43,7 +39,7 @@ usart2: serial@40004400 { }; usart1: serial@40011000 { - compatible = "st,stm32-usart", "st,stm32-uart"; + compatible = "st,stm32-uart"; reg = <0x40011000 0x400>; interrupts = <37>; clocks = <&rcc 0 164>; -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 1/3] Arm: dts: stm32: remove extra compatible string for uart @ 2017-09-28 22:51 ` Vikas Manocha 0 siblings, 0 replies; 15+ messages in thread From: Vikas Manocha @ 2017-09-28 22:51 UTC (permalink / raw) To: linux-arm-kernel This patch removes the extra compatibility string "st,stm32-usart" to avoid confusion, save some time & space. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com> --- Documentation/devicetree/bindings/dma/stm32-dma.txt | 2 +- Documentation/devicetree/bindings/serial/st,stm32-usart.txt | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/stm32-dma.txt b/Documentation/devicetree/bindings/dma/stm32-dma.txt index 4408af6..6f44df9 100644 --- a/Documentation/devicetree/bindings/dma/stm32-dma.txt +++ b/Documentation/devicetree/bindings/dma/stm32-dma.txt @@ -71,7 +71,7 @@ channel: a phandle to the DMA controller plus the following four integer cells: Example: usart1: serial at 40011000 { - compatible = "st,stm32-usart", "st,stm32-uart"; + compatible = "st,stm32-uart"; reg = <0x40011000 0x400>; interrupts = <37>; clocks = <&clk_pclk2>; diff --git a/Documentation/devicetree/bindings/serial/st,stm32-usart.txt b/Documentation/devicetree/bindings/serial/st,stm32-usart.txt index 3657f9f..d150b04 100644 --- a/Documentation/devicetree/bindings/serial/st,stm32-usart.txt +++ b/Documentation/devicetree/bindings/serial/st,stm32-usart.txt @@ -2,14 +2,10 @@ Required properties: - compatible: can be either: - - "st,stm32-usart", - "st,stm32-uart", - - "st,stm32f7-usart", - "st,stm32f7-uart", - - "st,stm32h7-usart" - "st,stm32h7-uart". - depending on whether the device supports synchronous mode - and is compatible with stm32(f4), stm32f7 or stm32h7. + depending is compatible with stm32(f4), stm32f7 or stm32h7. - reg: The address and length of the peripheral registers space - interrupts: - The interrupt line for the USART instance, @@ -33,7 +29,7 @@ usart4: serial at 40004c00 { }; usart2: serial at 40004400 { - compatible = "st,stm32-usart", "st,stm32-uart"; + compatible = "st,stm32-uart"; reg = <0x40004400 0x400>; interrupts = <38>; clocks = <&clk_pclk1>; @@ -43,7 +39,7 @@ usart2: serial at 40004400 { }; usart1: serial at 40011000 { - compatible = "st,stm32-usart", "st,stm32-uart"; + compatible = "st,stm32-uart"; reg = <0x40011000 0x400>; interrupts = <37>; clocks = <&rcc 0 164>; -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 1/3] Arm: dts: stm32: remove extra compatible string for uart @ 2017-09-28 22:51 ` Vikas Manocha 0 siblings, 0 replies; 15+ messages in thread From: Vikas Manocha @ 2017-09-28 22:51 UTC (permalink / raw) To: linux-kernel Cc: Vikas Manocha, alexandre.torgue, patrice.chotard, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, Greg Kroah-Hartman, moderated list:ARM/STM32 ARCHITECTURE, open list:SERIAL DRIVERS, Mark Rutland, Maxime Coquelin, Rob Herring, Vinod Koul This patch removes the extra compatibility string "st,stm32-usart" to avoid confusion, save some time & space. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com> --- Documentation/devicetree/bindings/dma/stm32-dma.txt | 2 +- Documentation/devicetree/bindings/serial/st,stm32-usart.txt | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/stm32-dma.txt b/Documentation/devicetree/bindings/dma/stm32-dma.txt index 4408af6..6f44df9 100644 --- a/Documentation/devicetree/bindings/dma/stm32-dma.txt +++ b/Documentation/devicetree/bindings/dma/stm32-dma.txt @@ -71,7 +71,7 @@ channel: a phandle to the DMA controller plus the following four integer cells: Example: usart1: serial@40011000 { - compatible = "st,stm32-usart", "st,stm32-uart"; + compatible = "st,stm32-uart"; reg = <0x40011000 0x400>; interrupts = <37>; clocks = <&clk_pclk2>; diff --git a/Documentation/devicetree/bindings/serial/st,stm32-usart.txt b/Documentation/devicetree/bindings/serial/st,stm32-usart.txt index 3657f9f..d150b04 100644 --- a/Documentation/devicetree/bindings/serial/st,stm32-usart.txt +++ b/Documentation/devicetree/bindings/serial/st,stm32-usart.txt @@ -2,14 +2,10 @@ Required properties: - compatible: can be either: - - "st,stm32-usart", - "st,stm32-uart", - - "st,stm32f7-usart", - "st,stm32f7-uart", - - "st,stm32h7-usart" - "st,stm32h7-uart". - depending on whether the device supports synchronous mode - and is compatible with stm32(f4), stm32f7 or stm32h7. + depending is compatible with stm32(f4), stm32f7 or stm32h7. - reg: The address and length of the peripheral registers space - interrupts: - The interrupt line for the USART instance, @@ -33,7 +29,7 @@ usart4: serial@40004c00 { }; usart2: serial@40004400 { - compatible = "st,stm32-usart", "st,stm32-uart"; + compatible = "st,stm32-uart"; reg = <0x40004400 0x400>; interrupts = <38>; clocks = <&clk_pclk1>; @@ -43,7 +39,7 @@ usart2: serial@40004400 { }; usart1: serial@40011000 { - compatible = "st,stm32-usart", "st,stm32-uart"; + compatible = "st,stm32-uart"; reg = <0x40011000 0x400>; interrupts = <37>; clocks = <&rcc 0 164>; -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] Arm: dts: stm32: remove extra compatible string for uart 2017-09-28 22:51 ` Vikas Manocha (?) @ 2017-10-05 23:32 ` Rob Herring -1 siblings, 0 replies; 15+ messages in thread From: Rob Herring @ 2017-10-05 23:32 UTC (permalink / raw) To: Vikas Manocha Cc: linux-kernel, alexandre.torgue, patrice.chotard, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, Greg Kroah-Hartman, moderated list:ARM/STM32 ARCHITECTURE, open list:SERIAL DRIVERS, Mark Rutland, Maxime Coquelin, Vinod Koul On Thu, Sep 28, 2017 at 03:51:24PM -0700, Vikas Manocha wrote: > This patch removes the extra compatibility string "st,stm32-usart" to > avoid confusion, save some time & space. I'm confused why you don't need it anymore. I thought the h/w blocks were configured differently. > > Signed-off-by: Vikas Manocha <vikas.manocha@st.com> > Reviewed-by: Patrice Chotard <patrice.chotard@st.com> > --- > Documentation/devicetree/bindings/dma/stm32-dma.txt | 2 +- > Documentation/devicetree/bindings/serial/st,stm32-usart.txt | 10 +++------- > 2 files changed, 4 insertions(+), 8 deletions(-) In any case, Acked-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] Arm: dts: stm32: remove extra compatible string for uart @ 2017-10-05 23:32 ` Rob Herring 0 siblings, 0 replies; 15+ messages in thread From: Rob Herring @ 2017-10-05 23:32 UTC (permalink / raw) To: linux-arm-kernel On Thu, Sep 28, 2017 at 03:51:24PM -0700, Vikas Manocha wrote: > This patch removes the extra compatibility string "st,stm32-usart" to > avoid confusion, save some time & space. I'm confused why you don't need it anymore. I thought the h/w blocks were configured differently. > > Signed-off-by: Vikas Manocha <vikas.manocha@st.com> > Reviewed-by: Patrice Chotard <patrice.chotard@st.com> > --- > Documentation/devicetree/bindings/dma/stm32-dma.txt | 2 +- > Documentation/devicetree/bindings/serial/st,stm32-usart.txt | 10 +++------- > 2 files changed, 4 insertions(+), 8 deletions(-) In any case, Acked-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] Arm: dts: stm32: remove extra compatible string for uart @ 2017-10-05 23:32 ` Rob Herring 0 siblings, 0 replies; 15+ messages in thread From: Rob Herring @ 2017-10-05 23:32 UTC (permalink / raw) To: Vikas Manocha Cc: linux-kernel, alexandre.torgue, patrice.chotard, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, Greg Kroah-Hartman, moderated list:ARM/STM32 ARCHITECTURE, open list:SERIAL DRIVERS, Mark Rutland, Maxime Coquelin, Vinod Koul On Thu, Sep 28, 2017 at 03:51:24PM -0700, Vikas Manocha wrote: > This patch removes the extra compatibility string "st,stm32-usart" to > avoid confusion, save some time & space. I'm confused why you don't need it anymore. I thought the h/w blocks were configured differently. > > Signed-off-by: Vikas Manocha <vikas.manocha@st.com> > Reviewed-by: Patrice Chotard <patrice.chotard@st.com> > --- > Documentation/devicetree/bindings/dma/stm32-dma.txt | 2 +- > Documentation/devicetree/bindings/serial/st,stm32-usart.txt | 10 +++------- > 2 files changed, 4 insertions(+), 8 deletions(-) In any case, Acked-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 2/3] Arm: dts: stm32: remove extra compatible string from DT & driver 2017-09-28 22:51 [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha @ 2017-09-28 22:51 ` Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha 2017-10-05 16:01 ` [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string Alexandre Torgue 3 siblings, 0 replies; 15+ messages in thread From: Vikas Manocha @ 2017-09-28 22:51 UTC (permalink / raw) To: linux-kernel Cc: Vikas Manocha, alexandre.torgue, patrice.chotard, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Greg Kroah-Hartman, Jiri Slaby, moderated list:ARM PORT, open list:SERIAL DRIVERS, Mark Rutland, Maxime Coquelin, Rob Herring, Russell King This patch remove the extra compatibility string "st,stm32-usart" from driver & device tree. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32f429.dtsi | 12 ++++++------ arch/arm/boot/dts/stm32f746.dtsi | 12 ++++++------ arch/arm/boot/dts/stm32h743.dtsi | 4 ++-- drivers/tty/serial/stm32-usart.c | 3 --- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi index dd7e99b..5d6bfdf 100644 --- a/arch/arm/boot/dts/stm32f429.dtsi +++ b/arch/arm/boot/dts/stm32f429.dtsi @@ -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)>; diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi index 5633860..5f94178 100644 --- a/arch/arm/boot/dts/stm32f746.dtsi +++ b/arch/arm/boot/dts/stm32f746.dtsi @@ -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>; diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi index 58ec227..26de315 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -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"; diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index 03a58326..46a1f86 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -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}, {}, }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/3] Arm: dts: stm32: remove extra compatible string from DT & driver @ 2017-09-28 22:51 ` Vikas Manocha 0 siblings, 0 replies; 15+ messages in thread From: Vikas Manocha @ 2017-09-28 22:51 UTC (permalink / raw) To: linux-arm-kernel This patch remove the extra compatibility string "st,stm32-usart" from driver & device tree. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32f429.dtsi | 12 ++++++------ arch/arm/boot/dts/stm32f746.dtsi | 12 ++++++------ arch/arm/boot/dts/stm32h743.dtsi | 4 ++-- drivers/tty/serial/stm32-usart.c | 3 --- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi index dd7e99b..5d6bfdf 100644 --- a/arch/arm/boot/dts/stm32f429.dtsi +++ b/arch/arm/boot/dts/stm32f429.dtsi @@ -315,7 +315,7 @@ }; usart2: serial at 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 at 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 at 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 at 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 at 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 at 40011400 { - compatible = "st,stm32-usart", "st,stm32-uart"; + compatible = "st,stm32-uart"; reg = <0x40011400 0x400>; interrupts = <71>; clocks = <&rcc 0 STM32F4_APB2_CLOCK(USART6)>; diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi index 5633860..5f94178 100644 --- a/arch/arm/boot/dts/stm32f746.dtsi +++ b/arch/arm/boot/dts/stm32f746.dtsi @@ -136,7 +136,7 @@ }; usart2: serial at 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 at 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 at 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 at 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 at 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 at 40011400 { - compatible = "st,stm32f7-usart", "st,stm32f7-uart"; + compatible = "st,stm32f7-uart"; reg = <0x40011400 0x400>; interrupts = <71>; clocks = <&rcc 1 CLK_USART6>; diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi index 58ec227..26de315 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -67,7 +67,7 @@ }; usart2: serial at 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 at 40011000 { - compatible = "st,stm32f7-usart", "st,stm32f7-uart"; + compatible = "st,stm32f7-uart"; reg = <0x40011000 0x400>; interrupts = <37>; status = "disabled"; diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index 03a58326..46a1f86 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -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}, {}, }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/3] Arm: dts: stm32: remove extra compatible string from DT & driver @ 2017-09-28 22:51 ` Vikas Manocha 0 siblings, 0 replies; 15+ messages in thread From: Vikas Manocha @ 2017-09-28 22:51 UTC (permalink / raw) To: linux-kernel Cc: Vikas Manocha, alexandre.torgue, patrice.chotard, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Greg Kroah-Hartman, Jiri Slaby, moderated list:ARM PORT, open list:SERIAL DRIVERS, Mark Rutland, Maxime Coquelin, Rob Herring, Russell King This patch remove the extra compatibility string "st,stm32-usart" from driver & device tree. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32f429.dtsi | 12 ++++++------ arch/arm/boot/dts/stm32f746.dtsi | 12 ++++++------ arch/arm/boot/dts/stm32h743.dtsi | 4 ++-- drivers/tty/serial/stm32-usart.c | 3 --- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi index dd7e99b..5d6bfdf 100644 --- a/arch/arm/boot/dts/stm32f429.dtsi +++ b/arch/arm/boot/dts/stm32f429.dtsi @@ -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)>; diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi index 5633860..5f94178 100644 --- a/arch/arm/boot/dts/stm32f746.dtsi +++ b/arch/arm/boot/dts/stm32f746.dtsi @@ -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>; diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi index 58ec227..26de315 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -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"; diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index 03a58326..46a1f86 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -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}, {}, }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/3] ARM: dts: stm32h7: correct uart nodes compatible string 2017-09-28 22:51 [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha @ 2017-09-28 22:51 ` Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha 2017-10-05 16:01 ` [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string Alexandre Torgue 3 siblings, 0 replies; 15+ messages in thread From: Vikas Manocha @ 2017-09-28 22:51 UTC (permalink / raw) To: linux-kernel Cc: Vikas Manocha, alexandre.torgue, patrice.chotard, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, moderated list:ARM PORT, Mark Rutland, Maxime Coquelin, Rob Herring, Russell King With this change, stm32h743 will use its own uart configuration. Major difference between stm32f7 & stm32h7 uart configuration is FIFO availability in stm32h7. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32h743.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi index 26de315..fab637b 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -67,7 +67,7 @@ }; usart2: serial@40004400 { - compatible = "st,stm32f7-uart"; + compatible = "st,stm32h7-uart"; reg = <0x40004400 0x400>; interrupts = <38>; status = "disabled"; @@ -99,7 +99,7 @@ }; usart1: serial@40011000 { - compatible = "st,stm32f7-uart"; + compatible = "st,stm32h7-uart"; reg = <0x40011000 0x400>; interrupts = <37>; status = "disabled"; -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/3] ARM: dts: stm32h7: correct uart nodes compatible string @ 2017-09-28 22:51 ` Vikas Manocha 0 siblings, 0 replies; 15+ messages in thread From: Vikas Manocha @ 2017-09-28 22:51 UTC (permalink / raw) To: linux-arm-kernel With this change, stm32h743 will use its own uart configuration. Major difference between stm32f7 & stm32h7 uart configuration is FIFO availability in stm32h7. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32h743.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi index 26de315..fab637b 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -67,7 +67,7 @@ }; usart2: serial at 40004400 { - compatible = "st,stm32f7-uart"; + compatible = "st,stm32h7-uart"; reg = <0x40004400 0x400>; interrupts = <38>; status = "disabled"; @@ -99,7 +99,7 @@ }; usart1: serial at 40011000 { - compatible = "st,stm32f7-uart"; + compatible = "st,stm32h7-uart"; reg = <0x40011000 0x400>; interrupts = <37>; status = "disabled"; -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/3] ARM: dts: stm32h7: correct uart nodes compatible string @ 2017-09-28 22:51 ` Vikas Manocha 0 siblings, 0 replies; 15+ messages in thread From: Vikas Manocha @ 2017-09-28 22:51 UTC (permalink / raw) To: linux-kernel Cc: Vikas Manocha, alexandre.torgue, patrice.chotard, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, moderated list:ARM PORT, Mark Rutland, Maxime Coquelin, Rob Herring, Russell King With this change, stm32h743 will use its own uart configuration. Major difference between stm32f7 & stm32h7 uart configuration is FIFO availability in stm32h7. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com> --- arch/arm/boot/dts/stm32h743.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi index 26de315..fab637b 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -67,7 +67,7 @@ }; usart2: serial@40004400 { - compatible = "st,stm32f7-uart"; + compatible = "st,stm32h7-uart"; reg = <0x40004400 0x400>; interrupts = <38>; status = "disabled"; @@ -99,7 +99,7 @@ }; usart1: serial@40011000 { - compatible = "st,stm32f7-uart"; + compatible = "st,stm32h7-uart"; reg = <0x40011000 0x400>; interrupts = <37>; status = "disabled"; -- 1.9.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string 2017-09-28 22:51 [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string Vikas Manocha ` (2 preceding siblings ...) 2017-09-28 22:51 ` Vikas Manocha @ 2017-10-05 16:01 ` Alexandre Torgue 2017-10-05 17:36 ` Vikas MANOCHA 3 siblings, 1 reply; 15+ messages in thread From: Alexandre Torgue @ 2017-10-05 16:01 UTC (permalink / raw) To: Vikas Manocha, linux-kernel; +Cc: patrice.chotard Hi Vikas On 09/29/2017 12:51 AM, Vikas Manocha wrote: > stm32 uart driver is using two compatible strings "st,stm32-usart" > & "st,stm32-uart". One can be removed safely to save some space & time. > > Vikas Manocha (3): > Arm: dts: stm32: remove extra compatible string for uart > Arm: dts: stm32: remove extra compatible string from DT & driver > ARM: dts: stm32h7: correct uart nodes compatible string > > Documentation/devicetree/bindings/dma/stm32-dma.txt | 2 +- > Documentation/devicetree/bindings/serial/st,stm32-usart.txt | 10 +++------- > arch/arm/boot/dts/stm32f429.dtsi | 12 ++++++------ > arch/arm/boot/dts/stm32f746.dtsi | 12 ++++++------ > arch/arm/boot/dts/stm32h743.dtsi | 4 ++-- > drivers/tty/serial/stm32-usart.c | 3 --- > 6 files changed, 18 insertions(+), 25 deletions(-) > I think it is better to put people in CC of patch 1, 2, 3 also in CC of cover-letter. I think you should split patches differently. Maybe one for drivers and bindings (doc) updates. And others for DT updates. Conerning DT patches, all headers should start by "ARM: dts: stm32: blabla" Regards Alex ^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string 2017-10-05 16:01 ` [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string Alexandre Torgue @ 2017-10-05 17:36 ` Vikas MANOCHA 0 siblings, 0 replies; 15+ messages in thread From: Vikas MANOCHA @ 2017-10-05 17:36 UTC (permalink / raw) To: Alexandre TORGUE, linux-kernel; +Cc: Patrice CHOTARD Hi Alex, > -----Original Message----- > From: Alexandre TORGUE > Sent: Thursday, October 05, 2017 9:02 AM > To: Vikas MANOCHA <vikas.manocha@st.com>; linux-kernel@vger.kernel.org > Cc: Patrice CHOTARD <patrice.chotard@st.com> > Subject: Re: [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string > > Hi Vikas > > > On 09/29/2017 12:51 AM, Vikas Manocha wrote: > > stm32 uart driver is using two compatible strings "st,stm32-usart" > > & "st,stm32-uart". One can be removed safely to save some space & time. > > > > Vikas Manocha (3): > > Arm: dts: stm32: remove extra compatible string for uart > > Arm: dts: stm32: remove extra compatible string from DT & driver > > ARM: dts: stm32h7: correct uart nodes compatible string > > > > Documentation/devicetree/bindings/dma/stm32-dma.txt | 2 +- > > Documentation/devicetree/bindings/serial/st,stm32-usart.txt | 10 +++------- > > arch/arm/boot/dts/stm32f429.dtsi | 12 ++++++------ > > arch/arm/boot/dts/stm32f746.dtsi | 12 ++++++------ > > arch/arm/boot/dts/stm32h743.dtsi | 4 ++-- > > drivers/tty/serial/stm32-usart.c | 3 --- > > 6 files changed, 18 insertions(+), 25 deletions(-) > > > > I think it is better to put people in CC of patch 1, 2, 3 also in CC of cover-letter. I am not sure how to add relevant people in cover-letter, Get_maintainers script works for the patches only. > I think you should split patches differently. Maybe one > for drivers and bindings (doc) updates. And others for DT updates. Yes, it's like this only. First patch is DT binding & second is its implementation in the driver & stm32 device tree. > > Conerning DT patches, all headers should start by "ARM: dts: stm32: blabla" Yes, Same headers is used for the patch. You mean "arm" should be "ARM" ? Cheers, Vikas > > Regards > Alex ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2017-10-05 23:32 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-09-28 22:51 [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string Vikas Manocha 2017-09-28 22:51 ` [PATCH 1/3] Arm: dts: stm32: remove extra compatible string for uart Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha 2017-10-05 23:32 ` Rob Herring 2017-10-05 23:32 ` Rob Herring 2017-10-05 23:32 ` Rob Herring 2017-09-28 22:51 ` [PATCH 2/3] Arm: dts: stm32: remove extra compatible string from DT & driver Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha 2017-09-28 22:51 ` [PATCH 3/3] ARM: dts: stm32h7: correct uart nodes compatible string Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha 2017-09-28 22:51 ` Vikas Manocha 2017-10-05 16:01 ` [PATCH 0/3] Arm: dts: stm32: remove extra compatible uart string Alexandre Torgue 2017-10-05 17:36 ` Vikas MANOCHA
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.