DMA: rk3368: add dma clk enable/disable

Signed-off-by: dkl <dkl@rock-chips.com>

HDMI: Modify color output policy.
        Introduce feature SUPPORT_YCBCR_INPUT. If VOP can
        output YCbCr, VOP output color mode is equal to HDMI
        output color mode. Otherwise, VOP just output RGB,
        HDMI will conver color space.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

HDMI: add mutex lock when hdmi is set to auto mode, to avoid
      system crash by NULL pointer.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

rk3368: thermal: add log trigger for tsadc
enable log:
echo t > sys/rockchip_thermal/temp
disable log:
echo f > sys/rockchip_thermal/temp

Signed-off-by: David Wu <wdc@rock-chips.com>

rk3368: tb_8846: change 8846 mode for tsadc

Signed-off-by: David Wu <wdc@rock-chips.com>

rk3368: add tsadc for p9

Signed-off-by: David Wu <wdc@rock-chips.com>

rk3368: tsadc: remove tsadc-int pin for p9

Signed-off-by: David Wu <wdc@rock-chips.com>

ethernet: fix dts for rk3368-box

Signed-off-by: chenzhi <roger.chen@rock-chips.com>

rk3368: thermal: remove dbg log

Signed-off-by: David Wu <wdc@rock-chips.com>

rk3368: use pvtm for 32k tep

Signed-off-by: David Wu <wdc@rock-chips.com>

rk3368: tsadc: remove tsadc_tockchip defconfig

Signed-off-by: David Wu <wdc@rock-chips.com>

rk3368: thermal: tsadc use usermode for rk3368

Signed-off-by: David Wu <wdc@rock-chips.com>

pvtm: rk3368: add pvtm_pmu clk support (output 32k)

Support pvtm_pmu output 32k clk. By default, 32k use xin32k,
and pvtm_pmu 32k clk is disabled.

Signed-off-by: dkl <dkl@rock-chips.com>

rk3368 codec : add support for headset detection of es8316

Signed-off-by: smj <smj@rock-chips.com>

rk3368: thermal: rockchip_thermal support rk3368

Signed-off-by: David Wu <wdc@rock-chips.com>

rk3368: thermal: sync form upstream for rockchip-thermal

Signed-off-by: David Wu <wdc@rock-chips.com>

Merge tag 'lsk-v3.10-android-15.02'

LSK Android 15.02 v3.10

Conflicts:
drivers/Kconfig
drivers/regulator/core.c
include/linux/of.h

A mistaken dts property name, cause driver could
not get the irq resource.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

Merge branch develop-3.10

Conflicts:
drivers/staging/android/ion/rockchip/rockchip_ion.c

wifi: update broadcom wifi driver bcmdhd to 1.201.34.2

wifi: update broadcom wifi driver bcmdhd to 1.201.34.2

camsys_drv config y defaultly

dtsi: add rk3368 camera support

Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>

camera:
camsys_drv: v0.0x1c.0
    oneframe: v0.2.0
    pingpong: v0.1.a

Conflicts:
drivers/media/video/rk_camsys/camsys_gpio.h
drivers/media/video/rk_camsys/camsys_internal.h
drivers/media/video/rk_camsys/camsys_soc_priv.c
include/linux/rockchip/cru.h

rk3368: rk818: enable HDMI 5V

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

rk3368: rk818 battery: allow capacity to be negative value

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

rk3368 codec : fix the es8316 codec capture gain

Signed-off-by: smj <smj@rock-chips.com>

rk fb: in no_dual mode, dsp parameter according to user setting

Signed-off-by: hjc <hjc@rock-chips.com>

rk3368 lcdc: add support overscan

Signed-off-by: hjc <hjc@rock-chips.com>

rk3368-p9: backlight: Polarity reversal

Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

add support rk1000 codec and tvencoder

