Commit Graph

1056211 Commits

Author SHA1 Message Date
Elaine Zhang
9804ea0266 clk: rockchip: rk3228: fix up the description error
Change-Id: I439314c590a7144fab6e33d1fb4f325530669842
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-18 20:33:36 +08:00
Elaine Zhang
43ee3bb5a0 clk: rockchip: rk3228: Perfect clock description
1 Add some necessary clk ID.
2 some clks add CLK_IGNORE_UNUSED flag
3 add some critical clk

Change-Id: If52699b4d5f430413b06084b7d21fb1afd4539dd
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-18 20:33:36 +08:00
Elaine Zhang
c86aa0a6b3 clk: rockchip: rk3368: use COMPOSITE_DCLK for dclk_vop
Change-Id: I45ce9a2e404acb7eae885fbca0b4703ec67176e9
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-18 20:33:36 +08:00
Elaine Zhang
2145f9dccb clk: rockchip: rk3368: mark the aclk_dmac_bus as critical clk
crypto and dmac share the same noc clk,
so mark the aclk_dmac_bus as critical clk.

Change-Id: Ib0b70bbed3fdefeab7b6f2b5f88350a416e66787
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-18 20:33:36 +08:00
Elaine Zhang
781056b84d clk: rockchip: rk3368: set clk parent npll to dummy_npll
npll is just for dclk_vop, others clk not allowed to set npll as parent.

Change-Id: I11e1770acab5486acaebafd56a0c57847f7f533c
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-18 20:33:36 +08:00
Elaine Zhang
e2def67cb9 clk: rockchip: rk3368: fix NPLL with NB parameter types RK3066_PLL_RATE_NB
with the NB parameter,can adjust the jitter of the output PLL.
make the npll jitter is better,make it more suitable for DCLK display.

Change-Id: I9d819bdc2b520205a7d63ee8ed83643601ccc821
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-18 20:33:36 +08:00
Elaine Zhang
b1d64bdb31 clk: rockchip: rk3368: add aclk_cci_pre ID
Change-Id: I855e79023a9e244c2db37af88a075a4ef4c36aec
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-18 20:33:36 +08:00
Elaine Zhang
e7ebb13742 clk: rockchip: rk3368: add CLK_SET_RATE_PARENT flag for dclk_vop
dclk_vop only allowed on NPLL.

Change-Id: I5325a530d3052de1e8685c39b90357291f0f4fb3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-18 20:33:36 +08:00
Elaine Zhang
a3ddb728c4 clk: rockchip: rk3368: add CLK_IGNORE_UNUSED flag for mcu clk
Change-Id: I27856c9523ac3bffd4b509f016a659a1e3094b41
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-18 20:33:35 +08:00
Elaine Zhang
8ac4c812c2 arm64: dts: rockchip: rk3399: set dummy_cpll and dummy_vpll as fixed clk
to fix up :
[    0.000000] clk: couldn't get clock 4 for /clock-controller@ff760000
[    0.000000] rockchip_clk_of_add_provider: could not register clk provider
The cause of the error:
struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id,
			     const char *con_id, bool with_orphans)
{
	/* This is to allow this function to be chained to others */
	if (!hw || IS_ERR(hw))
		return (struct clk *) hw;

	if (hw->core->orphan && !with_orphans)
		return ERR_PTR(-EPROBE_DEFER);

	return clk_hw_create_clk(hw, dev_id, con_id);
}
if clk is orphan and not have the with_orphans flag, it will
register clk provider failed.

Change-Id: I87ca9ec087611a5425545bfc857b09d8438218b5
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-18 20:33:35 +08:00
Jianqun Xu
14afd34332 arm64: dts: rockchip: add reboot-mode node for rk3399
Rockchip RK3399 SoCs support reboot with modes, such as recovery mode,
loader mode and normal mode.

