linux-next: manual merge of the tty tree with the devicetree tree

linux-next: manual merge of the tty tree with the devicetree tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2014 bytes --]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in include/linux/of.h between commit 2adfffa22350 ("OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled") from the devicetree tree and commit 5c19e95216b9 ("OF: Add helper for matching against linux,stdout-path") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Out of interest, why does of_device_is_stdout_path() not return bool?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/of.h
index 90a8811,429e168..0000000
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@@ -331,7 -337,14 +331,9 @@@ const __be32 *of_prop_next_u32(struct p
   *         printk("String value: %s\n", s);
   */
  const char *of_prop_next_string(struct property *prop, const char *cur);
 -#define of_property_for_each_string(np, propname, prop, s)	\
 -	for (prop = of_find_property(np, propname, NULL),	\
 -		s = of_prop_next_string(prop, NULL);		\
 -		s;						\
 -		s = of_prop_next_string(prop, s))
  
+ int of_device_is_stdout_path(struct device_node *dn);
+ 
  #else /* CONFIG_OF */
  
  static inline const char* of_node_full_name(struct device_node *np)
@@@ -494,20 -507,17 +496,25 @@@ static inline int of_machine_is_compati
  	return 0;
  }
  
 +static inline const __be32 *of_prop_next_u32(struct property *prop,
 +		const __be32 *cur, u32 *pu)
 +{
 +	return NULL;
 +}
 +
 +static inline const char *of_prop_next_string(struct property *prop,
 +		const char *cur)
 +{
 +	return NULL;
 +}
 +
+ static inline int of_device_is_stdout_path(struct device_node *dn)
+ {
+ 	return 0;
+ }
+ 
  #define of_match_ptr(_ptr)	NULL
  #define of_match_node(_matches, _node)	NULL
 -#define of_property_for_each_u32(np, propname, prop, p, u) \
 -	while (0)
 -#define of_property_for_each_string(np, propname, prop, s) \
 -	while (0)
  #endif /* CONFIG_OF */
  
  #ifndef of_node_to_nid

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the tty tree with the devicetree tree

[Greg KH]

On Tue, Aug 13, 2013 at 03:41:06PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in include/linux/of.h between commit 2adfffa22350 ("OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled") from the devicetree tree and commit 5c19e95216b9 ("OF: Add helper for matching against linux,stdout-path") from the tty tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

> Out of interest, why does of_device_is_stdout_path() not return bool?

Good question, Sascha, any ideas?

greg k-h

Re: linux-next: manual merge of the tty tree with the devicetree tree

[Greg KH]

On Tue, Jun 02, 2020 at 03:48:24PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   Documentation/devicetree/bindings/serial/rs485.yaml
> 
> between commit:
> 
>   9f60a65bc5e6 ("dt-bindings: Clean-up schema indentation formatting")
> 
> from the devicetree tree and commit:
> 
>   01c38ecff8b1 ("dt-bindings: serial: Add binding for rs485 bus termination GPIO")
> 
> from the tty tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc Documentation/devicetree/bindings/serial/rs485.yaml
> index 8141e4aad530,a9ad17864889..000000000000
> --- a/Documentation/devicetree/bindings/serial/rs485.yaml
> +++ b/Documentation/devicetree/bindings/serial/rs485.yaml
> @@@ -39,6 -41,9 +39,10 @@@ properties
>       $ref: /schemas/types.yaml#/definitions/flag
>   
>     rs485-rx-during-tx:
>  -   description: enables the receiving of data even while sending data.
>  -   $ref: /schemas/types.yaml#/definitions/flag
>  +    description: enables the receiving of data even while sending data.
>  +    $ref: /schemas/types.yaml#/definitions/flag
> + 
> +   rs485-term-gpios:
> +     description: GPIO pin to enable RS485 bus termination.
> +     maxItems: 1
>  +...

This should now be resolved in Linus's tree.

thanks,

