[RESEND] Revert "PCI: dra7xx: Mark driver as broken"
diff mbox

Message ID 1457087359-16816-1-git-send-email-kishon@ti.com
State New
Headers show

Commit Message

Kishon Vijay Abraham I March 4, 2016, 10:29 a.m. UTC
From: Sekhar Nori <nsekhar@ti.com>

This reverts commit <5c3b99d057525fe2befe6a7db9b1309035d93eee>
("PCI: dra7xx: Mark driver as broken").

With support to de-assert PCIe reset present in kernel,
DRA7x PCIe is not broken anymore.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
Bjorn,

This patch should be merged only after [1] hits linus tree.

Thanks
Kishon

[1] -> git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git
	for-v4.6/omap-hwmod-b

 drivers/pci/host/Kconfig |    1 -
 1 file changed, 1 deletion(-)

Comments

Bjorn Helgaas March 8, 2016, 6:05 p.m. UTC | #1
On Fri, Mar 04, 2016 at 03:59:19PM +0530, Kishon Vijay Abraham I wrote:
> From: Sekhar Nori <nsekhar@ti.com>
> 
> This reverts commit <5c3b99d057525fe2befe6a7db9b1309035d93eee>
> ("PCI: dra7xx: Mark driver as broken").
> 
> With support to de-assert PCIe reset present in kernel,
> DRA7x PCIe is not broken anymore.
> 
> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> ---
> Bjorn,
> 
> This patch should be merged only after [1] hits linus tree.
> 
> Thanks
> Kishon
> 
> [1] -> git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git
> 	for-v4.6/omap-hwmod-b

OK.  Would you mind pinging me about this after [1] is merged to
Linus' tree?  I don't want to put this in my "next" branch yet,
because I don't know whether Pauls branch or mine will be merged first
in the merge window.  But after the merge window closes, I can
certainly include this in a "PCI fixes" pull request for inclusion in
v4.6.

Bjorn

>  drivers/pci/host/Kconfig |    1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> index 75a6054..6d181ba 100644
> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig
> @@ -5,7 +5,6 @@ config PCI_DRA7XX
>  	bool "TI DRA7xx PCIe controller"
>  	select PCIE_DW
>  	depends on OF && HAS_IOMEM && TI_PIPE3
> -	depends on BROKEN
>  	help
>  	 Enables support for the PCIe controller in the DRA7xx SoC.  There
>  	 are two instances of PCIe controller in DRA7xx.  This controller can
> -- 
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kishon Vijay Abraham I March 9, 2016, 5:01 a.m. UTC | #2
On Tuesday 08 March 2016 11:35 PM, Bjorn Helgaas wrote:
> On Fri, Mar 04, 2016 at 03:59:19PM +0530, Kishon Vijay Abraham I wrote:
>> From: Sekhar Nori <nsekhar@ti.com>
>>
>> This reverts commit <5c3b99d057525fe2befe6a7db9b1309035d93eee>
>> ("PCI: dra7xx: Mark driver as broken").
>>
>> With support to de-assert PCIe reset present in kernel,
>> DRA7x PCIe is not broken anymore.
>>
>> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>> ---
>> Bjorn,
>>
>> This patch should be merged only after [1] hits linus tree.
>>
>> Thanks
>> Kishon
>>
>> [1] -> git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git
>> 	for-v4.6/omap-hwmod-b
> 
> OK.  Would you mind pinging me about this after [1] is merged to
> Linus' tree?  I don't want to put this in my "next" branch yet,
> because I don't know whether Pauls branch or mine will be merged first
> in the merge window.  But after the merge window closes, I can
> certainly include this in a "PCI fixes" pull request for inclusion in
> v4.6.

yes sure. I can do that.

Thanks
Kishon

> 
> Bjorn
> 
>>  drivers/pci/host/Kconfig |    1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
>> index 75a6054..6d181ba 100644
>> --- a/drivers/pci/host/Kconfig
>> +++ b/drivers/pci/host/Kconfig
>> @@ -5,7 +5,6 @@ config PCI_DRA7XX
>>  	bool "TI DRA7xx PCIe controller"
>>  	select PCIE_DW
>>  	depends on OF && HAS_IOMEM && TI_PIPE3
>> -	depends on BROKEN
>>  	help
>>  	 Enables support for the PCIe controller in the DRA7xx SoC.  There
>>  	 are two instances of PCIe controller in DRA7xx.  This controller can
>> -- 
>> 1.7.9.5
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kishon Vijay Abraham I March 22, 2016, 6:40 a.m. UTC | #3
Hi Bjorn,

