ARM: OMAP2+: Kconfig: minor cleanup for SOC names

PATCH New Kevin Hilman 4 participants 8 messages May 8, 2012 – May 9, 2012

Subsystems (4)

Network drivers Arm (32-bit) Arm sub-architectures OMAP2+ support

lore

Share & tools

lore

Kevin Hilman

author

2012-05-08 22:02 UTC #0 lore raw

cover ARM: OMAP2+: Kconfig: minor cleanup for SOC names

The CONFIG_SOC_* names for do not need an OMAP in the name since these are not called OMAP in most places. Drop the OMAP in the Kconfig names to improve readability.

Also fixes an obvious bug found in the TI81xx code which suggests that nobody is using the highest 32 interrupts on these SoCs, or nobody is using mainline for TI81xx.

Kevin Hilman (3):
ARM: OMAP2+: INTC: fix Kconfig option for TI81XX
ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX
ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX

 arch/arm/mach-omap2/Kconfig  |    8 ++++----
 arch/arm/mach-omap2/common.h |    4 ++--
 arch/arm/mach-omap2/io.c     |    8 ++++----
 arch/arm/mach-omap2/irq.c    |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

Signature · 1 line

1.7.9.2

Kevin Hilman

author

2012-05-08 22:02 UTC #1 lore raw

PATCH 1/3 ARM: OMAP2+: INTC: fix Kconfig option for TI81XX

The INTC core is using a Kconfig option for TI816x which doesn't exist. Convert it to use TI81XX.

Cc Hemant Pedanekar <[email protected]>

Signed-off-by Kevin Hilman <[email protected]>

---
 arch/arm/mach-omap2/irq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-omap2/irq.c +1 -1

index 65f0d257..a5da010 100644
@@ -231,7 +231,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs
 			goto out;
 
 		irqnr = readl_relaxed(base_addr + 0xd8);
-#ifdef CONFIG_SOC_OMAPTI816X
+#ifdef CONFIG_SOC_OMAPTI81XX
 		if (irqnr)
 			goto out;
 		irqnr = readl_relaxed(base_addr + 0xf8);

Signature · 1 line

1.7.9.2

Kevin Hilman

author

2012-05-08 22:02 UTC #2 lore raw

PATCH 2/3 ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX

In reply to Kevin Hilman

No need to have an OMAP prefix on these SoCs that are in the family but arent' really called OMAP.

Simple rename: CONFIG_SOC_OMAPTI81XX --> CONFIG_SOC_TI81XX

No functional change.

Signed-off-by Kevin Hilman <[email protected]>

---
 arch/arm/mach-omap2/Kconfig  |    6 +++---
 arch/arm/mach-omap2/common.h |    2 +-
 arch/arm/mach-omap2/io.c     |    4 ++--
 arch/arm/mach-omap2/irq.c    |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

arch/arm/mach-omap2/Kconfig +3 -3

index 8141b76..7f89697 100644
@@ -77,7 +77,7 @@ config SOC_OMAP3430
 	default y
 	select ARCH_OMAP_OTG
 
-config SOC_OMAPTI81XX
+config SOC_TI81XX
 	bool "TI81XX support"
 	depends on ARCH_OMAP3
 	default y

@@ -319,12 +319,12 @@ config MACH_OMAP_3630SDP
 
 config MACH_TI8168EVM
 	bool "TI8168 Evaluation Module"
-	depends on SOC_OMAPTI81XX
+	depends on SOC_TI81XX
 	default y
 
 config MACH_TI8148EVM
 	bool "TI8148 Evaluation Module"
-	depends on SOC_OMAPTI81XX
+	depends on SOC_TI81XX
 	default y
 
 config MACH_OMAP_4430SDP

arch/arm/mach-omap2/common.h +1 -1

index 57da7f4..bc0b571 100644
@@ -54,7 +54,7 @@ static inline void omap34xx_map_common_io(void)
 }
 #endif
 
-#ifdef CONFIG_SOC_OMAPTI81XX
+#ifdef CONFIG_SOC_TI81XX
 extern void omapti81xx_map_common_io(void);
 #else
 static inline void omapti81xx_map_common_io(void)

