Commit Graph

1036 Commits

Author SHA1 Message Date
Mauro (mdrjr) Ribeiro
6122ff4d83 Merge tag 'v4.9.211' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
This is the 4.9.211 stable release
2020-04-07 21:24:11 -03:00
Martin Blumenstingl
1a087b517c dt-bindings: reset: meson8b: fix duplicate reset IDs
commit 4881873f4c upstream.

According to the public S805 datasheet the RESET2 register uses the
following bits for the PIC_DC, PSC and NAND reset lines:
- PIC_DC is at bit 3 (meaning: RESET_VD_RMEM + 3)
- PSC is at bit 4 (meaning: RESET_VD_RMEM + 4)
- NAND is at bit 5 (meaning: RESET_VD_RMEM + 4)

Update the reset IDs of these three reset lines so they don't conflict
with PIC_DC and map to the actual hardware reset lines.

Fixes: 79795e20a1 ("dt-bindings: reset: Add bindings for the Meson SoC Reset Controller")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-01-23 08:19:38 +01:00
Shuai Li
48f15a63db audio: mclk pad0 doesn't output clk [1/1]
PD#OTT-5603

Problem:
Configurate GPIO_AO 9 as mclk_0,it doesn't work.

Solution:
From SM1, the mclk pad register is changed.
Using standard clk tree to make it compitable.

Verify:
TM2, SM1.

Change-Id: I8d53296297536c90768495232570f33fc89db131
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2019-09-09 02:23:40 -07:00
Dezhi Kong
3b92eb4596 drm: add TL1 drm support [1/1]
PD#SWPL-7987

Problem:
TL1 DRM support

Solution:
add TL1 DRM support

Verify:
t962x2_x301

Change-Id: Ibc8ff641f42c0a416e80c3a420c1d808e0ad8b26
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2019-08-27 03:57:42 -07:00
Jian Hu
5c40910fae clk: tl1: add clk81 mux clock [1/1]
PD#SWPL-8215

Problem:
1.clk81 can not switch to 24M
2.fixed pll can set rate
  call clk_prepare_enable to open it
  call clk_disable_unprepare to close it

Solution:
1.add clk81 mux clock
2.change fixed pll callback Read only to R/W

Verify:
test passed on tm2 ab301

Change-Id: I426d4307f19647afcb0166a23c1988df1b504807
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2019-08-01 04:29:39 -07:00
Dezhi Kong
1f1efcfdd8 drm: add multi-layer support [1/1]
PD#SWPL-9646

Problem:
unsupport multi-layer

Solution:
add multi-layer support

Verify:
verify by w400 with modetest command

Change-Id: I5cd50761d2ab9cfff0f80d38e20455044c7a33fd
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2019-07-11 10:10:57 +08:00
Qianggui Song
5628d5825b ir: support rca ir protocol [1/1]
PD#SWPL-8050

Problem:
current driver does not support rca ir protocol

Solution:
add register setting and code for rca use REMOTE_RYPE_RCA to configure.

Verify:
G12b_W400 & tl1 x301

Change-Id: I76d860d66a43071803fb60debeafcbf18f42b283
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
2019-05-05 23:45:25 -07:00
Guosong Zhou
6542e8ab5d camera: add mipi csi driver for sm1 [1/1]
PD#SWPL-5388

Problem:
sm1 board camera need add mipi csi module

Solution:
add mipi csi module

Verify:
verified on SM1 AC200

Change-Id: I819f2f74aa8da7d725cb59e5636e790185964f79
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>
2019-04-18 05:07:44 -07:00
Zhe Wang
19e844f08a audio: TM2 audio basic function bringup [1/1]
PD#SWPL-6721

Problem:
TM2 bringup

Solution:
audio basic function bringup

Verify:
Verified on T962e2_ab311

Change-Id: Ic48ded3964ea87e40c4d683d71a50bbdc1975f91
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-04-11 15:42:33 +08:00
Jian Hu
a6d41b925b clk: tm2: add dsu clock [2/3]
PD#SWPL-6758

