summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bus: imx-weim: populate devices on a simple busLiu Ying2014-07-181-1/+3
| | | | | | | | | | | | | | | | | There could be some memory map devices located in a certain chip select region of the i.MX WEIM. The devices could be attached to a simple bus(for example, a AXI bus) whose root node is one child device tree node of the i.MX WEIM device tree node. There should be a bridge(very likely, software transparent) bewteen the i.MX WEIM and the simple bus. This patch makes the i.MX WEIM driver possible to populate devices on a simple bus. In this way, people may try various IPs(in a FPGA, maybe) outside of i.MX chips with the i.MX WEIM embedded. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx: build cpu_is_imx6sl function conditionallyArnd Bergmann2014-07-181-0/+7
| | | | | | | | | | | | | | | | | | | imx6q_pm_enter calls imx6sl_set_wait_clk when run on an imx6sl based machine. However if support for imx6sl is not enabled at compile time, this prevents us from building the kernel and we get this link error instead: arch/arm/mach-imx/built-in.o: In function `imx6q_pm_enter': :(.text+0x4b84): undefined reference to `imx6sl_set_wait_clk' This makes the cpu_is_imx6sl function conditionally return false if imx6sl is disabled at compile-time, which matches what the older cpu_is_mx* macros did. We have similar inline functions for the other imx6 variants, but so far I have not run into a case where the extra #ifdef is necessary. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx: imx6sx uses imx6q cpuidle codeArnd Bergmann2014-07-181-0/+2
| | | | | | | | | | | | | | | Building a kernel for imx6sx but without imx6q support results in this link error because of the missing cpuidle driver: arch/arm/mach-imx/built-in.o: In function `imx6sx_init_late'::(.init.text+0xc228): undefined reference to `imx6q_cpuidle_init' This patch adds a Makefile entry so we always build support for the imx6q_cpuidle code when at least one of the 6sx or 6q variants are enabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx: drop PL310 errata 588369 and 727915Shawn Guo2014-07-181-4/+0
| | | | | | | | | The PL310 integrated on i.MX6 series and VF610 are revision r3p1 and later. Per ARM PL310 errata document, 588369 is fixed in r2p0 and 727915 is fixed in r3p1. Neither is needed for i.MX6 or VF610. So let's drop them. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx_v6_v7_defconfig: add FSL_EDMA and PRINTK_TIMEStefan Agner2014-07-181-0/+2
| | | | | | | Add EDMA for DMA support for Vybrid SoCs. Also add printk time. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx: clk-imx6sx: register SSI/SSI_IPG as shared gate clocksFabio Estevam2014-07-181-6/+9
| | | | | | | | SSI and SSI_IPG are clocks controlled by the same clock gating field, so register them with imx_clk_gate2_shared. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx_v6_v7_defconfig: Enable flexcan driver for can supportSilvio Fricke2014-07-181-0/+2
| | | | | Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx_v6_v7_defconfig: Enable STMPE gpio supportSilvio Fricke2014-07-181-0/+1
| | | | | | | | Enable STMPE gpio support as this is used on MX6 Data Modul edm-qmx6 board. Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx: mark .dt_compat as constShawn Guo2014-07-189-9/+9
| | | | | | | | Otherwise GCC will mark the .init.rodata section R/W, which causes a compile error once we add other real R/O data. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: mx6: Only check for 1.2GHz for mx6quadFabio Estevam2014-07-181-1/+1
| | | | | | | | | | | | It is only the mx6quad variant that can run up to 1.2GHz, so add the check accordingly. This avoids getting the following warning on a mx6solo: failed to disable 1.2 GHz OPP Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx_v4_v5_defconfig: Add USB device optionsFabio Estevam2014-07-181-0/+2
| | | | | | | Allow USB device to work by default. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX25 clk: Use of_clk_init() for DT caseDenis Carikli2014-07-183-22/+20
| | | | | | | | | | | Replace .init_time() hook with of_clk_init() for DT targets. Based on: d4347ee ARM: i.MX27 clk: Use of_clk_init() for DT case Signed-off-by: Denis Carikli <denis@eukrea.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM i.MX25 clk: Fix gpt timer clock.Denis Carikli2014-07-181-1/+1
| | | | | | | | | The gpt0 timer clock has been wrong since: 6bbaec5 ARM i.MX25: implement clocks using common clock framework Signed-off-by: Denis Carikli <denis@eukrea.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX21 clk: Add devicetree supportAlexander Shiyan2014-07-183-123/+244
| | | | | | | This patch adds devicetree support CCM module for i.MX21 CPUs. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX21 clk: Cleanup driverAlexander Shiyan2014-07-181-24/+1
| | | | | | | | | | | This is a cleanup for i.MX21 clk driver. This change includes: - Reduce license text. - Remove unused definitions. - Remove unused #include and sort the rest. - Remove useless comment. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX21 clk: Remove clk_register_clkdev() for unused clocksAlexander Shiyan2014-07-181-19/+0
| | | | | | | | This patch removes clk_register_clkdev() for the clocks that do not have any users for boards and drivers. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX21 clk: Clock initialization reworkAlexander Shiyan2014-07-182-45/+75
| | | | | | | | This patch perform rework i.MX21 clock initialization. This includes adding missing clocks and sort clocks by register address. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: clk-imx51-imx53: Remove clk_register_clkdev()Fabio Estevam2014-07-181-76/+0
| | | | | | | | | | | | mx51 and mx53 are device tree only platforms, so we no longer need all these calls to clk_register_clkdev(). Only keep cpu0 and gpc_dvfs clk_register_clkdev() calls. Tested on imx51-babbage and imx53-qsb boards. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx: add standby mode support for suspendAnson Huang2014-07-183-5/+32
| | | | | | | | | | | | | Add standby mode support for suspend, to enter standby mode: echo standby > /sys/power/state; Use UART or RTC alarm to wake up system, when system enters standby mode, SOC will enter STOP mode with ARM core kept power on and 24M XTAL on. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx: mem bit must be cleared before entering DSM modeAnson Huang2014-07-183-4/+8
| | | | | | | | According to hardware design, mem bit must be clear before entering DSM mode, as ARM core will be power gated in DSM mode. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx6qdl: switch to use macro for clock IDShawn Guo2014-07-183-497/+476
| | | | | | | | Instead of using enum for clock ID, let's switch imx6qdl clock driver to use macro. In this case, device tree can reuse these macros to improve readability. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx: add cpuidle support for i.mx6sxAnson Huang2014-07-182-1/+10
| | | | | | | | | | | Add cpuidle support for i.MX6SX, derive from i.MX6Q's cpuidle, two levels supported: 1. WFI; 2. WAIT mode. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx: add suspend support for i.mx6sxAnson Huang2014-07-183-3/+28
| | | | | | | | | | Add suspend support for i.MX6SX. To enter suspend, echo mem > /sys/power/state. To exit suspend, using RTC alarm or enable debug UART wakeup. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX: Remove Freescale i.MX27 IP Camera board supportAlexander Shiyan2014-07-184-88/+0
| | | | | | | | | The board has no insufficient support to be fully functional and seems has no users. This patch removes support for this board. However, the support may be added in the future by using the devicetree. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX system: Add a reset fallback if base address of watchdog is not setAlexander Shiyan2014-07-181-0/+4
| | | | | | | | | This patch adds a reset fallback if base address of watchdog is not set. This is intended for a targets not compatible with imx-21 watchdog, i.MX1 for example. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX system: Simplify handling watchdog clockAlexander Shiyan2014-07-181-13/+7
| | | | | | | | | This patch simplifies handling watchdog clock a bit. As an additional change, now we properly check WDT clock in a reset function. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx_v6_v7_defconfig: Select CONFIG_SOC_IMX6SXFabio Estevam2014-07-181-0/+1
| | | | | | | Let mx6sx be built by default. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX clk: Move clock check function in common locationAlexander Shiyan2014-07-1813-73/+32
| | | | | | | | This patch moves clock check function in common i.MX location and switch i.MX clk drivers to use this new function. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX27 clk: Use of_clk_init() for DT caseAlexander Shiyan2014-07-183-35/+29
| | | | | | | Replace .init_time() hook with of_clk_init() for DT targets. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX27 clk: Separate DT and non-DT init procedureAlexander Shiyan2014-07-181-15/+24
| | | | | | | | This patch separates DT and non-DT clock initialization procedure, so we can avoid a lot of unneeded clk_register_clkdev() for DT case. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX: Remove excess variableAlexander Shiyan2014-07-181-8/+7
| | | | | | | | Base address for driver is global, there are no need to use intermediate variable for it. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX: Use of_clk_get_by_name() for timer clocks for DT case.Alexander Shiyan2014-07-187-28/+25
| | | | | | | | | Use of_clk_get_by_name() for timer clocks for DT case. This patch eliminates a lot of unneeded clk_register_clkdev() calls for GPT. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx: defconfig: Select CONFIG_FHANDLEFabio Estevam2014-07-183-0/+3
| | | | | | | | CONFIG_FHANDLE=y is needed when running systemd with version >=210, so that it can spawn a serial tty via getty. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: remove mx51.h and mx53.hShawn Guo2014-07-185-654/+0
| | | | | | | Now all the macros in mx51.h and mx53.h are used nowhere, so remove them. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: clean function declarations in mx51.hShawn Guo2014-07-182-5/+1
| | | | | | | The mx51_display_revision() is a dead declaration. Remove it. Also, move mx51_revision() into common.h. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: remove file mm-imx5.cShawn Guo2014-07-186-67/+1
| | | | | | | | The only code left in mm-imx5.c is to create static mapping. While all IMX platform code are moved to use dynamic mapping, the file can just be removed now. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: move init hooks into mach-imx5x.cShawn Guo2014-07-184-48/+50
| | | | | | | | | | | | | | | These imx5 init_early[late] hooks are called only from mach-imx5x.c. Let's move them into mach-imx5x.c. While at it, replace the static mapping in imx51_ipu_mipi_setup() with dynamic mapping. Also this function and imx_src_init() do not necessarily to be called at .init_early hook, so move them into .init_machine. The mxc_iomux_v3_init() is dropped from imx51_init_early() in the moving, since it's only needed by non-DT boot. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: use dynamic mapping for Cortex and GPC blockShawn Guo2014-07-183-34/+60
| | | | | | | | The imx5 pm code uses static mapping to access Cortex and GPC registers. The patch create struct imx5_pm_data to encode physical address of Cortex and GPC block, and create dynamic mapping for them at run-time. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: reuse clock CCM mapping in pm codeShawn Guo2014-07-183-4/+17
| | | | | | | | The imx5 pm code needs to access CCM registers. Let's remove the use of CCM static mapping in pm code by reusing the dynamic mapping created in clock code. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: use dynamic mapping for DPLL blockShawn Guo2014-07-181-17/+48
| | | | | | | | | | | Replace the static mapping of DPLL block with dynamic mapping by calling ioremap(). Ideally, this should be done by calling of_iomap(), so that the physical address of DPLL can also be retrieved from device tree. But unfortunately, DPLL blocks are not defined in DT in the first place. So to maintain the compatibility of existing DTB, we use ioremap() with physical address defines in the code. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: use dynamic mapping for CCM blockShawn Guo2014-07-181-39/+51
| | | | | | | | | Replace the static mapping of CCM block with dynamic mapping and retrieve CCM base address from device tree. Though it's not nice to encode the variable ccm_base in macros, it helps to avoid a massive churn on the code. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: remove header crm-regs-imx5.hShawn Guo2014-07-183-602/+70
| | | | | | | Most of the macros in crm-regs-imx5.h are used nowhere. Let's move the needed ones into the C files, and remove the header. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: retrieve iim base from device treeShawn Guo2014-07-181-4/+21
| | | | | | | | Instead of using static define and mapping, the patch changes imx5 code that reads chip revision from IIM to retrieve base address from device tree and use dynamic mapping. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: call mxc_timer_init_dt() on imx51Shawn Guo2014-07-181-1/+1
| | | | | | | Since i.MX51 supports DT only, it's more appropriate to call mxc_timer_init_dt() than mxc_timer_init() to initialize timer. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: remove function imx51_soc_init()Shawn Guo2014-07-182-34/+0
| | | | | | | The function imx51_soc_init() was used by non-DT boot only. Since i.MX51 supports DT only, the function can be removed now. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: tzic_init_irq() can directly be .init_irq hookShawn Guo2014-07-186-26/+10
| | | | | | | | After i.MX51 supports DT only, tzic_init_irq() can figure out the tzic_base on its own. Thus, it can directly be .init_irq hook, and mx51[53]_init_irq() can be saved. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: drop arguments from mx5_clocks_common_init()Shawn Guo2014-07-181-10/+8
| | | | | | | | | The function mx5_clocks_common_init() was created with a number of arguments to pass oscillator clock rate in non-DT boot. Since i.MX5 is DT only platform, the arguments can be dropped, and the clock rate can just be retrieved from device tree. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: make mx51_clocks_init() a DT callShawn Guo2014-07-182-15/+3
| | | | | | | Since i.MX51 becomes a DT only platform, we can make mx51_clocks_init() a DT call and save function mx51_clocks_init_dt() now. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: remove i.MX5 non-DT device registration helpersShawn Guo2014-07-1813-190/+1
| | | | | | | i.MX5 is DT only platforms, so these non-DT device registration helpers is used nowhere. Remove them. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx5: remove imx51 non-DT support filesShawn Guo2014-07-185-1073/+1
| | | | | | | Since i.MX51 becomes a DT only platform, those non-DT support files can be removed now. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
OpenPOWER on IntegriCloud