Commit Graph

847329 Commits

Author SHA1 Message Date
Channagoud Kadabi
8dbbbc6014 FROMGIT: audit: Add option to enable/disable syscall audit
Enable syscall audit has performance impact on Android, add option to
enable/disable the syscall audits.

Change-Id: I654e553daca388c03774886bf13410e2fdec0b02
Signed-off-by: Channagoud Kadabi <ckadabi@codeaurora.org>
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from https://android.googlesource.com/kernel/msm
 commit 338bc8bf0733fd4a75935f5685be9aa8e489571f)
2019-11-01 19:54:32 +08:00
Wu Liangqing
0c175338f6 arm64: dts: rockchip: rk3399-excavator-sapphire: enabled st sensor driver for mpu6500
Change-Id: I68b2029dcdeb873c92adaabdc99f66f5d5f943bf
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-11-01 19:21:49 +08:00
Wu Liangqing
6f880e6cc8 arm: dts: rockchip: rk3126-bnd-m88-emmc for android Q
Change-Id: I0e18cf7d475f113ab198706f4d0568ffc1d154c6
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-11-01 19:19:06 +08:00
Chen Jinsen
27ee5b3f77 ASoC: rockchip: add support for rk312x codec
Change-Id: I1679742e7f6abb4ad9d894828ddf3781fc1bc2bb
Signed-off-by: Chen Jinsen <kevin.chen@rock-chips.com>
2019-11-01 14:17:04 +08:00
William Wu
8b8214e2dc usb: gadget: rndis: fix class definitions for windows
The RNDIS gadget function has USB class of 2 and subclass
of 2, which matches "USB\Class_02&SubClass_02" in the
usbser.inf file in the Windows system, so the device is
initially detected as a COM port instead of RNDIS. This
is why we need to install RNDIS manually.

Refer to Defined Class Codes [1] and rndis_host of Linux [2],
this patch sets the RNDIS gadget with base class of 0xE0h
(Wireless Controller) and subclass of 0x01h and protocol
of 0x03h.

[1] https://www.usb.org/defined-class-codes
[2] http://www.embedded-os.de/en/proto-rndis_host.shtml

Change-Id: Ida366749f378a0ce770d707b4ba56b87f9e188cf
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-11-01 14:07:19 +08:00
David Wu
d8ee9c29d5 net: ethernet: stmmac: dwmac-rk: Don't configure has_gmac for gmac5.10a
The gmac5.10a configure has_gmac4 with true and has_gmac with false.
Others still stay has_gmac with true.

Change-Id: I0d0d1adef8551d2f7aac6702f963cb23a9861036
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-11-01 10:17:13 +08:00
Wang Jie
c11ccaa96c i2c: i2c devices with the same device address can be registered on the same i2c bus.
(1) before: multiple i2c devices with the same address
            registered to the same i2c bus will fail.
(2) after:  multiple i2c devices with the same address
            registered to the same i2c bus just print
            the error log, but will not fail.

Fixes: b97a325b33 ("i2c: Devices which have some i2c addr can work in same i2c bus")
Change-Id: I53a2b5a988d96c32e64b8a426621cf894c9cba20
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2019-11-01 10:08:10 +08:00
Elaine Zhang
d68dc25527 PM / Domains: Keep the pd status during system PM phases
If a PM domain is powered off before system suspend,
we hope do nothing in system runtime suspend noirq phase
and system runtime resume noirq phase.