greg k-h

linux-next: manual merge of the tty tree with the devicetree tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]

Hi all,

Today's linux-next merge of the tty tree got a conflict in:

  Documentation/devicetree/bindings/serial/rs485.yaml

between commit:

  9f60a65bc5e6 ("dt-bindings: Clean-up schema indentation formatting")

from the devicetree tree and commit:

  01c38ecff8b1 ("dt-bindings: serial: Add binding for rs485 bus termination GPIO")

from the tty tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/serial/rs485.yaml
index 8141e4aad530,a9ad17864889..000000000000
--- a/Documentation/devicetree/bindings/serial/rs485.yaml
+++ b/Documentation/devicetree/bindings/serial/rs485.yaml
@@@ -39,6 -41,9 +39,10 @@@ properties
      $ref: /schemas/types.yaml#/definitions/flag
  
    rs485-rx-during-tx:
 -   description: enables the receiving of data even while sending data.
 -   $ref: /schemas/types.yaml#/definitions/flag
 +    description: enables the receiving of data even while sending data.
 +    $ref: /schemas/types.yaml#/definitions/flag
+ 
+   rs485-term-gpios:
+     description: GPIO pin to enable RS485 bus termination.
+     maxItems: 1
 +...

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the tty tree with the devicetree tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2664 bytes --]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
Documentation/devicetree/bindings/serial/pl011.txt between commit
a81a6c654bbe ("ARM: dt: fix up PL011 device tree bindings") from the
devicetree tree and commit 98267d33e2da ("serial: pl011: Add device
tree support for RX DMA polling") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc Documentation/devicetree/bindings/serial/pl011.txt
index 52464918cfe2,0e05340055e1..000000000000
--- a/Documentation/devicetree/bindings/serial/pl011.txt
+++ b/Documentation/devicetree/bindings/serial/pl011.txt
@@@ -6,34 -6,17 +6,39 @@@ Required properties
  - interrupts: exactly one interrupt specifier
  
  Optional properties:
 -- pinctrl:		When present, must have one state named "sleep"
 -			and one state named "default"
 -- clocks:		When present, must refer to exactly one clock named
 -			"apb_pclk"
 -- dmas:			When present, may have one or two dma channels.
 -			The first one must be named "rx", the second one
 -			must be named "tx".
 +- pinctrl: When present, must have one state named "default",
 +	   and may contain a second name named "sleep". The former
 +	   state sets up pins for ordinary operation whereas
 +	   the latter state will put the associated pins to sleep
 +	   when the UART is unused
 +- clocks:  When present, the first clock listed must correspond to
 +	   the clock named UARTCLK on the IP block, i.e. the clock
 +	   to the external serial line, whereas the second clock
 +	   must correspond to the PCLK clocking the internal logic
 +	   of the block. Just listing one clock (the first one) is
 +	   deprecated.
 +- clocks-names: When present, the first clock listed must be named
 +	   "uartclk" and the second clock listed must be named
 +	   "apb_pclk"
 +- dmas:	   When present, may have one or two dma channels.
 +	   The first one must be named "rx", the second one
 +	   must be named "tx".
+ - auto-poll:		Enables polling when using RX DMA.
+ - poll-rate-ms:		Rate at which poll occurs when auto-poll is set,
+ 			default 100ms.
+ - poll-timeout-ms:	Poll timeout when auto-poll is set, default
+ 			3000ms.
  
  See also bindings/arm/primecell.txt
 +
 +Example:
 +
 +uart@80120000 {
 +	compatible = "arm,pl011", "arm,primecell";
 +	reg = <0x80120000 0x1000>;
 +	interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
 +	dmas = <&dma 13 0 0x2>, <&dma 13 0 0x0>;
 +	dma-names = "rx", "tx";
 +	clocks = <&foo_clk>, <&bar_clk>;
 +	clock-names = "uartclk", "apb_pclk";
 +};

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]