Problem:
tm2 dsu clock does not work

Solution:
1.add dsu clock
2.gp1 pll clock

Verify:
verify on tm2 ad311

Change-Id: I8090a75d15ae4e532f6ae04563d6d0158f8fbc87
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2019-04-11 13:34:12 +08:00
Jian Hu
7625b3d031 clk: meson-tm2: add new clocks [1/1]
PD#SWPL-5636

Problem:
pcie and several clk81 clocks are newly added in tm2 SoC

Solution:
add pcie and several clk81 clocks

Verify:
test passed on ptm

Change-Id: I8456d7fa8ffb6438e99d3f1cddee4a3ba846b933
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2019-04-11 11:58:41 +08:00
Qianggui Song
20fe541c42 pinctrl: support tm2 pinctrl [1/1]
PD#SWPL-5656

Problem:
tm2 need a static data pinctrl file to depict pins

Solution:
add relative codes to support tm2

Verify:
T962E2_ab319

Change-Id: I55206f9b3df6390e8821fd777d329ddf05dd8386
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
2019-04-11 10:58:02 +08:00
Shunzhou Jiang
e2fc8c6205 clk: sm1: add sm1 special clk [1/1]
PD#SWPL-5407

Problem:
not include sm1 special defined clk

Solution:
add this clk

Verify:
sm1_skt

Change-Id: Iaf20aebe377d077d95eb053f7eea99473e3ac45d
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2019-03-29 20:31:33 +08:00
Xing Wang
6626b47c65 dts: sm1: add sound card config [1/2]
PD#SWPL-6151

Problem:
sound card for sm1

Solution:
add sound card for sm1

Verify:
ac200

Change-Id: I1de0cfe1748d401ab0e21b0a244def37b277b1ff
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2019-03-29 20:12:13 +08:00
Shunzhou Jiang
5e89d07b8e clk: sm1: add clk driver [1/1]
PD#SWPL-5407

Problem:
sm1 not have clk driver

Solution:
add clk driver

Verify:
PxP

Change-Id: Id48257d88ef200fd4adb309bf2e4ada1be407753
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2019-03-29 04:46:49 -07:00
Qianggui Song
a63ed76413 ir: ir support both NEC and RC5 [1/1]
PD#SWPL-5555

Problem:
Current driver does not support both NEC and RC5

Solution:
Add a macro to depecit both NEC and RC5 state

Verify:
X301

Change-Id: I06894d033eabdb22db6e34fc2ad76e0390ef565f
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
2019-03-07 04:23:57 -08:00
Jiamin Ma
d2d85a3e0c license: add missing license header [1/1]
PD#SWPL-4728

Problem:
Missing license header

Solution:
Add correct license header

Verify:
Compling passed

Change-Id: I291a41172f9ecf2cde7f7705e99ecb20567c9c8f
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2019-02-20 00:11:20 -08:00
Jian Hu
6a2ad57c56 clk: g12a: add bt656 clock [1/1]
PD#SWPL-3359

Problem:
the bt656 clocks were missing

Solution:
1.add bt656 clocks
2.fix several errors for media clocks

Verify:
test passed on u200

Change-Id: Iff69e790c78335930d6b2ea54f7544aca464e1fb
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-12-27 21:47:21 -08:00
Qianggui Song
6c8aecf093 ir: add toshiba protocol support [1/1]
PD#SWPL-3543

Problem:
current driver does not support toshiba ir remote control protocol

Solution:
add register setting and decode code for toshiba protocol
use REMOTE_TYPE_TOSHIBA/REMOTE_TYPE_NEC_TOSHIBA to configure toshiba
only/toshiba and nec.

Verify:
tl1_t962x2_x301

Change-Id: Idad70c3879fad6e8267f0c4d80d2447c34114103
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
2018-12-25 03:14:28 -08:00
Jian Hu
4da9bae3a6 clk: g12a: add gen clock [1/1]
PD#OTT-1025

Problem:
not support gen clock

Solution:
add gen clock