support different wifi bt chip auto compatible, modify
 arch/arm64/boot/dts/rk3368-p9_818.dts, arch/arm64/boot/dts/rk3368-tb_8846.dts

Revert "support different wifi bt chip auto compatible"

This reverts commit 2506d1678c7f5ed228e2a7ed4130a5f9ede641db.

support different wifi bt chip auto compatible
 arch/arm64/boot/dts/rk3368-p9_818.dts
 arch/arm64/boot/dts/rk3368-tb_8846.dts

solve make clean error causeed by wifi driver

rk: ion: fix compilation warning without CONFIG_COMPAT

Signed-off-by: CMY <cmy@rock-chips.com>

rk: ion: fix compilation error without CONFIG_COMPAT

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 52315d4d540dd3ef6db618b6856ceee0b5af8d98)

Signed-off-by: CMY <cmy@rock-chips.com>

rk: ion: fix compile warnning

Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit ee9707a058c52a0d0c27f5804db9e9e96075d363)

Signed-off-by: CMY <cmy@rock-chips.com>

rk: uboot_mem_reserve: lost a '=' in 'if' statement
(cherry picked from commit b9721d0365d9e88d0c16c3f0c2aff4b2c09c9dec)

Signed-off-by: CMY <cmy@rock-chips.com>

rk: uboot_mem_reserve: fix print format

Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit c9bbb3032c50e9b9ecaca58a4aa06ef4192bdbba)

Signed-off-by: CMY <cmy@rock-chips.com>

rk: ion: allow the cacheable buffer to map iommu

Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit db95a55ffa214b0bab8643454875a42d655a8ad7)

Signed-off-by: CMY <cmy@rock-chips.com>

rk: ion: assign sg's dma_length in ion allocation if CONFIG_NEED_SG_DMA_LENGTH is set
(cherry picked from commit c85ce1ade533fe0d02b7539dbe85d55b69386125)

Signed-off-by: CMY <cmy@rock-chips.com>

ARM64: ion: ION_IOC_GET_PHYS compat 32bit userspace app.

Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit 92ad540611e8599b7fb386a28793c77b410c81c6)

Signed-off-by: CMY <cmy@rock-chips.com>

ion: export ion_device for some kernel modules
(cherry picked from commit c32433f1e0847cffdee4e0c04c6d8ee7d64392bc)

Signed-off-by: CMY <cmy@rock-chips.com>

solve make clean error causeed by wifi driver

rfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288

remove unused wifi driver: rda5990, mt5931, mt7601, mt6620

support different wifi bt chip auto compatible
 like auto recognize rtl8188eu, ap6210, esp8089 in android

Conflicts:
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
net/rfkill/rfkill-wlan.c

mmc: rk_sdmmc: edmac limit FIFOTH when mburst exceed limitation

Signed-off-by: lintao <lintao@rock-chips.com>

mmc: rk_sdmmc: doesn't enforce hpclk to be used

Signed-off-by: lintao <lintao@rock-chips.com>

rfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288

rfkill-wlan.c: support rk3368

Conflicts:
net/rfkill/rfkill-wlan.c

update rkwifi bcmdhd to version 1.201.34.1

Conflicts:
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile

rk fb: if uboot logo not display, there is not need to poll blank and enable iommu

Signed-off-by: hjc <hjc@rock-chips.com>

mmc: add hclk_mmc_peri for 3368

Signed-off-by: lintao <lintao@rock-chips.com>

rk: ion: fix compile warnning

Signed-off-by: CMY <cmy@rock-chips.com>

ethernet: GMAC driver for RK3368

Signed-off-by: chenzhi <roger.chen@rock-chips.com>

mmc: 3368: midgreed WA

Signed-off-by: lintao <lintao@rock-chips.com>

rk3368 mipi: fix the phase between the mipi clock and mipi data

The mipi screen may be no-display in rk3368 when the mipi rate
higher than 900M, so we need to fix the phase between the clock and data.

Signed-off-by: chenyifu <chenyf@rock-chips.com>