arch/arm/mach-omap2/io.c +2 -2

index 595a5dd..23063a2 100644
@@ -172,7 +172,7 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
 };
 #endif
 
-#ifdef CONFIG_SOC_OMAPTI81XX
+#ifdef CONFIG_SOC_TI81XX
 static struct map_desc omapti81xx_io_desc[] __initdata = {
 	{
 		.virtual	= L4_34XX_VIRT,

@@ -255,7 +255,7 @@ void __init omap34xx_map_common_io(void)
 }
 #endif
 
-#ifdef CONFIG_SOC_OMAPTI81XX
+#ifdef CONFIG_SOC_TI81XX
 void __init omapti81xx_map_common_io(void)
 {
 	iotable_init(omapti81xx_io_desc, ARRAY_SIZE(omapti81xx_io_desc));

arch/arm/mach-omap2/irq.c +1 -1

index a5da010..8c552d6 100644
@@ -231,7 +231,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs
 			goto out;
 
 		irqnr = readl_relaxed(base_addr + 0xd8);
-#ifdef CONFIG_SOC_OMAPTI81XX
+#ifdef CONFIG_SOC_TI81XX
 		if (irqnr)
 			goto out;
 		irqnr = readl_relaxed(base_addr + 0xf8);

Signature · 1 line

1.7.9.2

Kevin Hilman

author

2012-05-08 22:02 UTC #3 lore raw

PATCH 3/3 ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX

In reply to Kevin Hilman

No need to have an OMAP prefix on these SoCs that are in the family but arent' really called OMAP.

Simple rename: CONFIG_SOC_OMAPAM33XX --> CONFIG_SOC_AM33XX

No functional change.

Signed-off-by Kevin Hilman <[email protected]>

---
 arch/arm/mach-omap2/Kconfig  |    2 +-
 arch/arm/mach-omap2/common.h |    2 +-
 arch/arm/mach-omap2/io.c     |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

arch/arm/mach-omap2/Kconfig +1 -1

index 7f89697..61bf3c3 100644
@@ -82,7 +82,7 @@ config SOC_TI81XX
 	depends on ARCH_OMAP3
 	default y
 
-config SOC_OMAPAM33XX
+config SOC_AM33XX
 	bool "AM33XX support"
 	depends on ARCH_OMAP3
 	default y

arch/arm/mach-omap2/common.h +1 -1

index bc0b571..22825db 100644
@@ -62,7 +62,7 @@ static inline void omapti81xx_map_common_io(void)
 }
 #endif
 
-#ifdef CONFIG_SOC_OMAPAM33XX
+#ifdef CONFIG_SOC_AM33XX
 extern void omapam33xx_map_common_io(void);
 #else
 static inline void omapam33xx_map_common_io(void)

arch/arm/mach-omap2/io.c +2 -2

index 23063a2..bafa592 100644
@@ -183,7 +183,7 @@ static struct map_desc omapti81xx_io_desc[] __initdata = {
 };
 #endif
 
-#ifdef CONFIG_SOC_OMAPAM33XX
+#ifdef CONFIG_SOC_AM33XX
 static struct map_desc omapam33xx_io_desc[] __initdata = {
 	{
 		.virtual	= L4_34XX_VIRT,

@@ -262,7 +262,7 @@ void __init omapti81xx_map_common_io(void)
 }
 #endif
 
-#ifdef CONFIG_SOC_OMAPAM33XX
+#ifdef CONFIG_SOC_AM33XX
 void __init omapam33xx_map_common_io(void)
 {
 	iotable_init(omapam33xx_io_desc, ARRAY_SIZE(omapam33xx_io_desc));

Signature · 1 line

1.7.9.2

Hiremath, Vaibhav

2012-05-09 11:21 UTC #4 lore raw

PATCH 3/3 ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX

Quoted 5 lines · Kevin

No need to have an OMAP prefix on these SoCs that are in the family but arent' really called OMAP.
Simple rename: CONFIG_SOC_OMAPAM33XX --> CONFIG_SOC_AM33XX

Quoted 9 lines

No functional change.

Signed-off-by Kevin Hilman <[email protected]>

---
 arch/arm/mach-omap2/Kconfig  |    2 +-
 arch/arm/mach-omap2/common.h |    2 +-
 arch/arm/mach-omap2/io.c     |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

Missed one place to change, Can you merge the below diff?

drivers/net/ethernet/ti/Kconfig +1 -1

index b42252c..1b173a6 100644
@@ -51,7 +51,7 @@ config TI_DAVINCI_CPDMA
 
 config TI_CPSW
        tristate "TI CPSW Switch Support"
-       depends on ARM && (ARCH_DAVINCI || SOC_OMAPAM33XX)
+       depends on ARM && (ARCH_DAVINCI || SOC_AM33XX)
        select TI_DAVINCI_CPDMA
        select TI_DAVINCI_MDIO
        ---help---

Thanks,
Vaibhav

Tony Lindgren

maintainer

2012-05-09 18:44 UTC #5 lore raw

PATCH 3/3 ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX

Quoted 16 lines · Hiremath, Vaibhav

Quoted 5 lines · Kevin
No need to have an OMAP prefix on these SoCs that are in the family but arent' really called OMAP.
Simple rename: CONFIG_SOC_OMAPAM33XX --> CONFIG_SOC_AM33XX
Quoted 9 lines
No functional change.
Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm/mach-omap2/Kconfig  |    2 +-
 arch/arm/mach-omap2/common.h |    2 +-
 arch/arm/mach-omap2/io.c     |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

Quoted 1 line

Missed one place to change, Can you merge the below diff?

Thanks I'll apply the first one into fixes-non-critical and the others into devel-soc branch. Will update with your change too.

Regards,

Tony

Quoted 17 lines

drivers/net/ethernet/ti/Kconfig +1 -1

index b42252c..1b173a6 100644
@@ -51,7 +51,7 @@ config TI_DAVINCI_CPDMA
 
 config TI_CPSW
        tristate "TI CPSW Switch Support"
-       depends on ARM && (ARCH_DAVINCI || SOC_OMAPAM33XX)
+       depends on ARM && (ARCH_DAVINCI || SOC_AM33XX)
        select TI_DAVINCI_CPDMA
        select TI_DAVINCI_MDIO
        ---help---

Thanks,
Vaibhav

Shilimkar, Santosh

2012-05-09 06:37 UTC #6 lore raw

cover ARM: OMAP2+: Kconfig: minor cleanup for SOC names

In reply to Kevin Hilman

Kevin,

Quoted 4 lines · Kevin Hilman

The CONFIG_SOC_* names for do not need an OMAP in the name since these are not called OMAP in most places. ?Drop the OMAP in the Kconfig names to improve readability.

Quoted 9 lines

Also fixes an obvious bug found in the TI81xx code which suggests that nobody is using the highest 32 interrupts on these SoCs, or nobody is using mainline for TI81xx.
Kevin Hilman (3):
?ARM: OMAP2+: INTC: fix Kconfig option for TI81XX ?ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX ?ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX

Any reason linux-omap is not CC'ed on this series ?

Regards
Santosh

Hiremath, Vaibhav

2012-05-09 08:36 UTC #7 lore raw

cover ARM: OMAP2+: Kconfig: minor cleanup for SOC names

In reply to Kevin Hilman

Quoted 13 lines · Kevin

The CONFIG_SOC_* names for do not need an OMAP in the name since these are not called OMAP in most places. Drop the OMAP in the Kconfig names to improve readability.
Also fixes an obvious bug found in the TI81xx code which suggests that nobody is using the highest 32 interrupts on these SoCs, or nobody is using mainline for TI81xx.
Kevin Hilman (3):
ARM: OMAP2+: INTC: fix Kconfig option for TI81XX
ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX
ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX

Quoted 6 lines

 arch/arm/mach-omap2/Kconfig  |    8 ++++----
 arch/arm/mach-omap2/common.h |    4 ++--
 arch/arm/mach-omap2/io.c     |    8 ++++----
 arch/arm/mach-omap2/irq.c    |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

Thanks Kevin, this is much needed change. Now it looks straight definitions.

Acked-by Vaibhav Hiremath <[email protected]>

Also, I will rebase my patches future patches on top of this.

Thanks,
Vaibhav