[PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Stephen Warren]

Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
sleep.S to do so.

Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
---
 arch/arm/mach-tegra/sleep.S |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
index 8f9fde1..48cc7c6 100644
--- a/arch/arm/mach-tegra/sleep.S
+++ b/arch/arm/mach-tegra/sleep.S
@@ -22,7 +22,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <asm/assembler.h>
+
 #include <linux/linkage.h>
+
 #include <mach/io.h>
 #include <mach/iomap.h>
 
-- 
1.7.0.4

Re: [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Rob Herring]

On 03/19/2012 11:50 AM, Stephen Warren wrote:
> Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
> IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
> sleep.S to do so.
> 
> Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
> ---
>  arch/arm/mach-tegra/sleep.S |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
> index 8f9fde1..48cc7c6 100644
> --- a/arch/arm/mach-tegra/sleep.S
> +++ b/arch/arm/mach-tegra/sleep.S
> @@ -22,7 +22,10 @@
>   * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
>   */
>  
> +#include <asm/assembler.h>
> +

Is there some reason you put this before linux/ include?

>  #include <linux/linkage.h>
> +
>  #include <mach/io.h>
>  #include <mach/iomap.h>
>  

Re: [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Stephen Warren]

On 03/19/2012 10:54 AM, Rob Herring wrote:
> On 03/19/2012 11:50 AM, Stephen Warren wrote:
>> Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
>> IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
>> sleep.S to do so.
>>
>> Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
>> ---
>>  arch/arm/mach-tegra/sleep.S |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
...
>> +#include <asm/assembler.h>
>> +
> 
> Is there some reason you put this before linux/ include?

No. I just misremembered which order linux/ and asm/ should go in. Do
you want me to repost?

>>  #include <linux/linkage.h>
>> +
>>  #include <mach/io.h>
>>  #include <mach/iomap.h>

Re: [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Thierry Reding]

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

* Stephen Warren wrote:
> Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
> IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
> sleep.S to do so.
> 
> Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
> ---
>  arch/arm/mach-tegra/sleep.S |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
> index 8f9fde1..48cc7c6 100644
> --- a/arch/arm/mach-tegra/sleep.S
> +++ b/arch/arm/mach-tegra/sleep.S
> @@ -22,7 +22,10 @@
>   * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
>   */
>  
> +#include <asm/assembler.h>
> +
>  #include <linux/linkage.h>
> +
>  #include <mach/io.h>
>  #include <mach/iomap.h>

I actually had a similar patch that looked pretty much like this:

	-#include <mach/io.h>
	+#include <asm/assembler.h>

The mach/io.h is no longer required AFAICT.

Thierry

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

[PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Stephen Warren]

Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
sleep.S to do so.

Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
---
v2: Fix linux/ vs. asm/ include ordering. Remove include of io.h too.

 arch/arm/mach-tegra/sleep.S |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
index 8f9fde1..5b20197 100644
--- a/arch/arm/mach-tegra/sleep.S
+++ b/arch/arm/mach-tegra/sleep.S
@@ -23,7 +23,9 @@
  */
 
 #include <linux/linkage.h>
-#include <mach/io.h>
+
+#include <asm/assembler.h>
+
 #include <mach/iomap.h>
 
 #include "flowctrl.h"
-- 
1.7.0.4

Re: [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Rob Herring]

On 03/19/2012 12:07 PM, Stephen Warren wrote:
> Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
> IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
> sleep.S to do so.
> 
> Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>

Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>

> ---
> v2: Fix linux/ vs. asm/ include ordering. Remove include of io.h too.
> 
>  arch/arm/mach-tegra/sleep.S |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
> index 8f9fde1..5b20197 100644
> --- a/arch/arm/mach-tegra/sleep.S
> +++ b/arch/arm/mach-tegra/sleep.S
> @@ -23,7 +23,9 @@
>   */
>  
>  #include <linux/linkage.h>
> -#include <mach/io.h>
> +
> +#include <asm/assembler.h>
> +
>  #include <mach/iomap.h>
>  
>  #include "flowctrl.h"

Re: [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Stephen Warren]

On 03/19/2012 12:10 PM, Rob Herring wrote:
> On 03/19/2012 12:07 PM, Stephen Warren wrote:
>> Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
>> IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
>> sleep.S to do so.
>>
>> Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
> 
> Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>

Arnd,

Can you pick up this fix directly into arm-soc, or do you want me to
generate a pull request for this kind of thing too?

ARM: tegra: Include assembler.h in sleep.S to fix build break
http://patchwork.ozlabs.org/patch/147587/

The same goes for:

ARM: tegra: Fix device tree AUXDATA for USB/EHCI
http://patchwork.ozlabs.org/patch/147616/

Thanks.

Re: [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Rob Herring]

