[PATCH 0/7] AT91 cleanup for 3.20 #1

[PATCH 0/7] AT91 cleanup for 3.20 #1

[Alexandre Belloni]

Hi,

This patch set cleans a lot of remaining header, config options and functions
that are not used anymore since the switch to DT only.

Patch 5 is moving mach/debug-macro.S to include/debug/at91.S to prepare the
upcoming switch to multiplatform.


Alexandre Belloni (7):
  ARM: at91: remove unused mach/memory.h
  ARM: at91: remove useless config MACH_AT91RM9200_DT
  ARM: at91: remove useless config MACH_AT91SAM9_DT
  ARM: at91: remove useless at91_sysirq_mask_rtx
  ARM: at91: move debug-macro.S into the common space
  ARM: at91: remove useless at91rm9200_dt_initialize()
  ARM: at91: remove useless at91rm9200_set_type()

 MAINTAINERS                                        |  1 +
 arch/arm/Kconfig.debug                             |  9 ++-
 .../mach/debug-macro.S => include/debug/at91.S}    | 19 +++---
 arch/arm/mach-at91/Kconfig                         |  8 ---
 arch/arm/mach-at91/Makefile                        |  6 +-
 arch/arm/mach-at91/at91sam9260.c                   |  2 -
 arch/arm/mach-at91/at91sam9261.c                   |  2 -
 arch/arm/mach-at91/at91sam9263.c                   |  3 -
 arch/arm/mach-at91/at91sam9g45.c                   |  3 -
 arch/arm/mach-at91/at91sam9n12.c                   |  6 --
 arch/arm/mach-at91/at91sam9rl.c                    |  3 -
 arch/arm/mach-at91/at91sam9x5.c                    | 10 ---
 arch/arm/mach-at91/board-dt-rm9200.c               |  2 +-
 arch/arm/mach-at91/generic.h                       |  6 --
 arch/arm/mach-at91/include/mach/at91_rtt.h         | 35 ----------
 arch/arm/mach-at91/include/mach/memory.h           | 26 --------
 arch/arm/mach-at91/sama5d3.c                       |  6 --
 arch/arm/mach-at91/setup.c                         | 18 ------
 arch/arm/mach-at91/sysirq_mask.c                   | 75 ----------------------
 19 files changed, 23 insertions(+), 217 deletions(-)
 rename arch/arm/{mach-at91/include/mach/debug-macro.S => include/debug/at91.S} (68%)
 delete mode 100644 arch/arm/mach-at91/include/mach/at91_rtt.h
 delete mode 100644 arch/arm/mach-at91/include/mach/memory.h
 delete mode 100644 arch/arm/mach-at91/sysirq_mask.c

-- 
2.1.0

[PATCH 1/7] ARM: at91: remove unused mach/memory.h

[Alexandre Belloni]

CONFIG_NEED_MACH_MEMORY_H is not set by any at91 platform, remove mach/memory.h

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/include/mach/memory.h | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 arch/arm/mach-at91/include/mach/memory.h

diff --git a/arch/arm/mach-at91/include/mach/memory.h b/arch/arm/mach-at91/include/mach/memory.h
deleted file mode 100644
index 401c207f2f39..000000000000
--- a/arch/arm/mach-at91/include/mach/memory.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * arch/arm/mach-at91/include/mach/memory.h
- *
- *  Copyright (C) 2004 SAN People
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-#include <mach/hardware.h>
-
-#endif
-- 
2.1.0

[PATCH 2/7] ARM: at91: remove useless config MACH_AT91RM9200_DT

[Alexandre Belloni]

Now that rm9200 is only supported through DT, remove CONFIG_MACH_AT91RM9200_DT
and use CONFIG_SOC_AT91RM9200 instead.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/Kconfig  | 3 ---
 arch/arm/mach-at91/Makefile | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 2395c68b3e32..34725b296e4d 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -174,9 +174,6 @@ config SOC_AT91SAM9N12
 # ----------------------------------------------------------
 endif # SOC_SAM_V4_V5
 
-config MACH_AT91RM9200_DT
-	def_bool SOC_AT91RM9200
-
 config MACH_AT91SAM9_DT
 	def_bool SOC_AT91SAM9
 
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 7b6424d40764..55fc93f5638b 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -19,7 +19,7 @@ obj-$(CONFIG_SOC_SAMA5D3)	+= sama5d3.o
 obj-$(CONFIG_SOC_SAMA5D4)	+= sama5d4.o
 
 # AT91SAM board with device-tree
-obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
+obj-$(CONFIG_SOC_AT91RM9200) += board-dt-rm9200.o
 obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
 
 # SAMA5 board with device-tree
-- 
2.1.0

[PATCH 3/7] ARM: at91: remove useless config MACH_AT91SAM9_DT

[Alexandre Belloni]

Now that at91sam9 SoCs are only supported through DT, remove
CONFIG_MACH_AT91SAM9_DT and use CONFIG_SOC_AT91SAM9 instead.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/Kconfig  | 5 -----
 arch/arm/mach-at91/Makefile | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 34725b296e4d..cec0fb5d621a 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -174,11 +174,6 @@ config SOC_AT91SAM9N12
 # ----------------------------------------------------------
 endif # SOC_SAM_V4_V5
 
-config MACH_AT91SAM9_DT
-	def_bool SOC_AT91SAM9
-
-# ----------------------------------------------------------
-
 comment "AT91 Feature Selections"
 
 config AT91_SLOW_CLOCK
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 55fc93f5638b..9165a4aa7f0d 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -20,7 +20,7 @@ obj-$(CONFIG_SOC_SAMA5D4)	+= sama5d4.o
 
 # AT91SAM board with device-tree
 obj-$(CONFIG_SOC_AT91RM9200) += board-dt-rm9200.o
-obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
+obj-$(CONFIG_SOC_AT91SAM9) += board-dt-sam9.o
 
 # SAMA5 board with device-tree
 obj-$(CONFIG_SOC_SAMA5)		+= board-dt-sama5.o
-- 
2.1.0

[PATCH 4/7] ARM: at91: remove useless at91_sysirq_mask_rtx

[Alexandre Belloni]

The irq fixup from at91_sysirq_mask_rtc and at91_sysirq_mask_rtt is now handled
by aic_common_rtc_irq_fixup and aic_common_rtt_irq_fixup. Remove those useless
functions.
Also remove the now unused mach/at91_rtt.h header.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/Makefile                |  2 +-
 arch/arm/mach-at91/at91sam9260.c           |  2 -
 arch/arm/mach-at91/at91sam9261.c           |  2 -
 arch/arm/mach-at91/at91sam9263.c           |  3 --
 arch/arm/mach-at91/at91sam9g45.c           |  3 --
 arch/arm/mach-at91/at91sam9n12.c           |  6 ---
 arch/arm/mach-at91/at91sam9rl.c            |  3 --
 arch/arm/mach-at91/at91sam9x5.c            | 10 ----
 arch/arm/mach-at91/generic.h               |  4 --
 arch/arm/mach-at91/include/mach/at91_rtt.h | 35 --------------
 arch/arm/mach-at91/sama5d3.c               |  6 ---
 arch/arm/mach-at91/sysirq_mask.c           | 75 ------------------------------
 12 files changed, 1 insertion(+), 150 deletions(-)
 delete mode 100644 arch/arm/mach-at91/include/mach/at91_rtt.h
 delete mode 100644 arch/arm/mach-at91/sysirq_mask.c

diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 9165a4aa7f0d..8ef7d9a2e855 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-obj-y		:= setup.o sysirq_mask.o
+obj-y		:= setup.o
 
 obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o
 
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 78137c24d90b..34e2abe82ae4 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -51,8 +51,6 @@ static void __init at91sam9260_map_io(void)
 static void __init at91sam9260_initialize(void)
 {
 	arm_pm_idle = at91sam9_idle;
-
-	at91_sysirq_mask_rtt(AT91SAM9260_BASE_RTT);
 }
 
 AT91_SOC_START(at91sam9260)
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index d29953ecb0c4..47878b849975 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -32,8 +32,6 @@ static void __init at91sam9261_map_io(void)
 static void __init at91sam9261_initialize(void)
 {
 	arm_pm_idle = at91sam9_idle;
-
-	at91_sysirq_mask_rtt(AT91SAM9261_BASE_RTT);
 }
 
 AT91_SOC_START(at91sam9261)
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index e7ad14864083..aabcb66145d0 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -29,9 +29,6 @@ static void __init at91sam9263_map_io(void)
 static void __init at91sam9263_initialize(void)
 {
 	arm_pm_idle = at91sam9_idle;
-
-	at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT0);
-	at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT1);
 }
 
 AT91_SOC_START(at91sam9263)
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index b6117bea9a6f..b044dbcc0dcc 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -29,9 +29,6 @@ static void __init at91sam9g45_map_io(void)
 static void __init at91sam9g45_initialize(void)
 {
 	arm_pm_idle = at91sam9_idle;
-
-	at91_sysirq_mask_rtc(AT91SAM9G45_BASE_RTC);
-	at91_sysirq_mask_rtt(AT91SAM9G45_BASE_RTT);
 }
 
 AT91_SOC_START(at91sam9g45)
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
index dee569b1987e..0135f868ea4f 100644
--- a/arch/arm/mach-at91/at91sam9n12.c
+++ b/arch/arm/mach-at91/at91sam9n12.c
@@ -21,12 +21,6 @@ static void __init at91sam9n12_map_io(void)
 	at91_init_sram(0, AT91SAM9N12_SRAM_BASE, AT91SAM9N12_SRAM_SIZE);
 }
 
-static void __init at91sam9n12_initialize(void)
-{
-	at91_sysirq_mask_rtc(AT91SAM9N12_BASE_RTC);
-}
-
 AT91_SOC_START(at91sam9n12)
 	.map_io = at91sam9n12_map_io,
-	.init = at91sam9n12_initialize,
 AT91_SOC_END
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
index f25b9aec9c50..7d303c132032 100644
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@ -42,9 +42,6 @@ static void __init at91sam9rl_map_io(void)
 static void __init at91sam9rl_initialize(void)
 {
 	arm_pm_idle = at91sam9_idle;
-
-	at91_sysirq_mask_rtc(AT91SAM9RL_BASE_RTC);
-	at91_sysirq_mask_rtt(AT91SAM9RL_BASE_RTT);
 }
 
 AT91_SOC_START(at91sam9rl)
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index f0d5a69a7237..aa17520ccb0a 100644
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -21,16 +21,6 @@ static void __init at91sam9x5_map_io(void)
 	at91_init_sram(0, AT91SAM9X5_SRAM_BASE, AT91SAM9X5_SRAM_SIZE);
 }
 
