LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the input tree with the arm-soc tree
@ 2019-05-01  3:40 Stephen Rothwell
  2019-05-12 23:28 ` Stephen Rothwell
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2019-05-01  3:40 UTC (permalink / raw)
  To: Dmitry Torokhov, Olof Johansson, Arnd Bergmann, ARM
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Clément Péron, Maxime Ripard, Jeff LaBundy

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

Hi Dmitry,

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

  Documentation/devicetree/bindings/vendor-prefixes.txt

between commit:

  2c98d9e47533 ("dt-bindings: vendor-prefixes: add AZW")

from the arm-soc tree and commit:

  7b5bb55d0dad ("Input: add support for Azoteq IQS550/572/525")

from the input 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/vendor-prefixes.txt
index 5f2b185a04e6,51f99549161e..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -54,7 -53,7 +54,8 @@@ avic	Shanghai AVIC Optoelectronics Co.
  avnet	Avnet, Inc.
  axentia	Axentia Technologies AB
  axis	Axis Communications AB
+ azoteq	Azoteq (Pty) Ltd
 +azw     Shenzhen AZW Technology Co., Ltd.
  bananapi BIPAI KEJI LIMITED
  bhf	Beckhoff Automation GmbH & Co. KG
  bitmain	Bitmain Technologies

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

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

* Re: linux-next: manual merge of the input tree with the arm-soc tree
  2019-05-01  3:40 linux-next: manual merge of the input tree with the arm-soc tree Stephen Rothwell
@ 2019-05-12 23:28 ` Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2019-05-12 23:28 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, ARM
  Cc: Dmitry Torokhov, Linux Next Mailing List,
	Linux Kernel Mailing List, Clément Péron,
	Maxime Ripard, Jeff LaBundy

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

Hi all,

On Wed, 1 May 2019 13:40:54 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the input tree got a conflict in:
> 
>   Documentation/devicetree/bindings/vendor-prefixes.txt
> 
> between commit:
> 
>   2c98d9e47533 ("dt-bindings: vendor-prefixes: add AZW")
> 
> from the arm-soc tree and commit:
> 
>   7b5bb55d0dad ("Input: add support for Azoteq IQS550/572/525")
> 
> from the input 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/vendor-prefixes.txt
> index 5f2b185a04e6,51f99549161e..000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@@ -54,7 -53,7 +54,8 @@@ avic	Shanghai AVIC Optoelectronics Co.
>   avnet	Avnet, Inc.
>   axentia	Axentia Technologies AB
>   axis	Axis Communications AB
> + azoteq	Azoteq (Pty) Ltd
>  +azw     Shenzhen AZW Technology Co., Ltd.
>   bananapi BIPAI KEJI LIMITED
>   bhf	Beckhoff Automation GmbH & Co. KG
>   bitmain	Bitmain Technologies

Thie is now a conflict between the arm-soc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: manual merge of the input tree with the arm-soc tree
@ 2020-10-06  5:06 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2020-10-06  5:06 UTC (permalink / raw)
  To: Dmitry Torokhov, Olof Johansson, Arnd Bergmann, ARM
  Cc: Heiko Stuebner, Johan Jonker, Linux Kernel Mailing List,
	Linux Next Mailing List, Michael Srba

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

Hi all,

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

  Documentation/devicetree/bindings/vendor-prefixes.yaml

between commit:

  cb1cc137a2c1 ("dt-bindings: Add vendor prefix for Shenzhen Zkmagic Technology Co., Ltd.")

from the arm-soc tree and commit:

  8f445ffa851e ("dt-bindings: input/touchscreen: add bindings for zinitix")

from the input 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/vendor-prefixes.yaml
index 6242f1baa24c,bd7b2d404124..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1214,8 -1143,8 +1214,10 @@@ patternProperties
      description: Shenzhen Zidoo Technology Co., Ltd.
    "^zii,.*":
      description: Zodiac Inflight Innovations
+   "^zinitix,.*":
+     description: Zinitix Co., Ltd
 +  "^zkmagic,.*":
 +    description: Shenzhen Zkmagic Technology Co., Ltd.
    "^zte,.*":
      description: ZTE Corp.
    "^zyxel,.*":

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

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

* linux-next: manual merge of the input tree with the arm-soc tree
@ 2012-01-03  3:33 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2012-01-03  3:33 UTC (permalink / raw)
  To: Dmitry Torokhov
  Cc: linux-next, linux-kernel, Olof Johansson, Arnd Bergmann,
	linux-arm-kernel, Kukjin Kim, Thomas Abraham, Mark Brown

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

Hi Dmitry,

