s5j: rename s5jt200_irq.h to irq.h
authorHeesub Shin <heesub.shin@samsung.com>
Mon, 3 Apr 2017 08:52:53 +0000 (17:52 +0900)
committerHeesub Shin <heesub.shin@samsung.com>
Tue, 18 Apr 2017 03:02:06 +0000 (12:02 +0900)
There is no point in having s5jt200_irq.h under
'arch/arm/include/s5j/soc/'. Let's rename it and move to
'arch/arm/include/s5j/'.

Change-Id: Id35acb6a1785d7103baf7ae010deba1650b92f8e
Signed-off-by: Heesub Shin <heesub.shin@samsung.com>
os/arch/arm/include/s5j/irq.h
os/arch/arm/include/s5j/soc/s5jt200_irq.h [deleted file]

index 8cea967..707f454 100644 (file)
@@ -15,7 +15,7 @@
  * language governing permissions and limitations under the License.
  *
  ****************************************************************************/
-/****************************************************************************************
+/****************************************************************************
  * arch/arm/include/s5j/irq.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ****************************************************************************************/
+ ****************************************************************************/
 
-/* This file should never be included directed but, rather, only indirectly through
- * tinyara/irq.h
+/*
+ * This file should never be included directed but, rather, only indirectly
+ * through tinyara/irq.h
  */
 
 #ifndef __ARCH_ARM_INCLUDE_S5J_IRQ_H
 #define __ARCH_ARM_INCLUDE_S5J_IRQ_H
 
-/****************************************************************************************
+/****************************************************************************
  * Included Files
- ****************************************************************************************/
-
+ ****************************************************************************/
 #include <tinyara/config.h>
-#include <arch/chip/chip.h>
 
-/****************************************************************************************
+/****************************************************************************
  * Pre-processor Definitions
- ****************************************************************************************/
+ ****************************************************************************/
+
+/*
+ * IRQ numbers. The IRQ numbers corresponds vector number and hence map
+ * directly to bits in the NVCI. This does, however, waste several words
+ * of memory in the IRQ to handle mapping tables.
+ */
+
+#define NR_IRQS                                128
+
+#define IRQ_INVALID                    0x3FF
+#define IRQ_SPI(x)                     (32 + (x))
+
+#define IRQ_EINT0                      IRQ_SPI(0)
+#define IRQ_EINT1                      IRQ_SPI(1)
+#define IRQ_EINT2                      IRQ_SPI(2)
+
+#define IRQ_GPIO_GIC_0                 IRQ_SPI(4)
+#define IRQ_GPIO_GIC_1                 IRQ_SPI(5)
+
+#define IRQ_MCT_G0                     IRQ_SPI(18)
+#define IRQ_MCT_G1                     IRQ_SPI(19)
+#define IRQ_MCT_G2                     IRQ_SPI(20)
+#define IRQ_MCT_G3                     IRQ_SPI(21)
+#define IRQ_MCT_L0                     IRQ_SPI(22)
+#define IRQ_MCT_L1                     IRQ_SPI(23)
+#define IRQ_MCT_L2                     IRQ_SPI(24)
+#define IRQ_MCT_L3                     IRQ_SPI(25)
+#define IRQ_TOP_RTC_TIC                        IRQ_SPI(26)
+#define IRQ_TOP_RTC_ALARM              IRQ_SPI(27)
+#define IRQ_TICK_COUNTER_TIC           IRQ_SPI(28)
+#define IRQ_TICK_COUNTER_ALARM         IRQ_SPI(29)
+
+#define IRQ_WDT                                IRQ_SPI(32)
+#define IRQ_UHD_EFUSE_WRITER           IRQ_SPI(33)
+
+#define IRQ_MAILBOX_WIFI               IRQ_SPI(35)
+#define IRQ_MAILBOX_M0                 IRQ_SPI(36)
+
+#define IRQ_PMU_CM0                    IRQ_SPI(39)
+#define IRQ_PMU_CR4                    IRQ_SPI(40)
+#define IRQ_PMU_ALIVE_WIFI_ACTIVE      IRQ_SPI(41)
+
+#define IRQ_PDMA_U1                    IRQ_SPI(44)
+
+#define IRQ_SSS_KM                     IRQ_SPI(47)
+#define IRQ_SSS_MB                     IRQ_SPI(48)
+#define IRQ_SSS                                IRQ_SPI(49)
+#define IRQ_SSS_SWDT_HOST_1            IRQ_SPI(50)
+#define IRQ_SSS_SWDT_HOST_2            IRQ_SPI(51)
 