Change-Id: Id72b1f92e10449c48006aced0d49612637402210
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-11-01 09:59:04 +08:00
Li Huang
c92c266bd4 video/rockchip: Kconfig && Makefile add rga1
Change-Id: I62be1a8e2580c7784ae1345283aff0b6e8cd2de3
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2019-11-01 08:55:53 +08:00
Li Huang
f56163ffeb video/rockchip: rga: fix compile error on 4.19
Change-Id: I1ad9c87a7401788a691cae6844807aaca5348cfc
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2019-11-01 08:47:00 +08:00
Chen Jinsen
2d27c680e0 arm: configs: rockchip_defconfig: enable CONFIG_SND_SOC_ROCKCHIP_I2S
Change-Id: I2345be483148aee0282509c4a9d65e11fec069ac
Signed-off-by: Chen Jinsen <kevin.chen@rock-chips.com>
2019-10-31 19:02:20 +08:00
Wang Panzhenzhuan
015c855d8b arm: dts: rk312x: rk3126-bnd-d708: gc0329 & gc2145 add module info
Change-Id: I4a94c93168c27526fa58a918b020a35d75e0c402
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-10-31 16:56:47 +08:00
Wang Panzhenzhuan
79c453a95a media: rockchip: cif: fix compile failure on kernel-4.19
Change-Id: I56537c637deb714f186e163227c194b65968c187
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-10-31 16:56:36 +08:00
Zorro Liu
9b7f73aea0 arm64: dts: rockchip: improve ddr freq when video play for rk3368 xikp boards
Change-Id: I8418040dd9f7bc5f2720fbcbec7a927a80994fc7
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-10-31 16:50:45 +08:00
Jianqun Xu
8e14b0bdae arm64: dts: rockchip: enabled rng default for rk3368-android
Change-Id: I476032fadd3711e9a5a75de04487fb7d773a0ac8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-10-31 16:49:23 +08:00
Jianqun Xu
8ce5f4d90c drivers: video: rockchip: rga2 fix to use rockchip ion below v4.4
Change-Id: Icde9bb4e5a285588cc7636696473e731b51c40f1
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-10-31 15:47:13 +08:00
Lyude Paul
f9ba6c5209 BACKPORT: drm/atomic_helper: Stop modesets on unregistered connectors harder
Unfortunately, it appears our fix in:
commit b5d29843d8 ("drm/atomic_helper: Allow DPMS On<->Off changes
for unregistered connectors")

Which attempted to work around the problems introduced by:
commit 4d80273976 ("drm/atomic_helper: Disallow new modesets on
unregistered connectors")

Is still not the right solution, as modesets can still be triggered
outside of drm_atomic_set_crtc_for_connector().

So in order to fix this, while still being careful that we don't break
modesets that a driver may perform before being registered with
userspace, we replace connector->registered with a tristate member,
connector->registration_state. This allows us to keep track of whether
or not a connector is still initializing and hasn't been exposed to
userspace, is currently registered and exposed to userspace, or has been
legitimately removed from the system after having once been present.

Using this info, we can prevent userspace from performing new modesets
on unregistered connectors while still allowing the driver to perform
modesets on unregistered connectors before the driver has finished being
registered.

Changes since v1:
- Fix WARN_ON() in drm_connector_cleanup() that CI caught with this
  patchset in igt@drv_module_reload@basic-reload-inject and
  igt@drv_module_reload@basic-reload by checking if the connector is
  registered instead of unregistered, as calling drm_connector_cleanup()
  on a connector that hasn't been registered with userspace yet should
  stay valid.
- Remove unregistered_connector_check(), and just go back to what we
  were doing before in commit 4d80273976 ("drm/atomic_helper: Disallow
  new modesets on unregistered connectors") except replacing
  READ_ONCE(connector->registered) with drm_connector_is_unregistered().
  This gets rid of the behavior of allowing DPMS On<->Off, but that should
  be fine as it's more consistent with the UAPI we had before - danvet
- s/drm_connector_unregistered/drm_connector_is_unregistered/ - danvet
- Update documentation, fix some typos.

Fixes: b5d29843d8 ("drm/atomic_helper: Allow DPMS On<->Off changes for unregistered connectors")
Change-Id: I998eb6f5434cf82be881085f5b23e33603b440e4
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: stable@vger.kernel.org
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20181016203946.9601-1-lyude@redhat.com
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 39b50c6038)
2019-10-31 15:46:05 +08:00
David Wu
1e47858fa9 ARM: dts: rockchip: Set pwm pin default pull setting when used for pwm regulator
As a second global reset, the GRF is not reset, the iomux and
pull of PWM pin is still keeping, but PWM controller is reset,
PWM pin goes into input mode. However, the pull is still none
changed in kernel, which can cause voltage problems, so should
always keep the PWM pin pull down mode, with 0~50 μA power
increase.

Change-Id: I9f46feca00bdb6e8cad4794342d2936d62206164
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-10-31 15:23:18 +08:00
David Wu
99c28b5be0 arm64: dts: rockchip: Set pwm pin default pull setting when used for pwm regulator
As a second global reset, the GRF is not reset, the iomux and
pull of PWM pin is still keeping, but PWM controller is reset,
PWM pin goes into input mode. However, the pull is still none
changed in kernel, which can cause voltage problems, so should
always keep the PWM pin pull down mode, with 0~50 μA power
increase.

Change-Id: Ibb1cbb5f5371d7838783264e23d5160c0757aaa6
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-10-31 15:21:02 +08:00
David Wu
016e8545af pwm: rockchip: Make pwm pinctrl setting after pwm enabled
If the PWM pinctrl uses default state, the iomux setting will
be done at probe, the PWM may not be enabled at this moment.
It will make PWM into an intermediate state, destroy the default
hardware state, the PWM is not ready for work yet. So it is better
for doing PWM pinctrl setting after PWM enabled.

Change-Id: Iea34a7baf6a4d7df0c631f7f4fdab5b9d61bbd5f
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-10-31 15:05:41 +08:00
David Wu
ddce12799c pwm: rockchip: Make pwm configure correctly for enable_conf
If some PWM enable_conf was configured with different values at
uboot/loader, the enable_conf should be cleaned firstly and
configured them at kernel. It is better to use the same parameters
on both sides to ensure excessive smoothing.

Change-Id: Ib1b7b55e9816639d9915543dadf059ce0e8be103
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-10-31 15:04:41 +08:00
Finley Xiao
5717787f94 arm64: dts: rockchip: rk3368: Add reboot frequcey for cpu
Change-Id: Icc09762bdc11eb33733c3dcc26ba0d4a1bdd59c1
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-10-31 14:59:22 +08:00
Finley Xiao
7a3872f748 arm64: dts: rockchip: rk3368: Add system monitor node
Change-Id: Id35935b83026a88af8bf137a8611dc93dd9ce945
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-10-31 14:58:32 +08:00
Yifeng Zhao
060a7cf7a7 drivers: rk_nand: fix access to virtual address 0 bug
The write or read request buffers may or may not be a highmem
page highmem or not allocated page, so the page->virtual will be
NULL, kmap it always need.

BUG:
[   25.928352] Unable to handle kernel paging request at virtual address 0
[   31.721348] pgd = a13fe17e
[   31.724062] [0] *pgd=00000000
[   31.727651] Internal error: Oops: 5 [#1] PREEMPT SMP ARM
[   31.732966] Modules linked in:

Change-Id: Icdbb052bb488ecc10be1c8a8b0ca954f65c17474
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2019-10-31 14:57:46 +08:00
Tao Huang
8a61de5df0 ARM: rockchip_defconfig: enable INITRD_ASYNC
Save about 50ms of boot time on RK3288 EVB

Change-Id: Id99a4e73019cad603a243f09f681f8c60faab8af
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-10-31 11:04:23 +08:00
Tao Huang
2f1bc0f1e6 ARM: rockchip_defconfig: merge q/android-4.19/android-base.config
https://android.googlesource.com/kernel/configs
commit aa4b4db78846 ("Freeze Q kernel configs")

Change-Id: Ibb68cd93491c5a748c675b8bb7a00d7448bfb9ed
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-10-31 11:04:23 +08:00
Tao Huang
77e6c0b329 ARM: rockchip_defconfig: Sync for 4.19
Change-Id: Ie07e3260bb01b53d52e2d49cd8ce99326cee6838
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-10-31 11:04:23 +08:00
Jianqun Xu
3cd7acb403 arm64: dts: rockchip: rk3368 init cpub/l freq to 600MHz
Since opp-suspend of cpub/l is 216MHz@950000mV, and the max frequency
under 950000mV is 600MHz, so initialize cpub/l freq to 600MHz.

Change-Id: I02d2ac44f4e5d125dfa90796b839c4a733442274
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-10-30 16:53:45 +08:00
Sandy Huang
b8f61f5bf3 drm/rockchip: vop: fix multile area win state error
the supported multile area win gate only can be closed when area0 is
disabled.

Change-Id: Idd447bb7c2157587456391c1abeeefc9a5d61bbd
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-10-30 16:10:17 +08:00
Sandy Huang
5b945448b2 drm/rockchip: vop: fix per-pixel alpha[255] calc error
Change-Id: I914711bf3195e1ee7cac18d001adc109888e380a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-10-30 16:10:01 +08:00
Shawn Lin
fedeff5024 mmc: dw_mmc-rockchip: Fix native sdmmc deep resume failure
Native sdmmc does not use rpm, but we set pm_runtime_force_suspend()
and pm_runtime_force_resume() for sleep PM. pm_runtime_force_*()
will check rpm status, so that the it doesn't call the resume
callback if we didn't increase its usage count.

Another drive-by fix is to de-init rpm once when rpm is used.

Change-Id: Id7ea1ca95c684fb51867fb87c66f8998fc0758a3
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2019-10-30 16:09:34 +08:00
Shawn Lin
085eb4c350 arm64: dts: rockchip: add disable-cqe for RK3399
Change-Id: I58cabc18a1f01e020b57ba980a0b8114eed4ba2a
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2019-10-30 16:09:34 +08:00
Shawn Lin
e3865605b0 mmc: sdhci-of-arasan: Parse disable-cqe
Add support to disable cqe function if disable-cqe
is assiged by firmware.

Change-Id: Iac2826c4b986c122510af1594c971c4135bafc34
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2019-10-30 16:09:34 +08:00
Tao Huang
e6010674ac arm64: rockchip_defconfig: merge q/android-4.19/android-recommended-arm64.config
https://android.googlesource.com/kernel/configs
commit 4dd5598f42b7 ("q: Recommend enabling architecture-optimized AES and SHA-256")

+CONFIG_RANDOMIZE_BASE=y

Change-Id: I22afcbc35a0b5ea5f9c3458a0f4e9817f41cd564
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-10-30 10:03:46 +08:00
Tao Huang
503fb3fc08 arm64: rockchip_defconfig: merge q/android-4.19/android-recommended.config
https://android.googlesource.com/kernel/configs
commit 94efd7a4ecb0 ("q: Recommend enabling ext4 and f2fs encryption support")

+CONFIG_PSI=y
+CONFIG_KPROBES=y
-CONFIG_KSM=y
+CONFIG_NET_SCH_NETEM=y
+CONFIG_DM_BOW=y
+CONFIG_EXT4_ENCRYPTION=y
+CONFIG_OVERLAY_FS=y

Change-Id: Ib45a224cc443c5836bc1883fe908b5cc5b76327e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-10-30 09:29:17 +08:00
Jianqun Xu
d88bd40057 arm64: dts: rockchip: rk3368 add more ip nodes to core dts
Add more ip nodes to rk3368 core dts file, such as iep, vop, ...

Change-Id: Ief8da75765bb84ebe038e9446c782aff3e3a6aed
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-10-30 09:14:28 +08:00
Sugar Zhang
a96df3beb9 arm64: dts: rockchip: rk3368: split i2s mclk from i2s-8ch-bus
Change-Id: I7cd8e67bc21ed3b35afb8835a270bc8f9f955aab
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 5e2f47bce0)
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-10-30 08:59:20 +08:00
Rocky Hao
092c617c77 arm64: dts: rockchip: update tsadc node for rk3368
add cpus' dynamic power coefficient and update alert temperature

Change-Id: I502e49d52268b63625e01103b50e6c18fb8da8b0
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
(cherry picked from commit 112fa9a922)
(cherry picked from commit 92f81f9d04)
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-10-30 08:59:20 +08:00
Chen Jinsen
19b08fd725 arm: configs: rockchip_defconfig: enable CONFIG_ION_SYSTEM_HEAP
Android 10 requires ion to allocate buffers for audio playback,
enable system heap by default to support it.

Change-Id: I20653e9377c86e4baed295f33a475e49a63f5082
Signed-off-by: Chen Jinsen <kevin.chen@rock-chips.com>
2019-10-30 08:48:19 +08:00
Tao Huang
6b920cb506 drivers/Kconfig: reorder rkflash and headset_observe
Same as 4.4

Change-Id: If0900b63e9dd81ac068670c00357d7b143a5f5a1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-10-30 08:45:55 +08:00
Shawn Lin
6234aa4bb3 mmc: core: Set clock after changing timing immediately for mmc_select_hs400es()
This's what mmc_select_hs400() or mmc_select_hs() did,
since mmc_set_clock() will let sdhci_arasan_set_clock()
update the PHY clock to match the timing, otherwise
the following mmc_switch_status() will be failed.

Change-Id: Ic1a0178ec209ec71d904f7212a84da6665904007
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2019-10-29 16:57:43 +08:00
Shawn Lin
c5d76c0167 mmc: core: don't check card status when flushing cache
It's meaningless to check the card's status which execute
the on-going flush. As the status been responded make no
any sense here.

Change-Id: I34197d1c93c01337dd2e68ec22e3ce8dd195c424
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2019-10-29 16:57:43 +08:00
Finley Xiao
8c07126830 PM / devfreq: rockchip_dmc: stop monitor only when enable auto-freq
This fix the warning:
WARNING: CPU: 1 PID: 1 at kernel/workqueue.c:2934 __flush_work+0x1f8/0x220
Modules linked in:
CPU: 1 PID: 1 Comm: init Not tainted 4.19.53 #303
Hardware name: Rockchip RK3399 EVB IND LPDDR4 Board edp (Android) (DT)
pstate: 00400005 (nzcv daif +PAN -UAO)
pc : __flush_work+0x1f8/0x220
lr : __cancel_work_timer+0x12c/0x1a8
sp : ffffff800804ba20
x29: ffffff800804ba20 x28: ffffffc0f1870000
x27: 0000000000000000 x26: ffffffc0f1870000
x25: ffffff800804bb30 x24: ffffff80094e8000
x23: ffffff80080d1910 x22: 0000000000000000
x21: ffffff800933d000 x20: ffffffc0f0777350
x19: ffffff80094e85b8 x18: ffffffffffffffff
x17: 0000000000000000 x16: 0000000000000001
x15: ffffff800933da88 x14: ffffff80894ecdf7
x13: ffffff80094ece05 x12: ffffff80094ed240
x11: ffffff800935e000 x10: 0000000000000000
x9 : ffffffc00a3a0180 x8 : 0000000000000004
x7 : 0000000002487900 x6 : 0000000000000001
x5 : 0000000000000001 x4 : 0000000000000800
x3 : ffffff800933da88 x2 : 0000000000000000
x1 : 0000000000000000 x0 : ffffffc0f0777350

Call trace:
 __flush_work+0x1f8/0x220
 __cancel_work_timer+0x12c/0x1a8
 cancel_delayed_work_sync+0x10/0x18
 devfreq_monitor_stop+0x10/0x18
 rockchip_dmcfreq_system_status_notifier+0x150/0x160
 notifier_call_chain+0x50/0x90
 __blocking_notifier_call_chain+0x50/0x78
 blocking_notifier_call_chain+0x14/0x20
 rockchip_set_system_status+0xb0/0xd0
 rockchip_monitor_reboot_notifier+0x10/0x20
 notifier_call_chain+0x50/0x90
 __blocking_notifier_call_chain+0x50/0x78
 blocking_notifier_call_chain+0x14/0x20
 kernel_restart_prepare+0x1c/0x40
 kernel_restart+0x14/0x78
 __se_sys_reboot+0x1cc/0x208
 __arm64_sys_reboot+0x18/0x20
 el0_svc_common+0xbc/0x188
 el0_svc_handler+0x2c/0x80
 el0_svc+0x8/0xc
---[ end trace 4548dcc701eee1b0 ]---

Change-Id: I479d0abdfcf6aa144036983c57b0878e104cd8e0
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-10-29 10:02:50 +08:00
Tao Huang
70f1413e90 Merge remote branch 'android-4.19' of https://android.googlesource.com/kernel/common
* android-4.19: (2854 commits)
  ANDROID: move up spin_unlock_bh() ahead of remove_proc_entry()
  BACKPORT: arm64: tags: Preserve tags for addresses translated via TTBR1
  UPSTREAM: arm64: memory: Implement __tag_set() as common function
  UPSTREAM: arm64/mm: fix variable 'tag' set but not used
  UPSTREAM: arm64: avoid clang warning about self-assignment
  ANDROID: sdcardfs: evict dentries on fscrypt key removal
  ANDROID: fscrypt: add key removal notifier chain
  ANDROID: refactor build.config files to remove duplication
  ANDROID: Move from clang r353983c to r365631c
  ANDROID: gki_defconfig: remove PWRSEQ_EMMC and PWRSEQ_SIMPLE
  ANDROID: unconditionally compile sig_ok in struct module
  Linux 4.19.80
  perf/hw_breakpoint: Fix arch_hw_breakpoint use-before-initialization
  PCI: vmd: Fix config addressing when using bus offsets
  x86/asm: Fix MWAITX C-state hint value
  hwmon: Fix HWMON_P_MIN_ALARM mask
  tracing: Get trace_array reference for available_tracers files
  ftrace: Get a reference counter for the trace_array on filter files
  tracing/hwlat: Don't ignore outer-loop duration when calculating max_latency
  tracing/hwlat: Report total time spent in all NMIs during the sample
  ...

Conflicts:
	drivers/clk/rockchip/clk-mmc-phase.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/regulator/core.c
	drivers/tty/serial/8250/8250_port.c
	drivers/usb/dwc3/core.h
	drivers/usb/dwc3/gadget.c
	drivers/usb/dwc3/gadget.h

Change-Id: I65599d770d6613caba14251b890fcfd1cfa0f100
2019-10-28 20:26:28 +08:00
David Wu
64d40c4000 pinctrl: rockchip: Add iomux recalculated for rk3328 GPIO2B0~GPIO2B6
The pins from GPIO2B0 to GPIO2B6 are located at GRF_GPIO2BL_IOMUX,
they are recalculated to get correct iomux.

Change-Id: I1e46697c4508c396b5e8140c32c4185925a040ea
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-10-28 18:24:36 +08:00
Jianqun Xu
37f7f42dec pinctrl: rockchip: add calculate slew rate for rk1808
Change-Id: Ia78e6ceda688942b655623d80fe4fe9fc1b349cc
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-10-28 18:24:36 +08:00
David Wu
6bfc507057 pinctrl: rockchip: Add slew rate support for px30
The usage of slew rate is needed to config it at DTS,
such as:
  fast speed: slew-rate = <1>;
  slew speed: slew-rate = <0>;

Change-Id: Iefa9c15a35c6c1e94f716f5d6dd7e30d20a7293f
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-10-28 18:24:36 +08:00
David Wu
74b11898ca pinctrl: rockchip: Disable GPIO_INTEN bit while gpio irq type setting
If the gpio IRQ type changes, it is possible to accidentally trigger
an interrupt, such as when the input is high, changed from level to
rise edge. For now, the best way to do this is to disable the INTEN
bit first, then configure the type to stagger this period of time.

Change-Id: I71351b9ed6f7920958c7451c2e51ab5f699875d1
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-10-28 18:24:36 +08:00
David Wu
c063b854bd pinctrl: rockchip: Add IOMUX_WRITABLE_32BIT flag for rk3288 gpio0 iomux
There are writable 32 bits for PMU_GPIO0's iomux, so add the
IOMUX_WRITABLE_32BIT to read iomux register at first, it would
not change others' bits.

Change-Id: I1fb27c60d5d26e5719b6911a78e7cdf144feba26
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-10-28 18:24:35 +08:00
David Wu
73c45e6cda PM / AVS: rockchip-io: add io selectors and supplies for rk3308
This adds the necessary data for handling io voltage domains on the rk3308.
As interesting tidbit, the rk3308 contains one iodomain area at grf,

Change-Id: Ife72a284a8926d02ef5df7a422d41924494d0300
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-10-28 18:24:14 +08:00