summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2013-04-17Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into ↵jb4.2.2_1.0.0-gaguoyin.chen
imx_3.0.35_android
2013-04-12ENGR00257847-1 MX6Q/DL-Fix Ethernet performance issue when WAIT mode is activeRanjani Vaidyanathan
All of the interrupts from the ENET block are not routed to the GPC block. Hence ENET interrupts are not able to wake up the SOC when the system is in WAIT mode. And the ENET interrupt gets serviced only when another interrupt causes the SOC to exit WAIT mode. This impacts the ENET performance. To fix the issue two options: 1. Route the ENET interrupt to a GPIO. Need to enable the CONFIG_MX6_ENET_IRQ_TO_GPIO in the config. This patch provides support for routing the ENET interrupt to GPIO_1_6. Routing to this GPIO requires no HW board mods. If the GPIO_1_6 is being used for some other peripheral, this patch can be followed to route the ENET interrupt to any other GPIO though a HW mode maybe required. 2. If the GPIO mechanism cannot be used and is not enabled by the above mentioned config, the patch will disable entry to WAIT mode until ENET clock is active. When the ENET clock is disabled, WAIT mode will be automatically enetered. Signed-off-by: Ranjani Vaidyanathan <ra5478@freescale.com>
2013-04-12ENGR00256417: MLB: can't receive data in wait modeTerry Lv
For MLB uses iram for data transfer, and there's a missing of dependency on iram in MLB's clock setting, MLB can't receive data in wait mode. We need to add ocram clock dependency in MLB clock. Signed-off-by: Terry Lv <r65388@freescale.com>
2013-04-07Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into ↵guoyin.chen
imx_3.0.35_android
2013-04-07Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into ↵guoyin.chen
imx_3.0.35_android Conflicts: arch/arm/mach-mx6/board-mx6q_hdmidongle.c drivers/input/touchscreen/egalax_ts.c
2013-04-07ENGR00257658 Revert "ENGR00256893-1 MX6Q/DL-Fix Ethernet performance issueJason Liu
This reverts commit 067c8dcfa79a169d86809272569fe734c4222c79. i.mx6dl/dq sabreauto/sabresd board will boot up failed randomly with this patch-set, thus revert it. [Jason] Signed-off-by: Jason Liu <r64343@freescale.com>
2013-04-03ENGR00237365: board-mx6q_sabreauto fix mipi-csi2 settingsAdrian Alonso
* Correct mipi-csi2 settings only one data line is used * Add mx6q_mipi_csi1_io_init ipu-csi setting callback use virtual channel 1 and attach it to CSI1 -> IPU0 * Set i2c slave address to 0x52 * Set ipu-csi clko_clk Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2013-04-03ENGR00254896 mx6: hdmidongle: Fix compile error.Zhang Xiaodong
After enable PICE in kernel config, building will meet fatal error:linux/wakelock.h: No such file or directory Signed-off-by: Zhang Xiaodong <B39117@freescale.com>
2013-04-03ENGR00256315-4 ARM: imx6: weim-nor: set proper PAD valueHuang Shijie
Set the proper pad values for the pins used for address. Signed-off-by: Huang Shijie <b32955@freescale.com>
2013-04-03ENGR00256315-3 ARM: WEIM-NOR: set the proper timingHuang Shijie
These timings are calculated from the M29W256GL7AN6E. Signed-off-by: Huang Shijie <b32955@freescale.com>
2013-04-03ENGR00256315-1 Revert "ENGR00244769-2 [NOR FLASH]-Improve WEIM NOR speed"Huang Shijie
This reverts commit 58209e14383520d58b1bf74e0e9f98f7d05b80c6. After apply these two patches, we can not pass the stress test. So revert these two patches. Signed-off-by: Huang Shijie <b32955@freescale.com>
2013-04-03ENGR00232210 BT: add uart5 config for imx6dlJianzheng Zhou
Add uart5 config for imx6dl, it is different with imx6q. Need to seperate it. Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2013-04-03Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into ↵guoyin.chen
imx_3.0.35_android Conflicts: drivers/net/fec.c
2013-04-02ENGR00256893-1 MX6Q/DL-Fix Ethernet performance issue when WAIT mode is activeRanjani Vaidyanathan
All of the interrupts from the ENET block are not routed to the GPC block. Hence ENET interrupts are not able to wake up the SOC when the system is in WAIT mode. And the ENET interrupt gets serviced only when another interrupt causes the SOC to exit WAIT mode. This impacts the ENET performance. To fix the issue two options: 1. Route the ENET interrupt to a GPIO. Need to enable the CONFIG_MX6_ENET_IRQ_TO_GPIO in the config. This patch provides support for routing the ENET interrupt to GPIO_1_6. Routing to this GPIO requires no HW board mods. If the GPIO_1_6 is being used for some other peripheral, this patch can be followed to route the ENET interrupt to any other GPIO though a HW mode maybe required. 2. If the GPIO mechanism cannot be used and is not enabled by the above mentioned config, the patch will disable entry to WAIT mode until ENET clock is active. When the ENET clock is disabled, WAIT mode will be automatically enetered. Signed-off-by: Ranjani Vaidyanathan <ra5478@freescale.com>
2013-03-28ENGR00255305 Sabreauto:refactor sd configJianzheng Zhou
Add "MMC_CAP_REMOVABLE" and "runtime_pm" to support hot-plug and trigger bus scan after resuming from suspend.Otherwise, sdio wifi won't work well. Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2013-03-27ENGR00256086 BT:clear some tweaks for BT enableJianzheng Zhou
1. Add rfkill support in kernel config. 2. Default enable BT. add mutual exclusion for BT reset and charger's LED GPIO. For they are optional to be selected only one in one board. Let it be decided by board config. Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2013-03-22ENGR00255484-3 msl: usb: add clock deinit at fail pathPeter Chen
If not, the clocks usage will be mismatch Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-22ENGR00255484-1 msl: usb: add NULL poiner check for fsl_xcvr_opsPeter Chen
Add NULL pointer check for global fsl_xcvr_ops Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-19ENGR00232913 Hdmidongle: add a seperate config for hdmidongleJack mao
Add a seperate config for hdmidongle for restricted config diff from common. Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2013-03-18Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into ↵guoyin.chen
imx_3.0.35_android
2013-03-17ENGR00252418-1: Fix iMX53 build break due to Fuse commitNitin Garg
commit 2786868e5f56c95afd1642fe487203ac4fa523dc (ENGR00252418) breaks the iMX5x builds as the fuse.c contains iMX6 specific code in plat-mxc common devices. Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
2013-03-15ENGR00254442 Sabre ARD Include WEIM-NOR on imx6_updater_defconfigAlejandro Sierra
Sabre ARD include WEIM-NOR configuration update to enable higher bandwidth on this interface for mfg tool support (imx6_updater_defconfig). Signed-off-by: Alex Sierra <b18039@freescale.com>
2013-03-15ENGR00253355 ARM: imx6q/imx6dl: Set proper PAD value for WEIM NORHuang Shijie
Set proper pad value for WEIM NOR. Without setting these pad value the weim-nor can not work. Signed-off-by: Huang Shijie <b32955@freescale.com>
2013-03-15ENGR00254457 mx6dl: fix mx6dl TO1.1 can't enter 'mem'Robin Gong
The previous patch ENGR00251630 didn't notice mx6q_revision() will return -EINVAL and will match 'mx6q_revision()<IMX_CHIP_REVISION_1_1' ,then mx6dl TO1.1 will also change suspend state to 'standby'. Signed-off-by: Robin Gong <b38343@freescale.com>
2013-03-14ENGR00254267 MX6DL/MX6SL max freq: Fix max cpu freq at 1G on MX6DL ARDRobin Gong
For MX6DL,align max cpufreq judge by SPEED_GRADING fuse bit with MX6DQ. For MX6SL without the fuse bit, we need add condition check, if found arm_max_freq set by default , change to1G. Else decided by 'arm_freq' setting by cmdline. Signed-off-by: Robin Gong <b38343@freescale.com>
2013-03-14Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into ↵guoyin.chen
imx_3.0.35_android Conflicts: arch/arm/mach-mx6/board-mx6q_sabresd.c arch/arm/plat-mxc/include/mach/mxc.h drivers/video/mxc/mxc_ipuv3_fb.c sound/soc/imx/imx-wm8962.c
2013-03-13ENGR00253418 IMX6 SabreSD Display: Support LVDS1 and HDMI dual displayWayne Zou
Support LVDS1 and HDMI dual display on SabreSD Rev.C board on i.mx6 By default, LVDS uses LDB_SEP1 mode due to the hardware design. Signed-off-by: Wayne Zou <b36644@freescale.com>
2013-03-12ENGR00163527 Sabresd: BT: add BT supportJianzheng Zhou
add BT support using uart5. user can add "bluetooth" in bootargs to enable BT. Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2013-03-12ENGR00169384 imx6q: uart: config and enble uart5Jianzheng Zhou
Config clock,irq,mux pad,data entry, etc to setup uart5. Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2013-03-12ENGR00252071-3: mxc_v4l2_capture: enable auto detect of ov5642/5640 in sabresdSheng Nan
- enable the auto detect for parallel ov5642 and ov5640 in sabresd board. Signed-off-by: Sheng Nan <b38800@freescale.com>
2013-03-12ENGR00252071-4: mxc_v4l2_capture: enable auto detect of ov5642/5640 in sabreliteSheng Nan
- enable the auto detect for parallel ov5642 and ov5640 in sabrelite board. Signed-off-by: Sheng Nan <b38800@freescale.com>
2013-03-12ENGR00169384 imx6q: uart: config and enble uart5Jianzheng Zhou
Config clock,irq,mux pad,data entry, etc to setup uart5. Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com> (cherry picked from commit 8c06604f1845028790e5da4474e4907b5f4b7504)
2013-03-11ENGR00252418-1: Fix iMX53 build break due to Fuse commitNitin Garg
commit 2786868e5f56c95afd1642fe487203ac4fa523dc (ENGR00252418) breaks the iMX5x builds as the fuse.c contains iMX6 specific code in plat-mxc common devices. Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
2013-03-06ENGR00252404 imx6: config: enable ov5640 csi sensorguoyin.chen
add ov5640 config for imx6 android config Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
2013-03-06Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_androidguoyin.chen
Conflicts: drivers/video/mxc/ldb.c
2013-03-06ARM: 7417/1: vfp: ensure preemption is disabled when enabling VFP accessWill Deacon
The vfp_enable function enables access to the VFP co-processor register space (cp10 and cp11) on the current CPU and must be called with preemption disabled. Unfortunately, the vfp_init late initcall does not disable preemption and can lead to an oops during boot if thread migration occurs at the wrong time and we end up attempting to access the FPSID on a CPU with VFP access disabled. This patch fixes the initcall to call vfp_enable from a non-preemptible context on each CPU and adds a BUG_ON(preemptible) to ensure that any similar problems are easily spotted in the future. Cc: stable@vger.kernel.org Reported-by: Hyungwoo Yang <hwoo.yang@gmail.com> Signed-off-by: Hyungwoo Yang <hyungwooy@nvidia.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> [Fix merge conflict] Signed-off-by: Jason Liu <r64343@freescale.com>
2013-03-06ARM: 7417/1: vfp: ensure preemption is disabled when enabling VFP accessWill Deacon
The vfp_enable function enables access to the VFP co-processor register space (cp10 and cp11) on the current CPU and must be called with preemption disabled. Unfortunately, the vfp_init late initcall does not disable preemption and can lead to an oops during boot if thread migration occurs at the wrong time and we end up attempting to access the FPSID on a CPU with VFP access disabled. This patch fixes the initcall to call vfp_enable from a non-preemptible context on each CPU and adds a BUG_ON(preemptible) to ensure that any similar problems are easily spotted in the future. Cc: stable@vger.kernel.org Reported-by: Hyungwoo Yang <hwoo.yang@gmail.com> Signed-off-by: Hyungwoo Yang <hyungwooy@nvidia.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> [Fix merge conflict] Signed-off-by: Jason Liu <r64343@freescale.com>
2013-03-06ENGR00251209-9 msl: usb: make global variable as drvdataPeter Chen
There is a bug when we try to remove wakeup module twice as g_ctrl is a globle variable, in fact, it is per controller wakeup driver, so the private data should be per device. Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-06ENGR00251209-6 msl-mx6: usb: keep the phy lower flag as true defaultlyPeter Chen
Keep the phy lower flag as true defaultly, the driver should mark it as false when the driver begins to use PHY. This fixes one bug that when build both host and gadget as loadable modules, the phy lower flag is false if the related module is not loaded, then, the wakeup interrupt will not be treated as happened if host module is loaded, but gadget is not loaded, or vice verse. Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-06ENGR00251209-4 msl-mx6: usb: Fix system hang when unload gadget modulePeter Chen
At gadget module remove function, it closes the clock, but at platform code, it still visits register. In fact, The PHY has already been low power mode when driver's remove before platform code is called. Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-06ENGR00251209-3 usb: fix below build warningPeter Chen
/home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c: In function 'mx6_usb_dr_init': /home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c: 615: warning: unused variable 'imx6q_mxc_ehci_otg_data' /home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c: At top level: /home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c: 77: warning: 'fsl_platform_otg_set_usb_phy_dis' defined but not used Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-06ENGR00251209-1 usb: add host 1 vbus callbackPeter Chen
The callback will be used at probe and remove Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-06ENGR00251209-9 msl: usb: make global variable as drvdataPeter Chen
There is a bug when we try to remove wakeup module twice as g_ctrl is a globle variable, in fact, it is per controller wakeup driver, so the private data should be per device. Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-06ENGR00251209-6 msl-mx6: usb: keep the phy lower flag as true defaultlyPeter Chen
Keep the phy lower flag as true defaultly, the driver should mark it as false when the driver begins to use PHY. This fixes one bug that when build both host and gadget as loadable modules, the phy lower flag is false if the related module is not loaded, then, the wakeup interrupt will not be treated as happened if host module is loaded, but gadget is not loaded, or vice verse. Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-06ENGR00251209-4 msl-mx6: usb: Fix system hang when unload gadget modulePeter Chen
At gadget module remove function, it closes the clock, but at platform code, it still visits register. In fact, The PHY has already been low power mode when driver's remove before platform code is called. Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-06ENGR00251209-3 usb: fix below build warningPeter Chen
/home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c: In function 'mx6_usb_dr_init': /home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c: 615: warning: unused variable 'imx6q_mxc_ehci_otg_data' /home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c: At top level: /home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c: 77: warning: 'fsl_platform_otg_set_usb_phy_dis' defined but not used Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-06ENGR00251209-1 usb: add host 1 vbus callbackPeter Chen
The callback will be used at probe and remove Signed-off-by: Peter Chen <peter.chen@freescale.com>
2013-03-05ENGR00252727-1 [mxc]Add fuse check for gpu platform deviceLoren Huang
Add fuse check for gpu platform device. Bypass gpu core initialization if certain core is fused.If all gpu cores are fused, bypass gpu driver loading. Signed-off-by: Loren Huang <b02279@freescale.com>
2013-03-05ENGR00252727-1 [mxc]Add fuse check for gpu platform deviceLoren Huang
Add fuse check for gpu platform device. Bypass gpu core initialization if certain core is fused.If all gpu cores are fused, bypass gpu driver loading. Signed-off-by: Loren Huang <b02279@freescale.com>
2013-03-04ENGR00237452 i.MX6:IEEE1588: disable phy Ar8031 SmartEEEFugang Duan
Connecting two boards directly more than 2 hours, Ar8031 phy link status generates glitch, which cause ethernet link down/up issue, but ethernet still be active. There have three cases to validate the issue: Item#1: If add performance stress test while runing IEEE1588, the link down/up issue cannot be found. Item#2: If insert switch between two net nodes and run IEEE1588 test, the issue also cannot be found. Item#3: If disable AR8031 SmartEEE feature, after two days overnight test, no such issue found. The issue is caused by phy Ar8031 SmartEEE feature, Item#1 and Item#2 can prevent phy enter lpm mode, which match the Item#3 test result, so disable SmartEEE feature to avoid the link issue generation. Signed-off-by: Fugang Duan <B38611@freescale.com>