Verify:
test passed on g12a u200

Change-Id: I5199289d3cd1483fffbbd41f8d104369214ba302
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-12-06 03:07:08 -08:00
Xing Wang
3710b197c9 audio: auge: fix drivers for tl1 [1/1]
PD#172587

Problem:
resample, eqdrc, dolby efuse, audio input (from atv, hdmirx)

Solution:
add drivers for them

Verify:
x301

Change-Id: I5187f9824d904283794f6e4be3dd9ce8463908e1
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-11-27 01:24:54 +08:00
Jian Hu
cf9676d4ff clk: tl1: bringup clock for tl1 [1/1]
PD#172587

Problem:
Bringup clock for tl1.

Solution:
Bringuup clock for tl1.
Cherrypick from bringup/amlogic-4.9/tl1-20181111

1. Add hdmirx meter clock
2. fix gp0 pll error
3. remove vpu_clk enable in clktree
4. add hdmi axi clock
5. fix tl1 mpll clk overflow issue
6. fix vapb clock error rate
7. add 1.404G and 1.5G cpu freqs for tl1

Verify:
TL1 T962X2 X301 & SKT

Change-Id: I73a9afca35f8a9ce26cc6f3a75a738525fc8d728
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-11-26 01:58:48 -08:00
Xing Wang
9c7a42844f audio: auge: add sound card support for tl1 [1/1]
PD#172587

Problem:
Bringup tl1 sound card.

Solution:
Add tl1 sound card.
Add external interface for audio input/output.

Verify:
Tested by PTM
Sound card is setup.
TDM and SPDIF internel loopback is ok

Change-Id: I60830ca44a62ee2a8e16343e91e7311152cab161
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-10-29 04:19:49 -07:00
Bo Yang
ae2e8e908a arm: dts: tl1: add initial device tree for tl1
PD#172587: arm: dts: tl1: add initial device tree for tl1

Change-Id: I17734ee00d88a84ff19bf17f8edf519e3ed2f0e4
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2018-09-28 02:51:18 -07:00
Xingyu Chen
821c9713cb pinctrl: txl: add pinctrl & gpio support for txl
PD#168480: pinctrl: txl: add pinctrl & gpio support for txl

Change-Id: I2496cdebfc283e90825f5dd7d20b0e16f57158d2
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2018-07-18 02:43:51 -07:00
Jian Hu
a53f89545d clk: txl: initial add clock driver
PD#168480: clk: txl: initial add clock driver

remove CLK_SET_RATE_PARENT flag for spicc.
If add CLK_SET_RATE_PARENT, it will change clk81 rate when set
spicc clock rate.

Change-Id: I80fec2c6d10611994ff40b06307e39b51ddb5a1a
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2018-07-18 02:32:38 -07:00
Shunzhou Jiang
5d4de95a06 clk: clock: add efuse clock for g12a
PD#168568: clock: add efuse clock

Change-Id: I4ef07515db93fd8bf7108bfbe622d0ce261ed2d6
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2018-07-10 18:39:11 -07:00
Jian Hu
ca3c135e30 clk: add gpio 12m and 24m for g12a/b
PD#165090: clk: add gpio 12m and 24m for g12a/b

Change-Id: I2a3e8ed2f318eb13375415939d6216b0f30103a3
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-06-29 00:36:30 -07:00
Qiufang Dai
70908b93bd clk: add media clk and fine-tune clkmsr table for g12b
PD#165090: add clock isp, mipi, vipnanoq, gate etc.
Fine-tune clkmsr table

Change-Id: I4b15996eccac439ce91ac51365411fca7c38f320
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-06-29 00:04:03 -07:00
Qiufang Dai
6c937ab673 clk: add sys1_pll/sys_pll for g12b
PD#165090: Add sys1_pll/sys_pll for g12b

These patch is compatible with g12a.

clk structur:

G12A: sys_pll(0xbd) ----> cpu_mux(0x67) ---> A53
G12B: sys1_pll(0xe0) ----> cpu_mux(0x67) ---> A53
      sys_pll(0xbd) ----> cpu_mux1(0x82) ---> A73