Change-Id: I96ed872f849c2b3b06d236248995db18be070960
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-05-18 11:00:49 +08:00
Tao Huang
b07446675b arm64: rockchip_defconfig: Disable DVB/TV/Radio media drivers
According to gki commit 13c6a5e993 ("ANDROID: Re-enable menus
hidden by disabling MEDIA_SUPPORT_FILTER").

-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT
-CONFIG_MEDIA_RADIO_SUPPORT
-CONFIG_MEDIA_SDR_SUPPORT
-CONFIG_MEDIA_TEST_SUPPORT

Change-Id: Id001fbc110e165e63249fc597f0681c3ce44ea2d
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-05-17 15:16:29 +08:00
Tao Huang
2220c3f613 mfd: rk808: Call rk808_i2c_driver_init() early when CONFIG_ROCKCHIP_THUNDER_BOOT=y
Change-Id: I03947c16b7a31579a1bce54ea1ce114541432b2f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-17 14:49:07 +08:00
Tao Huang
3a8467548d regulator: rk808: Call rk808_regulator_driver_init() early when CONFIG_ROCKCHIP_THUNDER_BOOT=y
Change-Id: Iae4d3bf9bc24c1be3789b261fcec3bace5f122c3
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-17 14:22:42 +08:00
Tao Huang
451b327661 soc: rockchip: Add ROCKCHIP_THUNDER_BOOT config
This option make the kernel boot faster.
Default n.

Change-Id: I918523621044e16953d5611ef9b0f2773746dae9
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-05-17 14:16:00 +08:00
Shawn Lin
855b2834d4 mmc: dw_mmc: Fix thunder boot support
Migrate to use new properties.

Fixes: af02b05e59 ("mmc: add thunder boot support")
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I26e1c5b65a994522fdfd5cbc54ed17909bbaa95f
2021-05-17 14:14:43 +08:00
Elaine Zhang
c44e5e04a4 rtc: rtc-rk808: use flag to distinguish chip differences
RK808\RK818 have November 31st,Other chips fixed the problem.

Fixes: f076ef44a4 ("rtc: rk808: Compensate for Rockchip calendar
deviation on November 31st")
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I8977a14abcc3973728b5941951d17d493b3955d4
2021-05-14 17:36:53 +08:00
shengfei Xu
b3eba31466 rtc: rk808: check the rtc is available
Change-Id: I383c08cd5ad7cb282c0ec0aa12e9e84c9df52ba3
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-14 17:36:25 +08:00
shengfei Xu
fd1a4a6389 regulator: rk809 & rk817: correct enable/disable for runtime
Change-Id: I4b4b29c6f31b3c877a3d74d791e14879620c6ff3
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-14 15:48:06 +08:00
Joseph Chen
6902a2c176 regulator: rk808: optimise/fix for rk805/816
RK805:
- correct enable/disable for suspend and runtime;
- add individual ramp delay set;
- add of_map_mode definition;
- buck4 has 2 line range group;

RK816:
- clean code;

Other: Add set/get mode for BUCKs.

Change-Id: Ife49259cc57c47fa54d078041724a69a42b0faae
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-14 15:45:12 +08:00
Elaine Zhang
9e18438aa3 regulator: rk808: fix up the set voltage overshoot of Buck1/2
modify the rk808 max steps for increase voltage of Buck1/2,
equal 25mv.

Change-Id: Ic6c016e99ce67f5773d5f5df0b65fa1de10f557a
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-14 15:44:43 +08:00
Elaine Zhang
00ee69d479 mfd: rk808: add rk816 support
include sub modules: regulator, rtc, gpio, pwrkey

Change-Id: I5efedb2abe2be5335c467aaa91955cb7b9f56cfb
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-14 15:41:35 +08:00
shengfei Xu
0276e9624b clk: rockchip: rk3218: add rkclk_cpuclk_div_setting
fix up the RK816 setting voltage drop make the system crash.
Before adjusting voltage, increase clk_cpu div and reduce CPU frequency
Only support for RK312x chips.

Change-Id: Id327da9590f7d9d383450e79acd1b309e05cd024
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2021-05-14 15:40:15 +08:00
Yifeng Zhao
78a35286b8 soc: rockchip: vendor storage: make modules support
This submit supports to compile vendor storage into a module.

Change-Id: Id88bbee6ff44a75b2aa163a669098d410afaa921
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2021-05-14 15:18:06 +08:00
Huibin Hong
81cbaaf3f4 Bluetooth: hci_ldisc: fix race between open, close and send data
Fix the bug below, it may be reproduced after open and close bt about 7000 times:

<1>[73036.938137] Unable to handle kernel NULL pointer dereference at virtual address 0000001c
<1>[73036.939316] pgd = ffffff800886d000
<1>[73036.939627] [0000001c] *pgd=000000000fffe003, *pud=000000000fffe003, *pmd=0000000000000000
<0>[73036.940396] Internal error: Oops: 96000006 [#1] PREEMPT SMP
<4>[73036.940899] Modules linked in:
<4>[73036.941193] CPU: 2 PID: 2989 Comm: kworker/2:2 Not tainted 4.4.138 #3
<4>[73036.942409] Workqueue: events hci_uart_write_work
<4>[73036.942836] task: ffffffc00d688ac0 task.stack: ffffffc00b184000
<4>[73036.943365] PC is at _raw_spin_lock_irqsave+0x1c/0x50
<4>[73036.943815] LR is at skb_dequeue+0x20/0x74
<4>[73036.944185] pc : [<ffffff8008576398>] lr : [<ffffff800840f9a4>] pstate: 800001c5
<4>[73036.944832] sp : ffffffc00b187d00
<4>[73036.945127] x29: ffffffc00b187d00 x28: 0000000000000000
<4>[73036.945620] x27: 0000000000000000 x26: 0000000000000000
<4>[73036.946114] x25: ffffffc00e1280e0 x24: ffffffc00038d000
<4>[73036.946606] x23: ffffffc00e1271f8 x22: ffffffc00e127f00
<4>[73036.947099] x21: 000000000000001c x20: 0000000000000008
<4>[73036.947592] x19: 0000000000000000 x18: 0000000000000000
<4>[73036.948086] x17: 0000007fade08530 x16: ffffff80080e308c
<4>[73036.948579] x15: 0000000000000000 x14: 65736f6c63207568
<4>[73036.949073] x13: 205d303537373339 x12: 2e36333033375b0a
<4>[73036.949566] x11: 3220746e63666572 x10: 00000000000006f0
<4>[73036.950060] x9 : ffffffc00b187d30 x8 : ffffffc00d689210
<4>[73036.950553] x7 : 0000000000002d31 x6 : 0000000000000400
<4>[73036.951046] x5 : 0000000000113d82 x4 : 0000000000002f32
<4>[73036.951539] x3 : 0000000000000140 x2 : ffffffc00d688ac0
<4>[73036.952032] x1 : 0000000000000001 x0 : 000000000000001c
<4>[73037.068289] [<ffffff8008576398>] _raw_spin_lock_irqsave+0x1c/0x50
<4>[73037.068858] [<ffffff8008377094>] h4_dequeue+0x14/0x1c
<4>[73037.069335] [<ffffff8008376924>] hci_uart_write_work+0x50/0x12c
<4>[73037.069893] [<ffffff80080abbc8>] process_one_work+0x1b0/0x294
<4>[73037.070426] [<ffffff80080ac920>] worker_thread+0x2d8/0x398
<4>[73037.070935] [<ffffff80080b0f28>] kthread+0xc8/0xd8
<4>[73037.071388] [<ffffff8008082e80>] ret_from_fork+0x10/0x50

	thread0               		thread1
	   |				   |
	hci_uart_tty_close		hci_uart_write_work
	   |				   |
	h4_close			h4_dequeue
	   |				   |
	free (h4_struct) h4		   |
	   |             _raw_spin_lock_irqsave access h4 null pointer

Change-Id: I61d8ad5fb4c9349e0a304d2e87332681240f22e2
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2021-05-12 17:10:00 +08:00
Joseph Chen
a4f43f5dbf mfd: rk808: add sysfs debug node "/sys/rk8xx/rk8xx_dbg"
Change-Id: I197dc97b7337414a7d52426da0e0cb8c7480c917
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 15:05:19 +08:00
Elaine Zhang
d23601e505 mfd: rk808: close rtc int when power off
Change-Id: I1f1bfe3d6c106632c45b51bec3c18361572df865
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 14:18:10 +08:00
Elaine Zhang
efd02ec172 mfd: rk808: update pre_init_reg for rk805/rk818
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I1bd9c99a544b4fbda23efc7b5540985048ca2f89
2021-05-12 14:18:10 +08:00
shengfei Xu
25fdb7ec91 mfd: rk808: modify the sequence of the sleep pin function and polarity
The sequence of operations is as follows:
1. disable the sleep pin function
2. modify the sleep pin polarity
3. delay 3 32k clock cycle
4. select the sleep pin function

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: If6df2b2f190951abe9bb31fbd18d9af47e145038
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 14:18:10 +08:00
shengfei Xu
f26962f3fb mfd: rk808: update rk817 volatile reg range
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ifeb89255a2e98d4d2af92b83726017c2f75ebc92
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 14:18:10 +08:00
Joseph Chen
f7bff6ccb3 mfd: rk808: add rk818 suspend/resume registers setting
set 3.4v interrupt signal assert when suspend, set 3.0v shutdown
signal assert when resume.

Change-Id: Id15b721bbdc9665a18cf9946b92c435a23f1666c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 14:18:10 +08:00
shengfei Xu
b2df070509 mfd: rk808: use REGCACHE_RBTREE cache_type for rk817/809
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I83d6f5f3db906b74760fd32a1c072ac9e4fb956f
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 14:18:10 +08:00
Joseph Chen
5a363f34b8 pinctrl: rk805: add rk816 support
RK816 has 1 pin to be used as GPIO or TS function.
When used as GPIO function, the pin can be output or input.

Change-Id: I8607595826ac3125dfa2a4c7c483be6b084204c2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 14:18:10 +08:00
Joseph Chen
e3e0d9035f mfd: rk808: remove rk805 buck1~4 initial setting
This setting will be added by ddr binary when necessary to
handle the high temperature-voltage issue on BUCK3.

Change-Id: Ief7d4954e459317ae571400496c4c5ef74f664af
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 14:18:10 +08:00
Joseph Chen
501f6ea1f5 mfd: rk808: add on/off source dump
Show the reason of this power on and last shutdown.

Change-Id: Id540433065859a0c3f4817ed66e295b7c6dfccb5
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 14:18:10 +08:00
Joseph Chen
3bb76af1a8 mfd: rk808: update rk818 volatile reg range
The registers relative with fuel gauge must be volatile.

Change-Id: I8e942e8f15f66dabf24ede48b81857947575fa23
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 14:18:09 +08:00
Tony Xie
a921d23418 mfd: rk808: Set only resetting pmic register for 817&809.
If the system needs hold register values when system will reboot.
need to set only resetting pmic register for 817&809 forcedly.

When system restart, there are two rst actions of PMIC sleep if
board hardware support:

- 0b'00: reset the PMIC itself completely.
- 0b'01: reset the 'RST' related register only.

In the case of 0b'00, PMIC reset itself which triggers SoC NPOR-reset
at the same time, so the command: reboot load/bootload/recovery, etc
is not effect any more.

We add a cmd list to check if this reboot cmd is what we expect for 0b'01.

Change-Id: Ib4b850c86ec3079cd7e374bc96460ee1532854a2
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 14:18:09 +08:00
Tony Xie
2dc862f592 pinctrl: support pinctrl driver for the RK817&RK809 PMIC
Change-Id: I9a24ee0d9266a000d582f8ffff8b0c872e3a0769
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 12:19:25 +08:00
Shengfei Xu
d061e5ed5b mfd: rk808: replace power key driver for rk805/rk809/rk817
remove the rk8xx-pwrkey.c file, it's function is same as rk805-pwerkey.c.

Change-Id: Ie8a0559c3a105ec9806f170d0c4d32c2691558c6
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 11:58:44 +08:00
Shunhua Lan
d66acca4b6 mfd: rk808: add rk817-codec cell
Change-Id: Ieea7bbeb01b5230e40285819e29f9be6e39cf8ec
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-12 11:58:44 +08:00
Elaine Zhang
262a88a9db regulator: rockchip: lp8752: support lp8752 regulator
updata lp8752 driver.
add devicetree bindings for lp8752.

Change-Id: I21cdbde985d4663862b56c28429c41d9d3c38c36
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-05-11 17:27:34 +08:00
Zain Wang
d08a978984 regulator: mp8865: add regulator driver for MP8865
Change-Id: I5fa8423e5d1e301a008dcdfd60f93c442f6211a8
Signed-off-by: Zain Wang <wzz@rock-chips.com>
2021-05-11 17:22:16 +08:00
Tao Huang
00ff4411ab arm64: rockchip_defconfig: Enable CONFIG_LEDS_TRIGGER_HEARTBEAT
RK3566 EVB use this feature.

Change-Id: I04796360365cf5e06952df5f00e4c7eb8493ea91
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-05-11 16:53:40 +08:00
Andy Yan
7b79b2a308 drm/rockchip: remove MEDIA_BUS_FMT_RGB666_1X7X3_JEIDA
This format is a definition from rockchip rk61x/rk62x
lvds, and has no application scenarios so far.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ifb139eaf35d5e83fa96579b1dfcf3762556a77a1
2021-05-11 11:54:37 +08:00
Andy Yan
cede6d9291 drm/rockchip: include drm_plane.h for rockchip_drm_vop.h
Fix the follow compile error:
In file included from drivers/gpu/drm/rockchip/rockchip_vop2_reg.c:10:
drivers/gpu/drm/rockchip/rockchip_drm_vop.h:196:22: error: field has
incomplete type 'enum drm_plane_type'
        enum drm_plane_type type;
                            ^
drivers/gpu/drm/rockchip/rockchip_drm_vop.h:196:7: note: forward
declaration of 'enum drm_plane_type'
        enum drm_plane_type type;

This is due to the remove of drmP.h:
commit 4e98f871bc ("drm: delete drmP.h + drm_os_linux.h")

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ic7d1d58d5d4c9c032067c7686c76cef41a92a5d2
2021-05-11 10:25:06 +08:00
Jianqun Xu
fd0a8bdb75 pinctrl: rockchip: remove gpiochip related codes
Remove gpiochip related codes from pinctrl driver, but populate gpio
platform devices from device tree data.

Change-Id: I347acaac2998a972e4c3be5c8827f77f468a7ad2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-05-10 18:00:36 +08:00
Jianqun Xu
2a120a1f7d gpio: add gpio-rockchip driver
This gpio driver codes mostly are copied from pinctrl-rockchip.c with
module fixes. Also it supports the old dt nodes.

Change-Id: I7f26b5fe0827c16e2146a40e035a81de74284191
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-05-10 18:00:30 +08:00
Tao Huang
30d770b62f soc: rockchip: Add NO_GKI config
Add a Kconfig flag to differentiate between a GKI and an Non GKI build.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib0c57f7579f2cec06288ac9e063548c6395bf44c
2021-05-10 14:46:11 +08:00
Jianqun Xu
130424767e UPSTREAM: pinctrl: rockchip: do coding style for mux route struct
The mux route tables take many lines for each SoC, and it will be more
instances for newly SoC, that makes the file size increase larger.

This patch only do coding style for mux route struct, by adding a new
definition and replace the structs by script which supplied by
huangtao@rock-chips.com

sed -i -e "
/static struct rockchip_mux_route_data /bcheck
b
:append-next-line
N
:check
/^[^;]*$/bappend-next-line
s/[[:blank:]]*.bank_num = \([[:digit:]]*,\)\n/\tRK_MUXROUTE_SAME(\1/g
s/[[:blank:]]*.pin =[[:blank:]]*0,\n/ RK_PA0,/g
s/[[:blank:]]*.pin =[[:blank:]]*1,\n/ RK_PA1,/g
s/[[:blank:]]*.pin =[[:blank:]]*2,\n/ RK_PA2,/g
s/[[:blank:]]*.pin =[[:blank:]]*3,\n/ RK_PA3,/g
s/[[:blank:]]*.pin =[[:blank:]]*4,\n/ RK_PA4,/g
s/[[:blank:]]*.pin =[[:blank:]]*5,\n/ RK_PA5,/g
s/[[:blank:]]*.pin =[[:blank:]]*6,\n/ RK_PA6,/g
s/[[:blank:]]*.pin =[[:blank:]]*7,\n/ RK_PA7,/g
s/[[:blank:]]*.pin =[[:blank:]]*8,\n/ RK_PB0,/g
s/[[:blank:]]*.pin =[[:blank:]]*9,\n/ RK_PB1,/g
s/[[:blank:]]*.pin =[[:blank:]]*10,\n/ RK_PB2,/g
s/[[:blank:]]*.pin =[[:blank:]]*11,\n/ RK_PB3,/g
s/[[:blank:]]*.pin =[[:blank:]]*12,\n/ RK_PB4,/g
s/[[:blank:]]*.pin =[[:blank:]]*13,\n/ RK_PB5,/g
s/[[:blank:]]*.pin =[[:blank:]]*14,\n/ RK_PB6,/g
s/[[:blank:]]*.pin =[[:blank:]]*15,\n/ RK_PB7,/g
s/[[:blank:]]*.pin =[[:blank:]]*16,\n/ RK_PC0,/g
s/[[:blank:]]*.pin =[[:blank:]]*17,\n/ RK_PC1,/g
s/[[:blank:]]*.pin =[[:blank:]]*18,\n/ RK_PC2,/g
s/[[:blank:]]*.pin =[[:blank:]]*19,\n/ RK_PC3,/g
s/[[:blank:]]*.pin =[[:blank:]]*20,\n/ RK_PC4,/g
s/[[:blank:]]*.pin =[[:blank:]]*21,\n/ RK_PC5,/g
s/[[:blank:]]*.pin =[[:blank:]]*22,\n/ RK_PC6,/g
s/[[:blank:]]*.pin =[[:blank:]]*23,\n/ RK_PC7,/g
s/[[:blank:]]*.pin =[[:blank:]]*24,\n/ RK_PD0,/g
s/[[:blank:]]*.pin =[[:blank:]]*25,\n/ RK_PD1,/g
s/[[:blank:]]*.pin =[[:blank:]]*26,\n/ RK_PD2,/g
s/[[:blank:]]*.pin =[[:blank:]]*27,\n/ RK_PD3,/g
s/[[:blank:]]*.pin =[[:blank:]]*28,\n/ RK_PD4,/g
s/[[:blank:]]*.pin =[[:blank:]]*29,\n/ RK_PD5,/g
s/[[:blank:]]*.pin =[[:blank:]]*30,\n/ RK_PD6,/g
s/[[:blank:]]*.pin =[[:blank:]]*31,\n/ RK_PD7,/g
s/[[:blank:]]*.func = \([[:digit:]]*,\)\n/ \1/g
s/[[:blank:]]*.route_location =[[:blank:]]*\([[:print:]]*,\)\n//g
s/[[:blank:]]*.route_offset = \(0x[[:xdigit:]]*,\)\n/ \1/g
s/[[:blank:]]*.route_val =[[:blank:]]*\([[:print:]]*\),\n/ \1),/g
s/\t{\n//g
s/\t}, {\n//g
s/\t},//g
s/[[:blank:]]*\(\/\*[[:print:]]*\*\/\)\n[[:blank:]]*RK_MUXROUTE_SAME(\([[:print:]]*\)),\n/\tRK_MUXROUTE_SAME(\2), \1\n/g
s/[[:blank:]]*\(\/\*[[:print:]]*\*\/\)\n[[:blank:]]*RK_MUXROUTE_SAME(\([[:print:]]*\)),/\tRK_MUXROUTE_SAME(\2), \1\n/g
" drivers/pinctrl/pinctrl-rockchip.c

Change-Id: I13e11b67026c4e689cee567976c251bc92000a0d
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Link: https://lore.kernel.org/r/20210420091240.1246429-1-jay.xu@rock-chips.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit fe202ea8e5)
2021-05-10 14:13:52 +08:00
Liu, Changcheng
26004d2275 UPSTREAM: dts: remove cris & metag dts hard link file
arch cris & metag have been removed from supported archs.
The dts hard link files should also be removed, or the ctags
tool will give warning.

execute"ctags -R" or "gtags", output:
ctags: Warning: cannot open source file
"scripts/dtc/include-prefixes/cris" : No such file or directory
ctags: Warning: cannot open source file
"scripts/dtc/include-prefixes/metag" : No such file or directory

This patch was override by commit 9820464afd ("UPSTREAM:
devicetree: Move include prefixes from arch to separate
directory"), so apply it again.

Change-Id: I002617cde3f879bc8364f55502839b3c3cd2dd92
Signed-off-by: Liu Changcheng <changcheng.liu@intel.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
(cherry picked from commit 8d14f31ec9)
2021-05-08 20:58:44 +08:00