sunxi: Rename cpu.h to cpu_sun4i.h

sun4i - sun8i have (aprox.) the same iomem layout, but sun9i is quite
different, so add a wrapper cpu.h which includes the right mach specific
cpu_sun#i.h based on mach, like we already do with clock.h and dram.h .

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h
index 82b3d4676fd7fd51f952882d2c054d53c9e8d87e..abf11fa431993878454de1832d28746c2ae543dc 100644 (file)
--- a/arch/arm/include/asm/arch-sunxi/cpu.h
+++ b/arch/arm/include/asm/arch-sunxi/cpu.h
@@ -1,7 +1,5 @@
 /*
- * (C) Copyright 2007-2011
- * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- * Tom Cubie <tangliang@allwinnertech.com>
+ * (C) Copyright 2015 Hans de Goede <hdegoede@redhat.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -9,146 +7,6 @@
 #ifndef _SUNXI_CPU_H
 #define _SUNXI_CPU_H
 
-#define SUNXI_SRAM_A1_BASE             0x00000000
-#define SUNXI_SRAM_A1_SIZE             (16 * 1024)     /* 16 kiB */
+#include <asm/arch/cpu_sun4i.h>
 
-#define SUNXI_SRAM_A2_BASE             0x00004000      /* 16 kiB */
-#define SUNXI_SRAM_A3_BASE             0x00008000      /* 13 kiB */
-#define SUNXI_SRAM_A4_BASE             0x0000b400      /* 3 kiB */
-#define SUNXI_SRAM_D_BASE              0x00010000      /* 4 kiB */
-#define SUNXI_SRAM_B_BASE              0x00020000      /* 64 kiB (secure) */
-
-#define SUNXI_SRAMC_BASE               0x01c00000
-#define SUNXI_DRAMC_BASE               0x01c01000
-#define SUNXI_DMA_BASE                 0x01c02000
-#define SUNXI_NFC_BASE                 0x01c03000
-#define SUNXI_TS_BASE                  0x01c04000
-#define SUNXI_SPI0_BASE                        0x01c05000
-#define SUNXI_SPI1_BASE                        0x01c06000
-#define SUNXI_MS_BASE                  0x01c07000
-#define SUNXI_TVD_BASE                 0x01c08000
-#define SUNXI_CSI0_BASE                        0x01c09000
-#define SUNXI_TVE0_BASE                        0x01c0a000
-#define SUNXI_EMAC_BASE                        0x01c0b000
-#define SUNXI_LCD0_BASE                        0x01c0C000
-#define SUNXI_LCD1_BASE                        0x01c0d000
-#define SUNXI_VE_BASE                  0x01c0e000
-#define SUNXI_MMC0_BASE                        0x01c0f000
-#define SUNXI_MMC1_BASE                        0x01c10000
-#define SUNXI_MMC2_BASE                        0x01c11000
-#define SUNXI_MMC3_BASE                        0x01c12000
-#if !defined CONFIG_MACH_SUN6I && !defined CONFIG_MACH_SUN8I
-#define SUNXI_USB0_BASE                        0x01c13000
-#define SUNXI_USB1_BASE                        0x01c14000
-#endif
-#define SUNXI_SS_BASE                  0x01c15000
-#define SUNXI_HDMI_BASE                        0x01c16000
-#define SUNXI_SPI2_BASE                        0x01c17000
-#define SUNXI_SATA_BASE                        0x01c18000
-#if !defined CONFIG_MACH_SUN6I && !defined CONFIG_MACH_SUN8I
-#define SUNXI_PATA_BASE                        0x01c19000
-#define SUNXI_ACE_BASE                 0x01c1a000
-#define SUNXI_TVE1_BASE                        0x01c1b000
-#define SUNXI_USB2_BASE                        0x01c1c000
-#else
-#define SUNXI_USB0_BASE                        0x01c19000
-#define SUNXI_USB1_BASE                        0x01c1a000
-#define SUNXI_USB2_BASE                        0x01c1b000
-#endif
-#define SUNXI_CSI1_BASE                        0x01c1d000
-#define SUNXI_TZASC_BASE               0x01c1e000
-#define SUNXI_SPI3_BASE                        0x01c1f000
-
-#define SUNXI_CCM_BASE                 0x01c20000
-#define SUNXI_INTC_BASE                        0x01c20400
-#define SUNXI_PIO_BASE                 0x01c20800
-#define SUNXI_TIMER_BASE               0x01c20c00
-#define SUNXI_SPDIF_BASE               0x01c21000
-#define SUNXI_AC97_BASE                        0x01c21400
-#define SUNXI_IR0_BASE                 0x01c21800
-#define SUNXI_IR1_BASE                 0x01c21c00
-
-#define SUNXI_IIS_BASE                 0x01c22400
-#define SUNXI_LRADC_BASE               0x01c22800
-#define SUNXI_AD_DA_BASE               0x01c22c00
-#define SUNXI_KEYPAD_BASE              0x01c23000
-#define SUNXI_TZPC_BASE                        0x01c23400
-#define SUNXI_SID_BASE                 0x01c23800
-#define SUNXI_SJTAG_BASE               0x01c23c00
-
-#define SUNXI_TP_BASE                  0x01c25000
-#define SUNXI_PMU_BASE                 0x01c25400
-#define SUN7I_CPUCFG_BASE              0x01c25c00
-
-#define SUNXI_UART0_BASE               0x01c28000
-#define SUNXI_UART1_BASE               0x01c28400
-#define SUNXI_UART2_BASE               0x01c28800
-#define SUNXI_UART3_BASE               0x01c28c00
-#define SUNXI_UART4_BASE               0x01c29000
-#define SUNXI_UART5_BASE               0x01c29400
-#define SUNXI_UART6_BASE               0x01c29800
-#define SUNXI_UART7_BASE               0x01c29c00
-#define SUNXI_PS2_0_BASE               0x01c2a000
-#define SUNXI_PS2_1_BASE               0x01c2a400
-
-#define SUNXI_TWI0_BASE                        0x01c2ac00
-#define SUNXI_TWI1_BASE                        0x01c2b000
-#define SUNXI_TWI2_BASE                        0x01c2b400
-
-#define SUNXI_CAN_BASE                 0x01c2bc00
-
-#define SUNXI_SCR_BASE                 0x01c2c400
-
-#ifndef CONFIG_MACH_SUN6I
-#define SUNXI_GPS_BASE                 0x01c30000
-#define SUNXI_MALI400_BASE             0x01c40000
-#define SUNXI_GMAC_BASE                        0x01c50000
-#else
-#define SUNXI_GMAC_BASE                        0x01c30000
-#endif
-
-#define SUNXI_DRAM_COM_BASE            0x01c62000
-#define SUNXI_DRAM_CTL0_BASE           0x01c63000
-#define SUNXI_DRAM_CTL1_BASE           0x01c64000
-#define SUNXI_DRAM_PHY0_BASE           0x01c65000
-#define SUNXI_DRAM_PHY1_BASE           0x01c66000
-
-/* module sram */
-#define SUNXI_SRAM_C_BASE              0x01d00000
-
-#define SUNXI_DE_FE0_BASE              0x01e00000
-#define SUNXI_DE_FE1_BASE              0x01e20000
-#define SUNXI_DE_BE0_BASE              0x01e60000
-#define SUNXI_DE_BE1_BASE              0x01e40000
-#define SUNXI_MP_BASE                  0x01e80000
-#define SUNXI_AVG_BASE                 0x01ea0000
-
-#define SUNXI_RTC_BASE                 0x01f00000
-#define SUNXI_PRCM_BASE                        0x01f01400
-#define SUN6I_CPUCFG_BASE              0x01f01c00
-#define SUNXI_R_UART_BASE              0x01f02800
-#define SUNXI_R_PIO_BASE               0x01f02c00
-#define SUN6I_P2WI_BASE                        0x01f03400
-#define SUNXI_RSB_BASE                 0x01f03400
-
-/* CoreSight Debug Module */
-#define SUNXI_CSDM_BASE                        0x3f500000
-
-#define SUNXI_DDRII_DDRIII_BASE                0x40000000      /* 2 GiB */
-
-#define SUNXI_BROM_BASE                        0xffff0000      /* 32 kiB */
-
-#define SUNXI_CPU_CFG                  (SUNXI_TIMER_BASE + 0x13c)
-
-/* SS bonding ids used for cpu identification */
-#define SUNXI_SS_BOND_ID_A31           4
-#define SUNXI_SS_BOND_ID_A31S          5
-
-#ifndef __ASSEMBLY__
-void sunxi_board_init(void);
-void sunxi_reset(void);
-int sunxi_get_ss_bonding_id(void);
-int sunxi_get_sid(unsigned int *sid);
-#endif /* __ASSEMBLY__ */
-
-#endif /* _CPU_H */
+#endif /* _SUNXI_CPU_H */

diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
new file mode 100644 (file)
index 0000000..dae6069
--- /dev/null
+++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
@@ -0,0 +1,154 @@
+/*
+ * (C) Copyright 2007-2011
+ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
+ * Tom Cubie <tangliang@allwinnertech.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _SUNXI_CPU_SUN4I_H
+#define _SUNXI_CPU_SUN4I_H
+
+#define SUNXI_SRAM_A1_BASE             0x00000000
+#define SUNXI_SRAM_A1_SIZE             (16 * 1024)     /* 16 kiB */
+
+#define SUNXI_SRAM_A2_BASE             0x00004000      /* 16 kiB */
+#define SUNXI_SRAM_A3_BASE             0x00008000      /* 13 kiB */
+#define SUNXI_SRAM_A4_BASE             0x0000b400      /* 3 kiB */
+#define SUNXI_SRAM_D_BASE              0x00010000      /* 4 kiB */
+#define SUNXI_SRAM_B_BASE              0x00020000      /* 64 kiB (secure) */
+
+#define SUNXI_SRAMC_BASE               0x01c00000
+#define SUNXI_DRAMC_BASE               0x01c01000
+#define SUNXI_DMA_BASE                 0x01c02000
+#define SUNXI_NFC_BASE                 0x01c03000
+#define SUNXI_TS_BASE                  0x01c04000
+#define SUNXI_SPI0_BASE                        0x01c05000
+#define SUNXI_SPI1_BASE                        0x01c06000
+#define SUNXI_MS_BASE                  0x01c07000
+#define SUNXI_TVD_BASE                 0x01c08000
+#define SUNXI_CSI0_BASE                        0x01c09000
+#define SUNXI_TVE0_BASE                        0x01c0a000
+#define SUNXI_EMAC_BASE                        0x01c0b000
+#define SUNXI_LCD0_BASE                        0x01c0C000
+#define SUNXI_LCD1_BASE                        0x01c0d000
+#define SUNXI_VE_BASE                  0x01c0e000
+#define SUNXI_MMC0_BASE                        0x01c0f000
+#define SUNXI_MMC1_BASE                        0x01c10000
+#define SUNXI_MMC2_BASE                        0x01c11000
+#define SUNXI_MMC3_BASE                        0x01c12000
+#if !defined CONFIG_MACH_SUN6I && !defined CONFIG_MACH_SUN8I
+#define SUNXI_USB0_BASE                        0x01c13000
+#define SUNXI_USB1_BASE                        0x01c14000
+#endif
+#define SUNXI_SS_BASE                  0x01c15000
+#define SUNXI_HDMI_BASE                        0x01c16000
+#define SUNXI_SPI2_BASE                        0x01c17000
+#define SUNXI_SATA_BASE                        0x01c18000
+#if !defined CONFIG_MACH_SUN6I && !defined CONFIG_MACH_SUN8I
+#define SUNXI_PATA_BASE                        0x01c19000
+#define SUNXI_ACE_BASE                 0x01c1a000
+#define SUNXI_TVE1_BASE                        0x01c1b000
+#define SUNXI_USB2_BASE                        0x01c1c000
+#else
+#define SUNXI_USB0_BASE                        0x01c19000
+#define SUNXI_USB1_BASE                        0x01c1a000
+#define SUNXI_USB2_BASE                        0x01c1b000
+#endif
+#define SUNXI_CSI1_BASE                        0x01c1d000
+#define SUNXI_TZASC_BASE               0x01c1e000
+#define SUNXI_SPI3_BASE                        0x01c1f000
+
+#define SUNXI_CCM_BASE                 0x01c20000
+#define SUNXI_INTC_BASE                        0x01c20400
+#define SUNXI_PIO_BASE                 0x01c20800
+#define SUNXI_TIMER_BASE               0x01c20c00
+#define SUNXI_SPDIF_BASE               0x01c21000
+#define SUNXI_AC97_BASE                        0x01c21400
+#define SUNXI_IR0_BASE                 0x01c21800
+#define SUNXI_IR1_BASE                 0x01c21c00
+
+#define SUNXI_IIS_BASE                 0x01c22400
+#define SUNXI_LRADC_BASE               0x01c22800
+#define SUNXI_AD_DA_BASE               0x01c22c00
+#define SUNXI_KEYPAD_BASE              0x01c23000
+#define SUNXI_TZPC_BASE                        0x01c23400
+#define SUNXI_SID_BASE                 0x01c23800
+#define SUNXI_SJTAG_BASE               0x01c23c00
+
+#define SUNXI_TP_BASE                  0x01c25000
+#define SUNXI_PMU_BASE                 0x01c25400
+#define SUN7I_CPUCFG_BASE              0x01c25c00
+
+#define SUNXI_UART0_BASE               0x01c28000
+#define SUNXI_UART1_BASE               0x01c28400
+#define SUNXI_UART2_BASE               0x01c28800
+#define SUNXI_UART3_BASE               0x01c28c00
+#define SUNXI_UART4_BASE               0x01c29000
+#define SUNXI_UART5_BASE               0x01c29400
+#define SUNXI_UART6_BASE               0x01c29800
+#define SUNXI_UART7_BASE               0x01c29c00
+#define SUNXI_PS2_0_BASE               0x01c2a000
+#define SUNXI_PS2_1_BASE               0x01c2a400
+
+#define SUNXI_TWI0_BASE                        0x01c2ac00
+#define SUNXI_TWI1_BASE                        0x01c2b000
+#define SUNXI_TWI2_BASE                        0x01c2b400
+
+#define SUNXI_CAN_BASE                 0x01c2bc00
+
+#define SUNXI_SCR_BASE                 0x01c2c400
+
+#ifndef CONFIG_MACH_SUN6I
+#define SUNXI_GPS_BASE                 0x01c30000
+#define SUNXI_MALI400_BASE             0x01c40000
+#define SUNXI_GMAC_BASE                        0x01c50000
+#else
+#define SUNXI_GMAC_BASE                        0x01c30000
+#endif
+
+#define SUNXI_DRAM_COM_BASE            0x01c62000
+#define SUNXI_DRAM_CTL0_BASE           0x01c63000
+#define SUNXI_DRAM_CTL1_BASE           0x01c64000
+#define SUNXI_DRAM_PHY0_BASE           0x01c65000
+#define SUNXI_DRAM_PHY1_BASE           0x01c66000
+
+/* module sram */
+#define SUNXI_SRAM_C_BASE              0x01d00000
+
+#define SUNXI_DE_FE0_BASE              0x01e00000
+#define SUNXI_DE_FE1_BASE              0x01e20000
+#define SUNXI_DE_BE0_BASE              0x01e60000
+#define SUNXI_DE_BE1_BASE              0x01e40000
+#define SUNXI_MP_BASE                  0x01e80000
+#define SUNXI_AVG_BASE                 0x01ea0000
+
+#define SUNXI_RTC_BASE                 0x01f00000
+#define SUNXI_PRCM_BASE                        0x01f01400
+#define SUN6I_CPUCFG_BASE              0x01f01c00
+#define SUNXI_R_UART_BASE              0x01f02800
+#define SUNXI_R_PIO_BASE               0x01f02c00
+#define SUN6I_P2WI_BASE                        0x01f03400
+#define SUNXI_RSB_BASE                 0x01f03400
+
+/* CoreSight Debug Module */
+#define SUNXI_CSDM_BASE                        0x3f500000
+
+#define SUNXI_DDRII_DDRIII_BASE                0x40000000      /* 2 GiB */
+
+#define SUNXI_BROM_BASE                        0xffff0000      /* 32 kiB */
+
+#define SUNXI_CPU_CFG                  (SUNXI_TIMER_BASE + 0x13c)
+
+/* SS bonding ids used for cpu identification */
+#define SUNXI_SS_BOND_ID_A31           4
+#define SUNXI_SS_BOND_ID_A31S          5
+
+#ifndef __ASSEMBLY__
+void sunxi_board_init(void);
+void sunxi_reset(void);
+int sunxi_get_ss_bonding_id(void);
+int sunxi_get_sid(unsigned int *sid);
+#endif /* __ASSEMBLY__ */
+
+#endif /* _SUNXI_CPU_SUN4I_H */