linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 0/3] Fix STi aliases property name
@ 2018-03-07 17:35 patrice.chotard
  2018-03-07 17:35 ` [PATCH v4 1/3] tty: st-asc: Update tty alias patrice.chotard
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: patrice.chotard @ 2018-03-07 17:35 UTC (permalink / raw)
  To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel,
	devicetree, gregkh, jslaby, linux-serial
  Cc: patrice.chotard

From: Patrice Chotard <patrice.chotard@st.com>

Since dtc v1.4.6-9-gaadd0b65c987, when compiling dtb with W=1 option,
the following warnings are triggered :
    
arch/arm/boot/dts/stih418-b2199.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'
arch/arm/boot/dts/stih407-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'
arch/arm/boot/dts/stih410-b2260.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'
arch/arm/boot/dts/stih410-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'

_ Patch 1, convert the aliases property name in lowercase in 
  all STi board dts files.

_ Patch 2, remove "console=serialN" from bootargs property

_ Patch 3, rework the tty driver st-asc accordingly, as aliases id is retrieved 
  using of_alias_get_id() with a defined string with is not lowercase only.

v4: Fix Rob Herring's remarks :
      _ reorder patches, first st-asc driver update and the DTS patches
        in order to not break boot.
      _ squash chunks of previous patch 1 into previous patch 2

v3: Fix Rob Herring's remarks :
      _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property
      _ update st-asc driver with "serial" alias prefix and keep "ttyAS" in second choice

v2: Fix Rob Herring's remarks :
      _ use serialN instead of ttyasN aliases to not break ABI
      _ remove useless stdout-path property
      _ update st-asc driver with "serial" alias prefix

Patrice Chotard (3):
  tty: st-asc: Update tty alias
  ARM: dts: STi: Fix aliases property name for STi boards
  ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards

 arch/arm/boot/dts/stih407-b2120.dts | 4 ++--
 arch/arm/boot/dts/stih410-b2120.dts | 4 ++--
 arch/arm/boot/dts/stih410-b2260.dts | 4 ++--
 arch/arm/boot/dts/stih418-b2199.dts | 4 ++--
 drivers/tty/serial/st-asc.c         | 4 +++-
 5 files changed, 11 insertions(+), 9 deletions(-)

-- 
1.9.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v4 1/3] tty: st-asc: Update tty alias
  2018-03-07 17:35 [PATCH v4 0/3] Fix STi aliases property name patrice.chotard
@ 2018-03-07 17:35 ` patrice.chotard
  2018-03-07 17:35 ` [PATCH v4 2/3] ARM: dts: STi: Fix aliases property name for STi boards patrice.chotard
  2018-03-07 17:35 ` [PATCH v4 3/3] ARM: dts: STi: Remove "console=ttyASN" from bootargs " patrice.chotard
  2 siblings, 0 replies; 6+ messages in thread
From: patrice.chotard @ 2018-03-07 17:35 UTC (permalink / raw)
  To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel,
	devicetree, gregkh, jslaby, linux-serial
  Cc: patrice.chotard

From: Patrice Chotard <patrice.chotard@st.com>

Since dtc v1.4.6-9-gaadd0b65c987, aliases property name
must include only lowercase and '-'.

After having updated all STi boards serial aliases from "ttyASN"
to "serialN", st-asc driver need to be updated accordingly as tty
aliases id is retrieved using of_alias_get_id().

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---

v4: _ add Reviewed-by
v3: _ update st-asc driver with "serial" alias prefix and keep "ttyAS" in second choice
v2: _ update st-asc driver with "serial" alias prefix

 drivers/tty/serial/st-asc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index c763253514e9..5f9f01fac6dd 100644
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -782,7 +782,9 @@ static struct asc_port *asc_of_get_asc_port(struct platform_device *pdev)
 	if (!np)
 		return NULL;
 
