23 Feb, 2017
40 commits
-
It's used for transceiver_switch.
NOTE: it's newly added since it's deleted by upstream before.
However, the driver is still using it, so have to add it.Signed-off-by: Dong Aisheng
(cherry picked from commit 53109634188e672b807a7256afbf10db0d9a6574) -
cherry-pick below patch:
ENGR00275004-4: power: sabresd_battery: add sabresd_battery driverAdd sabresd battery driver which based on Max8903 charger IC.
Signed-off-by: Robin Gong
(cherry picked from commit 19ac2dfcd1e0ea3f1ae231cfc230315eaa9a41be)
(cherry picked from commit b9e81012c21d3318a633a4447797e4a52676c760) -
Initial the mxc mipi dsi driver.
Baseline copied from imx_3.14.y branch.Signed-off-by: Sandor Yu
-
Initial the mxc dcic driver.
Baseline copied from imx_3.14.y branch.Signed-off-by: Sandor Yu
-
In order to workaround the PRE SoC bug recorded by errata ERR009624, the
software cannot write the PRE_CTRL register when the PRE writes the PRE_CTRL
register automatically to set the ENABLE bit(bit0) to 1 in the PRE repeat mode.The software mechanism to set the PRE_CTRL register is different for PRE Y
resolution higher than 9 lines and lower than or equal to 9 lines.For cases in which Y resolution is higher than 9 lines, before we update PRE
shadow, we just need to wait until the PRE store engine status runs out of
the problematic PRE automatic writing window.While for cases in which Y resolutin is lower than or equal to 9 lines, we
have to update PRE shadow in the buffer flip interrupt handler.Signed-off-by: Liu Ying
(cherry picked from commit bd9c14e24aaf67926dfd31bd819ab0c87129fe4b) -
In order to workaround the PRE SoC bug recorded by errata ERR009624, the
software cannot write the PRE_CTRL register when the PRE writes the PRE_CTRL
register automatically to set the ENABLE bit(bit0) to 1 in the PRE repeat mode.The software mechanism to set the PRE_CTRL register is different for PRE Y
resolution higher than 9 lines and lower than or equal to 9 lines. So,
this patch defines the small Y resolution and adds a helper to check the
Y resolution.Signed-off-by: Liu Ying
(cherry picked from commit cf7df46e3b1d2142ff354498982194247bf07fea) -
In order to workaround the PRE SoC bug recorded by errata ERR009624, the
software cannot write the PRE_CTRL register when the PRE writes the PRE_CTRL
register automatically to set the ENABLE bit(bit0) to 1 in the PRE repeat mode.This patch exports a function to set the PRE_CTRL register so that it could be
used by the software when the PRE automatic writing doesn't happen for sure.Signed-off-by: Liu Ying
(cherry picked from commit e64bbcd9243a17f9eba9cb3abb6f2c1939eae110) -
As with gpio, uart and others, allow specifying the name_idx via the
aliases-node in the devicetree.On embedded devices, there is often a combination of removable (e.g.
SD card) and non-removable mmc devices (e.g. eMMC).
Therefore the name_idx might change depending on
- host of removable device
- removable card present or notThis makes it difficult to hard code the root device, if it is on the
non-removable device. E.g. if SD card is present eMMC will be mmcblk1,
if SD card is not present at boot, eMMC will be mmcblk0.If the aliases-node is not found, the driver will act as before.
The original patch is from here:
https://www.mail-archive.com/linux-mmc@vger.kernel.org/msg26472.htmlThe patch requires additional alias_id fix or it won't work.
Because according to function definition the max_idx parameter of idx_alloc
is exclusive, so need add 1 or it will be unable to find the proper idx
within an invalid range.Signed-off-by: Sascha Hauer
Signed-off-by: Dong Aisheng
(cherry picked from commit 35928d6c6a76a24a16edfa636f4c08293614a1e0) -
of_alias_max_index will return the maximum number for which an
alias of a given stem exists. This is useful for frameworks
whishing to reserve a number of device slots from dynamic
allocation.Signed-off-by: Sascha Hauer
(cherry picked from commit 5ce2ad39b36fd48b9f77249198655da7cbcc7ee5)Conflicts:
include/linux/of.h -
When CONFIG_IMX_SEMA4 is NOT set, some modules may
still call SEMA4 APIs, need to add dummy function
to make sure build pass.Signed-off-by: Anson Huang
(cherry picked from commit 5a2537095621da25c8967a0ccdbb8b0029e14c94) -
mxc_epdc_fb.c for i.MX6SoloLite, and i.MX6DualLite (and i.MX50 as well),
mxc_epdc_v2_fb.c for i.MX7D.Signed-off-by: Robby Cai
-
Add PMIC 'MAX17135' module drivers to 4.1.y kernel. These are necessary
to supply power for E-ink panel display functions.Signed-off-by: Robby Cai
-
We actually have lvds2 (analog clock2), an I/O clock like lvds1, in the SoC.
And this lvds2, along with lvds1, can be used to provide external clock source
to the internal pll, such as pll4_audio and pll5_video.So This patch mainly adds the lvds2 to the clock tree and fix its relationship
with pll4 accordingly.Signed-off-by: Shengjiu Wang
(cherry picked from commit f9cfc11cf8628bd01efda611074131bfa323a120) -
add the pcie related macros definitions into gpr.
Signed-off-by: Richard Zhu
(cherry picked from commit b4a5b2e53b2e743824d0af7428f7d9d406bec8bd) -
Add imx6sx pcie related gpr bits definitions.
Signed-off-by: Richard Zhu
(cherry picked from commit 991fb25d62e3e2f550f98732f5bc00eeb98f78e3) -
Initial port of the mxc V4L2 capture driver.
Baseline copied from imx_3.14.y branch:Signed-off-by: Sandor Yu
-
This reverts commit 5cf6f7f327c95f09be859889be39e78950516556.
-
Forward imx_3.14.y mxc video output drivers to 4.1 kernel.
The priv field of v4l2_pix_format is used to expand colorspace,
and can not use to pass IPU input crop size.
Add private IOCTL VIDIOC_S_INPUT_CROP and VIDIOC_G_INPUT_CROP
to pass input crop size.Signed-off-by: Sandor Yu
-
This reverts commit b71c99801e18eb172ae34851daf25044a3bf644a.
Signed-off-by: Oliver Brown
(cherry picked from commit 5c74966c0e7deb0ac84b3fa8a84c6c942e7d434f)Conflicts:
drivers/media/v4l2-core/v4l2-compat-ioctl32.c
include/media/v4l2-subdev.h -
export this for 'make headers_install'
Signed-off-by: Robby Cai
-
export this for 'make headers_install'
Signed-off-by: Robby Cai
-
Add mxc_asrc.h to Kbuild. otherwise this header is not installed by
"make headers_install INSTALL_HDR_PATH=XXX".Signed-off-by: Shengjiu Wang
-
Add v4l2 and dcic head file.
Signed-off-by: Sandor Yu
-
Forward imx_3.14.y IPU and display drivers to 4.1 kernel.
This includes IPU core driver, display driver, LDB and HDMI driver.Signed-off-by: Sandor Yu
-
As A9 and M4 share many resources on i.MX6SX, especially for
clk and power related resource, so we need to handle the hardware
conflict between these two cores, there are two cases that we
need to consider currently:clk management: for every clk node, only when both A9 and
M4 do NOT need it, then we can disable it from hardware;Here we use MU and hardware SEMA4 to achieve our goal, MU is
for communiation between A9 and M4, SEMA4 is to protect the
shared memory.For clk management, we use shared memory to maintain the clk
status for both A9 and M4 side, and this shared memory is
protected by hardware SEMA4, A9 and M4 will maintain their
own clk tree info in their SW environment, and get other
CORE's clk tree info from shared memory to decide whether
to perform a hardware setting change when they plan to.Signed-off-by: Anson Huang
-
- add linux sema4 driver.
- use volatile types in sema4 structure.
- align the port definiton a9 is 1, m4 is 2.Signed-off-by: Anson Huang
Signed-off-by: Richard Zhu -
this patch is chery-picked from imx_3.14.y
(cherry picked from commit 51e376b469c)
ENGR00274056-1 thermal: add device cooling for thermal drivercpu cooling is not enough when temperature is
too hot, as some devices may contribute a lot of heat
to SOC, such as GPU, so we need to add device cooling
as well, when system is too hot, devices can also take
their actions to lower SOC temperature.when temperature cross the passive trip, device cooling
driver will send out notification, those devices who
register this devfreq_cooling notification will take
actions to lower SOC temperature.Signed-off-by: Anson Huang
Signed-off-by: Shawn Guo
Signed-off-by: Bai Ping -
Add isl29023 driver support for i.MX6Q/DL/SX platform. The code derives from 3.10.y branch.
Signed-off-by: Luwei Zhou
Signed-off-by: Fugang Duan
(cherry picked from commit: b0134420bba0022151499f1bb15e0d5daba970fa) -
when kernel command line has "uart_from_osc" defined, set uart1
parent clock to OSC for low power case.Signed-off-by: Fugang Duan
-
Add mlb support on imx_4.1.y. The files are copied from imx_3.14.y.
Signed-off-by: Gao Pan
-
Include 3.14 VPU driver with no change
Signed-off-by: Hongzhang Yang
-
By using gstreamer plugin v4l2radio, it will call VIDIOC_S_CTRL with
V4L2_CID_AUDIO_MUTE, but return failed.So add V4L2_CID_AUDIO_MUTE CTRL support for radio-si476x.
Signed-off-by: Zidan Wang
(cherry picked from commit c18520adfd6de40dcc0659ddd778b0a2bd383cd4) -
As spdif driver will register SPDIF clock to regmap, regmap will do
clk_prepare in init function, so SPDIF clock is prepared in probe, then its
root clock (pll clock) is prepared also, which cause the arm can't enter
low power mode.
Add SPDIF_GCLK in clock tree which share same gate bits with SPDIF clock.
Its root clock is ipg clock, and register it to regmap, then the issue can be
fixed.Signed-off-by: Shengjiu Wang
(cherry picked from commit 3f8999cdb4fabed4f720c6ee23947e19c8fff83f) -
cherry-pick below patch from imx_3.14.y
ENGR00307835-2 ASoC: dmaengine: Add two function for dmaengine_pcmAdd check_xrun and device_reset for dmaengine_pcm
Signed-off-by: Shengjiu Wang
(cherry picked from commit 405588f31e432e5c6634a0817e4d804ead87882b) -
Add MQS's bit description in gpr header file.
Signed-off-by: Shengjiu Wang
(cherry picked from commit 1e576de4b46a0fadd1c8df7f08229ac759e765f5) -
The initial source code for the new mipi dsi module which can
support the basic necessary functions(blank/unblank, set brightness
and etc). New functions can be added if required later.Signed-off-by: Fancy Fang
-
Add two new regulator events macro 'REGULATOR_EVENT_PRE_DO_ENABLE'
and 'REGULATOR_EVENT_PRE_DO_DISABLE', since some gpc operations
should be required when MIPI PHY is powered on/off.Signed-off-by: Fancy Fang
-
Add an interface for GPC used by drivers to keep mega fast mix domain
power.Signed-off-by: Li Jun
(cherry picked from commit f40b0d57803b26a889d12cb70f128801ef75055a) -
cherry-pick below patch from v3.14.y:
ENGR00330403-4: ASoC: fsl_asrc: Add Memory to Memory supportASRC M2M function is not able to put upstream due to its self-designed
ioctl protocol. So I just make a single patch for it and make it merge
into P2P driver as simply as possible.The patch can only be maintained internally unless some one designs a
new protocol or implement the originally protocol by using some common
approach provided by Linux Kernel.Signed-off-by: Shengjiu Wang
(cherry picked from commit b5a7a98da076b0202334db01ecc3833342a7ca11) -
Add MSL code for i.MX6QP.
Signed-off-by: Bai Ping