On Wednesday 09 March 2016 10:31 AM, Kishon Vijay Abraham I wrote:
> 
> 
> On Tuesday 08 March 2016 11:35 PM, Bjorn Helgaas wrote:
>> On Fri, Mar 04, 2016 at 03:59:19PM +0530, Kishon Vijay Abraham I wrote:
>>> From: Sekhar Nori <nsekhar@ti.com>
>>>
>>> This reverts commit <5c3b99d057525fe2befe6a7db9b1309035d93eee>
>>> ("PCI: dra7xx: Mark driver as broken").
>>>
>>> With support to de-assert PCIe reset present in kernel,
>>> DRA7x PCIe is not broken anymore.
>>>
>>> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>> ---
>>> Bjorn,
>>>
>>> This patch should be merged only after [1] hits linus tree.
>>>
>>> Thanks
>>> Kishon
>>>
>>> [1] -> git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git
>>> 	for-v4.6/omap-hwmod-b
>>
>> OK.  Would you mind pinging me about this after [1] is merged to
>> Linus' tree?  I don't want to put this in my "next" branch yet,
>> because I don't know whether Pauls branch or mine will be merged first
>> in the merge window.  But after the merge window closes, I can
>> certainly include this in a "PCI fixes" pull request for inclusion in
>> v4.6.
> 
> yes sure. I can do that.

The reset patch [2] has been merged to linus tree. This patch can be merged now.

Thanks
Kishon

[2] ->
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/arm/mach-omap2/omap_hwmod_7xx_data.c?id=1c96bee4df1998b9dec3e2ef8f77e8436e29342b
> 
> Thanks
> Kishon
> 
>>
>> Bjorn
>>
>>>  drivers/pci/host/Kconfig |    1 -
>>>  1 file changed, 1 deletion(-)
>>>
>>> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
>>> index 75a6054..6d181ba 100644
>>> --- a/drivers/pci/host/Kconfig
>>> +++ b/drivers/pci/host/Kconfig
>>> @@ -5,7 +5,6 @@ config PCI_DRA7XX
>>>  	bool "TI DRA7xx PCIe controller"
>>>  	select PCIE_DW
>>>  	depends on OF && HAS_IOMEM && TI_PIPE3
>>> -	depends on BROKEN
>>>  	help
>>>  	 Enables support for the PCIe controller in the DRA7xx SoC.  There
>>>  	 are two instances of PCIe controller in DRA7xx.  This controller can
>>> -- 
>>> 1.7.9.5
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas March 22, 2016, 12:59 p.m. UTC | #4
On Fri, Mar 04, 2016 at 03:59:19PM +0530, Kishon Vijay Abraham I wrote:
> From: Sekhar Nori <nsekhar@ti.com>
> 
> This reverts commit <5c3b99d057525fe2befe6a7db9b1309035d93eee>
> ("PCI: dra7xx: Mark driver as broken").
> 
> With support to de-assert PCIe reset present in kernel,
> DRA7x PCIe is not broken anymore.
> 
> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

Applied to for-linus for v4.6, thanks!

> ---
> Bjorn,
> 
> This patch should be merged only after [1] hits linus tree.
> 
> Thanks
> Kishon
> 
> [1] -> git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git
> 	for-v4.6/omap-hwmod-b
> 
>  drivers/pci/host/Kconfig |    1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> index 75a6054..6d181ba 100644
> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig
> @@ -5,7 +5,6 @@ config PCI_DRA7XX
>  	bool "TI DRA7xx PCIe controller"
>  	select PCIE_DW
>  	depends on OF && HAS_IOMEM && TI_PIPE3
> -	depends on BROKEN
>  	help
>  	 Enables support for the PCIe controller in the DRA7xx SoC.  There
>  	 are two instances of PCIe controller in DRA7xx.  This controller can
> -- 
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 75a6054..6d181ba 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -5,7 +5,6 @@  config PCI_DRA7XX
 	bool "TI DRA7xx PCIe controller"
 	select PCIE_DW
 	depends on OF && HAS_IOMEM && TI_PIPE3
-	depends on BROKEN
 	help
 	 Enables support for the PCIe controller in the DRA7xx SoC.  There
 	 are two instances of PCIe controller in DRA7xx.  This controller can