diff mbox

[1/4] powerpc/85xx: fix interrupt number of memory-controller for P4080

Message ID 1311243889-4316-1-git-send-email-Shaohui.Xie@freescale.com (mailing list archive)
State Superseded
Delegated to: Kumar Gala
Headers show

Commit Message

shaohui xie July 21, 2011, 10:24 a.m. UTC
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
---
 arch/powerpc/boot/dts/p4080ds.dts |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

Kumar Gala July 21, 2011, 12:13 p.m. UTC | #1
On Jul 21, 2011, at 5:24 AM, Shaohui Xie wrote:

> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
> ---
> arch/powerpc/boot/dts/p4080ds.dts |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts
> index 927f94d..9c37a85 100644
> --- a/arch/powerpc/boot/dts/p4080ds.dts
> +++ b/arch/powerpc/boot/dts/p4080ds.dts
> @@ -131,14 +131,14 @@
> 			compatible = "fsl,p4080-memory-controller";
> 			reg = <0x8000 0x1000>;
> 			interrupt-parent = <&mpic>;
> -			interrupts = <0x12 2>;
> +			interrupts = <16 2>;
> 		};
> 
> 		memory-controller@9000 {
> 			compatible = "fsl,p4080-memory-controller";
> 			reg = <0x9000 0x1000>;
> 			interrupt-parent = <&mpic>;
> -			interrupts = <0x12 2>;
> +			interrupts = <16 2>;
> 		};
> 
> 		corenet-cf@18000 {
> -- 
> 1.6.4

What code base / tree is this against?

- k
Tabi Timur-B04825 July 21, 2011, 3:57 p.m. UTC | #2
On Thu, Jul 21, 2011 at 5:24 AM, Shaohui Xie <Shaohui.Xie@freescale.com> wrote:
> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
> ---

Can you provide an explanation as to why the current numbers are wrong?
shaohui xie July 22, 2011, 2:04 a.m. UTC | #3
>-----Original Message-----
>From: Gala Kumar-B11780
>Sent: Thursday, July 21, 2011 8:13 PM
>To: Xie Shaohui-B21989
>Cc: linuxppc-dev@lists.ozlabs.org
>Subject: Re: [PATCH 1/4] powerpc/85xx: fix interrupt number of memory-
>controller for P4080
>
>
>On Jul 21, 2011, at 5:24 AM, Shaohui Xie wrote:
>
>> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
>> ---
>> arch/powerpc/boot/dts/p4080ds.dts |    4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/powerpc/boot/dts/p4080ds.dts
>b/arch/powerpc/boot/dts/p4080ds.dts
>> index 927f94d..9c37a85 100644
>> --- a/arch/powerpc/boot/dts/p4080ds.dts
>> +++ b/arch/powerpc/boot/dts/p4080ds.dts
>> @@ -131,14 +131,14 @@
>> 			compatible = "fsl,p4080-memory-controller";
>> 			reg = <0x8000 0x1000>;
>> 			interrupt-parent = <&mpic>;
>> -			interrupts = <0x12 2>;
>> +			interrupts = <16 2>;
>> 		};
>>
>> 		memory-controller@9000 {
>> 			compatible = "fsl,p4080-memory-controller";
>> 			reg = <0x9000 0x1000>;
>> 			interrupt-parent = <&mpic>;
>> -			interrupts = <0x12 2>;
>> +			interrupts = <16 2>;
>> 		};
>>
>> 		corenet-cf@18000 {
>> --
>> 1.6.4
>
>What code base / tree is this against?
>

[Xie Shaohui] This patch is based on v3.0-rc7.


Best Regards, 
Shaohui Xie
shaohui xie July 22, 2011, 2:12 a.m. UTC | #4
>From: Tabi Timur-B04825
>Sent: Thursday, July 21, 2011 11:58 PM
>To: Xie Shaohui-B21989
>Cc: linuxppc-dev@lists.ozlabs.org; Gala Kumar-B11780
>Subject: Re: [PATCH 1/4] powerpc/85xx: fix interrupt number of memory-
>controller for P4080
>
>On Thu, Jul 21, 2011 at 5:24 AM, Shaohui Xie <Shaohui.Xie@freescale.com>
>wrote:
>> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
>> ---
>
>Can you provide an explanation as to why the current numbers are wrong?
>

[Xie Shaohui] This irq number is used by edac/mc, the edac/mc will handle the error interrupt
Issued by memory-controllers, but the error interrupt on p4080 is 16.


Best Regards, 
Shaohui Xie
Kumar Gala July 22, 2011, 6 a.m. UTC | #5
On Jul 21, 2011, at 9:04 PM, Xie Shaohui-B21989 wrote:

> 
> 
> 
>> -----Original Message-----
>> From: Gala Kumar-B11780
>> Sent: Thursday, July 21, 2011 8:13 PM
>> To: Xie Shaohui-B21989
>> Cc: linuxppc-dev@lists.ozlabs.org
>> Subject: Re: [PATCH 1/4] powerpc/85xx: fix interrupt number of memory-
>> controller for P4080
>> 
>> 
>> On Jul 21, 2011, at 5:24 AM, Shaohui Xie wrote:
>> 
>>> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
>>> ---
>>> arch/powerpc/boot/dts/p4080ds.dts |    4 ++--
>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/arch/powerpc/boot/dts/p4080ds.dts
>> b/arch/powerpc/boot/dts/p4080ds.dts
>>> index 927f94d..9c37a85 100644
>>> --- a/arch/powerpc/boot/dts/p4080ds.dts
>>> +++ b/arch/powerpc/boot/dts/p4080ds.dts
>>> @@ -131,14 +131,14 @@
>>> 			compatible = "fsl,p4080-memory-controller";
>>> 			reg = <0x8000 0x1000>;
>>> 			interrupt-parent = <&mpic>;
>>> -			interrupts = <0x12 2>;
>>> +			interrupts = <16 2>;
>>> 		};
>>> 
>>> 		memory-controller@9000 {
>>> 			compatible = "fsl,p4080-memory-controller";
>>> 			reg = <0x9000 0x1000>;
>>> 			interrupt-parent = <&mpic>;
>>> -			interrupts = <0x12 2>;
>>> +			interrupts = <16 2>;
>>> 		};
>>> 
>>> 		corenet-cf@18000 {
>>> --
>>> 1.6.4
>> 
>> What code base / tree is this against?
>> 
> 
> [Xie Shaohui] This patch is based on v3.0-rc7.

Please use galak/powerpc.git 'next' branch.

It has the following:

http://git.kernel.org/?p=linux/kernel/git/galak/powerpc.git;a=blob;f=arch/powerpc/boot/dts/p4080si.dtsi;h=b71051f506c1763fbb911a0df62b58577eda2ce0;hb=refs/heads/next

- k
shaohui xie July 22, 2011, 6:22 a.m. UTC | #6
>-----Original Message-----
>From: Kumar Gala [mailto:galak@kernel.crashing.org]
>Sent: Friday, July 22, 2011 2:01 PM
>To: Xie Shaohui-B21989
>Cc: Gala Kumar-B11780; linuxppc-dev@lists.ozlabs.org
>Subject: Re: [PATCH 1/4] powerpc/85xx: fix interrupt number of memory-
>controller for P4080
>
>
>On Jul 21, 2011, at 9:04 PM, Xie Shaohui-B21989 wrote:
>
>>
>>
>>
>>> -----Original Message-----
>>> From: Gala Kumar-B11780
>>> Sent: Thursday, July 21, 2011 8:13 PM
>>> To: Xie Shaohui-B21989
>>> Cc: linuxppc-dev@lists.ozlabs.org
>>> Subject: Re: [PATCH 1/4] powerpc/85xx: fix interrupt number of
>>> memory- controller for P4080
>>>
>>>
>>> On Jul 21, 2011, at 5:24 AM, Shaohui Xie wrote:
>>>
>>>> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
>>>> ---
>>>> arch/powerpc/boot/dts/p4080ds.dts |    4 ++--
>>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/arch/powerpc/boot/dts/p4080ds.dts
>>> b/arch/powerpc/boot/dts/p4080ds.dts
>>>> index 927f94d..9c37a85 100644
>>>> --- a/arch/powerpc/boot/dts/p4080ds.dts
>>>> +++ b/arch/powerpc/boot/dts/p4080ds.dts
>>>> @@ -131,14 +131,14 @@
>>>> 			compatible = "fsl,p4080-memory-controller";
>>>> 			reg = <0x8000 0x1000>;
>>>> 			interrupt-parent = <&mpic>;
>>>> -			interrupts = <0x12 2>;
>>>> +			interrupts = <16 2>;
>>>> 		};
>>>>
>>>> 		memory-controller@9000 {
>>>> 			compatible = "fsl,p4080-memory-controller";
>>>> 			reg = <0x9000 0x1000>;
>>>> 			interrupt-parent = <&mpic>;
>>>> -			interrupts = <0x12 2>;
>>>> +			interrupts = <16 2>;
>>>> 		};
>>>>
>>>> 		corenet-cf@18000 {
>>>> --
>>>> 1.6.4
>>>
>>> What code base / tree is this against?
>>>
>>
>> [Xie Shaohui] This patch is based on v3.0-rc7.
>
>Please use galak/powerpc.git 'next' branch.
>
>It has the following:
>
>http://git.kernel.org/?p=linux/kernel/git/galak/powerpc.git;a=blob;f=arch/
>powerpc/boot/dts/p4080si.dtsi;h=b71051f506c1763fbb911a0df62b58577eda2ce0;h
>b=refs/heads/next
>

[Xie Shaohui] OK, thanks!
I'll rebase these patches on 'next' branch.



Best Regards, 
Shaohui Xie
diff mbox

Patch

diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts
index 927f94d..9c37a85 100644
--- a/arch/powerpc/boot/dts/p4080ds.dts
+++ b/arch/powerpc/boot/dts/p4080ds.dts
@@ -131,14 +131,14 @@ 
 			compatible = "fsl,p4080-memory-controller";
 			reg = <0x8000 0x1000>;
 			interrupt-parent = <&mpic>;
-			interrupts = <0x12 2>;
+			interrupts = <16 2>;
 		};
 
 		memory-controller@9000 {
 			compatible = "fsl,p4080-memory-controller";
 			reg = <0x9000 0x1000>;
 			interrupt-parent = <&mpic>;
-			interrupts = <0x12 2>;
+			interrupts = <16 2>;
 		};
 
 		corenet-cf@18000 {