Today's linux-next merge of the input tree got a conflict in
drivers/input/keyboard/samsung-keypad.c between commit b3d6ac3e5f93
("input: samsung-keypad: Add device tree support") from the arm-soc tree
and commit 48c98b1bb85a ("Input: samsung-keypad - implement runtime power
management support") from the input tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/input/keyboard/samsung-keypad.c
index 8a0060c,b746fce..0000000
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@@ -20,11 -20,11 +20,13 @@@
  #include <linux/io.h>
  #include <linux/module.h>
  #include <linux/platform_device.h>
+ #include <linux/pm.h>
+ #include <linux/pm_runtime.h>
  #include <linux/slab.h>
 +#include <linux/of.h>
 +#include <linux/of_gpio.h>
  #include <linux/sched.h>
- #include <plat/keypad.h>
+ #include <linux/input/samsung-keypad.h>
  
  #define SAMSUNG_KEYIFCON			0x00
  #define SAMSUNG_KEYIFSTSCLR			0x04
@@@ -69,8 -70,8 +72,9 @@@ struct samsung_keypad 
  	void __iomem *base;
  	wait_queue_head_t wait;
  	bool stopped;
+ 	bool wake_enabled;
  	int irq;
 +	enum samsung_keypad_type type;
  	unsigned int row_shift;
  	unsigned int rows;
  	unsigned int cols;
@@@ -421,18 -318,9 +438,19 @@@ static int __devinit samsung_keypad_pro
  	keypad->row_shift = row_shift;
  	keypad->rows = pdata->rows;
  	keypad->cols = pdata->cols;
+ 	keypad->stopped = true;
  	init_waitqueue_head(&keypad->wait);
  
 +	if (pdev->dev.of_node) {
 +#ifdef CONFIG_OF
 +		samsung_keypad_parse_dt_gpio(&pdev->dev, keypad);
 +		keypad->type = of_device_is_compatible(pdev->dev.of_node,
 +					"samsung,s5pv210-keypad");
 +#endif
 +	} else {
 +		keypad->type = platform_get_device_id(pdev)->driver_data;
 +	}
 +
  	input_dev->name = pdev->name;
  	input_dev->id.bustype = BUS_HOST;
  	input_dev->dev.parent = &pdev->dev;
@@@ -471,21 -363,15 +493,21 @@@
  	if (error)
  		goto err_free_irq;
  
- 	device_init_wakeup(&pdev->dev, pdata->wakeup);
- 	platform_set_drvdata(pdev, keypad);
- 
 +	if (pdev->dev.of_node) {
 +		devm_kfree(&pdev->dev, (void *)pdata->keymap_data->keymap);
 +		devm_kfree(&pdev->dev, (void *)pdata->keymap_data);
 +		devm_kfree(&pdev->dev, (void *)pdata);
 +	}
  	return 0;
  
  err_free_irq:
  	free_irq(keypad->irq, keypad);
+ 	pm_runtime_disable(&pdev->dev);
+ 	device_init_wakeup(&pdev->dev, 0);
+ 	platform_set_drvdata(pdev, NULL);
  err_put_clk:
  	clk_put(keypad->clk);
 +	samsung_keypad_dt_gpio_free(keypad);
  err_unmap_base:
  	iounmap(keypad->base);
  err_free_mem:
@@@ -578,24 -510,14 +647,25 @@@ static int samsung_keypad_resume(struc
  
  	return 0;
  }
+ #endif
  
  static const struct dev_pm_ops samsung_keypad_pm_ops = {
- 	.suspend	= samsung_keypad_suspend,
- 	.resume		= samsung_keypad_resume,
+ 	SET_SYSTEM_SLEEP_PM_OPS(samsung_keypad_suspend, samsung_keypad_resume)
+ 	SET_RUNTIME_PM_OPS(samsung_keypad_runtime_suspend,
+ 			   samsung_keypad_runtime_resume, NULL)
  };
- #endif
  
 +#ifdef CONFIG_OF
 +static const struct of_device_id samsung_keypad_dt_match[] = {
 +	{ .compatible = "samsung,s3c6410-keypad" },
 +	{ .compatible = "samsung,s5pv210-keypad" },
 +	{},
 +};
 +MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
 +#else
 +#define samsung_keypad_dt_match NULL
 +#endif
 +
  static struct platform_device_id samsung_keypad_driver_ids[] = {
  	{
  		.name		= "samsung-keypad",
@@@ -614,10 -536,7 +684,8 @@@ static struct platform_driver samsung_k
  	.driver		= {
  		.name	= "samsung-keypad",
  		.owner	= THIS_MODULE,
 +		.of_match_table = samsung_keypad_dt_match,
- #ifdef CONFIG_PM
  		.pm	= &samsung_keypad_pm_ops,
- #endif
  	},
  	.id_table	= samsung_keypad_driver_ids,
  };

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

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

end of thread, other threads:[~2020-10-06  5:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-01  3:40 linux-next: manual merge of the input tree with the arm-soc tree Stephen Rothwell
2019-05-12 23:28 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-10-06  5:06 Stephen Rothwell
2012-01-03  3:33 Stephen Rothwell

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).