[opensuse-kernel] Chipidea cleanup patch update to get USB working
Hi, the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module. I replaced the following lines: +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o By: +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o +endif +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o +endif That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: # PCI doesn't provide stubs, need to check ifneq ($(CONFIG_PCI),) obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o endif ifneq ($(CONFIG_OF),) obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o endif Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. I would like to send a patch for 13.2 and master ASAP. Guillaume -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
At Tue, 04 Nov 2014 16:39:41 +0100, Guillaume Gardet wrote:
Hi,
the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module.
I replaced the following lines: +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o
By: +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o +endif +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o +endif
That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: # PCI doesn't provide stubs, need to check ifneq ($(CONFIG_PCI),) obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o endif
ifneq ($(CONFIG_OF),) obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o endif
Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. I would like to send a patch for 13.2 and master ASAP.
It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and CONFIG_USB_CHIPIDEA_IMX from bool to tristate. Takashi -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
Le 04/11/2014 17:00, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 16:39:41 +0100, Guillaume Gardet wrote:
Hi,
the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module.
I replaced the following lines: +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o
By: +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o +endif +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o +endif
That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: # PCI doesn't provide stubs, need to check ifneq ($(CONFIG_PCI),) obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o endif
ifneq ($(CONFIG_OF),) obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o endif
Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. I would like to send a patch for 13.2 and master ASAP. It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and CONFIG_USB_CHIPIDEA_IMX from bool to tristate.
Right. :) I will update the patch tomorrow. Guillaume -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
At Tue, 04 Nov 2014 18:04:14 +0100, Guillaume Gardet wrote:
Le 04/11/2014 17:00, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 16:39:41 +0100, Guillaume Gardet wrote:
Hi,
the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module.
I replaced the following lines: +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o
By: +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o +endif +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o +endif
That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: # PCI doesn't provide stubs, need to check ifneq ($(CONFIG_PCI),) obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o endif
ifneq ($(CONFIG_OF),) obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o endif
Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. I would like to send a patch for 13.2 and master ASAP. It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and CONFIG_USB_CHIPIDEA_IMX from bool to tristate.
Right. :)
I will update the patch tomorrow.
Reconsidering again, I wonder whether we can just add a proper dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only CONFIG_OF, if the faulty build on powerpc is the problem. In anyway, the updated fix should be resubmitted to upstream. Takashi -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
Le 05/11/2014 08:08, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 18:04:14 +0100, Guillaume Gardet wrote:
Le 04/11/2014 17:00, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 16:39:41 +0100, Guillaume Gardet wrote:
Hi,
the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module.
I replaced the following lines: +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o
By: +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o +endif +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o +endif
That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: # PCI doesn't provide stubs, need to check ifneq ($(CONFIG_PCI),) obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o endif
ifneq ($(CONFIG_OF),) obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o endif
Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. I would like to send a patch for 13.2 and master ASAP. It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and CONFIG_USB_CHIPIDEA_IMX from bool to tristate. Right. :)
I will update the patch tomorrow.
Reconsidering again, I wonder whether we can just add a proper dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only CONFIG_OF, if the faulty build on powerpc is the problem.
Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS). Does the build problem still exist at all on powerpc? Guillaume -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
At Wed, 05 Nov 2014 09:39:27 +0100, Guillaume Gardet wrote:
Le 05/11/2014 08:08, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 18:04:14 +0100, Guillaume Gardet wrote:
Le 04/11/2014 17:00, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 16:39:41 +0100, Guillaume Gardet wrote:
Hi,
the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module.
I replaced the following lines: +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o
By: +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o +endif +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o +endif
That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: # PCI doesn't provide stubs, need to check ifneq ($(CONFIG_PCI),) obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o endif
ifneq ($(CONFIG_OF),) obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o endif
Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. I would like to send a patch for 13.2 and master ASAP. It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and CONFIG_USB_CHIPIDEA_IMX from bool to tristate. Right. :)
I will update the patch tomorrow.
Reconsidering again, I wonder whether we can just add a proper dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only CONFIG_OF, if the faulty build on powerpc is the problem.
Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS).
Does the build problem still exist at all on powerpc?
Yeah, that's a primary question. IMO, we should begin with dropping the patch. If anything gets broken by that, let's fix again. Takashi -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
Le 05/11/2014 09:45, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 09:39:27 +0100, Guillaume Gardet wrote:
Le 05/11/2014 08:08, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 18:04:14 +0100, Guillaume Gardet wrote:
Le 04/11/2014 17:00, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 16:39:41 +0100, Guillaume Gardet wrote:
Hi,
the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module.
I replaced the following lines: +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o
By: +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o +endif +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o +endif
That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: # PCI doesn't provide stubs, need to check ifneq ($(CONFIG_PCI),) obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o endif
ifneq ($(CONFIG_OF),) obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o endif
Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. I would like to send a patch for 13.2 and master ASAP. It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and CONFIG_USB_CHIPIDEA_IMX from bool to tristate. Right. :)
I will update the patch tomorrow. Reconsidering again, I wonder whether we can just add a proper dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only CONFIG_OF, if the faulty build on powerpc is the problem. Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS).
Does the build problem still exist at all on powerpc?
Yeah, that's a primary question. IMO, we should begin with dropping the patch. If anything gets broken by that, let's fix again.
Ok, then I will submit a patch to remove it for master, see what's happen and make a new patch if needed. Guillaume -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
At Wed, 05 Nov 2014 09:51:42 +0100, Guillaume Gardet wrote:
Le 05/11/2014 09:45, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 09:39:27 +0100, Guillaume Gardet wrote:
Le 05/11/2014 08:08, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 18:04:14 +0100, Guillaume Gardet wrote:
Le 04/11/2014 17:00, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 16:39:41 +0100, Guillaume Gardet wrote: > Hi, > > the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module. > > I replaced the following lines: > +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o > +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o > > By: > +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) > + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o > +endif > +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) > + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o > +endif > > That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: > # PCI doesn't provide stubs, need to check > ifneq ($(CONFIG_PCI),) > obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o > endif > > ifneq ($(CONFIG_OF),) > obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o > endif > > > Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. > I would like to send a patch for 13.2 and master ASAP. It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and CONFIG_USB_CHIPIDEA_IMX from bool to tristate. Right. :)
I will update the patch tomorrow. Reconsidering again, I wonder whether we can just add a proper dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only CONFIG_OF, if the faulty build on powerpc is the problem. Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS).
Does the build problem still exist at all on powerpc?
Yeah, that's a primary question. IMO, we should begin with dropping the patch. If anything gets broken by that, let's fix again.
Ok, then I will submit a patch to remove it for master, see what's happen and make a new patch if needed.
Oh, no need for that. Removing a patch is easier done by hand. Maybe better to disable the patch by guard at first, then remove it later. Takashi -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
Le 05/11/2014 10:01, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 09:51:42 +0100, Guillaume Gardet wrote:
Le 05/11/2014 09:45, Takashi Iwai a écrit :
Le 05/11/2014 08:08, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 18:04:14 +0100, Guillaume Gardet wrote:
Le 04/11/2014 17:00, Takashi Iwai a écrit : > At Tue, 04 Nov 2014 16:39:41 +0100, > Guillaume Gardet wrote: >> Hi, >> >> the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module. >> >> I replaced the following lines: >> +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o >> +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o >> >> By: >> +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) >> + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >> +endif >> +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) >> + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >> +endif >> >> That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: >> # PCI doesn't provide stubs, need to check >> ifneq ($(CONFIG_PCI),) >> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >> endif >> >> ifneq ($(CONFIG_OF),) >> obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >> endif >> >> >> Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. >> I would like to send a patch for 13.2 and master ASAP. > It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and > CONFIG_USB_CHIPIDEA_IMX from bool to tristate. Right. :)
I will update the patch tomorrow. Reconsidering again, I wonder whether we can just add a proper dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only CONFIG_OF, if the faulty build on powerpc is the problem. Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS).
Does the build problem still exist at all on powerpc? Yeah, that's a primary question. IMO, we should begin with dropping
At Wed, 05 Nov 2014 09:39:27 +0100, Guillaume Gardet wrote: the patch. If anything gets broken by that, let's fix again. Ok, then I will submit a patch to remove it for master, see what's happen and make a new patch if needed.
Oh, no need for that. Removing a patch is easier done by hand. Maybe better to disable the patch by guard at first, then remove it later.
Do you mean to comment it out in series.conf or something else? Guillaume -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
At Wed, 05 Nov 2014 10:17:10 +0100, Guillaume Gardet wrote:
Le 05/11/2014 10:01, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 09:51:42 +0100, Guillaume Gardet wrote:
Le 05/11/2014 09:45, Takashi Iwai a écrit :
Le 05/11/2014 08:08, Takashi Iwai a écrit :
At Tue, 04 Nov 2014 18:04:14 +0100, Guillaume Gardet wrote: > Le 04/11/2014 17:00, Takashi Iwai a écrit : >> At Tue, 04 Nov 2014 16:39:41 +0100, >> Guillaume Gardet wrote: >>> Hi, >>> >>> the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module. >>> >>> I replaced the following lines: >>> +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o >>> +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o >>> >>> By: >>> +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) >>> + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>> +endif >>> +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) >>> + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>> +endif >>> >>> That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: >>> # PCI doesn't provide stubs, need to check >>> ifneq ($(CONFIG_PCI),) >>> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>> endif >>> >>> ifneq ($(CONFIG_OF),) >>> obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>> endif >>> >>> >>> Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. >>> I would like to send a patch for 13.2 and master ASAP. >> It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and >> CONFIG_USB_CHIPIDEA_IMX from bool to tristate. > Right. :) > > I will update the patch tomorrow. Reconsidering again, I wonder whether we can just add a proper dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only CONFIG_OF, if the faulty build on powerpc is the problem. Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS).
Does the build problem still exist at all on powerpc? Yeah, that's a primary question. IMO, we should begin with dropping
At Wed, 05 Nov 2014 09:39:27 +0100, Guillaume Gardet wrote: the patch. If anything gets broken by that, let's fix again. Ok, then I will submit a patch to remove it for master, see what's happen and make a new patch if needed.
Oh, no need for that. Removing a patch is easier done by hand. Maybe better to disable the patch by guard at first, then remove it later.
Do you mean to comment it out in series.conf or something else?
Add either - or + guard to the patch in series.conf. This is the standard way to disable/enable the patch while keeping it for a while. Takashi -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
Le 05/11/2014 10:22, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 10:17:10 +0100, Guillaume Gardet wrote:
Le 05/11/2014 10:01, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 09:51:42 +0100, Guillaume Gardet wrote:
Le 05/11/2014 09:45, Takashi Iwai a écrit :
Le 05/11/2014 08:08, Takashi Iwai a écrit : > At Tue, 04 Nov 2014 18:04:14 +0100, > Guillaume Gardet wrote: >> Le 04/11/2014 17:00, Takashi Iwai a écrit : >>> At Tue, 04 Nov 2014 16:39:41 +0100, >>> Guillaume Gardet wrote: >>>> Hi, >>>> >>>> the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module. >>>> >>>> I replaced the following lines: >>>> +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o >>>> +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o >>>> >>>> By: >>>> +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) >>>> + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>> +endif >>>> +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) >>>> + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>> +endif >>>> >>>> That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: >>>> # PCI doesn't provide stubs, need to check >>>> ifneq ($(CONFIG_PCI),) >>>> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>> endif >>>> >>>> ifneq ($(CONFIG_OF),) >>>> obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>> endif >>>> >>>> >>>> Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. >>>> I would like to send a patch for 13.2 and master ASAP. >>> It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and >>> CONFIG_USB_CHIPIDEA_IMX from bool to tristate. >> Right. :) >> >> I will update the patch tomorrow. > Reconsidering again, I wonder whether we can just add a proper > dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only > CONFIG_OF, if the faulty build on powerpc is the problem. Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS).
Does the build problem still exist at all on powerpc? Yeah, that's a primary question. IMO, we should begin with dropping
At Wed, 05 Nov 2014 09:39:27 +0100, Guillaume Gardet wrote: the patch. If anything gets broken by that, let's fix again. Ok, then I will submit a patch to remove it for master, see what's happen and make a new patch if needed. Oh, no need for that. Removing a patch is easier done by hand. Maybe better to disable the patch by guard at first, then remove it later. Do you mean to comment it out in series.conf or something else?
Add either - or + guard to the patch in series.conf. This is the standard way to disable/enable the patch while keeping it for a while.
Ok. I have done it locally (OBS branch). I am waiting for PPC builds. It could speed up the process, if it breaks. Guillaume -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
Le 05/11/2014 10:31, Guillaume Gardet a écrit :
Le 05/11/2014 10:22, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 10:17:10 +0100, Guillaume Gardet wrote:
Le 05/11/2014 10:01, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 09:51:42 +0100, Guillaume Gardet wrote:
Le 05/11/2014 09:45, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 09:39:27 +0100, Guillaume Gardet wrote: > Le 05/11/2014 08:08, Takashi Iwai a écrit : >> At Tue, 04 Nov 2014 18:04:14 +0100, >> Guillaume Gardet wrote: >>> Le 04/11/2014 17:00, Takashi Iwai a écrit : >>>> At Tue, 04 Nov 2014 16:39:41 +0100, >>>> Guillaume Gardet wrote: >>>>> Hi, >>>>> >>>>> the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module. >>>>> >>>>> I replaced the following lines: >>>>> +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o >>>>> +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o >>>>> >>>>> By: >>>>> +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) >>>>> + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>>> +endif >>>>> +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) >>>>> + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>>> +endif >>>>> >>>>> That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: >>>>> # PCI doesn't provide stubs, need to check >>>>> ifneq ($(CONFIG_PCI),) >>>>> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>>> endif >>>>> >>>>> ifneq ($(CONFIG_OF),) >>>>> obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>>> endif >>>>> >>>>> >>>>> Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. >>>>> I would like to send a patch for 13.2 and master ASAP. >>>> It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and >>>> CONFIG_USB_CHIPIDEA_IMX from bool to tristate. >>> Right. :) >>> >>> I will update the patch tomorrow. >> Reconsidering again, I wonder whether we can just add a proper >> dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only >> CONFIG_OF, if the faulty build on powerpc is the problem. > Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS). > > Does the build problem still exist at all on powerpc? Yeah, that's a primary question. IMO, we should begin with dropping the patch. If anything gets broken by that, let's fix again. Ok, then I will submit a patch to remove it for master, see what's happen and make a new patch if needed. Oh, no need for that. Removing a patch is easier done by hand. Maybe better to disable the patch by guard at first, then remove it later. Do you mean to comment it out in series.conf or something else?
Add either - or + guard to the patch in series.conf. This is the standard way to disable/enable the patch while keeping it for a while.
Ok. I have done it locally (OBS branch). I am waiting for PPC builds. It could speed up the process, if it breaks.
I just noticed that CONFIG_USB_CHIPIDEA is only enable on armv7 configs! So, there will be no problem on PPC. Do you want to keep the patch and just disable it in series.conf, or could I remove it? Guillaume -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
At Wed, 05 Nov 2014 10:45:09 +0100, Guillaume Gardet wrote:
Le 05/11/2014 10:31, Guillaume Gardet a écrit :
Le 05/11/2014 10:22, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 10:17:10 +0100, Guillaume Gardet wrote:
Le 05/11/2014 10:01, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 09:51:42 +0100, Guillaume Gardet wrote:
Le 05/11/2014 09:45, Takashi Iwai a écrit : > At Wed, 05 Nov 2014 09:39:27 +0100, > Guillaume Gardet wrote: >> Le 05/11/2014 08:08, Takashi Iwai a écrit : >>> At Tue, 04 Nov 2014 18:04:14 +0100, >>> Guillaume Gardet wrote: >>>> Le 04/11/2014 17:00, Takashi Iwai a écrit : >>>>> At Tue, 04 Nov 2014 16:39:41 +0100, >>>>> Guillaume Gardet wrote: >>>>>> Hi, >>>>>> >>>>>> the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module. >>>>>> >>>>>> I replaced the following lines: >>>>>> +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o >>>>>> +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o >>>>>> >>>>>> By: >>>>>> +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) >>>>>> + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>>>> +endif >>>>>> +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) >>>>>> + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>>>> +endif >>>>>> >>>>>> That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: >>>>>> # PCI doesn't provide stubs, need to check >>>>>> ifneq ($(CONFIG_PCI),) >>>>>> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>>>> endif >>>>>> >>>>>> ifneq ($(CONFIG_OF),) >>>>>> obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>>>> endif >>>>>> >>>>>> >>>>>> Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. >>>>>> I would like to send a patch for 13.2 and master ASAP. >>>>> It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and >>>>> CONFIG_USB_CHIPIDEA_IMX from bool to tristate. >>>> Right. :) >>>> >>>> I will update the patch tomorrow. >>> Reconsidering again, I wonder whether we can just add a proper >>> dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only >>> CONFIG_OF, if the faulty build on powerpc is the problem. >> Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS). >> >> Does the build problem still exist at all on powerpc? > Yeah, that's a primary question. IMO, we should begin with dropping > the patch. If anything gets broken by that, let's fix again. Ok, then I will submit a patch to remove it for master, see what's happen and make a new patch if needed. Oh, no need for that. Removing a patch is easier done by hand. Maybe better to disable the patch by guard at first, then remove it later. Do you mean to comment it out in series.conf or something else?
Add either - or + guard to the patch in series.conf. This is the standard way to disable/enable the patch while keeping it for a while.
Ok. I have done it locally (OBS branch). I am waiting for PPC builds. It could speed up the process, if it breaks.
I just noticed that CONFIG_USB_CHIPIDEA is only enable on armv7 configs! So, there will be no problem on PPC.
Do you want to keep the patch and just disable it in series.conf, or could I remove it?
I already disabled and pushed the git branch. Takashi -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
Le 05/11/2014 11:17, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 10:45:09 +0100, Guillaume Gardet wrote:
Le 05/11/2014 10:31, Guillaume Gardet a écrit :
Le 05/11/2014 10:22, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 10:17:10 +0100, Guillaume Gardet wrote:
Le 05/11/2014 10:01, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 09:51:42 +0100, Guillaume Gardet wrote: > Le 05/11/2014 09:45, Takashi Iwai a écrit : >> At Wed, 05 Nov 2014 09:39:27 +0100, >> Guillaume Gardet wrote: >>> Le 05/11/2014 08:08, Takashi Iwai a écrit : >>>> At Tue, 04 Nov 2014 18:04:14 +0100, >>>> Guillaume Gardet wrote: >>>>> Le 04/11/2014 17:00, Takashi Iwai a écrit : >>>>>> At Tue, 04 Nov 2014 16:39:41 +0100, >>>>>> Guillaume Gardet wrote: >>>>>>> Hi, >>>>>>> >>>>>>> the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module. >>>>>>> >>>>>>> I replaced the following lines: >>>>>>> +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o >>>>>>> +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o >>>>>>> >>>>>>> By: >>>>>>> +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) >>>>>>> + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>>>>> +endif >>>>>>> +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) >>>>>>> + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>>>>> +endif >>>>>>> >>>>>>> That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: >>>>>>> # PCI doesn't provide stubs, need to check >>>>>>> ifneq ($(CONFIG_PCI),) >>>>>>> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>>>>> endif >>>>>>> >>>>>>> ifneq ($(CONFIG_OF),) >>>>>>> obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>>>>> endif >>>>>>> >>>>>>> >>>>>>> Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. >>>>>>> I would like to send a patch for 13.2 and master ASAP. >>>>>> It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and >>>>>> CONFIG_USB_CHIPIDEA_IMX from bool to tristate. >>>>> Right. :) >>>>> >>>>> I will update the patch tomorrow. >>>> Reconsidering again, I wonder whether we can just add a proper >>>> dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only >>>> CONFIG_OF, if the faulty build on powerpc is the problem. >>> Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS). >>> >>> Does the build problem still exist at all on powerpc? >> Yeah, that's a primary question. IMO, we should begin with dropping >> the patch. If anything gets broken by that, let's fix again. > Ok, then I will submit a patch to remove it for master, see what's happen and make a new patch if needed. Oh, no need for that. Removing a patch is easier done by hand. Maybe better to disable the patch by guard at first, then remove it later. Do you mean to comment it out in series.conf or something else? Add either - or + guard to the patch in series.conf. This is the standard way to disable/enable the patch while keeping it for a while. Ok. I have done it locally (OBS branch). I am waiting for PPC builds. It could speed up the process, if it breaks. I just noticed that CONFIG_USB_CHIPIDEA is only enable on armv7 configs! So, there will be no problem on PPC.
Do you want to keep the patch and just disable it in series.conf, or could I remove it? I already disabled and pushed the git branch.
Perfect. Thanks. If you have done it for master only, could you do it for 13.2 also, please? (I cannot check, the server is not yet in sync). Guillaume -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
At Wed, 05 Nov 2014 11:26:22 +0100, Guillaume Gardet wrote:
Le 05/11/2014 11:17, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 10:45:09 +0100, Guillaume Gardet wrote:
Le 05/11/2014 10:31, Guillaume Gardet a écrit :
Le 05/11/2014 10:22, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 10:17:10 +0100, Guillaume Gardet wrote:
Le 05/11/2014 10:01, Takashi Iwai a écrit : > At Wed, 05 Nov 2014 09:51:42 +0100, > Guillaume Gardet wrote: >> Le 05/11/2014 09:45, Takashi Iwai a écrit : >>> At Wed, 05 Nov 2014 09:39:27 +0100, >>> Guillaume Gardet wrote: >>>> Le 05/11/2014 08:08, Takashi Iwai a écrit : >>>>> At Tue, 04 Nov 2014 18:04:14 +0100, >>>>> Guillaume Gardet wrote: >>>>>> Le 04/11/2014 17:00, Takashi Iwai a écrit : >>>>>>> At Tue, 04 Nov 2014 16:39:41 +0100, >>>>>>> Guillaume Gardet wrote: >>>>>>>> Hi, >>>>>>>> >>>>>>>> the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module. >>>>>>>> >>>>>>>> I replaced the following lines: >>>>>>>> +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o >>>>>>>> +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o >>>>>>>> >>>>>>>> By: >>>>>>>> +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) >>>>>>>> + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>>>>>> +endif >>>>>>>> +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) >>>>>>>> + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>>>>>> +endif >>>>>>>> >>>>>>>> That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: >>>>>>>> # PCI doesn't provide stubs, need to check >>>>>>>> ifneq ($(CONFIG_PCI),) >>>>>>>> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>>>>>> endif >>>>>>>> >>>>>>>> ifneq ($(CONFIG_OF),) >>>>>>>> obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>>>>>> endif >>>>>>>> >>>>>>>> >>>>>>>> Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. >>>>>>>> I would like to send a patch for 13.2 and master ASAP. >>>>>>> It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and >>>>>>> CONFIG_USB_CHIPIDEA_IMX from bool to tristate. >>>>>> Right. :) >>>>>> >>>>>> I will update the patch tomorrow. >>>>> Reconsidering again, I wonder whether we can just add a proper >>>>> dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only >>>>> CONFIG_OF, if the faulty build on powerpc is the problem. >>>> Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS). >>>> >>>> Does the build problem still exist at all on powerpc? >>> Yeah, that's a primary question. IMO, we should begin with dropping >>> the patch. If anything gets broken by that, let's fix again. >> Ok, then I will submit a patch to remove it for master, see what's happen and make a new patch if needed. > Oh, no need for that. Removing a patch is easier done by hand. > Maybe better to disable the patch by guard at first, then remove it > later. Do you mean to comment it out in series.conf or something else? Add either - or + guard to the patch in series.conf. This is the standard way to disable/enable the patch while keeping it for a while. Ok. I have done it locally (OBS branch). I am waiting for PPC builds. It could speed up the process, if it breaks. I just noticed that CONFIG_USB_CHIPIDEA is only enable on armv7 configs! So, there will be no problem on PPC.
Do you want to keep the patch and just disable it in series.conf, or could I remove it? I already disabled and pushed the git branch.
Perfect. Thanks. If you have done it for master only, could you do it for 13.2 also, please? (I cannot check, the server is not yet in sync).
Let's check master builds for a while, then apply to 13.2 and stable. But, for applying to 13.2, we need a bugzilla entry. Care to open a bug report? Takashi -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
Le 05/11/2014 11:32, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 11:26:22 +0100, Guillaume Gardet wrote:
Le 05/11/2014 11:17, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 10:45:09 +0100, Guillaume Gardet wrote:
Le 05/11/2014 10:31, Guillaume Gardet a écrit :
Le 05/11/2014 10:22, Takashi Iwai a écrit :
At Wed, 05 Nov 2014 10:17:10 +0100, Guillaume Gardet wrote: > Le 05/11/2014 10:01, Takashi Iwai a écrit : >> At Wed, 05 Nov 2014 09:51:42 +0100, >> Guillaume Gardet wrote: >>> Le 05/11/2014 09:45, Takashi Iwai a écrit : >>>> At Wed, 05 Nov 2014 09:39:27 +0100, >>>> Guillaume Gardet wrote: >>>>> Le 05/11/2014 08:08, Takashi Iwai a écrit : >>>>>> At Tue, 04 Nov 2014 18:04:14 +0100, >>>>>> Guillaume Gardet wrote: >>>>>>> Le 04/11/2014 17:00, Takashi Iwai a écrit : >>>>>>>> At Tue, 04 Nov 2014 16:39:41 +0100, >>>>>>>> Guillaume Gardet wrote: >>>>>>>>> Hi, >>>>>>>>> >>>>>>>>> the "patches.rpmify/chipidea-clean-up-dependencies" patch in openSUSE git repo is not working because IMX (and PCI) bits needs to be built as modules, at least when CONFIG_USB_CHIPIDEA is also a module. >>>>>>>>> >>>>>>>>> I replaced the following lines: >>>>>>>>> +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o >>>>>>>>> +obj-$(CONFIG_USB_CHIPIDEA_IMX) += usbmisc_imx.o ci_hdrc_imx.o >>>>>>>>> >>>>>>>>> By: >>>>>>>>> +ifneq ($(CONFIG_USB_CHIPIDEA_PCI),) >>>>>>>>> + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>>>>>>> +endif >>>>>>>>> +ifneq ($(CONFIG_USB_CHIPIDEA_IMX),) >>>>>>>>> + obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>>>>>>> +endif >>>>>>>>> >>>>>>>>> That way USB is working fine on iMX6 boards (tested on Sabre Lite board), and we are more in line with upstream which uses: >>>>>>>>> # PCI doesn't provide stubs, need to check >>>>>>>>> ifneq ($(CONFIG_PCI),) >>>>>>>>> obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o >>>>>>>>> endif >>>>>>>>> >>>>>>>>> ifneq ($(CONFIG_OF),) >>>>>>>>> obj-$(CONFIG_USB_CHIPIDEA) += usbmisc_imx.o ci_hdrc_imx.o >>>>>>>>> endif >>>>>>>>> >>>>>>>>> >>>>>>>>> Any comment on how I did it? I guess we could do it better, so if you have any suggestion, please share. >>>>>>>>> I would like to send a patch for 13.2 and master ASAP. >>>>>>>> It'd be much easier to change CONFIG_USB_CHIPIDEA_PCI and >>>>>>>> CONFIG_USB_CHIPIDEA_IMX from bool to tristate. >>>>>>> Right. :) >>>>>>> >>>>>>> I will update the patch tomorrow. >>>>>> Reconsidering again, I wonder whether we can just add a proper >>>>>> dependency, e.g. depends on CONFIG_ARCH_MXS, instead of only >>>>>> CONFIG_OF, if the faulty build on powerpc is the problem. >>>>> Why not. (It would be CONFIG_ARCH_MXC instead of CONFIG_ARCH_MXS). >>>>> >>>>> Does the build problem still exist at all on powerpc? >>>> Yeah, that's a primary question. IMO, we should begin with dropping >>>> the patch. If anything gets broken by that, let's fix again. >>> Ok, then I will submit a patch to remove it for master, see what's happen and make a new patch if needed. >> Oh, no need for that. Removing a patch is easier done by hand. >> Maybe better to disable the patch by guard at first, then remove it >> later. > Do you mean to comment it out in series.conf or something else? Add either - or + guard to the patch in series.conf. This is the standard way to disable/enable the patch while keeping it for a while. Ok. I have done it locally (OBS branch). I am waiting for PPC builds. It could speed up the process, if it breaks. I just noticed that CONFIG_USB_CHIPIDEA is only enable on armv7 configs! So, there will be no problem on PPC.
Do you want to keep the patch and just disable it in series.conf, or could I remove it? I already disabled and pushed the git branch. Perfect. Thanks. If you have done it for master only, could you do it for 13.2 also, please? (I cannot check, the server is not yet in sync).
Let's check master builds for a while, then apply to 13.2 and stable. But, for applying to 13.2, we need a bugzilla entry. Care to open a bug report?
Done: #903986 I just tested a PPC build locally with option enabled and it does build fine. So, there is really no reason to keep this patch. Guillaume -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
This patch update applies to master, 13.2 and 13.1 branches. Signed-off-by: Guillaume GARDET <guillaume.gardet@opensuse.org> --- patches.rpmify/chipidea-clean-up-dependencies | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/patches.rpmify/chipidea-clean-up-dependencies b/patches.rpmify/chipidea-clean-up-dependencies index 169ce8e..f0c455f 100644 --- a/patches.rpmify/chipidea-clean-up-dependencies +++ b/patches.rpmify/chipidea-clean-up-dependencies @@ -1,7 +1,12 @@ -From: Jeff Mahoney <jeffm@suse.com> +From: Guillaume GARDET <guillaume.gardet@opensuse.org> Subject: chipidea: Allow user to select PCI/IMX options -Patch-mainline: Submitted to LKML Aug 27 2012 +Patch-mainline: V1 submitted to LKML Aug 27 2012 +* V2: +Change _PCI and _IMX from bool to tristate to fix USB when CONFIG_USB_CHIPIDEA +is a module. Tested on iMX6 board (Sabre Lite). + +* V1: The chipidea driver currently has needless ifneq rules in the makefile for things that should be config options. This can be problematic, especially in the IMX case, since the OF dependency will be met @@ -12,6 +17,7 @@ This patch adds _PCI and _IMX config options to allow the user to select whether to build the modules. Signed-off-by: Jeff Mahoney <jeffm@suse.com> +Signed-off-by: Guillaume GARDET <guillaume.gardet@opensuse.org> --- drivers/usb/chipidea/Kconfig | 11 +++++++++++ drivers/usb/chipidea/Makefile | 11 ++--------- @@ -24,13 +30,13 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com> Say Y here to enable debugging output of the ChipIdea driver. +config USB_CHIPIDEA_PCI -+ bool "ChipIdea PCI support" ++ tristate "ChipIdea PCI support" + depends on PCI + help + This option enables ChipIdea support on PCI. + +config USB_CHIPIDEA_IMX -+ bool "ChipIdea IMX support" ++ tristate "ChipIdea IMX support" + depends on OF + help + This option enables ChipIdea support on IMX. -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
participants (3)
-
Guillaume Gardet -
Guillaume GARDET
-
Takashi Iwai