-	id = of_alias_get_id(np, ASC_SERIAL_NAME);
+	id = of_alias_get_id(np, "serial");
+	if (id < 0)
+		id = of_alias_get_id(np, ASC_SERIAL_NAME);
 
 	if (id < 0)
 		id = 0;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v4 2/3] ARM: dts: STi: Fix aliases property name for STi boards
  2018-03-07 17:35 [PATCH v4 0/3] Fix STi aliases property name patrice.chotard
  2018-03-07 17:35 ` [PATCH v4 1/3] tty: st-asc: Update tty alias patrice.chotard
@ 2018-03-07 17:35 ` patrice.chotard
  2018-03-07 17:35 ` [PATCH v4 3/3] ARM: dts: STi: Remove "console=ttyASN" from bootargs " patrice.chotard
  2 siblings, 0 replies; 6+ messages in thread
From: patrice.chotard @ 2018-03-07 17:35 UTC (permalink / raw)
  To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel,
	devicetree, gregkh, jslaby, linux-serial
  Cc: patrice.chotard

From: Patrice Chotard <patrice.chotard@st.com>

Update serial aliases from "ttyASN" to more common "serialN".

Since dtc v1.4.6-9-gaadd0b65c987, aliases property name must
be lowercase only. This allows to fix following dtc warnings:

arch/arm/boot/dts/stih418-b2199.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'
arch/arm/boot/dts/stih407-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'
arch/arm/boot/dts/stih410-b2260.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'
arch/arm/boot/dts/stih410-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---
v4: _ remove bootargs chunks
v3: _ none
v2: _ use serialN instead of ttyasN aliases to not break ABI

 arch/arm/boot/dts/stih407-b2120.dts | 2 +-
 arch/arm/boot/dts/stih410-b2120.dts | 2 +-
 arch/arm/boot/dts/stih410-b2260.dts | 2 +-
 arch/arm/boot/dts/stih418-b2199.dts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts
index de3c8bf129b5..00de810a3bcc 100644
--- a/arch/arm/boot/dts/stih407-b2120.dts
+++ b/arch/arm/boot/dts/stih407-b2120.dts
@@ -24,7 +24,7 @@
 	};
 
 	aliases {
-		ttyAS0 = &sbc_serial0;
+		serial0 = &sbc_serial0;
 		ethernet0 = &ethernet0;
 	};
 
diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts
index 0a59b7b0f4b2..07d7969923ea 100644
--- a/arch/arm/boot/dts/stih410-b2120.dts
+++ b/arch/arm/boot/dts/stih410-b2120.dts
@@ -24,7 +24,7 @@
 	};
 
 	aliases {
-		ttyAS0 = &sbc_serial0;
+		serial0 = &sbc_serial0;
 		ethernet0 = &ethernet0;
 	};
 
diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts
index feb8834478fa..0b2129712bef 100644
--- a/arch/arm/boot/dts/stih410-b2260.dts
+++ b/arch/arm/boot/dts/stih410-b2260.dts
@@ -25,7 +25,7 @@
 	};
 
 	aliases {
-		ttyAS1 = &uart1;
+		serial1 = &uart1;
 		ethernet0 = &ethernet0;
 	};
 
diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts
index 39b4db2e3507..f88856c36a3f 100644
--- a/arch/arm/boot/dts/stih418-b2199.dts
+++ b/arch/arm/boot/dts/stih418-b2199.dts
@@ -24,7 +24,7 @@
 	};
 
 	aliases {
-		ttyAS0 = &sbc_serial0;
+		serial0 = &sbc_serial0;
 		ethernet0 = &ethernet0;
 	};
 
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v4 3/3] ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
  2018-03-07 17:35 [PATCH v4 0/3] Fix STi aliases property name patrice.chotard
  2018-03-07 17:35 ` [PATCH v4 1/3] tty: st-asc: Update tty alias patrice.chotard
  2018-03-07 17:35 ` [PATCH v4 2/3] ARM: dts: STi: Fix aliases property name for STi boards patrice.chotard
@ 2018-03-07 17:35 ` patrice.chotard
  2018-03-14 13:57   ` Greg KH
  2 siblings, 1 reply; 6+ messages in thread
From: patrice.chotard @ 2018-03-07 17:35 UTC (permalink / raw)
  To: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel,
	devicetree, gregkh, jslaby, linux-serial
  Cc: patrice.chotard

From: Patrice Chotard <patrice.chotard@st.com>

As serial interface is already specified into stdout-path property,
"console=ttyASN,115200" from bootargs can be removed.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---
v4: _ none
v3: _ remove "console=serialN,115200" from bootargs and use prefered 
      stdout-path property
v2: _ none

 arch/arm/boot/dts/stih407-b2120.dts | 2 +-
 arch/arm/boot/dts/stih410-b2120.dts | 2 +-
 arch/arm/boot/dts/stih410-b2260.dts | 2 +-
 arch/arm/boot/dts/stih418-b2199.dts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts
index 00de810a3bcc..62ce1cecbb1f 100644
--- a/arch/arm/boot/dts/stih407-b2120.dts
+++ b/arch/arm/boot/dts/stih407-b2120.dts
@@ -14,7 +14,7 @@
 	compatible = "st,stih407-b2120", "st,stih407";
 
 	chosen {
-		bootargs = "console=ttyAS0,115200 clk_ignore_unused";
+		bootargs = "clk_ignore_unused";
 		stdout-path = &sbc_serial0;
 	};
 
diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts
index 07d7969923ea..2a5a9802a5ec 100644
--- a/arch/arm/boot/dts/stih410-b2120.dts
+++ b/arch/arm/boot/dts/stih410-b2120.dts
@@ -14,7 +14,7 @@
 	compatible = "st,stih410-b2120", "st,stih410";
 
 	chosen {
-		bootargs = "console=ttyAS0,115200 clk_ignore_unused";
+		bootargs = "clk_ignore_unused";
 		stdout-path = &sbc_serial0;
 	};
 
diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts
index 0b2129712bef..155caa8c002a 100644
--- a/arch/arm/boot/dts/stih410-b2260.dts
+++ b/arch/arm/boot/dts/stih410-b2260.dts
@@ -15,7 +15,7 @@
 	compatible = "st,stih410-b2260", "st,stih410";
 
 	chosen {
-		bootargs = "console=ttyAS1,115200 clk_ignore_unused";
+		bootargs = "clk_ignore_unused";
 		stdout-path = &uart1;
 	};
 
diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts
index f88856c36a3f..cd0d719e31b7 100644
--- a/arch/arm/boot/dts/stih418-b2199.dts
+++ b/arch/arm/boot/dts/stih418-b2199.dts
@@ -14,7 +14,7 @@
 	compatible = "st,stih418-b2199", "st,stih418";
 
 	chosen {
-		bootargs = "console=ttyAS0,115200 clk_ignore_unused";
+		bootargs = "clk_ignore_unused";
 		stdout-path = &sbc_serial0;
 	};
 
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v4 3/3] ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
  2018-03-07 17:35 ` [PATCH v4 3/3] ARM: dts: STi: Remove "console=ttyASN" from bootargs " patrice.chotard