On 03/21/2012 11:15 AM, Stephen Warren wrote:
> On 03/19/2012 12:10 PM, Rob Herring wrote:
>> On 03/19/2012 12:07 PM, Stephen Warren wrote:
>>> Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
>>> IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
>>> sleep.S to do so.
>>>
>>> Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
>>
>> Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
> 
> Arnd,
> 
> Can you pick up this fix directly into arm-soc, or do you want me to
> generate a pull request for this kind of thing too?
> 
> ARM: tegra: Include assembler.h in sleep.S to fix build break
> http://patchwork.ozlabs.org/patch/147587/
> 
> The same goes for:
> 
> ARM: tegra: Fix device tree AUXDATA for USB/EHCI
> http://patchwork.ozlabs.org/patch/147616/
> 

I can take it and send the pull request. I've got a couple of other
fixes as well.

Rob

Re: [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Stephen Warren]

On 03/21/2012 11:02 AM, Rob Herring wrote:
> On 03/21/2012 11:15 AM, Stephen Warren wrote:
>> On 03/19/2012 12:10 PM, Rob Herring wrote:
>>> On 03/19/2012 12:07 PM, Stephen Warren wrote:
>>>> Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
>>>> IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
>>>> sleep.S to do so.
>>>>
>>>> Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
>>>
>>> Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
>>
>> Arnd,
>>
>> Can you pick up this fix directly into arm-soc, or do you want me to
>> generate a pull request for this kind of thing too?
>>
>> ARM: tegra: Include assembler.h in sleep.S to fix build break
>> http://patchwork.ozlabs.org/patch/147587/
>>
>> The same goes for:
>>
>> ARM: tegra: Fix device tree AUXDATA for USB/EHCI
>> http://patchwork.ozlabs.org/patch/147616/
> 
> I can take it and send the pull request. I've got a couple of other
> fixes as well.

That's just for the sleep.S change, right.

Re: [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Rob Herring]

On 03/21/2012 12:05 PM, Stephen Warren wrote:
> On 03/21/2012 11:02 AM, Rob Herring wrote:
>> On 03/21/2012 11:15 AM, Stephen Warren wrote:
>>> On 03/19/2012 12:10 PM, Rob Herring wrote:
>>>> On 03/19/2012 12:07 PM, Stephen Warren wrote:
>>>>> Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
>>>>> IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
>>>>> sleep.S to do so.
>>>>>
>>>>> Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
>>>>
>>>> Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
>>>
>>> Arnd,
>>>
>>> Can you pick up this fix directly into arm-soc, or do you want me to
>>> generate a pull request for this kind of thing too?
>>>
>>> ARM: tegra: Include assembler.h in sleep.S to fix build break
>>> http://patchwork.ozlabs.org/patch/147587/
>>>
>>> The same goes for:
>>>
>>> ARM: tegra: Fix device tree AUXDATA for USB/EHCI
>>> http://patchwork.ozlabs.org/patch/147616/
>>
>> I can take it and send the pull request. I've got a couple of other
>> fixes as well.
> 
> That's just for the sleep.S change, right.

Ah, I missed the 2nd one. So it makes less sense now for me to take it.
I'm still happy to, but it doesn't really save you anything.

Rob

Rob

Re: [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break

[Rob Herring]

Stephen,

On 03/21/2012 12:19 PM, Rob Herring wrote:
> On 03/21/2012 12:05 PM, Stephen Warren wrote:
>> On 03/21/2012 11:02 AM, Rob Herring wrote:
>>> On 03/21/2012 11:15 AM, Stephen Warren wrote:
>>>> On 03/19/2012 12:10 PM, Rob Herring wrote:
>>>>> On 03/19/2012 12:07 PM, Stephen Warren wrote:
>>>>>> Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro
>>>>>> IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's
>>>>>> sleep.S to do so.
>>>>>>
>>>>>> Signed-off-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
>>>>>
>>>>> Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
>>>>
>>>> Arnd,
>>>>
>>>> Can you pick up this fix directly into arm-soc, or do you want me to
>>>> generate a pull request for this kind of thing too?
>>>>
>>>> ARM: tegra: Include assembler.h in sleep.S to fix build break
>>>> http://patchwork.ozlabs.org/patch/147587/
>>>>
>>>> The same goes for:
>>>>
>>>> ARM: tegra: Fix device tree AUXDATA for USB/EHCI
>>>> http://patchwork.ozlabs.org/patch/147616/
>>>
>>> I can take it and send the pull request. I've got a couple of other
>>> fixes as well.
>>
>> That's just for the sleep.S change, right.
> 
> Ah, I missed the 2nd one. So it makes less sense now for me to take it.
> I'm still happy to, but it doesn't really save you anything.

After our irc discussion, I pulled this in and then realized this is a
newly added file that's not in my tree. So you should send this fix to
Arnd/Olof.

Rob