arm64: rockchip: rk3386: fix ion heap id

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

Merge branch develop-3.10

Revert "rk: ion: fix compilation error on arm64"

This reverts commit 6ba08d968d0938cac5d6d6d3ea0e71fd4aa05c27.

Revert "rk: ion: fix dts parse failure on arm64"

This reverts commit e46863d23c4753b4f523dcdde0a907c06df40494.

rk312x codec : fix the bug of codec capture gain

arm/configs: add CONFIG_SECCOMP to rockchip_defconfig

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rk: ion: fix dts parse failure on arm64

rk: ion: fix compilation error on arm64

Conflicts:

drivers/staging/android/ion/rockchip/rockchip_ion.c
include/linux/rockchip_ion.h

clk: rockchip: set aclk_core_div to 4 for all rates in rk3036_apll_table

Set aclk_core_div to 4 for all rates, which makes rk3126\rk3128\rk3126b apll
frequency change stably.

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

USB: DWC_OTG: Support otg suspend and resume pm

Signed-off-by: Wu Liang feng <wulf@rock-chips.com>

ion: export ion_device for some kernel modules

rk3368 lcdc: fix crash when close display

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

rk fb: add win mirror pos config

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

rk3368 lcdc: add yuv overlay and close lut when switch hdmi

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

rk3368 lcdc: fbdc test ok use auto test case

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

rk fb: compatible when 32bit system call used on 64bit kernel

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

rk312x: lcdc: fix shutdown power and clock deinit

immediately power down lcdc and clock, maybe
regs_update_handler still work, some status would
became wrong.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

usb: support rk3368 OTG device side and EHCI

usb: ohci: backport ohci-platform.c driver from kernel-3.18

usb: ehci: backport ehci-platform.c driver from kernel-3.18

usb: dwc_otg: set dma_mask 32bit for both device and host mode

rk3368: io-domain: add io domain volt sel

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

mmc: rk_sdmmc: manually zero desc after allocated on ARM64 platform.

ARM64 call dmam_alloc_coherent mathod to allocate descriptor
will not auto clear buffer. So mmc may get wrong d->desc1 calculated that
load wrong address for BUF2 for dual-buf mode if NO CH set in d->desc0.
Then IDMAC will halt for BUF2 in WR_REQ_WAIT state and cannot generate
TI/RI or others in combine-interrupt.

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

Revert "arm64: rockchip: rockchip_defconfig disable MMC_DW_IDMAC temporarily"

This reverts commit da9ae0c513b4a01ff4302a21a82746ddaeb2c16c.

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

arm64: rockchip: rk3368 enable 8 CPUs support

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

ion: rockchip: fix snapshot alignment fault on armv8