rk3368 lcdc: init pixclock when uboot logo on is open, it is need by DSI

Signed-off-by: hjc <hjc@rock-chips.com>

rk: uboot_mem_reserve: lost a '=' in 'if' statement

arm64: mm: reserve memory region for uboot

Signed-off-by: CMY <cmy@rock-chips.com>

rk: uboot_mem_reserve: fix print format

Signed-off-by: CMY <cmy@rock-chips.com>

rk3368: iommu: fix 32bit iommu work error in 64bit kernel

unsigned long has 8bytes in 64bit kernel,Maybach iommu each entry
both dte and pte has 4bytes,so we can not use unsigned long type
to define the entry address,otherwise,wrong page table will be set up,
that will cause page fault.So,replace unsigned long with unsigned int to
define the entry address

Signed-off-by: Simon <xxm@rock-chips.com>

rk3368 codec : add support for codec es8316

Signed-off-by: smj <smj@rock-chips.com>

mmc: replace tSD enumaration machanism

Remove dt property "support-tSD" and combine "support-emmc" with
"support-sd" in together for tSD/emmc distinguish by mmc core. More details
please refer to arch/arm/boot/dts/rk3288-tb.dts

Signed-off-by: lintao <lintao@rock-chips.com>

rockchip: i2s: use subysys_initcall_sync for probe.

because some codecs initialization depends on i2s mclk.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

camsys_drv: v0.0x1c.0

camera:
oneframe: v0.2.0
pingpong: v0.1.a

remove unused wifi driver: rda5990, mt5931, mt7601, mt6620

rk3368: p9_dts: add lcd_en delay time

rk3368 lcdc: fix fbdc addr config error

Signed-off-by: hjc <hjc@rock-chips.com>

support different wifi bt chip auto compatible
 like auto recognize rtl8188eu, ap6210, esp8089 in android

support different wifi bt chip auto compatible
 modify arch/arm/boot/dts/rk3128-86v.dts

support different wifi bt chip auto compatible
 modify arch/arm/boot/dts/rk3126-86v.dts

support different wifi bt chip auto compatible
 Attention: this is only for android 5.0, not compatible for android 4.4, meaning can't compatible for 4.4 after this commit
 modify arch/arm/boot/dts/rk3288-tb_8846.dts

rk: ion: allow the cacheable buffer to map iommu

Signed-off-by: CMY <cmy@rock-chips.com>

HDMI:
1. In DVI mode, input color and output color should be RGB[0-255];
   In HDMI mode, input color should be YCbCr;
2. For MID, HDMI is default disabled.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

hdmi: hdmiv1:
For nlpcm bitstream mode, we need to set audio
channel status nlpcm bit to 1.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

hdmi: fix set hdmi switch state error when remove hdmi.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

rk3368 lcdc: inter bak register will lead to clear
    other inter status, so when we clear inter inter
    status we should set clear register to zero.

Signed-off-by: hjc <hjc@rock-chips.com>

rk31xx lvds: set clock lane enable int ttl mode

Signed-off-by: hjc <hjc@rock-chips.com>

rk_sdmmc: speed up MMC for 3368

   Test with p9-818 board, without DM for ext4 mount option.

Signed-off-by: lintao <lintao@rock-chips.com>

rk fb: if uboot-logo-on set 1, open iommu when iommu en

Signed-off-by: hjc <hjc@rock-chips.com>

rk312x/rk3036: not change aclk_core_div for stability

In rk312x/rk3036, do not change aclk_core_div for stability.
Also remove some unusued macros and codes.

Signed-off-by: dkl <dkl@rock-chips.com>

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Merge branch 'lsk/v3.10/topic/of' into linux-linaro-lsk

i2c: Mark instantiated device nodes with OF_POPULATE

