ARM: imx: Further cleanups due to dt-only conversion
Subsystems (5)
Fabio Estevam
reviewerv2 cover ARM: imx: Further cleanups due to dt-only conversion
Now that i.MX has been converted to a devicetree-only platform, do one more round of cleanups that consists mainly in using devicetree to get the peripherals base addresses and get rid of unused clock driver code.
Changes since v1:
- Do not introduce a sysctrl node to avoid breaking DT compatibility (Arnd)
- Remove unused definitions for base address, IRQ and DMA (Arnd)
Fabio Estevam (11):
ARM: imx27: Retrieve the SYSCTRL base address from devicetree
ARM: imx27: Retrieve the CCM base address from devicetree
ARM: imx31: Retrieve the IIM base address from devicetree
ARM: imx3: Retrieve the CCM base address from devicetree
ARM: imx3: Retrieve the AVIC base address from devicetree
ARM: imx35: Retrieve the IIM base address from devicetree
ARM: imx: Remove unused definitions
clk: imx: imx27: Remove mx27_clocks_init()
clk: imx: imx31: Remove mx31_clocks_init()
clk: imx: imx35: Remove mx35_clocks_init()
clk: imx: imx21: Remove clock driver
arch/arm/mach-imx/cpu-imx27.c | 10 +- arch/arm/mach-imx/cpu-imx31.c | 9 +- arch/arm/mach-imx/cpu-imx35.c | 9 +- arch/arm/mach-imx/mm-imx3.c | 31 +++++- arch/arm/mach-imx/mx27.h | 196 ---------------------------------- arch/arm/mach-imx/mx31.h | 179 ------------------------------- arch/arm/mach-imx/mx35.h | 173 ------------------------------ arch/arm/mach-imx/pm-imx27.c | 12 ++- drivers/clk/imx/Kconfig | 4 - drivers/clk/imx/Makefile | 1 - drivers/clk/imx/clk-imx21.c | 171 ----------------------------- drivers/clk/imx/clk-imx27.c | 73 ------------- drivers/clk/imx/clk-imx31.c | 71 ------------ drivers/clk/imx/clk-imx35.c | 68 ------------ 14 files changed, 62 insertions(+), 945 deletions(-) delete mode 100644 drivers/clk/imx/clk-imx21.c
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 1/11 ARM: imx27: Retrieve the SYSCTRL base address from devicetree
Now that imx27 has been converted to a devicetree-only platform, retrieve the SYSCTRL base address from devicetree.
To keep devicetree compatibilty the SYSCTRL base address will be retrieved from the CCM base address plus an 0x800 offset.
This is not a problem as the imx27.dtsi describes the CCM register range as 0x1000.
---
Changes since v1:
- Do not introduce a sysctrl node to avoid breaking DT compatibility (Arnd)
arch/arm/mach-imx/cpu-imx27.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
arch/arm/mach-imx/cpu-imx27.c +9 -1
@@ -9,6 +9,7 @@*/ #include <linux/io.h> +#include <linux/of_address.h> #include <linux/module.h> #include "hardware.h"
@@ -17,16 +18,23 @@ static int mx27_cpu_rev = -1;static int mx27_cpu_partnumber;#define SYS_CHIP_ID 0x00/* The offset of CHIP ID register */ +#define SYSCTRL_OFFSET 0x800/* Offset from CCM base address */ static int mx27_read_cpu_rev (void ) { +void __iomem *ccm_base; +struct device_node *np;u32 val; + + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx27-ccm" ); + ccm_base =of_iomap (np,0 ); +BUG_ON (!ccm_base);/* * now we have access to the IO registers. As we need * the silicon revision very early we read it here to * avoid any further hooks */ - val =imx_readl (MX27_IO_ADDRESS (MX27_SYSCTRL_BASE_ADDR +SYS_CHIP_ID )); + val =imx_readl (ccm_base +SYSCTRL_OFFSET +SYS_CHIP_ID ); mx27_cpu_partnumber = (int )((val >>12 ) &0xFFFF );
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 2/11 ARM: imx27: Retrieve the CCM base address from devicetree
In reply to Fabio EstevamNow that imx27 has been converted to a devicetree-only platform, retrieve the CCM base address from devicetree.
---
Chamges since v1:
- None
arch/arm/mach-imx/pm-imx27.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
arch/arm/mach-imx/pm-imx27.c +10 -2
@@ -7,6 +7,7 @@* modify it under the terms of the GNU General Public License. */ +#include <linux/of_address.h> #include <linux/kernel.h> #include <linux/suspend.h> #include <linux/io.h>
@@ -15,13 +16,20 @@static int mx27_suspend_enter (suspend_state_t state) { +void __iomem *ccm_base; +struct device_node *np;u32 cscr; + + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx27-ccm" ); + ccm_base =of_iomap (np,0 ); +BUG_ON (!ccm_base); +switch (state) {case PM_SUSPEND_MEM :/* Clear MPEN and SPEN to disable MPLL/SPLL */ - cscr =imx_readl (MX27_IO_ADDRESS (MX27_CCM_BASE_ADDR )); + cscr =imx_readl (ccm_base); cscr &=0xFFFFFFFC ; -imx_writel (cscr,MX27_IO_ADDRESS (MX27_CCM_BASE_ADDR )); +imx_writel (cscr, ccm_base);/* Executes WFI */ cpu_do_idle ();break ;
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 3/11 ARM: imx31: Retrieve the IIM base address from devicetree
In reply to Fabio EstevamNow that imx31 has been converted to a devicetree-only platform, retrieve the IIM base address from devicetree.
---
Chamges since v1:
- None
arch/arm/mach-imx/cpu-imx31.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm/mach-imx/cpu-imx31.c +8 -1
@@ -6,6 +6,7 @@*/ #include <linux/module.h> +#include <linux/of_address.h> #include <linux/io.h> #include "common.h"
@@ -32,10 +33,16 @@ static struct {static int mx31_read_cpu_rev (void ) { +void __iomem *iim_base; +struct device_node *np;u32 i, srev; + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx31-iim" ); + iim_base =of_iomap (np,0 ); +BUG_ON (!iim_base); +/* read SREV register from IIM module */ - srev =imx_readl (MX31_IO_ADDRESS (MX31_IIM_BASE_ADDR +MXC_IIMSREV )); + srev =imx_readl (iim_base +MXC_IIMSREV ); srev &=0xff ;for (i =0 ; i <ARRAY_SIZE (mx31_cpu_type); i++)
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 4/11 ARM: imx3: Retrieve the CCM base address from devicetree
In reply to Fabio EstevamNow that imx31 and imx35 has been converted to a devicetree-only platform, retrieve the CCM base address from devicetree.
---
Chamges since v1:
- None
arch/arm/mach-imx/mm-imx3.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
arch/arm/mach-imx/mm-imx3.c +11 -2
@@ -11,6 +11,7 @@#include <linux/init.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/of_address.h> #include <linux/pinctrl/machine.h> #include <asm/system_misc.h>
@@ -99,10 +100,14 @@ static void imx31_idle(void)void __init imx31_init_early (void ) { +struct device_node *np; +mxc_set_cpu_type (MXC_CPU_MX31 ); arch_ioremap_caller = imx3_ioremap_caller; arm_pm_idle = imx31_idle; - mx3_ccm_base =MX31_IO_ADDRESS (MX31_CCM_BASE_ADDR ); + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx31-ccm" ); + mx3_ccm_base =of_iomap (np,0 ); +BUG_ON (!mx3_ccm_base); }void __init mx31_init_irq (void )
@@ -137,10 +142,14 @@ static void imx35_idle(void)void __init imx35_init_early (void ) { +struct device_node *np; +mxc_set_cpu_type (MXC_CPU_MX35 ); arm_pm_idle = imx35_idle; arch_ioremap_caller = imx3_ioremap_caller; - mx3_ccm_base =MX35_IO_ADDRESS (MX35_CCM_BASE_ADDR ); + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx35-ccm" ); + mx3_ccm_base =of_iomap (np,0 ); +BUG_ON (!mx3_ccm_base); }void __init mx35_init_irq (void )
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 5/11 ARM: imx3: Retrieve the AVIC base address from devicetree
In reply to Fabio EstevamNow that imx31 and imx35 has been converted to a devicetree-only platform, retrieve the AVIC base address from devicetree.
---
Chamges since v1:
- None
arch/arm/mach-imx/mm-imx3.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
arch/arm/mach-imx/mm-imx3.c +16 -2
@@ -112,7 +112,14 @@ void __init imx31_init_early(void)void __init mx31_init_irq (void ) { -mxc_init_irq (MX31_IO_ADDRESS (MX31_AVIC_BASE_ADDR )); +void __iomem *avic_base; +struct device_node *np; + + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx31-avic" ); + avic_base =of_iomap (np,0 ); +BUG_ON (!avic_base); + +mxc_init_irq (avic_base); }#endif /* ifdef CONFIG_SOC_IMX31 */
@@ -154,6 +161,13 @@ void __init imx35_init_early(void)void __init mx35_init_irq (void ) { -mxc_init_irq (MX35_IO_ADDRESS (MX35_AVIC_BASE_ADDR )); +void __iomem *avic_base; +struct device_node *np; + + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx35-avic" ); + avic_base =of_iomap (np,0 ); +BUG_ON (!avic_base); + +mxc_init_irq (avic_base); }#endif /* ifdef CONFIG_SOC_IMX35 */
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 6/11 ARM: imx35: Retrieve the IIM base address from devicetree
In reply to Fabio EstevamNow that imx35 has been converted to a devicetree-only platform, retrieve the IIM base address from devicetree.
---
Chamges since v1:
- None
arch/arm/mach-imx/cpu-imx35.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm/mach-imx/cpu-imx35.c +8 -1
@@ -5,6 +5,7 @@* Copyright (c) 2009 Daniel Mack <[email protected]> */ #include <linux/module.h> +#include <linux/of_address.h> #include <linux/io.h> #include "hardware.h"
@@ -14,9 +15,15 @@ static int mx35_cpu_rev = -1;static int mx35_read_cpu_rev (void ) { +void __iomem *iim_base; +struct device_node *np;u32 rev; - rev =imx_readl (MX35_IO_ADDRESS (MX35_IIM_BASE_ADDR +MXC_IIMSREV )); + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx35-iim" ); + iim_base =of_iomap (np,0 ); +BUG_ON (!iim_base); + + rev =imx_readl (iim_base +MXC_IIMSREV );switch (rev) {case 0x00 :return IMX_CHIP_REVISION_1_0 ;
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 7/11 ARM: imx: Remove unused definitions
In reply to Fabio EstevamMost of the definitions for peripheral base addresses, interrupt and DMA information is no longer used, so get rid of them.
---
Chamges since v1:
- Remove unused definitions for base address, IRQ and DMA (Arnd)
arch/arm/mach-imx/mx27.h | 196 --------------------------------------- arch/arm/mach-imx/mx31.h | 179 ----------------------------------- arch/arm/mach-imx/mx35.h | 173 ---------------------------------- 3 files changed, 548 deletions(-)
arch/arm/mach-imx/mx27.h +0 -196
@@ -13,209 +13,13 @@#define MX27_AIPI_BASE_ADDR 0x10000000#define MX27_AIPI_SIZE SZ_1M -#define MX27_DMA_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x01000) -#define MX27_WDOG_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x02000) -#define MX27_GPT1_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x03000) -#define MX27_GPT2_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x04000) -#define MX27_GPT3_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x05000) -#define MX27_PWM_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x06000) -#define MX27_RTC_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x07000) -#define MX27_KPP_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x08000) -#define MX27_OWIRE_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x09000) -#define MX27_UART1_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x0a000) -#define MX27_UART2_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x0b000) -#define MX27_UART3_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x0c000) -#define MX27_UART4_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x0d000) -#define MX27_CSPI1_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x0e000) -#define MX27_CSPI2_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x0f000) -#define MX27_SSI1_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x10000) -#define MX27_SSI2_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x11000) -#define MX27_I2C1_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x12000) -#define MX27_SDHC1_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x13000) -#define MX27_SDHC2_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x14000) -#define MX27_GPIO_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x15000) -#define MX27_GPIO1_BASE_ADDR (MX27_GPIO_BASE_ADDR + 0x000) -#define MX27_GPIO2_BASE_ADDR (MX27_GPIO_BASE_ADDR + 0x100) -#define MX27_GPIO3_BASE_ADDR (MX27_GPIO_BASE_ADDR + 0x200) -#define MX27_GPIO4_BASE_ADDR (MX27_GPIO_BASE_ADDR + 0x300) -#define MX27_GPIO5_BASE_ADDR (MX27_GPIO_BASE_ADDR + 0x400) -#define MX27_GPIO6_BASE_ADDR (MX27_GPIO_BASE_ADDR + 0x500) -#define MX27_AUDMUX_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x16000) -#define MX27_CSPI3_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x17000) -#define MX27_MSHC_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x18000) -#define MX27_GPT4_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x19000) -#define MX27_GPT5_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x1a000) -#define MX27_UART5_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x1b000) -#define MX27_UART6_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x1c000) -#define MX27_I2C2_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x1d000) -#define MX27_SDHC3_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x1e000) -#define MX27_GPT6_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x1f000) -#define MX27_LCDC_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x21000) -#define MX27_SLCDC_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x22000) -#define MX27_VPU_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x23000) -#define MX27_USB_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x24000) -#define MX27_USB_OTG_BASE_ADDR (MX27_USB_BASE_ADDR + 0x0000) -#define MX27_USB_HS1_BASE_ADDR (MX27_USB_BASE_ADDR + 0x0200) -#define MX27_USB_HS2_BASE_ADDR (MX27_USB_BASE_ADDR + 0x0400) -#define MX27_SAHARA_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x25000) -#define MX27_EMMAPP_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x26000) -#define MX27_EMMAPRP_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x26400) -#define MX27_CCM_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x27000) -#define MX27_SYSCTRL_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x27800) -#define MX27_IIM_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x28000) -#define MX27_RTIC_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x2a000) -#define MX27_FEC_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x2b000) -#define MX27_SCC_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x2c000) -#define MX27_ETB_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x3b000) -#define MX27_ETB_RAM_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x3c000) -#define MX27_JAM_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x3e000) -#define MX27_MAX_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x3f000) - -#define MX27_AVIC_BASE_ADDR 0x10040000 - -/* ROM patch */ -#define MX27_ROMP_BASE_ADDR 0x10041000#define MX27_SAHB1_BASE_ADDR 0x80000000#define MX27_SAHB1_SIZE SZ_1M -#define MX27_CSI_BASE_ADDR (MX27_SAHB1_BASE_ADDR + 0x0000) -#define MX27_ATA_BASE_ADDR (MX27_SAHB1_BASE_ADDR + 0x1000) - -/* Memory regions and CS */ -#define MX27_SDRAM_BASE_ADDR 0xa0000000 -#define MX27_CSD1_BASE_ADDR 0xb0000000 -#define MX27_CS0_BASE_ADDR 0xc0000000 -#define MX27_CS1_BASE_ADDR 0xc8000000 -#define MX27_CS2_BASE_ADDR 0xd0000000 -#define MX27_CS3_BASE_ADDR 0xd2000000 -#define MX27_CS4_BASE_ADDR 0xd4000000 -#define MX27_CS5_BASE_ADDR 0xd6000000 - -/* NAND, SDRAM, WEIM, M3IF, EMI controllers */ #define MX27_X_MEMC_BASE_ADDR 0xd8000000#define MX27_X_MEMC_SIZE SZ_1M -#define MX27_NFC_BASE_ADDR (MX27_X_MEMC_BASE_ADDR) -#define MX27_SDRAMC_BASE_ADDR (MX27_X_MEMC_BASE_ADDR + 0x1000) -#define MX27_WEIM_BASE_ADDR (MX27_X_MEMC_BASE_ADDR + 0x2000) -#define MX27_M3IF_BASE_ADDR (MX27_X_MEMC_BASE_ADDR + 0x3000) -#define MX27_PCMCIA_CTL_BASE_ADDR (MX27_X_MEMC_BASE_ADDR + 0x4000) - -#define MX27_WEIM_CSCRx_BASE_ADDR (cs) (MX27_WEIM_BASE_ADDR + (cs) * 0x10) -#define MX27_WEIM_CSCRxU (cs) (MX27_WEIM_CSCRx_BASE_ADDR(cs)) -#define MX27_WEIM_CSCRxL (cs) (MX27_WEIM_CSCRx_BASE_ADDR(cs) + 0x4) -#define MX27_WEIM_CSCRxA (cs) (MX27_WEIM_CSCRx_BASE_ADDR(cs) + 0x8) - -#define MX27_PCMCIA_MEM_BASE_ADDR 0xdc000000 - -/* IRAM */ -#define MX27_IRAM_BASE_ADDR 0xffff4c00/* internal ram */ #define MX27_IO_P2V (x) IMX_IO_P2V(x) -#define MX27_IO_ADDRESS (x) IOMEM(MX27_IO_P2V(x)) - -/* fixed interrupt numbers */ -#include <asm/irq.h> -#define MX27_INT_I2C2 (NR_IRQS_LEGACY + 1) -#define MX27_INT_GPT6 (NR_IRQS_LEGACY + 2) -#define MX27_INT_GPT5 (NR_IRQS_LEGACY + 3) -#define MX27_INT_GPT4 (NR_IRQS_LEGACY + 4) -#define MX27_INT_RTIC (NR_IRQS_LEGACY + 5) -#define MX27_INT_CSPI3 (NR_IRQS_LEGACY + 6) -#define MX27_INT_MSHC (NR_IRQS_LEGACY + 7) -#define MX27_INT_GPIO (NR_IRQS_LEGACY + 8) -#define MX27_INT_SDHC3 (NR_IRQS_LEGACY + 9) -#define MX27_INT_SDHC2 (NR_IRQS_LEGACY + 10) -#define MX27_INT_SDHC1 (NR_IRQS_LEGACY + 11) -#define MX27_INT_I2C1 (NR_IRQS_LEGACY + 12) -#define MX27_INT_SSI2 (NR_IRQS_LEGACY + 13) -#define MX27_INT_SSI1 (NR_IRQS_LEGACY + 14) -#define MX27_INT_CSPI2 (NR_IRQS_LEGACY + 15) -#define MX27_INT_CSPI1 (NR_IRQS_LEGACY + 16) -#define MX27_INT_UART4 (NR_IRQS_LEGACY + 17) -#define MX27_INT_UART3 (NR_IRQS_LEGACY + 18) -#define MX27_INT_UART2 (NR_IRQS_LEGACY + 19) -#define MX27_INT_UART1 (NR_IRQS_LEGACY + 20) -#define MX27_INT_KPP (NR_IRQS_LEGACY + 21) -#define MX27_INT_RTC (NR_IRQS_LEGACY + 22) -#define MX27_INT_PWM (NR_IRQS_LEGACY + 23) -#define MX27_INT_GPT3 (NR_IRQS_LEGACY + 24) -#define MX27_INT_GPT2 (NR_IRQS_LEGACY + 25) -#define MX27_INT_GPT1 (NR_IRQS_LEGACY + 26) -#define MX27_INT_WDOG (NR_IRQS_LEGACY + 27) -#define MX27_INT_PCMCIA (NR_IRQS_LEGACY + 28) -#define MX27_INT_NFC (NR_IRQS_LEGACY + 29) -#define MX27_INT_ATA (NR_IRQS_LEGACY + 30) -#define MX27_INT_CSI (NR_IRQS_LEGACY + 31) -#define MX27_INT_DMACH0 (NR_IRQS_LEGACY + 32) -#define MX27_INT_DMACH1 (NR_IRQS_LEGACY + 33) -#define MX27_INT_DMACH2 (NR_IRQS_LEGACY + 34) -#define MX27_INT_DMACH3 (NR_IRQS_LEGACY + 35) -#define MX27_INT_DMACH4 (NR_IRQS_LEGACY + 36) -#define MX27_INT_DMACH5 (NR_IRQS_LEGACY + 37) -#define MX27_INT_DMACH6 (NR_IRQS_LEGACY + 38) -#define MX27_INT_DMACH7 (NR_IRQS_LEGACY + 39) -#define MX27_INT_DMACH8 (NR_IRQS_LEGACY + 40) -#define MX27_INT_DMACH9 (NR_IRQS_LEGACY + 41) -#define MX27_INT_DMACH10 (NR_IRQS_LEGACY + 42) -#define MX27_INT_DMACH11 (NR_IRQS_LEGACY + 43) -#define MX27_INT_DMACH12 (NR_IRQS_LEGACY + 44) -#define MX27_INT_DMACH13 (NR_IRQS_LEGACY + 45) -#define MX27_INT_DMACH14 (NR_IRQS_LEGACY + 46) -#define MX27_INT_DMACH15 (NR_IRQS_LEGACY + 47) -#define MX27_INT_UART6 (NR_IRQS_LEGACY + 48) -#define MX27_INT_UART5 (NR_IRQS_LEGACY + 49) -#define MX27_INT_FEC (NR_IRQS_LEGACY + 50) -#define MX27_INT_EMMAPRP (NR_IRQS_LEGACY + 51) -#define MX27_INT_EMMAPP (NR_IRQS_LEGACY + 52) -#define MX27_INT_VPU (NR_IRQS_LEGACY + 53) -#define MX27_INT_USB_HS1 (NR_IRQS_LEGACY + 54) -#define MX27_INT_USB_HS2 (NR_IRQS_LEGACY + 55) -#define MX27_INT_USB_OTG (NR_IRQS_LEGACY + 56) -#define MX27_INT_SCC_SMN (NR_IRQS_LEGACY + 57) -#define MX27_INT_SCC_SCM (NR_IRQS_LEGACY + 58) -#define MX27_INT_SAHARA (NR_IRQS_LEGACY + 59) -#define MX27_INT_SLCDC (NR_IRQS_LEGACY + 60) -#define MX27_INT_LCDC (NR_IRQS_LEGACY + 61) -#define MX27_INT_IIM (NR_IRQS_LEGACY + 62) -#define MX27_INT_CCM (NR_IRQS_LEGACY + 63) - -/* fixed DMA request numbers */ -#define MX27_DMA_REQ_CSPI3_RX 1 -#define MX27_DMA_REQ_CSPI3_TX 2 -#define MX27_DMA_REQ_EXT 3 -#define MX27_DMA_REQ_MSHC 4 -#define MX27_DMA_REQ_SDHC2 6 -#define MX27_DMA_REQ_SDHC1 7 -#define MX27_DMA_REQ_SSI2_RX0 8 -#define MX27_DMA_REQ_SSI2_TX0 9 -#define MX27_DMA_REQ_SSI2_RX1 10 -#define MX27_DMA_REQ_SSI2_TX1 11 -#define MX27_DMA_REQ_SSI1_RX0 12 -#define MX27_DMA_REQ_SSI1_TX0 13 -#define MX27_DMA_REQ_SSI1_RX1 14 -#define MX27_DMA_REQ_SSI1_TX1 15 -#define MX27_DMA_REQ_CSPI2_RX 16 -#define MX27_DMA_REQ_CSPI2_TX 17 -#define MX27_DMA_REQ_CSPI1_RX 18 -#define MX27_DMA_REQ_CSPI1_TX 19 -#define MX27_DMA_REQ_UART4_RX 20 -#define MX27_DMA_REQ_UART4_TX 21 -#define MX27_DMA_REQ_UART3_RX 22 -#define MX27_DMA_REQ_UART3_TX 23 -#define MX27_DMA_REQ_UART2_RX 24 -#define MX27_DMA_REQ_UART2_TX 25 -#define MX27_DMA_REQ_UART1_RX 26 -#define MX27_DMA_REQ_UART1_TX 27 -#define MX27_DMA_REQ_ATA_TX 28 -#define MX27_DMA_REQ_ATA_RCV 29 -#define MX27_DMA_REQ_CSI_STAT 30 -#define MX27_DMA_REQ_CSI_RX 31 -#define MX27_DMA_REQ_UART5_TX 32 -#define MX27_DMA_REQ_UART5_RX 33 -#define MX27_DMA_REQ_UART6_TX 34 -#define MX27_DMA_REQ_UART6_RX 35 -#define MX27_DMA_REQ_SDHC3 36 -#define MX27_DMA_REQ_NFC 37#endif /* ifndef __MACH_MX27_H__ */
arch/arm/mach-imx/mx31.h +0 -179
196 lines not on this page · raw message
arch/arm/mach-imx/mx35.h +0 -173
190 lines not on this page · raw message
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 8/11 clk: imx: imx27: Remove mx27_clocks_init()
In reply to Fabio Estevammx27_clocks_init() has been used to register clocks on i.MX27 non-devicetree platforms.
Now that i.MX is a devicetree-only platform, it is safe to remove mx27_clocks_init() as there are no more users.
---
Chamges since v1:
- None
drivers/clk/imx/clk-imx27.c | 73 ------------------------------------- 1 file changed, 73 deletions(-)
drivers/clk/imx/clk-imx27.c +0 -73
@@ -181,79 +181,6 @@ static void __init _mx27_clocks_init(unsigned long fref)imx_print_silicon_rev ("i.MX27" ,mx27_revision ()); } -int __init mx27_clocks_init (unsigned long fref) -{ - ccm =ioremap (MX27_CCM_BASE_ADDR ,SZ_4K ); - -_mx27_clocks_init (fref); - -clk_register_clkdev (clk[IMX27_CLK_UART1_IPG_GATE ],"ipg" ,"imx21-uart.0" ); -clk_register_clkdev (clk[IMX27_CLK_PER1_GATE ],"per" ,"imx21-uart.0" ); -clk_register_clkdev (clk[IMX27_CLK_UART2_IPG_GATE ],"ipg" ,"imx21-uart.1" ); -clk_register_clkdev (clk[IMX27_CLK_PER1_GATE ],"per" ,"imx21-uart.1" ); -clk_register_clkdev (clk[IMX27_CLK_UART3_IPG_GATE ],"ipg" ,"imx21-uart.2" ); -clk_register_clkdev (clk[IMX27_CLK_PER1_GATE ],"per" ,"imx21-uart.2" ); -clk_register_clkdev (clk[IMX27_CLK_UART4_IPG_GATE ],"ipg" ,"imx21-uart.3" ); -clk_register_clkdev (clk[IMX27_CLK_PER1_GATE ],"per" ,"imx21-uart.3" ); -clk_register_clkdev (clk[IMX27_CLK_UART5_IPG_GATE ],"ipg" ,"imx21-uart.4" ); -clk_register_clkdev (clk[IMX27_CLK_PER1_GATE ],"per" ,"imx21-uart.4" ); -clk_register_clkdev (clk[IMX27_CLK_UART6_IPG_GATE ],"ipg" ,"imx21-uart.5" ); -clk_register_clkdev (clk[IMX27_CLK_PER1_GATE ],"per" ,"imx21-uart.5" ); -clk_register_clkdev (clk[IMX27_CLK_GPT1_IPG_GATE ],"ipg" ,"imx-gpt.0" ); -clk_register_clkdev (clk[IMX27_CLK_PER1_GATE ],"per" ,"imx-gpt.0" ); -clk_register_clkdev (clk[IMX27_CLK_PER2_GATE ],"per" ,"imx21-mmc.0" ); -clk_register_clkdev (clk[IMX27_CLK_SDHC1_IPG_GATE ],"ipg" ,"imx21-mmc.0" ); -clk_register_clkdev (clk[IMX27_CLK_PER2_GATE ],"per" ,"imx21-mmc.1" ); -clk_register_clkdev (clk[IMX27_CLK_SDHC2_IPG_GATE ],"ipg" ,"imx21-mmc.1" ); -clk_register_clkdev (clk[IMX27_CLK_PER2_GATE ],"per" ,"imx21-mmc.2" ); -clk_register_clkdev (clk[IMX27_CLK_SDHC2_IPG_GATE ],"ipg" ,"imx21-mmc.2" ); -clk_register_clkdev (clk[IMX27_CLK_PER2_GATE ],"per" ,"imx27-cspi.0" ); -clk_register_clkdev (clk[IMX27_CLK_CSPI1_IPG_GATE ],"ipg" ,"imx27-cspi.0" ); -clk_register_clkdev (clk[IMX27_CLK_PER2_GATE ],"per" ,"imx27-cspi.1" ); -clk_register_clkdev (clk[IMX27_CLK_CSPI2_IPG_GATE ],"ipg" ,"imx27-cspi.1" ); -clk_register_clkdev (clk[IMX27_CLK_PER2_GATE ],"per" ,"imx27-cspi.2" ); -clk_register_clkdev (clk[IMX27_CLK_CSPI3_IPG_GATE ],"ipg" ,"imx27-cspi.2" ); -clk_register_clkdev (clk[IMX27_CLK_PER3_GATE ],"per" ,"imx21-fb.0" ); -clk_register_clkdev (clk[IMX27_CLK_LCDC_IPG_GATE ],"ipg" ,"imx21-fb.0" ); -clk_register_clkdev (clk[IMX27_CLK_LCDC_AHB_GATE ],"ahb" ,"imx21-fb.0" ); -clk_register_clkdev (clk[IMX27_CLK_CSI_AHB_GATE ],"ahb" ,"imx27-camera.0" ); -clk_register_clkdev (clk[IMX27_CLK_PER4_GATE ],"per" ,"imx27-camera.0" ); -clk_register_clkdev (clk[IMX27_CLK_USB_DIV ],"per" ,"imx-udc-mx27" ); -clk_register_clkdev (clk[IMX27_CLK_USB_IPG_GATE ],"ipg" ,"imx-udc-mx27" ); -clk_register_clkdev (clk[IMX27_CLK_USB_AHB_GATE ],"ahb" ,"imx-udc-mx27" ); -clk_register_clkdev (clk[IMX27_CLK_USB_DIV ],"per" ,"mxc-ehci.0" ); -clk_register_clkdev (clk[IMX27_CLK_USB_IPG_GATE ],"ipg" ,"mxc-ehci.0" ); -clk_register_clkdev (clk[IMX27_CLK_USB_AHB_GATE ],"ahb" ,"mxc-ehci.0" ); -clk_register_clkdev (clk[IMX27_CLK_USB_DIV ],"per" ,"mxc-ehci.1" ); -clk_register_clkdev (clk[IMX27_CLK_USB_IPG_GATE ],"ipg" ,"mxc-ehci.1" ); -clk_register_clkdev (clk[IMX27_CLK_USB_AHB_GATE ],"ahb" ,"mxc-ehci.1" ); -clk_register_clkdev (clk[IMX27_CLK_USB_DIV ],"per" ,"mxc-ehci.2" ); -clk_register_clkdev (clk[IMX27_CLK_USB_IPG_GATE ],"ipg" ,"mxc-ehci.2" ); -clk_register_clkdev (clk[IMX27_CLK_USB_AHB_GATE ],"ahb" ,"mxc-ehci.2" ); -clk_register_clkdev (clk[IMX27_CLK_SSI1_IPG_GATE ],NULL ,"imx-ssi.0" ); -clk_register_clkdev (clk[IMX27_CLK_SSI2_IPG_GATE ],NULL ,"imx-ssi.1" ); -clk_register_clkdev (clk[IMX27_CLK_NFC_BAUD_GATE ],NULL ,"imx27-nand.0" ); -clk_register_clkdev (clk[IMX27_CLK_VPU_BAUD_GATE ],"per" ,"coda-imx27.0" ); -clk_register_clkdev (clk[IMX27_CLK_VPU_AHB_GATE ],"ahb" ,"coda-imx27.0" ); -clk_register_clkdev (clk[IMX27_CLK_DMA_AHB_GATE ],"ahb" ,"imx27-dma" ); -clk_register_clkdev (clk[IMX27_CLK_DMA_IPG_GATE ],"ipg" ,"imx27-dma" ); -clk_register_clkdev (clk[IMX27_CLK_FEC_IPG_GATE ],"ipg" ,"imx27-fec.0" ); -clk_register_clkdev (clk[IMX27_CLK_FEC_AHB_GATE ],"ahb" ,"imx27-fec.0" ); -clk_register_clkdev (clk[IMX27_CLK_WDOG_IPG_GATE ],NULL ,"imx2-wdt.0" ); -clk_register_clkdev (clk[IMX27_CLK_I2C1_IPG_GATE ],NULL ,"imx21-i2c.0" ); -clk_register_clkdev (clk[IMX27_CLK_I2C2_IPG_GATE ],NULL ,"imx21-i2c.1" ); -clk_register_clkdev (clk[IMX27_CLK_OWIRE_IPG_GATE ],NULL ,"mxc_w1.0" ); -clk_register_clkdev (clk[IMX27_CLK_KPP_IPG_GATE ],NULL ,"imx-keypad" ); -clk_register_clkdev (clk[IMX27_CLK_EMMA_AHB_GATE ],"emma-ahb" ,"imx27-camera.0" ); -clk_register_clkdev (clk[IMX27_CLK_EMMA_IPG_GATE ],"emma-ipg" ,"imx27-camera.0" ); -clk_register_clkdev (clk[IMX27_CLK_EMMA_AHB_GATE ],"ahb" ,"m2m-emmaprp.0" ); -clk_register_clkdev (clk[IMX27_CLK_EMMA_IPG_GATE ],"ipg" ,"m2m-emmaprp.0" ); - -mxc_timer_init (MX27_GPT1_BASE_ADDR ,MX27_INT_GPT1 ,GPT_TYPE_IMX21 ); - -return 0 ; -} -static void __init mx27_clocks_init_dt (struct device_node *np) {struct device_node *refnp;
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 9/11 clk: imx: imx31: Remove mx31_clocks_init()
In reply to Fabio Estevammx31_clocks_init() has been used to register clocks on i.MX31 non-devicetree platforms.
Now that i.MX is a devicetree-only platform, it is safe to remove mx31_clocks_init() as there are no more users.
---
Chamges since v1:
- None
drivers/clk/imx/clk-imx31.c | 71 ------------------------------------- 1 file changed, 71 deletions(-)
drivers/clk/imx/clk-imx31.c +0 -71
@@ -132,77 +132,6 @@ static void __init _mx31_clocks_init(void __iomem *base, unsigned long fref)clk_disable_unprepare (clk[iim_gate]); } -int __init mx31_clocks_init (unsigned long fref) -{ -void __iomem *base; - - base =ioremap (MX31_CCM_BASE_ADDR ,SZ_4K ); -if (!base) -panic ("%s: failed to map registers\n" , __func__); - -_mx31_clocks_init (base, fref); - -clk_register_clkdev (clk[gpt_gate],"per" ,"imx-gpt.0" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx-gpt.0" ); -clk_register_clkdev (clk[cspi1_gate],NULL ,"imx31-cspi.0" ); -clk_register_clkdev (clk[cspi2_gate],NULL ,"imx31-cspi.1" ); -clk_register_clkdev (clk[cspi3_gate],NULL ,"imx31-cspi.2" ); -clk_register_clkdev (clk[pwm_gate],"pwm" ,NULL ); -clk_register_clkdev (clk[wdog_gate],NULL ,"imx2-wdt.0" ); -clk_register_clkdev (clk[ckil],"ref" ,"imx21-rtc" ); -clk_register_clkdev (clk[rtc_gate],"ipg" ,"imx21-rtc" ); -clk_register_clkdev (clk[epit1_gate],"epit" ,NULL ); -clk_register_clkdev (clk[epit2_gate],"epit" ,NULL ); -clk_register_clkdev (clk[nfc],NULL ,"imx27-nand.0" ); -clk_register_clkdev (clk[ipu_gate],NULL ,"ipu-core" ); -clk_register_clkdev (clk[ipu_gate],NULL ,"mx3_sdc_fb" ); -clk_register_clkdev (clk[kpp_gate],NULL ,"imx-keypad" ); -clk_register_clkdev (clk[usb_div_post],"per" ,"mxc-ehci.0" ); -clk_register_clkdev (clk[usb_gate],"ahb" ,"mxc-ehci.0" ); -clk_register_clkdev (clk[ipg],"ipg" ,"mxc-ehci.0" ); -clk_register_clkdev (clk[usb_div_post],"per" ,"mxc-ehci.1" ); -clk_register_clkdev (clk[usb_gate],"ahb" ,"mxc-ehci.1" ); -clk_register_clkdev (clk[ipg],"ipg" ,"mxc-ehci.1" ); -clk_register_clkdev (clk[usb_div_post],"per" ,"mxc-ehci.2" ); -clk_register_clkdev (clk[usb_gate],"ahb" ,"mxc-ehci.2" ); -clk_register_clkdev (clk[ipg],"ipg" ,"mxc-ehci.2" ); -clk_register_clkdev (clk[usb_div_post],"per" ,"imx-udc-mx27" ); -clk_register_clkdev (clk[usb_gate],"ahb" ,"imx-udc-mx27" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx-udc-mx27" ); -clk_register_clkdev (clk[csi_gate],NULL ,"mx3-camera.0" ); -/* i.mx31 has the i.mx21 type uart */ -clk_register_clkdev (clk[uart1_gate],"per" ,"imx21-uart.0" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx21-uart.0" ); -clk_register_clkdev (clk[uart2_gate],"per" ,"imx21-uart.1" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx21-uart.1" ); -clk_register_clkdev (clk[uart3_gate],"per" ,"imx21-uart.2" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx21-uart.2" ); -clk_register_clkdev (clk[uart4_gate],"per" ,"imx21-uart.3" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx21-uart.3" ); -clk_register_clkdev (clk[uart5_gate],"per" ,"imx21-uart.4" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx21-uart.4" ); -clk_register_clkdev (clk[i2c1_gate],NULL ,"imx21-i2c.0" ); -clk_register_clkdev (clk[i2c2_gate],NULL ,"imx21-i2c.1" ); -clk_register_clkdev (clk[i2c3_gate],NULL ,"imx21-i2c.2" ); -clk_register_clkdev (clk[owire_gate],NULL ,"mxc_w1.0" ); -clk_register_clkdev (clk[sdhc1_gate],NULL ,"imx31-mmc.0" ); -clk_register_clkdev (clk[sdhc2_gate],NULL ,"imx31-mmc.1" ); -clk_register_clkdev (clk[ssi1_gate],NULL ,"imx-ssi.0" ); -clk_register_clkdev (clk[ssi2_gate],NULL ,"imx-ssi.1" ); -clk_register_clkdev (clk[firi_gate],"firi" ,NULL ); -clk_register_clkdev (clk[ata_gate],NULL ,"pata_imx" ); -clk_register_clkdev (clk[rtic_gate],"rtic" ,NULL ); -clk_register_clkdev (clk[rng_gate],NULL ,"mxc_rnga" ); -clk_register_clkdev (clk[sdma_gate],NULL ,"imx31-sdma" ); -clk_register_clkdev (clk[iim_gate],"iim" ,NULL ); - - -imx_register_uart_clocks (uart_clks); -mxc_timer_init (MX31_GPT1_BASE_ADDR ,MX31_INT_GPT ,GPT_TYPE_IMX31 ); - -return 0 ; -} -static void __init mx31_clocks_init_dt (struct device_node *np) {struct device_node *osc_np;
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 10/11 clk: imx: imx35: Remove mx35_clocks_init()
In reply to Fabio Estevammx35_clocks_init() has been used to register clocks on i.MX35 non-devicetree platforms.
Now that i.MX is a devicetree-only platform, it is safe to remove mx35_clocks_init() as there are no more users.
---
Chamges since v1:
- None
drivers/clk/imx/clk-imx35.c | 68 ------------------------------------- 1 file changed, 68 deletions(-)
drivers/clk/imx/clk-imx35.c +0 -68
@@ -248,74 +248,6 @@ static void __init _mx35_clocks_init(void)imx_print_silicon_rev ("i.MX35" ,mx35_revision ()); } -int __init mx35_clocks_init (void ) -{ -_mx35_clocks_init (); - -clk_register_clkdev (clk[pata_gate],NULL ,"pata_imx" ); -clk_register_clkdev (clk[can1_gate],NULL ,"flexcan.0" ); -clk_register_clkdev (clk[can2_gate],NULL ,"flexcan.1" ); -clk_register_clkdev (clk[cspi1_gate],"per" ,"imx35-cspi.0" ); -clk_register_clkdev (clk[cspi1_gate],"ipg" ,"imx35-cspi.0" ); -clk_register_clkdev (clk[cspi2_gate],"per" ,"imx35-cspi.1" ); -clk_register_clkdev (clk[cspi2_gate],"ipg" ,"imx35-cspi.1" ); -clk_register_clkdev (clk[epit1_gate],NULL ,"imx-epit.0" ); -clk_register_clkdev (clk[epit2_gate],NULL ,"imx-epit.1" ); -clk_register_clkdev (clk[esdhc1_gate],"per" ,"sdhci-esdhc-imx35.0" ); -clk_register_clkdev (clk[ipg],"ipg" ,"sdhci-esdhc-imx35.0" ); -clk_register_clkdev (clk[ahb],"ahb" ,"sdhci-esdhc-imx35.0" ); -clk_register_clkdev (clk[esdhc2_gate],"per" ,"sdhci-esdhc-imx35.1" ); -clk_register_clkdev (clk[ipg],"ipg" ,"sdhci-esdhc-imx35.1" ); -clk_register_clkdev (clk[ahb],"ahb" ,"sdhci-esdhc-imx35.1" ); -clk_register_clkdev (clk[esdhc3_gate],"per" ,"sdhci-esdhc-imx35.2" ); -clk_register_clkdev (clk[ipg],"ipg" ,"sdhci-esdhc-imx35.2" ); -clk_register_clkdev (clk[ahb],"ahb" ,"sdhci-esdhc-imx35.2" ); -/* i.mx35 has the i.mx27 type fec */ -clk_register_clkdev (clk[fec_gate],NULL ,"imx27-fec.0" ); -clk_register_clkdev (clk[gpt_gate],"per" ,"imx-gpt.0" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx-gpt.0" ); -clk_register_clkdev (clk[i2c1_gate],NULL ,"imx21-i2c.0" ); -clk_register_clkdev (clk[i2c2_gate],NULL ,"imx21-i2c.1" ); -clk_register_clkdev (clk[i2c3_gate],NULL ,"imx21-i2c.2" ); -clk_register_clkdev (clk[ipu_gate],NULL ,"ipu-core" ); -clk_register_clkdev (clk[ipu_gate],NULL ,"mx3_sdc_fb" ); -clk_register_clkdev (clk[kpp_gate],NULL ,"imx-keypad" ); -clk_register_clkdev (clk[owire_gate],NULL ,"mxc_w1" ); -clk_register_clkdev (clk[sdma_gate],NULL ,"imx35-sdma" ); -clk_register_clkdev (clk[ssi1_gate],NULL ,"imx-ssi.0" ); -clk_register_clkdev (clk[ssi2_gate],NULL ,"imx-ssi.1" ); -/* i.mx35 has the i.mx21 type uart */ -clk_register_clkdev (clk[uart1_gate],"per" ,"imx21-uart.0" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx21-uart.0" ); -clk_register_clkdev (clk[uart2_gate],"per" ,"imx21-uart.1" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx21-uart.1" ); -clk_register_clkdev (clk[uart3_gate],"per" ,"imx21-uart.2" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx21-uart.2" ); -/* i.mx35 has the i.mx21 type rtc */ -clk_register_clkdev (clk[ckil],"ref" ,"imx21-rtc" ); -clk_register_clkdev (clk[rtc_gate],"ipg" ,"imx21-rtc" ); -clk_register_clkdev (clk[usb_div],"per" ,"mxc-ehci.0" ); -clk_register_clkdev (clk[ipg],"ipg" ,"mxc-ehci.0" ); -clk_register_clkdev (clk[usbotg_gate],"ahb" ,"mxc-ehci.0" ); -clk_register_clkdev (clk[usb_div],"per" ,"mxc-ehci.1" ); -clk_register_clkdev (clk[ipg],"ipg" ,"mxc-ehci.1" ); -clk_register_clkdev (clk[usbotg_gate],"ahb" ,"mxc-ehci.1" ); -clk_register_clkdev (clk[usb_div],"per" ,"mxc-ehci.2" ); -clk_register_clkdev (clk[ipg],"ipg" ,"mxc-ehci.2" ); -clk_register_clkdev (clk[usbotg_gate],"ahb" ,"mxc-ehci.2" ); -clk_register_clkdev (clk[usb_div],"per" ,"imx-udc-mx27" ); -clk_register_clkdev (clk[ipg],"ipg" ,"imx-udc-mx27" ); -clk_register_clkdev (clk[usbotg_gate],"ahb" ,"imx-udc-mx27" ); -clk_register_clkdev (clk[wdog_gate],NULL ,"imx2-wdt.0" ); -clk_register_clkdev (clk[nfc_div],NULL ,"imx25-nand.0" ); -clk_register_clkdev (clk[csi_gate],NULL ,"mx3-camera.0" ); -clk_register_clkdev (clk[admux_gate],"audmux" ,NULL ); - -mxc_timer_init (MX35_GPT1_BASE_ADDR ,MX35_INT_GPT ,GPT_TYPE_IMX31 ); - -return 0 ; -} -static void __init mx35_clocks_init_dt (struct device_node *ccm_node) {_mx35_clocks_init ();
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fabio Estevam
reviewerPATCH v2 11/11 clk: imx: imx21: Remove clock driver
In reply to Fabio EstevamAs i.MX21 support has been removed, get rid of its clock driver too.
---
Chamges since v1:
- None
drivers/clk/imx/Kconfig | 4 - drivers/clk/imx/Makefile | 1 - drivers/clk/imx/clk-imx21.c | 171 ------------------------------------ 3 files changed, 176 deletions(-) delete mode 100644 drivers/clk/imx/clk-imx21.c
drivers/clk/imx/Kconfig +0 -4
@@ -13,10 +13,6 @@ config CLK_IMX1 def_bool SOC_IMX1 select MXC_CLK -config CLK_IMX21 - def_bool SOC_IMX21 - select MXC_CLK - config CLK_IMX25 def_bool SOC_IMX25 select MXC_CLK
drivers/clk/imx/Makefile +0 -1
@@ -31,7 +31,6 @@ clk-imx-scu-$(CONFIG_CLK_IMX8QXP) += clk-scu.o clk-imx8qxp.o clk-imx-lpcg-scu-$(CONFIG_CLK_IMX8QXP) += clk-lpcg-scu.o clk-imx8qxp-lpcg.o obj-$(CONFIG_CLK_IMX1) += clk-imx1.o -obj-$(CONFIG_CLK_IMX21) += clk-imx21.o obj-$(CONFIG_CLK_IMX25) += clk-imx25.o obj-$(CONFIG_CLK_IMX27) += clk-imx27.o obj-$(CONFIG_CLK_IMX31) += clk-imx31.o
drivers/clk/imx/clk-imx21.c deleted +0 -171
171 lines not on this page · raw message
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 10 lines · Fabio Estevam
Now that i.MX has been converted to a devicetree-only platform, do one more round of cleanups that consists mainly in using devicetree to get the peripherals base addresses and get rid of unused clock driver code.
Changes since v1:
- Do not introduce a sysctrl node to avoid breaking DT compatibility (Arnd)
- Remove unused definitions for base address, IRQ and DMA (Arnd)
Whole series:
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Shawn Guo
AppliedQuoted 10 lines · Fabio Estevam
Now that i.MX has been converted to a devicetree-only platform, do one more round of cleanups that consists mainly in using devicetree to get the peripherals base addresses and get rid of unused clock driver code.
Changes since v1:
- Do not introduce a sysctrl node to avoid breaking DT compatibility (Arnd)
- Remove unused definitions for base address, IRQ and DMA (Arnd)
Quoted 12 lines
Fabio Estevam (11):
ARM: imx27: Retrieve the SYSCTRL base address from devicetree
ARM: imx27: Retrieve the CCM base address from devicetree
ARM: imx31: Retrieve the IIM base address from devicetree
ARM: imx3: Retrieve the CCM base address from devicetree
ARM: imx3: Retrieve the AVIC base address from devicetree
ARM: imx35: Retrieve the IIM base address from devicetree
ARM: imx: Remove unused definitions
clk: imx: imx27: Removemx27_clocks_init()
clk: imx: imx31: Removemx31_clocks_init()
clk: imx: imx35: Removemx35_clocks_init()
clk: imx: imx21: Remove clock driver
Applied all, thanks.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel