rk3368:camera: change aclk_isp from <&gates17 0> to <&gates16 0>.

default disable gmac in rk3368-p9_818.dts

dts: rk3368: enable fclk_mcu\stclk_mcu\clk_jtag temporarily

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

arm64: rockchip: update rockchip_defconfig by savedefconfig

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

arm64: rockchip: rockchip_defconfig enable DEBUG_INFO

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

Merge branch develop-3.10

Conflicts:
arch/arm/mach-rockchip/dvfs.c

usb: dwc_otg: fix bug in FORCE_HOST_MODE

rk3368: usb: adjust usb phy parameter

rk: arm64: disable set pm_power_off for compatible with old pmic driver

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

DMA: pl330: add chan_status to mutex between pl330_tasklet and pl330_control DMA_TERMINATE_ALL

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>

camsys_drv: v0.0x1e.0

rk fb: box product not need to load screen when switch screen par enable is zero

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: support win mirror and update NO_DUAL mode

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>

rk3368 lcdc: add CABC mode config

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

solve bluetooth hid problem:
  when bluetooth hid device connected, the key is delayed to be reponse about 5 second

revert drivers/hid/uhid.c of commit 522c0bb37a66e65b704a4bd0f1bee7fec526dd32
  solve uhid Bad address error in 64bit cpu

rk fb: box product not need to load screen when switch screen par enable is zero

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

revert drivers/hid/uhid.c of commit 522c0bb37a66e65b704a4bd0f1bee7fec526dd32
  solve uhid Bad address error in 64bit cpu

rk fb: if not want the config effect,set reserved[3] bit[0] 1

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

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

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

rk fb: update pixclock init value and scale mode only support ONE_DUAL mode

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

rk fb: add win mirror pos config

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

rk fb: add support phy address config

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

rk fb: compatible with 32 bit system

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

mmc: rk_sdmmc: remove hpclk ops in set_sdio_status callback

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

mmc: rk_sdmmc: close FJTAG when drv probe

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

rk fb: update check var screen info

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

solve realtek wifi driver compile error with rk3368

Revert "Add flags parameter to get_country_code template"

This reverts commit a3d5a3f5affd45d9aa21daf04d4eb543fd3ed444.

Conflicts:
include/linux/wlan_plat.h

dvfs: add gpu temperate control

Signed-off-by: Xiao Feng <xf@rock-chips.com>

arm64: rockchip: rk3368: set sleep idle latency as large as possible

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

dvfs: add gpu temperate control

Signed-off-by: Xiao Feng <xf@rock-chips.com>

rk3368: support armoff

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

rk3368: update arm dvfs table and add gpu 576M

Signed-off-by: Xiao Feng <xf@rock-chips.com>

pd: rk3368: add qos save support

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

rk: move cpu_axi.h from arch/arm/mach-rockchip to include/linux/rockchip

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

rk_serial: support console write by thread

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

rk: cpufreq: interactive: touch boost all cpus

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

cpufreq: cpufreq_stats: prevent last_index = -1

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

cpufreq: rockchip_big_little: fix panic when topology_physical_package_id return -1 if no cluster info in dts

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

cpufreq: rockchip_big_little: add rockchip_bl_ prefix and indent

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

dt-bindings: add rockchip vendor prefix

It seems I forgot to add the vendor prefix for rockchip to the vendor-prefix
list. Therefore add it now.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Rob Herring <robh@kernel.org>
(cherry picked from commit e48ca29d30a10556eb7abd8d91980b8a57dabf10)

rk3368 lcdc: enable irq when open lcdc device

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

dts: rk3368-box.dts fix rk1000 tve probe error and reduce the frequency of EMMC to 100M

rk fb: add support phy address config

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

spi: show spi test time and data rate after test

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>

RK3368: spi: spi0 2csn,spi1 2csn,sp2 1csn in dts config

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>

spi: add CONFIG_NEED_SG_DMA_LENGTH for dma_length

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>

rk31xx lvds: add power domain control for lvds

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

rk3368 lcdc: add power domain control for lcdc

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

Merge branch 'rk_develop-3.10' into rk_develop-3.10-next

Conflicts:
drivers/mmc/host/rk_sdmmc.c

camera: rk3368: add aclk_rga

fix rga timeout mmu buf free bug

camsys_drv: v0.0x1d.0

arm64: rockchip: rk3368 support psci-0.2

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

arm64: rockchip: rk3368 fix qos reg define and increase peri priority

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

wifi: remove make modules configs

camsys_head: v0.0xb.0

rk3368: support cpu suspend to wfi

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

IEP: revise the dtsi clock gate number.

Incorrect clock gate provided in previous commit.

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

rk3x:pmic:rk818:not init rk818_ldo3 in uboot