Change-Id: I67b508f216db6124885154ea09ccb4868834e772
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-06-28 23:54:17 -07:00
Qiufang Dai
f6739bf8ea clk: add g12b.c for g12b new clocks
PD#165090: add g12b.c for new clocks, include sys1_pll

Change-Id: If9234037eab5439cf1abfbcecc70c9f4eab6c954
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-06-28 23:44:40 -07:00
Qiufang Dai
0bc5df5436 clk: add sys1_pll for g12b
PD#165090: add sys1_pll for g12b

Change-Id: Icc1be3df1ca9ba2863ce49e0acf0be872e2dd411
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-06-28 23:34:39 -07:00
Victor Wan
324524de04 Merge branch 'android-4.9' into amlogic-4.9-dev 2018-05-22 10:48:42 +08:00
Victor Wan
810c6dd972 Merge branch 'android-4.9' into amlogic-4.9-dev
Signed-off-by: Victor Wan <victor.wan@amlogic.com>

Conflicts:
	arch/arm/configs/bcm2835_defconfig
	arch/arm/configs/sunxi_defconfig
	include/linux/cpufreq.h
	init/main.c
2018-04-24 17:43:19 +08:00
Sean Wang
e58d3bccad dt-bindings: clock: mediatek: add binding for fixed-factor clock axisel_d4
commit 55a5fcafe3 upstream.

Just add binding for a fixed-factor clock axisel_d4, which would be
referenced by PWM devices on MT7623 or MT2701 SoC.

Cc: stable@vger.kernel.org
Fixes: 1de9b21633 ("clk: mediatek: Add dt-bindings for MT2701 clocks")
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: devicetree@vger.kernel.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-04-24 09:34:14 +02:00
Xingyu Chen
3fcf2b78e4 pinctrl: keep the same GPIO ID after adding GPIOV_0 for G12A
PD#163124: pinctrl: keep the same GPIO ID after adding GPIOV_0 for G12A

Change-Id: I45b99df3a15e2bf0f7ad34ae8705dc4a509c70a1
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-03-27 04:22:54 -08:00
Xingyu Chen
0731af6113 pinctrl: add virtual GPIO "GPIOV_0" for g12a
PD#162992: pinctrl: add virtual GPIO "GPIOV_0" for g12a

The gpio is used to set the bit PERIPHS_PIN_MUX_2 BIT[17]. Please refer
the following method to use it.

1). set the PERIPHS_PIN_MUX_2 BIT[17] to <1>
mux_en {
	groups = "sdio_dummy";
	function = "sdio";
}

2). set the PERIPHS_PIN_MUX_2 BIT[17] to <0>
mux_dis {
	groups = "GPIOV_0";
	function = "gpio_periphs";
}

Change-Id: Ied0e6c71ed1ff8ab9a26cb76ec1508d83a4453d7
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-03-26 01:41:10 -08:00
Geert Uytterhoeven
dab825106b ARM: dts: r8a7794: Add DU1 clock to device tree
commit 1764f8081f upstream.

Add the missing module clock for the second channel of the display unit.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-03-22 09:17:44 +01:00
Laxman Dewangan
f29628b716 gpio: core: Decouple open drain/source flag with active low/high
PD#161621: gpio: core: Decouple open drain/source flag with active low/high

Currently, the GPIO interface is said to Open Drain if it is Single
Ended and active LOW. Similarly, it is said as Open Source if it is
Single Ended and active HIGH.

The active HIGH/LOW is used in the interface for setting the pin
state to HIGH or LOW when enabling/disabling the interface.

In Open Drain interface, pin is set to HIGH by putting pin in
high impedance and LOW by driving to the LOW.

In Open Source interface, pin is set to HIGH by driving pin to
HIGH and set to LOW by putting pin in high impedance.

With above, the Open Drain/Source is unrelated to the active LOW/HIGH
in interface. There is interface where the enable/disable of interface
is ether active LOW or HIGH but it is Open Drain type.