-static void __init at91sam9x5_initialize(void)
-{
-	at91_sysirq_mask_rtc(AT91SAM9X5_BASE_RTC);
-}
-
-/* --------------------------------------------------------------------
- *  Interrupt initialization
- * -------------------------------------------------------------------- */
-
 AT91_SOC_START(at91sam9x5)
 	.map_io = at91sam9x5_map_io,
-	.init = at91sam9x5_initialize,
 AT91_SOC_END
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index d53324210adf..e0368aa06390 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -25,10 +25,6 @@ extern void __init at91rm9200_set_type(int type);
 extern void __init at91rm9200_dt_initialize(void);
 extern void __init at91_dt_initialize(void);
 
- /* Interrupts */
-extern void __init at91_sysirq_mask_rtc(u32 rtc_base);
-extern void __init at91_sysirq_mask_rtt(u32 rtt_base);
-
  /* Timer */
 extern void at91rm9200_timer_init(void);
 
diff --git a/arch/arm/mach-at91/include/mach/at91_rtt.h b/arch/arm/mach-at91/include/mach/at91_rtt.h
deleted file mode 100644
index 7ec75de8bbb6..000000000000
--- a/arch/arm/mach-at91/include/mach/at91_rtt.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/arm/mach-at91/include/mach/at91_rtt.h
- *
- * Copyright (C) 2007 Andrew Victor
- * Copyright (C) 2007 Atmel Corporation.
- *
- * Real-time Timer (RTT) - System peripherals regsters.
- * Based on AT91SAM9261 datasheet revision D.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef AT91_RTT_H
-#define AT91_RTT_H
-
-#define AT91_RTT_MR		0x00			/* Real-time Mode Register */
-#define		AT91_RTT_RTPRES		(0xffff << 0)		/* Real-time Timer Prescaler Value */
-#define		AT91_RTT_ALMIEN		(1 << 16)		/* Alarm Interrupt Enable */
-#define		AT91_RTT_RTTINCIEN	(1 << 17)		/* Real Time Timer Increment Interrupt Enable */
-#define		AT91_RTT_RTTRST		(1 << 18)		/* Real Time Timer Restart */
-
-#define AT91_RTT_AR		0x04			/* Real-time Alarm Register */
-#define		AT91_RTT_ALMV		(0xffffffff)		/* Alarm Value */
-
-#define AT91_RTT_VR		0x08			/* Real-time Value Register */
-#define		AT91_RTT_CRTV		(0xffffffff)		/* Current Real-time Value */
-
-#define AT91_RTT_SR		0x0c			/* Real-time Status Register */
-#define		AT91_RTT_ALMS		(1 << 0)		/* Real-time Alarm Status */
-#define		AT91_RTT_RTTINC		(1 << 1)		/* Real-time Timer Increment */
-
-#endif
diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c
index 3d775d08de08..ae58feada72b 100644
--- a/arch/arm/mach-at91/sama5d3.c
+++ b/arch/arm/mach-at91/sama5d3.c
@@ -30,12 +30,6 @@ static void __init sama5d3_map_io(void)
 	at91_init_sram(0, SAMA5D3_SRAM_BASE, SAMA5D3_SRAM_SIZE);
 }
 
-static void __init sama5d3_initialize(void)
-{
-	at91_sysirq_mask_rtc(SAMA5D3_BASE_RTC);
-}
-
 AT91_SOC_START(sama5d3)
 	.map_io = sama5d3_map_io,
-	.init = sama5d3_initialize,
 AT91_SOC_END
diff --git a/arch/arm/mach-at91/sysirq_mask.c b/arch/arm/mach-at91/sysirq_mask.c
deleted file mode 100644
index f8bc3511a8c8..000000000000
--- a/arch/arm/mach-at91/sysirq_mask.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * sysirq_mask.c - System-interrupt masking
- *
- * Copyright (C) 2013 Johan Hovold <jhovold@gmail.com>
- *
- * Functions to disable system interrupts from backup-powered peripherals.
- *
- * The RTC and RTT-peripherals are generally powered by backup power (VDDBU)
- * and are not reset on wake-up, user, watchdog or software reset. This means
- * that their interrupts may be enabled during early boot (e.g. after a user
- * reset).
- *
- * As the RTC and RTT share the system-interrupt line with the PIT, an
- * interrupt occurring before a handler has been installed would lead to the
- * system interrupt being disabled and prevent the system from booting.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/io.h>
-#include <mach/at91_rtt.h>
-
-#include "generic.h"
-
-#define AT91_RTC_IDR		0x24	/* Interrupt Disable Register */
-#define AT91_RTC_IMR		0x28	/* Interrupt Mask Register */
-#define AT91_RTC_IRQ_MASK	0x1f	/* Available IRQs mask */
-
-void __init at91_sysirq_mask_rtc(u32 rtc_base)
-{
-	void __iomem *base;
-
-	base = ioremap(rtc_base, 64);
-	if (!base)
-		return;
-
-	/*
-	 * sam9x5 SoCs have the following errata:
-	 * "RTC: Interrupt Mask Register cannot be used
-	 *  Interrupt Mask Register read always returns 0."
-	 *
-	 * Hence we're not relying on IMR values to disable
-	 * interrupts.
-	 */
-	writel_relaxed(AT91_RTC_IRQ_MASK, base + AT91_RTC_IDR);
-	(void)readl_relaxed(base + AT91_RTC_IMR);	/* flush */
-
-	iounmap(base);
-}
-
-void __init at91_sysirq_mask_rtt(u32 rtt_base)
-{
-	void __iomem *base;
-	void __iomem *reg;
-	u32 mode;
-
-	base = ioremap(rtt_base, 16);
-	if (!base)
-		return;
-
-	reg = base + AT91_RTT_MR;
-
-	mode = readl_relaxed(reg);
-	if (mode & (AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN)) {
-		pr_info("AT91: Disabling rtt irq\n");
-		mode &= ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN);
-		writel_relaxed(mode, reg);
-		(void)readl_relaxed(reg);			/* flush */
-	}
-
-	iounmap(base);
-}
-- 
2.1.0

