summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2014-04-30Merge remote-tracking branch 'fsl-linux-sdk/imx_3.10.31_1.1.0_alpha' into ↵kk4.4.2_2.0.0-alphaguoyin.chen
imx_3.10.y_android
2014-04-29serial: imx: Remove init() and exit() platform callbacksrel_imx_3.10.31_1.1.0_alphaAlexander Shiyan
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Huang Shijie <b32955@freescale.com>
2014-04-28ENGR00310741-2 enable gpu low memory killer for 3.10 kernel.Xiaowen Liu
add CONFIG_GPU_LOW_MEMORY_KILLER to default config. Signed-off-by: Xiaowen Liu <b37945@freescale.com>
2014-04-28ENGR00309743 [Android_MX6Q/DL_ARD] Suspend: Touch cannot work after ↵Ke Qinghua
suspend->resume. 100% Disable touchscreen suspend/resume in dts because wakeup gpio conflict issue Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-25Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_alpha' ↵Ke Qinghua
into imx_3.10.y_android
2014-04-24ENGR00310290 ARM: imx: enable necessary clocks for i.mx6sxAnson Huang
On i.MX6SX, when CA9 and CM4 are working together, CA9 can NOT disable those shared modules' clock, so keep those clocks CM4 needs always enabled. Signed-off-by: Anson Huang <b20788@freescale.com>
2014-04-23ENGR00309837 Failed to enter recovery by command "reboot recovery". 100%Ke Qinghua
Enable recovery flag setting in SNVS for kernel 3.10 Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-23ENGR00309977-2 ARM: imx6q/sl: Set SPDIF clock to 22736841HzNicolin Chen
Since we no longer use clk_set_rate() in spdif driver, the rate we provide to it on imx6q/sl platforms is no more contented for its supporting sample rates. By setting the clock to 22736841Hz, we can get the sample rates: 48008Hz for 48000Hz 32005Hz for 32000Hz 43859Hz for 44100Hz The results for 48KHz and 32KHz has changed comparing to the previous release, but the one for 44100Hz has a bit lose even though it should be the best we can get based on the current clock rate. If user want to playback a perfect 44100Hz, they need to change the parent clock rate. Acked-by: Wang Shengjiu <b02247@freescale.com> Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com> (cherry picked from commit f12e2ea9c6c5557adb3bbe26c51021978f2c8d99)
2014-04-23ENGR00309977-1 ARM: imx6sx: Separate SPDIF and Audio clocksNicolin Chen
Shawn's patch -- ARM: imx: shared gate support for i.MX clk_gate2 clocko has fixed the problem of clock conflicts due to sharing a same gate. So from now on, we can no longer need to take care the shared gate clock for each audio clock route. Thus this patch separates them by using the new clock registering helper function. And meanwhile, we set a proper rate for each route so as to support each module. For S/PDIF, we use 98304000Hz so that the current driver would perfectly get 32000Hz and 48000Hz sample rate playback support, even though we can only get 43885Hz for 44100Hz sample rate in this way -- If user want to playback 44100Hz group sample rates, they need to change the parent rate. Acked-by: Wang Shengjiu <b02247@freescale.com> Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com> (cherry picked from commit b50eb55b1eb35e8e568ab777dc794370f20464eb)
2014-04-23ARM: imx: add shared gate clock supportShawn Guo
It's quite common on i.MX that one gate bit controls the gating of multiple clocks, i.e. this is a shared gate. The patch adds the function imx_clk_gate2_shared() for such case. The clocks controlled by the same gate bits should call this function with a pointer to a single share count variable, so that the gate bits will only be operated on the first enabling and the last disabling of these shared gate clocks. Thanks to Gerhard Sittig <gsi@denx.de> for this idea. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com> (cherry picked from commit 9c830d95d0e6d7522a31cd14f9641c37700d4e85)
2014-04-23ARM: imx: lock is always valid for clk_gate2Shawn Guo
The imx specific clk_gate2 always has a valid lock with the clock. So the validation on gate->lock is not really needed. Remove it. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com> (cherry picked from commit 430468ff84e8d8a8d53e3ca974721edd85042d47)
2014-04-23ARM: imx: define struct clk_gate2 on our ownShawn Guo
The imx clk-gate2 driver implements an i.MX specific gate clock, which has two bits controlling the gate states. While this is a completely separate gate driver from the common clk-gate one, it reuses the common clk_gate structure. Such reusing makes the extending of clk_gate2 clumsy. Let's define struct clk_gate2 on our own to make the driver independent of the common clk-gate one, and ease the clk_gate2 extending at a later time. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com> (cherry picked from commit b0293bafbb378183279eb74442506194db7b2c89)
2014-04-23ENGR00309931 [Android_MX6SL_EVK] Backlight control: backlight control not ↵Ke Qinghua
work. 100% Update EVK DTS pwm backlight name settting to match with android. Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-23ENGR00309934 ARM: imx_v7_defconfig: Select CONFIG_USB_G_NCM as moduleLi Jun
Enable g_ncm as module for use g_ncm gadget driver. Signed-off-by: Li Jun <b47624@freescale.com>
2014-04-23ENGR00309828 ARM: imx6sx: Add imx6sx-17x17-arm2-mlb.dtb in MakefileLuwei Zhou
Add imx6sx-17x17-arm2-mlb.dtb in devicetree makefile list Signed-off-by: Luwei Zhou <b45643@freescale.com> (cherry picked from commit 0ac36559f00dace422fbc766de3e06cf2a343fdf)
2014-04-23ENGR00309918 ARM: imx6sx: enable usb charger for sdb boardPeter Chen
Enable usb charger for imx6sx-sdb board Signed-off-by: Peter Chen <peter.chen@freescale.com>
2014-04-22ENGR00305254-10 imx6sx sarbesd board bring upKe Qinghua
Add kernel 3.10.31 merge missing part. Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-22ENGR00309798 arm: create standalone dts for a9 when m4 is runningRichard Zhu
Create standalone dts for a9 when m4 is running, since there are some conflictions in the following modules * i2c3 * flexcan1&2 * uart2 Signed-off-by: Richard Zhu <r65037@freescale.com>
2014-04-21ENGR00305254-10 imx6sx sarbesd board bring upKe Qinghua
Fix backlight file open error for sarbe auto board. Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-21ENGR00305254-8 imx6sx sarbesd board bring upKe Qinghua
Enable selinux in kernel 3.10 config Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-21ENGR00305254-6 imx6sx sarbesd board bring upKe Qinghua
Enable early suspend/late resume in config Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-21ENGR00305254-4 imx6sx sarbesd board bring upKe Qinghua
Enable ONOFF power key for imx6sx sabresd board Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-21ARM64: copy CONFIG_CMDLINE_EXTEND from ARMColin Cross
Copy the config choice for CONFIG_CMDLINE_EXTEND from arch/arm/Kconfig, including CONFIG_CMDLINE_FROM_BOOTLOADER as the default. These will be used by drivers/of/fdt.c. Change-Id: I8416038498ddf8fc1e99ab06109825eb1492aa7f Signed-off-by: Colin Cross <ccross@android.com>
2014-04-21ENGR00305254-3 imx6sx sarbesd board bring upKe Qinghua
Enable LVDS Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-21ENGR00305254-3 imx6sx sarbesd board bring upKe Qinghua
Enable CPU frequence Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-21ENGR00305254-2 imx6sx sarbesd board bring upKe Qinghua
Enable sdhc4 and NTFS fs Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-21ENGR00305254-1 imx6sx sarbesd board bring upKe Qinghua
Update config and enable power key/usb for imx6sx sd board Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-21ENGR00303524 Plugout HDMI while video playing, the audio is blocked.Shengjiu Wang
The requirement for Android is different. it need the driver exit ASAP. Don't block the user space, android will restart the driver in user space. Yocto need the driver to start the transfer by itself. Add a specific kernel config for this case. Signed-off-by: Shengjiu Wang <b02247@freescale.com>
2014-04-21ARM64: add option to build Image.gz/dtb comboAlex Ray
Allows a defconfig to set a list of dtbs to concatenate with an Image.gz to create a Image.gz-dtb. Change-Id: I0dc3935e57f01b517aa64eda0c27b0101e9ea3b2 Signed-off-by: Alex Ray <aray@google.com>
2014-04-21ENGR00302224-1 sensor: make change for sensor dts configJianzheng Zhou
For imx6qdl-sabreauto and imx6qdl-sabresd boards,make sensor work: 1.Add interrupt property for mma8x5x. 2.Change interrupts config to low-to-high edge triggered. 3.Add default interrupt gpio config in hog. Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2014-04-21ENGR00301351 evk6sl, add ion in dts for 3.10.17 kernelFang Hui
add ion in dts for evk6sl on 3.10.17 kernel Signed-off-by: Fang Hui <b31070@freescale.com>
2014-04-21arm64: cmpxchg: update macros to prevent warningsMark Hambleton
Make sure the value we are going to return is referenced in order to avoid warnings from newer GCCs such as: arch/arm64/include/asm/cmpxchg.h:162:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__cmpxchg_mb((ptr), \ ^ net/netfilter/nf_conntrack_core.c:674:2: note: in expansion of macro ‘cmpxchg’ cmpxchg(&nf_conntrack_hash_rnd, 0, rand); [Modified to use the current underlying implementation as current mainline for both cmpxchg() and cmpxchg_local() does -- broonie] Signed-off-by: Mark Hambleton <mahamble@broadcom.com> Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2014-04-21ENGR00299402-4 Enable miniPCIE 3G modem in 3.10 kernelguoyin.chen
Add minipcie_ctrl to control the power supply to miniPCIE 3G modem Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
2014-04-21ENGR00299402-3 Enable miniPCIE 3G modem in 3.10 kernelguoyin.chen
Init PCIE_PWR_EN to supply power to miniPCIE 3G modem for SabreSD board. Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
2014-04-21ENGR00299402-1 Enable miniPCIE 3G modem in 3.10 kernelguoyin.chen
3G modem device need to have ttyUSB* inteface for AT and data channel Add USB_SERIAL, USB_SERIAL_WWAN, USB_SERIAL_OPTION, and PPP configs Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
2014-04-21ENGR00300035 add ion function for Linux 3.10 kernel upgrade.Liu Xiaowen
add ion function for Linux 3.10 kernel upgrade. Signed-off-by: Liu Xiaowen <b37945@freescale.com>
2014-04-21ENGR00300015-2 Update confing for android linux kernel 3.10Ke Qinghua
Update DTS setting for andorid of linux kernel 3.10 Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-21ENGR00300015-1 Update confing for android linux kernel 3.10Ke Qinghua
Add default config for android of linux kerenel 3.10 Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-04-21Fix aarch64 build issue with IONJohn Stultz
In trying to build ION for aarch64, I came across the following build error: In file included from /home/jstultz/projects/linux/linaro.android/arch/arm64/include/asm/page.h:39:0, from drivers/staging/android/ion/ion_system_heap.c:17: /home/jstultz/projects/linux/linaro.android/arch/arm64/include/asm/pgtable-3level-types.h:19:1: error: unknown type name u64 typedef u64 pteval_t; ^ /home/jstultz/projects/linux/linaro.android/arch/arm64/include/asm/pgtable-3level-types.h:20:1: error: unknown type name u64 typedef u64 pmdval_t; ^ ... The problem is asm/page.h doesn't include anything that defines u64, so add an asm/types.h include to the pgtable-3level-types.h to match upstream and avoid the issue. Change-Id: I3f098bf666761ac6b316389a46d37cc449c342d6 Signed-off-by: John Stultz <john.stultz@linaro.org>
2014-04-21arm64: mm: permit use of tagged pointers at EL0Will Deacon
TCR.TBI0 can be used to cause hardware address translation to ignore the top byte of userspace virtual addresses. Whilst not especially useful in standard C programs, this can be used by JITs to `tag' pointers with various pieces of metadata. This patch enables this bit for AArch64 Linux, and adds a new file to Documentation/arm64/ which describes some potential caveats when using tagged virtual addresses. Change-Id: I4c025d026144c69a2259b6562e46176f95b4e110 Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2014-04-21ARM: fiq_glue: Add custom fiq return handler api.Arve Hjønnevåg
Change-Id: I5ff2764e85151ca0a88576542fda07c2d33dd065 Signed-off-by: Arve Hjønnevåg <arve@android.com>
2014-04-21ARM: Fix "Make low-level printk work" to use a separate config optionArve Hjønnevåg
Signed-off-by: Arve Hjønnevåg <arve@android.com>
2014-04-21ARM: Fix dtb list when DTB_IMAGE_NAMES is emptyBenoit Goby
In the 3.10 kernel, dtb-y is not defined in Makefile.boot anymore but in dts/Makefile, so it needs to be included too. Change-Id: I6d6fccf933709bcb6220ce8f12b4b9e2a7c40d63 Signed-off-by: Benoit Goby <benoit@android.com>
2014-04-21ARM: kgdb: ignore breakpoint instructions from user modeTodd Poynor
Avoid conflicts with user mode usage of the same instructions, as with Clang -ftrapv. Change-Id: I12d1c6d8f94376bfd2503cb0be843d7e478fb6ea Signed-off-by: Todd Poynor <toddpoynor@google.com>
2014-04-21ARM: mm: Allow an empty PMD in alloc_init_pte()Jon Medhurst (Tixy)
The Android patch titled "ARM: allow the kernel text section to be made read-only" modifies alloc_init_pte() and adds a BUG_ON to detect the case where a section mapping is being overwritten. However the test doesn't allow for the legitimate case where the PMD is empty, as can happen for kernels built with CONFIG_ARM_LPAE. So extend the test to allow this. Change-Id: I28eeaefd856bae63a5532980e41e0fd4d8922e79 Signed-off-by: Jon Medhurst <tixy@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org>
2014-04-21ARM: decompressor: Flush tlb before swiching domain 0 to client modeArve Hjønnevåg
If the bootloader used a page table that is incompatible with domain 0 in client mode, and boots with the mmu on, then swithing domain 0 to client mode causes a fault if we don't flush the tlb after updating the page table pointer. v2: Add ISB before loading dacr. Signed-off-by: Arve Hjønnevåg <arve@android.com>
2014-04-21ARM: mm: Split memory banks that span multiple sections when sparsemem is ↵Arve Hjønnevåg
enabled This fixes a crash in mem_init which assumes all pages in a memory bank are part of the same page array. Signed-off-by: Arve Hjønnevåg <arve@android.com>
2014-04-21ARM: fiq_debugger: Update tty code for 3.9Arve Hjønnevåg
Signed-off-by: Arve Hjønnevåg <arve@android.com>
2014-04-21ARM: fiq_debugger: Use kmsg_dumper to dump kernel logsArve Hjønnevåg
Signed-off-by: Arve Hjønnevåg <arve@android.com>
2014-04-21ARM: fiq_debugger: Fix to compile on 3.7Arve Hjønnevåg
Use for_each_irq_desc in arch/arm/common/fiq_debugger.c Signed-off-by: Arve Hjønnevåg <arve@android.com>
generated by cgit v1.2.3 (git 2.0.4) at 2024-05-27 19:00:12 +0000