diff options
-rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mm-imx5.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/src.c | 4 |
4 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 8b6dfd1a1b2f..8805adb7c7f6 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi | |||
@@ -520,7 +520,7 @@ | |||
520 | }; | 520 | }; |
521 | 521 | ||
522 | src: src@020d8000 { | 522 | src: src@020d8000 { |
523 | compatible = "fsl,imx6q-src"; | 523 | compatible = "fsl,imx6q-src", "fsl,imx51-src"; |
524 | reg = <0x020d8000 0x4000>; | 524 | reg = <0x020d8000 0x4000>; |
525 | interrupts = <0 91 0x04 0 96 0x04>; | 525 | interrupts = <0 91 0x04 0 96 0x04>; |
526 | #reset-cells = <1>; | 526 | #reset-cells = <1>; |
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 6575e4ebe26e..91571a16f986 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -149,6 +149,7 @@ config SOC_IMX5 | |||
149 | 149 | ||
150 | config SOC_IMX51 | 150 | config SOC_IMX51 |
151 | bool | 151 | bool |
152 | select HAVE_IMX_SRC | ||
152 | select PINCTRL | 153 | select PINCTRL |
153 | select PINCTRL_IMX51 | 154 | select PINCTRL_IMX51 |
154 | select SOC_IMX5 | 155 | select SOC_IMX5 |
@@ -774,6 +775,7 @@ comment "Device tree only" | |||
774 | config SOC_IMX53 | 775 | config SOC_IMX53 |
775 | bool "i.MX53 support" | 776 | bool "i.MX53 support" |
776 | select HAVE_CAN_FLEXCAN if CAN | 777 | select HAVE_CAN_FLEXCAN if CAN |
778 | select HAVE_IMX_SRC | ||
777 | select IMX_HAVE_PLATFORM_IMX2_WDT | 779 | select IMX_HAVE_PLATFORM_IMX2_WDT |
778 | select PINCTRL | 780 | select PINCTRL |
779 | select PINCTRL_IMX53 | 781 | select PINCTRL_IMX53 |
diff --git a/arch/arm/mach-imx/mm-imx5.c b/arch/arm/mach-imx/mm-imx5.c index cf34994cfe28..b7c4e70e5081 100644 --- a/arch/arm/mach-imx/mm-imx5.c +++ b/arch/arm/mach-imx/mm-imx5.c | |||
@@ -84,6 +84,7 @@ void __init imx51_init_early(void) | |||
84 | mxc_set_cpu_type(MXC_CPU_MX51); | 84 | mxc_set_cpu_type(MXC_CPU_MX51); |
85 | mxc_iomux_v3_init(MX51_IO_ADDRESS(MX51_IOMUXC_BASE_ADDR)); | 85 | mxc_iomux_v3_init(MX51_IO_ADDRESS(MX51_IOMUXC_BASE_ADDR)); |
86 | mxc_arch_reset_init(MX51_IO_ADDRESS(MX51_WDOG1_BASE_ADDR)); | 86 | mxc_arch_reset_init(MX51_IO_ADDRESS(MX51_WDOG1_BASE_ADDR)); |
87 | imx_src_init(); | ||
87 | } | 88 | } |
88 | 89 | ||
89 | void __init imx53_init_early(void) | 90 | void __init imx53_init_early(void) |
@@ -91,6 +92,7 @@ void __init imx53_init_early(void) | |||
91 | mxc_set_cpu_type(MXC_CPU_MX53); | 92 | mxc_set_cpu_type(MXC_CPU_MX53); |
92 | mxc_iomux_v3_init(MX53_IO_ADDRESS(MX53_IOMUXC_BASE_ADDR)); | 93 | mxc_iomux_v3_init(MX53_IO_ADDRESS(MX53_IOMUXC_BASE_ADDR)); |
93 | mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG1_BASE_ADDR)); | 94 | mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG1_BASE_ADDR)); |
95 | imx_src_init(); | ||
94 | } | 96 | } |
95 | 97 | ||
96 | void __init mx51_init_irq(void) | 98 | void __init mx51_init_irq(void) |
diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c index e15f1555c59b..cef5ca7c464d 100644 --- a/arch/arm/mach-imx/src.c +++ b/arch/arm/mach-imx/src.c | |||
@@ -61,7 +61,9 @@ void __init imx_src_init(void) | |||
61 | struct device_node *np; | 61 | struct device_node *np; |
62 | u32 val; | 62 | u32 val; |
63 | 63 | ||
64 | np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-src"); | 64 | np = of_find_compatible_node(NULL, NULL, "fsl,imx51-src"); |
65 | if (!np) | ||
66 | return; | ||
65 | src_base = of_iomap(np, 0); | 67 | src_base = of_iomap(np, 0); |
66 | WARN_ON(!src_base); | 68 | WARN_ON(!src_base); |
67 | 69 | ||