[PATCH 5/7] ARM: at91: move debug-macro.S into the common space

[Alexandre Belloni]

Move debug-macro.S from include/mach/ to include/debug where all other common
debug macros are.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 MAINTAINERS                                           |  1 +
 arch/arm/Kconfig.debug                                |  9 +++++++--
 .../mach/debug-macro.S => include/debug/at91.S}       | 19 +++++++++++--------
 3 files changed, 19 insertions(+), 10 deletions(-)
 rename arch/arm/{mach-at91/include/mach/debug-macro.S => include/debug/at91.S} (68%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 3589d67437f8..8c25979a3c43 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -877,6 +877,7 @@ F:	arch/arm/boot/dts/at91*.dts
 F:	arch/arm/boot/dts/at91*.dtsi
 F:	arch/arm/boot/dts/sama*.dts
 F:	arch/arm/boot/dts/sama*.dtsi
+F:	arch/arm/include/debug/at91.S
 
 ARM/ATMEL AT91 Clock Support
 M:	Boris Brezillon <boris.brezillon@free-electrons.com>
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 5ddd4906f7a7..e34d24949c6a 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -115,15 +115,18 @@ choice
 		    0x80024000      | 0xf0024000     | UART9
 
 	config AT91_DEBUG_LL_DBGU0
-		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"
+		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10, 9rl, 9x5, 9n12"
+		select DEBUG_AT91_UART
 		depends on HAVE_AT91_DBGU0
 
 	config AT91_DEBUG_LL_DBGU1
-		bool "Kernel low-level debugging on 9263 and 9g45"
+		bool "Kernel low-level debugging on 9263, 9g45 and sama5d3"
+		select DEBUG_AT91_UART
 		depends on HAVE_AT91_DBGU1
 
 	config AT91_DEBUG_LL_DBGU2
 		bool "Kernel low-level debugging on sama5d4"
+		select DEBUG_AT91_UART
 		depends on HAVE_AT91_DBGU2
 
 	config DEBUG_BCM2835
@@ -1165,6 +1168,8 @@ config DEBUG_LL_INCLUDE
 	string
 	default "debug/sa1100.S" if DEBUG_SA1100
 	default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
+	default "debug/at91.S" if AT91_DEBUG_LL_DBGU0 || AT91_DEBUG_LL_DBGU1 || \
+				AT91_DEBUG_LL_DBGU2
 	default "debug/asm9260.S" if DEBUG_ASM9260_UART
 	default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2
 	default "debug/meson.S" if DEBUG_MESON_UARTAO
diff --git a/arch/arm/mach-at91/include/mach/debug-macro.S b/arch/arm/include/debug/at91.S
similarity index 68%
rename from arch/arm/mach-at91/include/mach/debug-macro.S
rename to arch/arm/include/debug/at91.S
index 2103a90f2261..80a6501b4d50 100644
--- a/arch/arm/mach-at91/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/at91.S
@@ -1,6 +1,4 @@
 /*
- * arch/arm/mach-at91/include/mach/debug-macro.S
- *
  *  Copyright (C) 2003-2005 SAN People
  *
  * Debugging macro include header
@@ -11,18 +9,23 @@
  *
 */
 
-#include <mach/hardware.h>
-#include <mach/at91_dbgu.h>
-
 #if defined(CONFIG_AT91_DEBUG_LL_DBGU0)
-#define AT91_DBGU AT91_BASE_DBGU0
+#define AT91_DBGU 0xfffff200 /* AT91_BASE_DBGU0 */
 #elif defined(CONFIG_AT91_DEBUG_LL_DBGU1)
-#define AT91_DBGU AT91_BASE_DBGU1
+#define AT91_DBGU 0xffffee00 /* AT91_BASE_DBGU1 */
 #else
 /* On sama5d4, use USART3 as low level serial console */
-#define AT91_DBGU SAMA5D4_BASE_USART3
+#define AT91_DBGU 0xfc00c000 /* SAMA5D4_BASE_USART3 */
 #endif
 
+/* Keep in sync with mach-at91/include/mach/hardware.h */
+#define AT91_IO_P2V(x) ((x) - 0x01000000)
+
+#define AT91_DBGU_SR		(0x14)	/* Status Register */
+#define AT91_DBGU_THR		(0x1c)	/* Transmitter Holding Register */
+#define AT91_DBGU_TXRDY		(1 << 1)	/* Transmitter Ready */
+#define AT91_DBGU_TXEMPTY	(1 << 9)	/* Transmitter Empty */
+
 	.macro	addruart, rp, rv, tmp
 	ldr	\rp, =AT91_DBGU				@ System peripherals (phys address)
 	ldr	\rv, =AT91_IO_P2V(AT91_DBGU)		@ System peripherals (virt address)
-- 
2.1.0

[PATCH 6/7] ARM: at91: remove useless at91rm9200_dt_initialize()

[Alexandre Belloni]

at91rm9200_dt_initialize() is doing the same as at91_dit_initialize(), use that
one instead.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/board-dt-rm9200.c | 2 +-
 arch/arm/mach-at91/generic.h         | 1 -
 arch/arm/mach-at91/setup.c           | 7 -------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c
index 76dfe8f9af50..a15ab6f8de00 100644
--- a/arch/arm/mach-at91/board-dt-rm9200.c
+++ b/arch/arm/mach-at91/board-dt-rm9200.c
@@ -38,6 +38,6 @@ static const char *at91rm9200_dt_board_compat[] __initdata = {
 DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
 	.init_time      = at91rm9200_dt_timer_init,
 	.map_io		= at91_map_io,
-	.init_early	= at91rm9200_dt_initialize,
+	.init_early	= at91_dt_initialize,
 	.dt_compat	= at91rm9200_dt_board_compat,
 MACHINE_END
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index e0368aa06390..c10c2ddaae6d 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -22,7 +22,6 @@ extern void __init at91_init_sram(int bank, unsigned long base,
 
  /* Processors */
 extern void __init at91rm9200_set_type(int type);
-extern void __init at91rm9200_dt_initialize(void);
 extern void __init at91_dt_initialize(void);
 
  /* Timer */
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index ce25e85720fb..acb8d7724609 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -429,13 +429,6 @@ static void at91_dt_ramc(void)
 	at91_pm_set_standby(standby);
 }
 
-void __init at91rm9200_dt_initialize(void)
-{
-	at91_dt_ramc();
-
-	at91_boot_soc.init();
-}
-
 void __init at91_dt_initialize(void)
 {
 	at91_dt_ramc();
-- 
2.1.0

[PATCH 7/7] ARM: at91: remove useless at91rm9200_set_type()

[Alexandre Belloni]

Since all rm9200 board files have been removed, there is no user of
at91rm9200_set_type() left. Remove it

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/generic.h |  1 -
 arch/arm/mach-at91/setup.c   | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index c10c2ddaae6d..54f3837a0a4d 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -21,7 +21,6 @@ extern void __init at91_init_sram(int bank, unsigned long base,
 				  unsigned int length);
 
  /* Processors */
-extern void __init at91rm9200_set_type(int type);
 extern void __init at91_dt_initialize(void);
 
  /* Timer */
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index acb8d7724609..e3c21b458bb8 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -31,17 +31,6 @@ struct at91_init_soc __initdata at91_boot_soc;
 struct at91_socinfo at91_soc_initdata;
 EXPORT_SYMBOL(at91_soc_initdata);
 
-void __init at91rm9200_set_type(int type)
-{
-	if (type == ARCH_REVISON_9200_PQFP)
-		at91_soc_initdata.subtype = AT91_SOC_RM9200_PQFP;
-	else
-		at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
-
-	pr_info("filled in soc subtype: %s\n",
-		at91_get_soc_subtype(&at91_soc_initdata));
-}
-
 void __iomem *at91_ramc_base[2];
 EXPORT_SYMBOL_GPL(at91_ramc_base);
 
-- 
2.1.0

Re: [PATCH 0/7] AT91 cleanup for 3.20 #1

[Boris Brezillon]

Hi Alexandre,

On Mon, 12 Jan 2015 19:42:09 +0100
Alexandre Belloni <alexandre.belloni@free-electrons.com> wrote:

> Hi,
> 
> This patch set cleans a lot of remaining header, config options and functions
> that are not used anymore since the switch to DT only.
> 
> Patch 5 is moving mach/debug-macro.S to include/debug/at91.S to prepare the
> upcoming switch to multiplatform.
> 

Thanks for those cleanup changes.

To the whole series:

Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>

> 
> Alexandre Belloni (7):
>   ARM: at91: remove unused mach/memory.h
>   ARM: at91: remove useless config MACH_AT91RM9200_DT
>   ARM: at91: remove useless config MACH_AT91SAM9_DT
>   ARM: at91: remove useless at91_sysirq_mask_rtx
>   ARM: at91: move debug-macro.S into the common space
>   ARM: at91: remove useless at91rm9200_dt_initialize()
>   ARM: at91: remove useless at91rm9200_set_type()
> 
>  MAINTAINERS                                        |  1 +
>  arch/arm/Kconfig.debug                             |  9 ++-
>  .../mach/debug-macro.S => include/debug/at91.S}    | 19 +++---
>  arch/arm/mach-at91/Kconfig                         |  8 ---
>  arch/arm/mach-at91/Makefile                        |  6 +-
>  arch/arm/mach-at91/at91sam9260.c                   |  2 -
>  arch/arm/mach-at91/at91sam9261.c                   |  2 -
>  arch/arm/mach-at91/at91sam9263.c                   |  3 -
>  arch/arm/mach-at91/at91sam9g45.c                   |  3 -
>  arch/arm/mach-at91/at91sam9n12.c                   |  6 --
>  arch/arm/mach-at91/at91sam9rl.c                    |  3 -
>  arch/arm/mach-at91/at91sam9x5.c                    | 10 ---
>  arch/arm/mach-at91/board-dt-rm9200.c               |  2 +-
>  arch/arm/mach-at91/generic.h                       |  6 --
>  arch/arm/mach-at91/include/mach/at91_rtt.h         | 35 ----------
>  arch/arm/mach-at91/include/mach/memory.h           | 26 --------
>  arch/arm/mach-at91/sama5d3.c                       |  6 --
>  arch/arm/mach-at91/setup.c                         | 18 ------
>  arch/arm/mach-at91/sysirq_mask.c                   | 75 ----------------------
>  19 files changed, 23 insertions(+), 217 deletions(-)
>  rename arch/arm/{mach-at91/include/mach/debug-macro.S => include/debug/at91.S} (68%)
>  delete mode 100644 arch/arm/mach-at91/include/mach/at91_rtt.h
>  delete mode 100644 arch/arm/mach-at91/include/mach/memory.h
>  delete mode 100644 arch/arm/mach-at91/sysirq_mask.c
> 



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Re: [PATCH 6/7] ARM: at91: remove useless at91rm9200_dt_initialize()

[Bo Shen]

Hi Alexandre,

On 01/13/2015 02:42 AM, Alexandre Belloni wrote:
> at91rm9200_dt_initialize() is doing the same as at91_dit_initialize(), use that

s/at91_dit_initialize/at91_dt_initialize

> one instead.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
>   arch/arm/mach-at91/board-dt-rm9200.c | 2 +-
>   arch/arm/mach-at91/generic.h         | 1 -
>   arch/arm/mach-at91/setup.c           | 7 -------
>   3 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c
> index 76dfe8f9af50..a15ab6f8de00 100644
> --- a/arch/arm/mach-at91/board-dt-rm9200.c
> +++ b/arch/arm/mach-at91/board-dt-rm9200.c
> @@ -38,6 +38,6 @@ static const char *at91rm9200_dt_board_compat[] __initdata = {
>   DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
>   	.init_time      = at91rm9200_dt_timer_init,
>   	.map_io		= at91_map_io,
> -	.init_early	= at91rm9200_dt_initialize,
> +	.init_early	= at91_dt_initialize,
>   	.dt_compat	= at91rm9200_dt_board_compat,
>   MACHINE_END
> diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
> index e0368aa06390..c10c2ddaae6d 100644
> --- a/arch/arm/mach-at91/generic.h
> +++ b/arch/arm/mach-at91/generic.h
> @@ -22,7 +22,6 @@ extern void __init at91_init_sram(int bank, unsigned long base,
>
>    /* Processors */
>   extern void __init at91rm9200_set_type(int type);
> -extern void __init at91rm9200_dt_initialize(void);
>   extern void __init at91_dt_initialize(void);
>
>    /* Timer */
> diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
> index ce25e85720fb..acb8d7724609 100644
> --- a/arch/arm/mach-at91/setup.c
> +++ b/arch/arm/mach-at91/setup.c
> @@ -429,13 +429,6 @@ static void at91_dt_ramc(void)
>   	at91_pm_set_standby(standby);
>   }
>
> -void __init at91rm9200_dt_initialize(void)
> -{
> -	at91_dt_ramc();
> -
> -	at91_boot_soc.init();
> -}
> -
>   void __init at91_dt_initialize(void)
>   {
>   	at91_dt_ramc();
>

Best Regards,
Bo Shen

Re: [PATCH 6/7] ARM: at91: remove useless at91rm9200_dt_initialize()

[Nicolas Ferre]

Le 13/01/2015 02:24, Bo Shen a écrit :
> Hi Alexandre,
> 
> On 01/13/2015 02:42 AM, Alexandre Belloni wrote:
>> at91rm9200_dt_initialize() is doing the same as at91_dit_initialize(), use that
> 
> s/at91_dit_initialize/at91_dt_initialize

Alex I'll correct that when including it to the at91-3.20-cleanup
branch. No need to resend.

Voice: thanks for the review.

Bye,


>> one instead.
>>
>> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>> ---
>>   arch/arm/mach-at91/board-dt-rm9200.c | 2 +-
>>   arch/arm/mach-at91/generic.h         | 1 -
>>   arch/arm/mach-at91/setup.c           | 7 -------
>>   3 files changed, 1 insertion(+), 9 deletions(-)
>>
>> diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c
>> index 76dfe8f9af50..a15ab6f8de00 100644
>> --- a/arch/arm/mach-at91/board-dt-rm9200.c
>> +++ b/arch/arm/mach-at91/board-dt-rm9200.c
>> @@ -38,6 +38,6 @@ static const char *at91rm9200_dt_board_compat[] __initdata = {
>>   DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
>>   	.init_time      = at91rm9200_dt_timer_init,
>>   	.map_io		= at91_map_io,
>> -	.init_early	= at91rm9200_dt_initialize,
>> +	.init_early	= at91_dt_initialize,
>>   	.dt_compat	= at91rm9200_dt_board_compat,
>>   MACHINE_END
>> diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
>> index e0368aa06390..c10c2ddaae6d 100644
>> --- a/arch/arm/mach-at91/generic.h
>> +++ b/arch/arm/mach-at91/generic.h
>> @@ -22,7 +22,6 @@ extern void __init at91_init_sram(int bank, unsigned long base,
>>
>>    /* Processors */
>>   extern void __init at91rm9200_set_type(int type);
>> -extern void __init at91rm9200_dt_initialize(void);
>>   extern void __init at91_dt_initialize(void);
>>
>>    /* Timer */
>> diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
>> index ce25e85720fb..acb8d7724609 100644
>> --- a/arch/arm/mach-at91/setup.c
>> +++ b/arch/arm/mach-at91/setup.c
>> @@ -429,13 +429,6 @@ static void at91_dt_ramc(void)
>>   	at91_pm_set_standby(standby);
>>   }
>>
>> -void __init at91rm9200_dt_initialize(void)
>> -{
>> -	at91_dt_ramc();
>> -
>> -	at91_boot_soc.init();
>> -}
>> -
>>   void __init at91_dt_initialize(void)
>>   {
>>   	at91_dt_ramc();
>>
> 
> Best Regards,
> Bo Shen
> 


-- 
Nicolas Ferre

Re: [PATCH 0/7] AT91 cleanup for 3.20 #1

[Nicolas Ferre]

Le 12/01/2015 20:26, Boris Brezillon a écrit :
> Hi Alexandre,
> 
> On Mon, 12 Jan 2015 19:42:09 +0100
> Alexandre Belloni <alexandre.belloni@free-electrons.com> wrote:
> 
>> Hi,
>>
>> This patch set cleans a lot of remaining header, config options and functions
>> that are not used anymore since the switch to DT only.
>>
>> Patch 5 is moving mach/debug-macro.S to include/debug/at91.S to prepare the
>> upcoming switch to multiplatform.
>>
> 
> Thanks for those cleanup changes.
> 
> To the whole series:
> 
> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

With the change noted in patch 6/7, all queued on at91-3.20-at91. Thanks.


>> Alexandre Belloni (7):
>>   ARM: at91: remove unused mach/memory.h
>>   ARM: at91: remove useless config MACH_AT91RM9200_DT
>>   ARM: at91: remove useless config MACH_AT91SAM9_DT
>>   ARM: at91: remove useless at91_sysirq_mask_rtx
>>   ARM: at91: move debug-macro.S into the common space
>>   ARM: at91: remove useless at91rm9200_dt_initialize()
>>   ARM: at91: remove useless at91rm9200_set_type()
>>
>>  MAINTAINERS                                        |  1 +
>>  arch/arm/Kconfig.debug                             |  9 ++-
>>  .../mach/debug-macro.S => include/debug/at91.S}    | 19 +++---
>>  arch/arm/mach-at91/Kconfig                         |  8 ---
>>  arch/arm/mach-at91/Makefile                        |  6 +-
>>  arch/arm/mach-at91/at91sam9260.c                   |  2 -
>>  arch/arm/mach-at91/at91sam9261.c                   |  2 -
>>  arch/arm/mach-at91/at91sam9263.c                   |  3 -
>>  arch/arm/mach-at91/at91sam9g45.c                   |  3 -
>>  arch/arm/mach-at91/at91sam9n12.c                   |  6 --
>>  arch/arm/mach-at91/at91sam9rl.c                    |  3 -
>>  arch/arm/mach-at91/at91sam9x5.c                    | 10 ---
>>  arch/arm/mach-at91/board-dt-rm9200.c               |  2 +-
>>  arch/arm/mach-at91/generic.h                       |  6 --
>>  arch/arm/mach-at91/include/mach/at91_rtt.h         | 35 ----------
>>  arch/arm/mach-at91/include/mach/memory.h           | 26 --------
>>  arch/arm/mach-at91/sama5d3.c                       |  6 --
>>  arch/arm/mach-at91/setup.c                         | 18 ------
>>  arch/arm/mach-at91/sysirq_mask.c                   | 75 ----------------------
>>  19 files changed, 23 insertions(+), 217 deletions(-)
>>  rename arch/arm/{mach-at91/include/mach/debug-macro.S => include/debug/at91.S} (68%)
>>  delete mode 100644 arch/arm/mach-at91/include/mach/at91_rtt.h
>>  delete mode 100644 arch/arm/mach-at91/include/mach/memory.h
>>  delete mode 100644 arch/arm/mach-at91/sysirq_mask.c
>>
> 
> 
> 


-- 
Nicolas Ferre

Re: [PATCH 5/7] ARM: at91: move debug-macro.S into the common space

[Paul Bolle]

Alexandre,

On Mon, 2015-01-12 at 19:42 +0100, Alexandre Belloni wrote:
> Move debug-macro.S from include/mach/ to include/debug where all other common
> debug macros are.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

This patch became commit 5f58c97099f2 ("ARM: at91: move debug-macro.S
into the common space") in today's linux-next (ie, next-20150120). I
noticed because a script I use to check linux-next spotted a problem in
it.

>  MAINTAINERS                                           |  1 +
>  arch/arm/Kconfig.debug                                |  9 +++++++--
>  .../mach/debug-macro.S => include/debug/at91.S}       | 19 +++++++++++--------
>  3 files changed, 19 insertions(+), 10 deletions(-)
>  rename arch/arm/{mach-at91/include/mach/debug-macro.S => include/debug/at91.S} (68%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 3589d67437f8..8c25979a3c43 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -877,6 +877,7 @@ F:	arch/arm/boot/dts/at91*.dts
>  F:	arch/arm/boot/dts/at91*.dtsi
>  F:	arch/arm/boot/dts/sama*.dts
>  F:	arch/arm/boot/dts/sama*.dtsi
> +F:	arch/arm/include/debug/at91.S
>  
>  ARM/ATMEL AT91 Clock Support
>  M:	Boris Brezillon <boris.brezillon@free-electrons.com>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 5ddd4906f7a7..e34d24949c6a 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -115,15 +115,18 @@ choice
>  		    0x80024000      | 0xf0024000     | UART9
>  
>  	config AT91_DEBUG_LL_DBGU0
> -		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"
> +		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10, 9rl, 9x5, 9n12"
> +		select DEBUG_AT91_UART

There's no Kconfig symbol DEBUG_AT91_UART in linux-next. So this select
is currently a nop. Why was it added?

>  		depends on HAVE_AT91_DBGU0
>  
>  	config AT91_DEBUG_LL_DBGU1
> -		bool "Kernel low-level debugging on 9263 and 9g45"
> +		bool "Kernel low-level debugging on 9263, 9g45 and sama5d3"
> +		select DEBUG_AT91_UART

Ditto.

>  		depends on HAVE_AT91_DBGU1
>  
>  	config AT91_DEBUG_LL_DBGU2
>  		bool "Kernel low-level debugging on sama5d4"
> +		select DEBUG_AT91_UART

Ditto.

>  		depends on HAVE_AT91_DBGU2
>  
>  	config DEBUG_BCM2835
> @@ -1165,6 +1168,8 @@ config DEBUG_LL_INCLUDE
>  	string
>  	default "debug/sa1100.S" if DEBUG_SA1100
>  	default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
> +	default "debug/at91.S" if AT91_DEBUG_LL_DBGU0 || AT91_DEBUG_LL_DBGU1 || \
> +				AT91_DEBUG_LL_DBGU2
>  	default "debug/asm9260.S" if DEBUG_ASM9260_UART
>  	default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2
>  	default "debug/meson.S" if DEBUG_MESON_UARTAO

Thanks,


Paul Bolle

[PATCH] ARM: at91: fix Kconfig.debug by adding DEBUG_AT91_UART option

[Nicolas Ferre]

The DEBUG_AT91_UART Kconfig option was forgotten when moving the
AT91 debug-macro.S file. Add it and use it for the at91.S compilation.

Reported-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Hi Alexandre,
Please tell me if this patch makes sense to fix the lack of this
DEBUG_AT91_UART Kconfig option.

Paul,
Thanks for the heads up.

Bye,
  Nico.

 arch/arm/Kconfig.debug | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index e34d24949c6a..b3d388e5f4ff 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1164,12 +1164,15 @@ config DEBUG_STI_UART
 	bool
 	depends on ARCH_STI
 
+config DEBUG_AT91_UART
+	bool
+	depends on ARCH_AT91
+
 config DEBUG_LL_INCLUDE
 	string
 	default "debug/sa1100.S" if DEBUG_SA1100
 	default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
-	default "debug/at91.S" if AT91_DEBUG_LL_DBGU0 || AT91_DEBUG_LL_DBGU1 || \
-				AT91_DEBUG_LL_DBGU2
+	default "debug/at91.S" if DEBUG_AT91_UART
 	default "debug/asm9260.S" if DEBUG_ASM9260_UART
 	default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2
 	default "debug/meson.S" if DEBUG_MESON_UARTAO
-- 
2.1.3

Re: [PATCH] ARM: at91: fix Kconfig.debug by adding DEBUG_AT91_UART option

[Olof Johansson]

Hi Nicolas,

On Tue, Jan 20, 2015 at 2:54 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
> The DEBUG_AT91_UART Kconfig option was forgotten when moving the
> AT91 debug-macro.S file. Add it and use it for the at91.S compilation.
>
> Reported-by: Paul Bolle <pebolle@tiscali.nl>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Hi Alexandre,
> Please tell me if this patch makes sense to fix the lack of this
> DEBUG_AT91_UART Kconfig option.
>
> Paul,
> Thanks for the heads up.
>
> Bye,
>   Nico.
>
>  arch/arm/Kconfig.debug | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index e34d24949c6a..b3d388e5f4ff 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -1164,12 +1164,15 @@ config DEBUG_STI_UART
>         bool
>         depends on ARCH_STI
>
> +config DEBUG_AT91_UART
> +       bool
> +       depends on ARCH_AT91
> +

This is not inserted in the list alphabetically. It's not very well
sorted today either, but it should probably go above exynos.

Also, there are a number of configs that _select_ DEBUG_AT91_UART in
the list above, but they don't depend on AT91. So what can happen is
that you can select those, and then they will enable this option
(which will spit out a warning about unfulfilled dependency).

You should probably make the choices that select this option also
depend on AT91?


-Olof