-#include <arch/chip/soc/s5jt200_irq.h>
+#define S5J_IRQ_UART0                  IRQ_SPI(54)
+#define S5J_IRQ_UART1                  IRQ_SPI(55)
+#define S5J_IRQ_UART2                  IRQ_SPI(56)
+#define S5J_IRQ_UART3                  IRQ_SPI(57)
+#define S5J_IRQ_UARTDBG                        IRQ_SPI(58)
 
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
+#define S5J_IRQ_SPI_0                  IRQ_SPI(60)
+#define S5J_IRQ_SPI_1                  IRQ_SPI(61)
+#define S5J_IRQ_SPI_2                  IRQ_SPI(62)
+#define S5J_IRQ_SPI_3                  IRQ_SPI(63)
 
-#ifndef __ASSEMBLY__
+#define IRQ_HSI2C_0                    IRQ_SPI(65)
+#define IRQ_HSI2C_1                    IRQ_SPI(66)
+#define IRQ_HSI2C_2                    IRQ_SPI(67)
+#define IRQ_HSI2C_3                    IRQ_SPI(68)
 
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
+#define IRQ_I2S                                IRQ_SPI(71)
 
-#ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
-#endif
+#define IRQ_ADC                                IRQ_SPI(74)
 
-/****************************************************************************************
- * Public Function Prototypes
- ****************************************************************************************/
+#define IRQ_PWM0_0                     IRQ_SPI(77)
+#define IRQ_PWM0_1                     IRQ_SPI(78)
+#define IRQ_PWM0_2                     IRQ_SPI(79)
+#define IRQ_PWM0_3                     IRQ_SPI(80)
+#define IRQ_PWM0_4                     IRQ_SPI(81)
+#define IRQ_PWM1_0                     IRQ_SPI(82)
+#define IRQ_PWM1_1                     IRQ_SPI(83)
+#define IRQ_SDIO_DEVICE_SDIO           IRQ_SPI(84)
+#define IRQ_SDIO_DEVICE_RSTSOFT                IRQ_SPI(85)
+#define IRQ_SDIO_DEVICE_RSTFUN         IRQ_SPI(86)
+#define IRQ_WIFI_WB2AP_WDOG_RESET      IRQ_SPI(87)
 
-#undef EXTERN
-#ifdef __cplusplus
-}
-#endif
-#endif
+#define IRQ_CR4_PMUIRQ                 IRQ_SPI(90)
+#define IRQ_CR4_VALIRQ                 IRQ_SPI(91)
+#define IRQ_CR4_VALFIQ                 IRQ_SPI(92)
 
