diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts index e2e68c014e4a..945d4fb5b223 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts @@ -1150,8 +1150,8 @@ * 4: pdmin; */ datain_src = <4>; - datain_chnum = <8>; - datain_chmask = <0x7f>; + datain_chnum = <4>; + datain_chmask = <0x3>; /* tdmin_lb src * 0: tdmoutA @@ -1167,7 +1167,7 @@ datalb_chnum = <2>; /*config which data pin as loopback*/ /*datalb-lane-mask-in = <0 0 0 1>;*/ - datalb_chmask = <0x1>; + datalb_chmask = <0x3>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts b/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts index 90e16bf91051..80262564dac6 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts @@ -971,8 +971,8 @@ * 4: pdmin; */ datain_src = <4>; - datain_chnum = <8>; - datain_chmask = <0x7f>; + datain_chnum = <4>; + datain_chmask = <0x3>; /* tdmin_lb src * 0: tdmoutA @@ -988,7 +988,7 @@ datalb_chnum = <2>; /*config which data pin as loopback*/ /*datalb-lane-mask-in = <0 1>;*/ - datalb_chmask = <0x1>; + datalb_chmask = <0x3>; status = "okay"; }; diff --git a/drivers/amlogic/ledring/aml-is31fl32xx.c b/drivers/amlogic/ledring/aml-is31fl32xx.c index 8badc17f6aca..f21127f07d9e 100644 --- a/drivers/amlogic/ledring/aml-is31fl32xx.c +++ b/drivers/amlogic/ledring/aml-is31fl32xx.c @@ -831,7 +831,7 @@ static const struct dev_pm_ops is31fl32xx_pm = { static struct i2c_driver is31fl32xx_driver = { .driver = { - .name = "is31fl32xx", + .name = "is31fl32xx,aml", .owner = THIS_MODULE, .of_match_table = of_is31fl32xx_match, .pm = &is31fl32xx_pm,