rk fb: update pixclock init value and scale mode only support ONE_DUAL mode

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

rk3368-p9: dts: change rk818 battery configs.

rk_sdmmc: recalculate audib rx_wmark
AudiB contain a less limitation in rx_wmark.

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

regmap: Make regmap-mmio usable from atomic contexts

regmap-mmio uses a spinlock with spin_lock() and spin_unlock() for locking.
To be able to use the regmap API from different contexts (atomic vs non-atomic),
without the risk of race conditions, we need to use spin_lock_irqsave() and
spin_lock_irqrestore() instead. A new field, the spinlock_flags field, is added
to regmap struct to store the flags between regmap_{,un}lock_spinlock(). The
spinlock_flags field itself is also protected by the spinlock.

Thanks to Stephen Warren for the suggestion of this particular solution.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
(cherry picked from commit 92ab1aab59c61b3e05200b9aa0e05ab770059142)

arm64: rockchip: rk3368 support boot from little core

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

usb: dwc_otg: enable clk and exit suspend when usb_core_reset

Avoid this warning message "WARN::dwc_otg_core_reset:5543:
dwc_otg_core_reset() HANG! AHB Idle GRSTCTL=4000020"

rk3368 hdmi: support pd_hdmi.

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

mmc: use ilog2 for fifoth calculation

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

dtsi: sdmmc: add card_detect for udbg

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

Merge branch develop-3.10

rk fb: compatible with 32 bit system

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

rk3368 lcdc: add yuv420sp nv21 format at lcdc scale fac

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

rga2 support 32bit compile at 64bit platform

fix conpile error

wifi: use buildin instand of ko for compatibility

mmc: rk_sdmmc: add uart & jtag soft-switch by routine card present signal

Reviewed-and-tested-by: <xiaoyao@rock-chips.com>
Signed-off-by: lintao <lintao@rock-chips.com>

dtsi: rk3368: add uart & jtag pcl func for sdmmc mux

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

VPU: revise previous commit.

can not be built in previous commit.

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

dts: add work and power led in rk3128-box.dts

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

VPU, enable frequency raise for 4k h.264 decoding.

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

arm64: add PSCI CPU_SUSPEND based cpu_suspend support

This patch implements the cpu_suspend cpu operations method through
the PSCI CPU SUSPEND API. The PSCI implementation translates the idle state
index passed by the cpu_suspend core call into a valid PSCI state according to
the PSCI states initialized at boot through the cpu_init_idle() CPU
operations hook.

The PSCI CPU suspend operation hook checks if the PSCI state is a
standby state. If it is, it calls the PSCI suspend implementation
straight away, without saving any context. If the state is a power
down state the kernel calls the __cpu_suspend API (that saves the CPU
context) and passed the PSCI suspend finisher as a parameter so that PSCI
can be called by the __cpu_suspend implementation after saving and flushing
the context as last function before power down.

For power down states, entry point is set to cpu_resume physical address,
that represents the default kernel execution address following a CPU reset.

Reviewed-by: Ashwin Chaugule <ashwin.chaugule@linaro.org>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 18910ab0d916b1a87016d69efd027714a80521dd)
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Conflicts:
arch/arm64/kernel/psci.c

arm64: kernel: fix __cpu_suspend mm switch on warm-boot

On arm64 the TTBR0_EL1 register is set to either the reserved TTBR0
page tables on boot or to the active_mm mappings belonging to user space
processes, it must never be set to swapper_pg_dir page tables mappings.

When a CPU is booted its active_mm is set to init_mm even though its
TTBR0_EL1 points at the reserved TTBR0 page mappings. This implies
that when __cpu_suspend is triggered the active_mm can point at
init_mm even if the current TTBR0_EL1 register contains the reserved
TTBR0_EL1 mappings.

Therefore, the mm save and restore executed in __cpu_suspend might
turn out to be erroneous in that, if the current->active_mm corresponds
to init_mm, on resume from low power it ends up restoring in the
TTBR0_EL1 the init_mm mappings that are global and can cause speculation
of TLB entries which end up being propagated to user space.

This patch fixes the issue by checking the active_mm pointer before
restoring the TTBR0 mappings. If the current active_mm == &init_mm,
the code sets the TTBR0_EL1 to the reserved TTBR0 mapping instead of
switching back to the active_mm, which is the expected behaviour
corresponding to the TTBR0_EL1 settings when __cpu_suspend was entered.

Fixes: 95322526ef62 ("arm64: kernel: cpu_{suspend/resume} implementation")
Cc: <stable@vger.kernel.org> # 3.14+: 18ab7db
Cc: <stable@vger.kernel.org> # 3.14+: 714f599
Cc: <stable@vger.kernel.org> # 3.14+: c3684fb
Cc: <stable@vger.kernel.org> # 3.14+
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit f43c27188a49111b58e9611afa2f0365b0b55625)