Mark (and unmark) device nodes with the POPULATE flag as appropriate.
This is required to avoid multi probing when using I2C and device
overlays containing a mux.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 6d0a0d9ad09be16e3ca676b245643945b4bff47d)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
drivers/i2c/i2c-core.c

i2c: Mark instantiated device nodes with OF_POPULATE

Mark (and unmark) device nodes with the POPULATE flag as appropriate.
This is required to avoid multi probing when using I2C and device
overlays containing a mux.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit d5285c36e6d27c1a411a3131c034641a5fa452cb)
Signed-off-by: Mark Brown <broonie@kernel.org>

i2c/of: Add OF_RECONFIG notifier handler

CONFIG_OF_DYNAMIC enables runtime changes to the device tree which in
turn may trigger addition or removal of devices from Linux. Add an
OF_RECONFIG notifier handler to receive tree change events and to
creating or destroy i2c devices as required.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
[grant.likely: clean up #ifdefs and drop unneeded error handling]
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Reviewed-by: Wolfram Sang <wsa@the-dreams.de>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: linux-i2c@vger.kernel.org
(cherry picked from commit ea7513bbc04170f1cbf42953187a4d8b731c71c4)
Signed-off-by: Mark Brown <broonie@kernel.org>

i2c/of: Factor out Devicetree registration code

Dynamically inserting i2c client device nodes requires the use
of a single device registration method. Factor out the loop body of
of_i2c_register_devices() so that it can be called for individual
device_nodes instead of for all the children of a node.

Note: The diff of this commit looks far more complicated than it
actually is due the indentation being changed for a large block of code.
When viewed using the diff -w flag to ignore whitespace changes it can
be seen that the change is actually quite simple.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
[grant.likely: Made new function static and removed changes to header]
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Reviewed-by: Wolfram Sang <wsa@the-dreams.de>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: linux-i2c@vger.kernel.org
(cherry picked from commit a430a3455f2c48995e06b359a82a1109a419e9ef)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
drivers/i2c/i2c-core.c

i2c: move OF helpers into the core

I2C of helpers used to live in of_i2c.c but experience (from SPI) shows
that it is much cleaner to have this in the core. This also removes a
circular dependency between the helpers and the core, and so we can
finally register child nodes in the core instead of doing this manually
in each driver. So, fix the drivers and documentation, too.

[Modified to keep a stub device registration API exposed to drivers in
order to avoid disruption]

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 687b81d083c082bc1e853032e3a2a54f8c251d27)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c
drivers/i2c/busses/i2c-imx.c
drivers/i2c/busses/i2c-stu300.c
drivers/i2c/busses/i2c-wmt.c
drivers/of/Kconfig
drivers/of/Makefile
drivers/staging/imx-drm/imx-tve.c
sound/soc/fsl/imx-wm8962.c

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Conflicts:
drivers/Kconfig
drivers/Makefile
fs/pstore/inode.c
fs/pstore/ram.c

Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into lsk-v3.10-aosp

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk

Conflicts:
drivers/of/Makefile

of/overlay: Directly include idr.h

The overlay code uses IDRs but does not explicitly include the header
providing the interface, instead relying on an implicit inclusion. Make
the dependency implict to avoid potential future build issues if the
implicit inclusion goes away.

Signed-off-by: Mark Brown <broonie@kernel.org>

of/platform: Handle of_populate drivers in notifier

When using overlays with drivers calling of_populate the notifier
will try to create the device twice. Using the populated bit
before proceeding protects against this.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit 15204ab1ebc5aba608cd19c83c37b98438b938b0)
Signed-off-by: Mark Brown <broonie@kernel.org>

of/overlay: Do not generate duplicate nodes

During the course of the rewrites a bug sneaked in when dealing
with children nodes of overlays, which ends up duplicating
sub nodes.

Simply remove the duplicate traversal of child nodes to fix.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit 3e7f7626fd49a9ffba8520a1a073f62929acad63)
Signed-off-by: Mark Brown <broonie@kernel.org>