Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the gpio-brgl tree with the gpio tree
@ 2019-08-16  6:56 Stephen Rothwell
  2019-08-16 22:30 ` Linus Walleij
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2019-08-16  6:56 UTC (permalink / raw)
  To: Bartosz Golaszewski, Linus Walleij
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Masahiro Yamada, Thierry Reding, Brian Masney

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

Hi all,

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

  include/linux/gpio/driver.h

between commit:

  fdd61a013a24 ("gpio: Add support for hierarchical IRQ domains")

from the gpio tree and commit:

  9091373ab7ea ("gpio: remove less important #ifdef around declarations")

from the gpio-brgl 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 include/linux/gpio/driver.h
index 0e6d3b0c0211,f28f534f451a..000000000000
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@@ -20,12 -20,6 +20,8 @@@ struct module
  enum gpiod_flags;
  enum gpio_lookup_flags;
  
- #ifdef CONFIG_GPIOLIB
- 
- #ifdef CONFIG_GPIOLIB_IRQCHIP
- 
 +struct gpio_chip;
 +
  /**
   * struct gpio_irq_chip - GPIO interrupt controller
   */
@@@ -530,38 -443,6 +523,36 @@@ struct bgpio_pdata 
  	int ngpio;
  };
  
 +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
 +
 +void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,
 +					     struct irq_fwspec *fwspec,
 +					     unsigned int parent_hwirq,
 +					     unsigned int parent_type);
 +void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,
 +					      struct irq_fwspec *fwspec,
 +					      unsigned int parent_hwirq,
 +					      unsigned int parent_type);
 +
 +#else
 +
 +static void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,
 +						    struct irq_fwspec *fwspec,
 +						    unsigned int parent_hwirq,
 +						    unsigned int parent_type)
 +{
 +}
 +
 +static void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,
 +						     struct irq_fwspec *fwspec,
 +						     unsigned int parent_hwirq,
 +						     unsigned int parent_type)
 +{
 +}
 +
 +#endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */
 +
 +
- #if IS_ENABLED(CONFIG_GPIO_GENERIC)
- 
  int bgpio_init(struct gpio_chip *gc, struct device *dev,
  	       unsigned long sz, void __iomem *dat, void __iomem *set,
  	       void __iomem *clr, void __iomem *dirout, void __iomem *dirin,

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

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

* Re: linux-next: manual merge of the gpio-brgl tree with the gpio tree
  2019-08-16  6:56 linux-next: manual merge of the gpio-brgl tree with the gpio tree Stephen Rothwell
@ 2019-08-16 22:30 ` Linus Walleij
  0 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2019-08-16 22:30 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bartosz Golaszewski, Linux Next Mailing List,
	Linux Kernel Mailing List, Masahiro Yamada, Thierry Reding,
	Brian Masney

On Fri, Aug 16, 2019 at 8:56 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   include/linux/gpio/driver.h
>
> between commit:
>
>   fdd61a013a24 ("gpio: Add support for hierarchical IRQ domains")
>
> from the gpio tree and commit:
>
>   9091373ab7ea ("gpio: remove less important #ifdef around declarations")
>
> from the gpio-brgl tree.

OK Bartosz can you send me a pull request for your tree so we can
sync them up?

Yours,
Linus Walleij

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

* linux-next: manual merge of the gpio-brgl tree with the gpio tree
@ 2019-11-08  3:27 Stephen Rothwell
  0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-11-08  3:27 UTC (permalink / raw)
  To: Bartosz Golaszewski, Linus Walleij
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Drew Fustini,
	Kent Gibson

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

Hi all,

Today's linux-next merge of the gpio-brgl tree got conflicts in:

  drivers/gpio/gpiolib.c
  include/uapi/linux/gpio.h

between commit:

  8c550e94b883 ("gpio: expose pull-up/pull-down line flags to userspace")

from the gpio tree and commit:

  6d8251b35add ("gpio: expose pull-up/pull-down line flags to userspace")

from the gpio-brgl tree.

I fixed it up (I just used the latter versions) 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

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

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

* linux-next: manual merge of the gpio-brgl tree with the gpio tree
@ 2019-08-26  6:50 Stephen Rothwell
  0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-08-26  6:50 UTC (permalink / raw)
  To: Bartosz Golaszewski, Linus Walleij
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Masahiro Yamada, YueHaibing

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

Hi all,

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

  include/linux/gpio/driver.h

between commit:

  c7663fa2a663 ("gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h")

from the gpio tree and commit:

  9091373ab7ea ("gpio: remove less important #ifdef around declarations")

from the gpio-brgl 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 include/linux/gpio/driver.h
index 8d06a054abc8,f28f534f451a..000000000000
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@@ -20,12 -20,6 +20,8 @@@ struct module
  enum gpiod_flags;
  enum gpio_lookup_flags;
  
- #ifdef CONFIG_GPIOLIB
- 
- #ifdef CONFIG_GPIOLIB_IRQCHIP
- 
 +struct gpio_chip;
 +
  /**
   * struct gpio_irq_chip - GPIO interrupt controller
   */