Fix this bug:
Unhandled fault: alignment fault (0x96000061) at 0xffffff8000006016
Internal error: : 96000061 [#1] PREEMPT SMP
Modules linked in: dc_fbdev(O) pvrsrvkm(O)
CPU: 0 PID: 125 Comm: Binder_2 Tainted: G           O 3.10.0 #36
task: ffffffc0530f7380 ti: ffffffc0531c0000 task.ti: ffffffc0531c0000
PC is at memcpy+0x2c/0x60
LR is at vsnprintf+0x100/0x598
[<ffffffc0002e093c>] memcpy+0x2c/0x60
[<ffffffc00018b3bc>] seq_vprintf+0x48/0x84
[<ffffffc00018b44c>] seq_printf+0x54/0x60
[<ffffffc00063a238>] ion_alloc+0x4fc/0x778
[<ffffffc00063a98c>] ion_ioctl+0x164/0x360
[<ffffffc00017bfa8>] vfs_ioctl+0x20/0x3c
[<ffffffc00017c8ac>] do_vfs_ioctl+0x474/0x540
[<ffffffc00017c9d4>] SyS_ioctl+0x5c/0x88

pgprot_noncached will map buffer as MT_DEVICE, but
All store accesses to Device memory use the asynchronous abort mechanism on
Cortex-A53.

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rk3368: io-domain: sync with upstream to add REGULATOR_EVENT_PRE_VOLTAGE_CHANGE

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

arm64: rockchip: rk3368-tb_8836 fix cw2015 gpio define

rk: ion: ion's heap id order by heap type
  need update android, including:
    hardware/rk29/libgralloc_ump/
    hardware/rk29/camera/
    external/rk-pcba-test/

rk3368: i2c: fix i2c1&i2c2 reg address and irq error

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

arm64: rockchip: rk3368 enable 4 big CPUs support

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

arm64: rockchip: rk3368-tb_8836 add tp support

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

arm64: rockchip: rk3368 fix cpu axi init

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

usb: rk312x: rk3126/3128 usb phy tuning set OTG port disconnect
trigger point to 600mv, default is 650mv

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

LSK Android 14.12 v3.10

Conflicts:
include/linux/clk-provider.h

rk3368: dma: enable pl330 and dmadevices defconfig

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

rk3368: uart_dbg: uart_dbg pinctrl is decided by hardware

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

rk3368: voppwm: add voppwm function

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

mali_760_driver, rk_ext :
Add log of ver_info and built_time of mali_ko.

mali_760_driver : rk_ext on arm_release_ver, from r5p0-02dev0.

mali_760_driver : arm_release_ver r5p0-02dev0.

rk312x: close the bluetooth in the file rk3128-box-rk88.dts.

arm64: rockchip: build resource.img with logo_kernel.bmp

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

ARM: rk: kernel.img depends on logo_kernel.bmp

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

arm64: dts: rk3368-tb_8846: enable edp panel

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

arm64: dts: rk3368: fix grf, interrupts, resets for edp

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

video: rockchip: rk32_dp: add support for rk3368

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

video: rockchip: rk32_dp: covert dsb() to dsb(sy)

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

Revert "rk32 dp: port to rk3368"

This reverts commit b8fdfeb2cfeec753b23236584e9e24b1f3be83c1.

rk3368 lcdc: 1.add YUV domain overlay config; 2.edp force rgb888 output; 3.add 1.8 IO domain selete;

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

rk fb: fix open hdmi open backlight again in no dual mode

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

rk3368 lcdc: update gamma lut 10bit to 8bit

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

rk31xx lvds: set iomux for lvds ttl mode

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

Merge branch develop-3.10 into develop-3.10-next

iep driver:

get rid of kfree buffer which allocated using devm_kzalloc.

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

reset: rockchip: load as subsys_initcall_sync

rockchip reset control should probe before edp

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

rk3368: pinctrl: add hdmi-i2c-xfer

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

remove rga driver mmu buf malloc to prevent crash

camera: UVC: fix UVC interrupt and other issues

rk312x: miss the new file rk3126.dtsi&&3128.dtsi for the commit c59e8d086aaf89d0f48351ff7287708b57e5aba1(rk312x: adjust dts relation)

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

arm64: rockchip: rk3368 disable qos init temporarily

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rk3368: clk: fix rk3368 apllb/aplll set_rate

After rk3368 apllb/aplll change settings, set the divider of core back to 1.

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

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

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

arm64: rockchip: rockchip_defconfig enable RK31XX_LVDS RK32_DP

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

ion: ino reserve

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

rk32 dp: port to rk3368

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

rk31xx lvds: add lvds grf config

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

rk3368 lcdc: 1.delete force vop output aaa mode in hdmi and edp mode; 2.not to control power domain.

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

arm64: rockchip: rockchip_defconfig disable MMC_DW_IDMAC temporarily

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rk3368: dts: init gpll rate before clk_core_b and clk_core_l

It's better to init gpll rate before clk_core_b and clk_core_l,
because gpll will be used when clk_core_b and clk_core_l change rate.

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

rk3368: clk: fix rk3368 apll set_rate

In rk3368, apll enter slow mode before changing settings
and return to normal mode after changing settings.

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

arm64: rockchip: rockchip_defconfig enable some ARM64 feature

+DISABLE_CPU_SCHED_DOMAIN_BALANCE
+SCHED_HMP
+HMP_VARIABLE_SCALE
+HMP_FREQUENCY_INVARIANT_SCALE
+SCHED_HMP_LITTLE_PACKING
+ARM_BIG_LITTLE_CPUFREQ
+ARM_DT_BL_CPUFREQ
+ARM64_CPUIDLE
+SERIAL_ROCKCHIP_CONSOLE
+RK30_CAMERA_ONEFRAME

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

arm64: rockchip: fix tb_8846 boot

uart_dbg status default disabled
disabe wireless-wlan
bootargs remove vmalloc=512M console=ttyS2
remove memory node

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

PM / Domains: Add generic OF-based PM domain look-up

This patch introduces generic code to perform PM domain look-up using
device tree and automatically bind devices to their PM domains.

Generic device tree bindings are introduced to specify PM domains of
devices in their device tree nodes.

Backwards compatibility with legacy Samsung-specific PM domain bindings
is provided, but for now the new code is not compiled when
CONFIG_ARCH_EXYNOS is selected to avoid collision with legacy code.
This will change as soon as the Exynos PM domain code gets converted to
use the generic framework in further patch.

This patch was originally submitted by Tomasz Figa when he was employed
by Samsung.

Link: http://marc.info/?l=linux-pm&m=139955349702152&w=2
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit aa42240ab2544a8bcb2efb400193826f57f3175e)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
include/linux/pm_domain.h