Hence decouple the Open Drain with Single Ended + Active LOW and
Open Source with Single Ended + Active HIGH.

Adding different flag for the Open Drain/Open Source which is valid
only when Single ended flag is enabled.

Note: the patch from v4.14-rc6 with original commit ID 4c0facddb

Change-Id: I2f652614d3783caee3f510dc70e5e185379f49a7
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-06 23:15:29 -08:00
pengcheng chen
b9144dde67 osd: add viu2 support for g12a
PD#156734: osd: add viu2 support for g12a

Change-Id: If225bdd08a0357960ca307ca7614131211b9aed1
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-03-05 19:34:14 -08:00
Jian Hu
6aaff51d03 arm64: dts: add i2c alias aliases node
PD#158433: arm64: dts: add i2c alias in aliases node

add alias for i2c controller to fasten i2c dev id

Change-Id: I87c1999766c69e9df63f551f0559b8028844d660
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-03-05 19:33:55 -08:00
Qiufang Dai
3642f1368b clock: G12A: add hevcf, spicc clock
PD#156734: add hevcf, spicc clock

Change-Id: Ibe63b44e61058255b3b72ef9efaded765e262b0a
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-05 15:34:27 +08:00
Qiufang Dai
8bbcb53bd6 clock: g12a: add emmc portA and aoclkc
PD#156734: add emmc portA and aoclkc

Change-Id: Ib54a6eb113bdce21eacc7a2d460df23ee9129e92
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 15:07:55 +08:00
Xing Wang
bee5db11b7 audio: auge: add sound driver for g12a
PD#156734: audio: auge: add sound driver for g12a

Change-Id: Ic2e9bf734ea33fbbf2911d0d9168934974f37b07
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-03-02 15:07:51 +08:00
Qiufang Dai
ecedcccc28 clock: G12A: new add decode, t_sensor clock & vclk2 clk tree
PD#156734: clock: G12A: new add decode, t_sensor clock & vclk2 clk tree

Change-Id: I1a76bb870ecb5793ae7b560472fd2c2aa3f3651f
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 15:07:50 +08:00
Jian Hu
4d21978ef5 i2c: meson-g12a: add i2c support [1/2]
PD#156734: i2c: meson-g12a: add i2c support

Change-Id: I10ac105b99f7a426e23fef501741a62d3b887985
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-03-02 14:52:28 +08:00
Xingyu Chen
294a05a220 pinctrl: add pinctrl&gpio support for g12a
PD#156734: pinctrl: add pinctrl&gpio support for g12a

the new pin feature (drive-strength) is first introduced in Meson
Series SoC [G12A]. we can refer the following example to use:
mux {
	groups = "uart_ao_tx_a", "uart_ao_rx_a";
	function = "uart_ao_a";

	drive-strength = <1>;
}

the value of drive-strength can be set to 0/1/2/3, the larger
the value, the faster the slew rate.

Change-Id: I22c6967aa1d5de1b3f6acb84cb18a79b05c0403b
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-03-02 14:52:26 +08:00
Qiufang Dai
8b5ae71fdf clock: clock tree for G12A
PD#156734: base clock tree for G12A,
include clk81, ee gate, sdemmc clock, fix/hifi/syspll/pcie plls, mpll, clkmsr

Change-Id: I9fe7c1d64d9db5d384070f5dcefdc69f5f60dbd2
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 14:52:26 +08:00
Qiufang Dai
ad6c0e42a2 G12A: initial clk headfile for pxp
PD#156734: G12A: initial clk headfile for pxp

Change-Id: I82b549cea704d9d1b94b36dfb27eaf5547bcf172
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 14:52:25 +08:00
Victor Wan
2c95ea743b Merge branch 'android-4.9' into amlogic-4.9-dev
Conflicts:
	arch/arm/configs/omap2plus_defconfig
	drivers/Makefile
	drivers/android/binder.c
2018-01-08 18:44:19 +08:00