@ 2018-03-14 13:57   ` Greg KH
  2018-03-14 14:53     ` Patrice CHOTARD
  0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2018-03-14 13:57 UTC (permalink / raw)
  To: patrice.chotard
  Cc: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel,
	devicetree, jslaby, linux-serial

On Wed, Mar 07, 2018 at 06:35:34PM +0100, patrice.chotard@st.com wrote:
> From: Patrice Chotard <patrice.chotard@st.com>
> 
> As serial interface is already specified into stdout-path property,
> "console=ttyASN,115200" from bootargs can be removed.
> 
> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
> ---
> v4: _ none
> v3: _ remove "console=serialN,115200" from bootargs and use prefered 
>       stdout-path property
> v2: _ none
> 

This patch does not apply at all, are you sure you made it correctly?

Can you please fix it up and resend?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v4 3/3] ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
  2018-03-14 13:57   ` Greg KH
@ 2018-03-14 14:53     ` Patrice CHOTARD
  0 siblings, 0 replies; 6+ messages in thread
From: Patrice CHOTARD @ 2018-03-14 14:53 UTC (permalink / raw)
  To: Greg KH
  Cc: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-kernel,
	devicetree, jslaby, linux-serial

Hi Greg

On 03/14/2018 02:57 PM, Greg KH wrote:
> On Wed, Mar 07, 2018 at 06:35:34PM +0100, patrice.chotard@st.com wrote:
>> From: Patrice Chotard <patrice.chotard@st.com>
>>
>> As serial interface is already specified into stdout-path property,
>> "console=ttyASN,115200" from bootargs can be removed.
>>
>> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
>> ---
>> v4: _ none
>> v3: _ remove "console=serialN,115200" from bootargs and use prefered
>>        stdout-path property
>> v2: _ none
>>
> 
> This patch does not apply at all, are you sure you made it correctly?
> 
> Can you please fix it up and resend?

No problem, the patch has just been sent.

Thanks

Patrice

> 
> thanks,
> 
> greg k-h
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-03-14 14:53 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-07 17:35 [PATCH v4 0/3] Fix STi aliases property name patrice.chotard
2018-03-07 17:35 ` [PATCH v4 1/3] tty: st-asc: Update tty alias patrice.chotard
2018-03-07 17:35 ` [PATCH v4 2/3] ARM: dts: STi: Fix aliases property name for STi boards patrice.chotard
2018-03-07 17:35 ` [PATCH v4 3/3] ARM: dts: STi: Remove "console=ttyASN" from bootargs " patrice.chotard
2018-03-14 13:57   ` Greg KH
2018-03-14 14:53     ` Patrice CHOTARD

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).