ACPI / PM: Assign the ->detach() callback when attaching the PM domain

As as preparation to simplify the detachment of devices from their PM
domains, we assign the ->detach() callback to genpd_dev_pm_detach().

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 86f1e15f5646b4855bd77025c950239650c4843e)
Signed-off-by: Mark Brown <broonie@kernel.org>

PM / Domains: Add a detach callback to the struct dev_pm_domain

The intent of this callback is to simplify detachment of devices from
their PM domains. Further patches will show the benefit.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit c3099a5294f2c7266234e8ea35cbffc20a41aa9a)
Signed-off-by: Mark Brown <broonie@kernel.org>

rk, gpu :
source code for device/rockchip/common/gpu/libMali-T760/mali_kbase.ko,
in branch rk/rk32/mid/5.0/develop,
commit 1b187041f11b7ca1d6c1490b934f09648f334a19.

rk312x: adjust dts relation

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

arm64: rockchip: add rk3368-tb_8846.dts

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

arm64: rockchip: rk3368.dtsi add more configure

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rk3368 lcdc: support win mirror and update NO_DUAL mode

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

rk3368: clk: add CLKOPS_RATE_RK3368_DCLK_LCDC for dclk_vop0

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

rk3368: dts: clk: fix some errors

Adjust vip clks, rename clk_gpu_core "clk_gpu" and remove wrong clk4x_ddr.

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

Merge branch develop-3.10 into develop-3.10-next

Revert "rk3368 lcdc: support win mirror and update NO_DUAL mode"

This reverts commit fd18d428fa43fba8f42c6be7649cd857263c8c8e.

ARM: rk: build resource.img with logo_kernel.bmp

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rk3368: reset: add soft_reset id

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

rk fb: delete unused message

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

cif: set CONFIG_RK30_CAMERA_ONEFRAME default as yes in rockchip_defconfig

clk: rockchip: fix some code style problems in clk-pll.c

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

clk: rockchip: fix pll_clk_get_best_set() for rk3188plus type pll

When selecting a best setting for rk3188plus type pll, consider a
larger NO first(means larger VCO freq), and a smaller NR later.

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

rk32: disabled ohci in dt

ARM: rockchip: rockchip_defconfig add USB_OHCI_HCD

rk312x: add support for ehci to all rk312x series

rk32: ehci: work-around for abnormal ohci

Revert "USB: Fix EHCI bug if connect with FS or LS device."

This reverts commit f65cb6fc5a364f0efba4fc9f0039c4ddb34ef4dd.

rk fb: box is use NO_DUAL mode,so fb have to disable dsp_black

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

rk: Makefile set default CROSS_COMPILE when ARCH is arm64

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rk_fb: logo: get kernel logo addr from protect memory region

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>