-#endif                                                 /* __ARCH_ARM_INCLUDE_S5J_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_S5J_IRQ_H */
diff --git a/os/arch/arm/include/s5j/soc/s5jt200_irq.h b/os/arch/arm/include/s5j/soc/s5jt200_irq.h
deleted file mode 100644 (file)
index 17ffd5e..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************
- *
- * Copyright 2016 Samsung Electronics All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- *
- ****************************************************************************/
-/****************************************************************************
- * arch/arm/include/s5j/soc/s5jt200_irq.h
- *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/*
- * This file should never be included directed but,
- * rather, only indirectly through tinyara/irq.h
- */
-
-#ifndef __ARCH_ARM_INCLUDE_S5J_S5JT200_IRQ_H
-#define __ARCH_ARM_INCLUDE_S5J_S5JT200_IRQ_H
-
-#define NR_IRQS                                128
-
-#define IRQ_INVALID                    0x3FF
-#define IRQ_SPI(x)                     (32 + (x))
-
-#define IRQ_EINT0                      IRQ_SPI(0)
-#define IRQ_EINT1                      IRQ_SPI(1)
-#define IRQ_EINT2                      IRQ_SPI(2)
-
-#define IRQ_GPIO_GIC_0                 IRQ_SPI(4)
-#define IRQ_GPIO_GIC_1                 IRQ_SPI(5)
-
-#define IRQ_MCT_G0                     IRQ_SPI(18)
-#define IRQ_MCT_G1                     IRQ_SPI(19)
-#define IRQ_MCT_G2                     IRQ_SPI(20)
-#define IRQ_MCT_G3                     IRQ_SPI(21)
-#define IRQ_MCT_L0                     IRQ_SPI(22)
-#define IRQ_MCT_L1                     IRQ_SPI(23)
-#define IRQ_MCT_L2                     IRQ_SPI(24)
-#define IRQ_MCT_L3                     IRQ_SPI(25)
-#define IRQ_TOP_RTC_TIC                        IRQ_SPI(26)
-#define IRQ_TOP_RTC_ALARM              IRQ_SPI(27)
-#define IRQ_TICK_COUNTER_TIC           IRQ_SPI(28)
-#define IRQ_TICK_COUNTER_ALARM         IRQ_SPI(29)
-
-#define IRQ_WDT                                IRQ_SPI(32)
-#define IRQ_UHD_EFUSE_WRITER           IRQ_SPI(33)
-
-#define IRQ_MAILBOX_WIFI               IRQ_SPI(35)
-#define IRQ_MAILBOX_M0                 IRQ_SPI(36)
-
-#define IRQ_PMU_CM0                    IRQ_SPI(39)
-#define IRQ_PMU_CR4                    IRQ_SPI(40)
-#define IRQ_PMU_ALIVE_WIFI_ACTIVE      IRQ_SPI(41)
-
-#define IRQ_PDMA_U1                    IRQ_SPI(44)
-
-#define IRQ_SSS_KM                     IRQ_SPI(47)
-#define IRQ_SSS_MB                     IRQ_SPI(48)
-#define IRQ_SSS                                IRQ_SPI(49)
-#define IRQ_SSS_SWDT_HOST_1            IRQ_SPI(50)
-#define IRQ_SSS_SWDT_HOST_2            IRQ_SPI(51)
-
-#define S5J_IRQ_UART0                  IRQ_SPI(54)
-#define S5J_IRQ_UART1                  IRQ_SPI(55)
-#define S5J_IRQ_UART2                  IRQ_SPI(56)
-#define S5J_IRQ_UART3                  IRQ_SPI(57)
-#define S5J_IRQ_UARTDBG                        IRQ_SPI(58)
-
-#define S5J_IRQ_SPI_0                  IRQ_SPI(60)
-#define S5J_IRQ_SPI_1                  IRQ_SPI(61)
-#define S5J_IRQ_SPI_2                  IRQ_SPI(62)
-#define S5J_IRQ_SPI_3                  IRQ_SPI(63)
-
-#define IRQ_HSI2C_0                    IRQ_SPI(65)
-#define IRQ_HSI2C_1                    IRQ_SPI(66)
-#define IRQ_HSI2C_2                    IRQ_SPI(67)
-#define IRQ_HSI2C_3                    IRQ_SPI(68)
-
-#define IRQ_I2S                                IRQ_SPI(71)
-
-#define IRQ_ADC                                IRQ_SPI(74)
-
-#define IRQ_PWM0_0                     IRQ_SPI(77)
-#define IRQ_PWM0_1                     IRQ_SPI(78)
-#define IRQ_PWM0_2                     IRQ_SPI(79)
-#define IRQ_PWM0_3                     IRQ_SPI(80)
-#define IRQ_PWM0_4                     IRQ_SPI(81)
-#define IRQ_PWM1_0                     IRQ_SPI(82)
-#define IRQ_PWM1_1                     IRQ_SPI(83)
-#define IRQ_SDIO_DEVICE_SDIO           IRQ_SPI(84)
-#define IRQ_SDIO_DEVICE_RSTSOFT                IRQ_SPI(85)
-#define IRQ_SDIO_DEVICE_RSTFUN         IRQ_SPI(86)
-#define IRQ_WIFI_WB2AP_WDOG_RESET      IRQ_SPI(87)
-
-#define IRQ_CR4_PMUIRQ                 IRQ_SPI(90)
-#define IRQ_CR4_VALIRQ                 IRQ_SPI(91)
-#define IRQ_CR4_VALFIQ                 IRQ_SPI(92)
-
-#endif /* __ARCH_ARM_INCLUDE_S5J_S5JT200_IRQ_H */