@@@ -520,38 -443,6 +513,35 @@@ struct bgpio_pdata 
  	int ngpio;
  };
  
 +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
 +
 +void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,
 +					     struct irq_fwspec *fwspec,
 +					     unsigned int parent_hwirq,
 +					     unsigned int parent_type);
 +void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,
 +					      struct irq_fwspec *fwspec,
 +					      unsigned int parent_hwirq,
 +					      unsigned int parent_type);
 +
 +#else
 +
 +static inline void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,
 +						    struct irq_fwspec *fwspec,
 +						    unsigned int parent_hwirq,
 +						    unsigned int parent_type)
 +{
 +}
 +
 +static inline void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,
 +						     struct irq_fwspec *fwspec,
 +						     unsigned int parent_hwirq,
 +						     unsigned int parent_type)
 +{
 +}
 +
 +#endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */
 +
- 
- #if IS_ENABLED(CONFIG_GPIO_GENERIC)
- 
  int bgpio_init(struct gpio_chip *gc, struct device *dev,
  	       unsigned long sz, void __iomem *dat, void __iomem *set,
  	       void __iomem *clr, void __iomem *dirout, void __iomem *dirin,
@@@ -720,10 -603,11 +702,15 @@@ void gpiochip_free_own_desc(struct gpio
  void devprop_gpiochip_set_names(struct gpio_chip *chip,
  				const struct fwnode_handle *fwnode);
  
+ 
+ #ifdef CONFIG_GPIOLIB
+ 
+ struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc);
+ 
 +/* lock/unlock as IRQ */
 +int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
 +void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);
 +
  #else /* CONFIG_GPIOLIB */
  
  static inline struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc)
@@@ -733,18 -617,6 +720,18 @@@
  	return ERR_PTR(-ENODEV);
  }
  
 +static inline int gpiochip_lock_as_irq(struct gpio_chip *chip,
 +				       unsigned int offset)
 +{
 +	WARN_ON(1);
 +	return -EINVAL;
 +}
 +
 +static inline void gpiochip_unlock_as_irq(struct gpio_chip *chip,
 +					  unsigned int offset)
 +{
 +	WARN_ON(1);
 +}
  #endif /* CONFIG_GPIOLIB */
  
- #endif
+ #endif /* __LINUX_GPIO_DRIVER_H */

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

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

* linux-next: manual merge of the gpio-brgl tree with the gpio tree
@ 2019-08-19  6:30 Stephen Rothwell
  0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-08-19  6:30 UTC (permalink / raw)
  To: Bartosz Golaszewski, Linus Walleij
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Masahiro Yamada

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

Hi all,

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

  include/linux/gpio/driver.h

between commit:

  379ce1ff51aa ("gpio: stubs in headers should be inline")

from the gpio tree and commit:

  9091373ab7ea ("gpio: remove less important #ifdef around declarations")

from the gpio-brgl 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 include/linux/gpio/driver.h
index 72d48a2bab65,f28f534f451a..000000000000
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@@ -20,12 -20,6 +20,8 @@@ struct module
  enum gpiod_flags;
  enum gpio_lookup_flags;
  
- #ifdef CONFIG_GPIOLIB
- 
- #ifdef CONFIG_GPIOLIB_IRQCHIP
- 
 +struct gpio_chip;
 +
  /**
   * struct gpio_irq_chip - GPIO interrupt controller
   */
@@@ -530,38 -443,6 +523,35 @@@ struct bgpio_pdata 
  	int ngpio;
  };
  
 +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
 +
 +void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,
 +					     struct irq_fwspec *fwspec,
 +					     unsigned int parent_hwirq,
 +					     unsigned int parent_type);
 +void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,
 +					      struct irq_fwspec *fwspec,
 +					      unsigned int parent_hwirq,
 +					      unsigned int parent_type);
 +
 +#else
 +
 +static inline void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,
 +						    struct irq_fwspec *fwspec,
 +						    unsigned int parent_hwirq,
 +						    unsigned int parent_type)
 +{
 +}
 +
 +static inline void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,
 +						     struct irq_fwspec *fwspec,
 +						     unsigned int parent_hwirq,
 +						     unsigned int parent_type)
 +{
 +}
 +
 +#endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */
 +
- 
- #if IS_ENABLED(CONFIG_GPIO_GENERIC)
- 
  int bgpio_init(struct gpio_chip *gc, struct device *dev,
  	       unsigned long sz, void __iomem *dat, void __iomem *set,
  	       void __iomem *clr, void __iomem *dirout, void __iomem *dirin,

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

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

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-16  6:56 linux-next: manual merge of the gpio-brgl tree with the gpio tree Stephen Rothwell
2019-08-16 22:30 ` Linus Walleij
2019-08-19  6:30 Stephen Rothwell
2019-08-26  6:50 Stephen Rothwell
2019-11-08  3:27 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git