arm64: Move cpu_resume into the text section

The function cpu_resume currently lives in the .data section.
There's no reason for it to be there since we can use relative
instructions without a problem. Move a few cpu_resume data
structures out of the assembly file so the .data annotation
can be dropped completely and cpu_resume ends up in the read
only text section.

Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tested-by: Kees Cook <keescook@chromium.org>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
(cherry picked from commit c3684fbb446501b48dec6677a6a9f61c215053de)

arm64: kernel: refactor the CPU suspend API for retention states

CPU suspend is the standard kernel interface to be used to enter
low-power states on ARM64 systems. Current cpu_suspend implementation
by default assumes that all low power states are losing the CPU context,
so the CPU registers must be saved and cleaned to DRAM upon state
entry. Furthermore, the current cpu_suspend() implementation assumes
that if the CPU suspend back-end method returns when called, this has
to be considered an error regardless of the return code (which can be
successful) since the CPU was not expected to return from a code path that
is different from cpu_resume code path - eg returning from the reset vector.

All in all this means that the current API does not cope well with low-power
states that preserve the CPU context when entered (ie retention states),
since first of all the context is saved for nothing on state entry for
those states and a successful state entry can return as a normal function
return, which is considered an error by the current CPU suspend
implementation.

This patch refactors the cpu_suspend() API so that it can be split in
two separate functionalities. The arm64 cpu_suspend API just provides
a wrapper around CPU suspend operation hook. A new function is
introduced (for architecture code use only) for states that require
context saving upon entry:

__cpu_suspend(unsigned long arg, int (*fn)(unsigned long))

__cpu_suspend() saves the context on function entry and calls the
so called suspend finisher (ie fn) to complete the suspend operation.
The finisher is not expected to return, unless it fails in which case
the error is propagated back to the __cpu_suspend caller.

The API refactoring results in the following pseudo code call sequence for a
suspending CPU, when triggered from a kernel subsystem:

/*
 * int cpu_suspend(unsigned long idx)
 * @idx: idle state index
 */
{
-> cpu_suspend(idx)
|---> CPU operations suspend hook called, if present
|--> if (retention_state)
|--> direct suspend back-end call (eg PSCI suspend)
     else
|--> __cpu_suspend(idx, &back_end_finisher);
}

By refactoring the cpu_suspend API this way, the CPU operations back-end
has a chance to detect whether idle states require state saving or not
and can call the required suspend operations accordingly either through
simple function call or indirectly through __cpu_suspend() which carries out
state saving and suspend finisher dispatching to complete idle state entry.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 714f59925595b9c2ea9c22b107b340d38e3b3bc9)

arm64: kernel: add missing __init section marker to cpu_suspend_init

Suspend init function must be marked as __init, since it is not needed
after the kernel has booted. This patch moves the cpu_suspend_init()
function to the __init section.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 18ab7db6b749ac27aac08d572afbbd2f4d937934)

driver/core: cpu: initialize of_node in cpu's device struture

CPUs are also registered as devices but the of_node in these cpu
devices are not initialized. Currently different drivers requiring
to access cpu device node are parsing the nodes themselves and
initialising the of_node in cpu device.

The of_node in all the cpu devices needs to be initialized properly
and at one place. The best place to update this is CPU subsystem
driver when registering the cpu devices.

The OF/DT core library now provides of_get_cpu_node to retrieve a cpu
device node for a given logical index by abstracting the architecture
specific details.

This patch uses of_get_cpu_node to assign of_node when registering the
cpu devices.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
(cherry picked from commit f86e4718f24b83be0c42894d2b97accc993d65d3)
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Conflicts:
drivers/base/cpu.c

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

Merge branch linux-linaro-lsk-v3.10-android

dts: update rk3368-box dts:1, wifi_bt,2,enabled pwm1;3.emmc clk

pd: rk3368: add rk3368 power domain support (as pd clk)

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

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

usb: dwc_otg: fix bug in device_init routine

1.wait epenable bit timeout decrease from 10s to 1s
2.fix bug, without 'j++' this loop never break if there is some
problem with ep state

dts: rk3368: remove "clk_ignore_unused" from bootargs

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

usb: ehci: fix suspend bug

usb: dwc_otg: change method of checking urb dequeue status

According to commit e9df41c5c, change dwc_otg driver to call
usb_hcd_link_urb_to_ep() and usb_hcd_unlink_urb_from_ep() routine
for checking urb dequeue status instead check for null pointer
by hcd driver to test address.

TEST:
1.rk3126 run host/device change script for 10000 times

rk818-battery: add calibration of charge and discharge

Signed-off-by: 许盛飞 <xsf@rock-chips.com>