From 596a196d05739741b2843d8b3b64b275a6aba8c8 Mon Sep 17 00:00:00 2001 From: Yi Zhou Date: Mon, 18 Mar 2019 16:53:42 +0800 Subject: [PATCH] dv: dv bringup for sm1 [1/1] PD#SWPL-5408 Problem: dv bringup for sm1 Solution: dv bringup for sm1, add chip id Verify: sm1 ptm Change-Id: Ifbf175cb5c495949f5e4bd02b98690f08239a735 Signed-off-by: Yi Zhou --- arch/arm/boot/dts/amlogic/sm1_pxp.dts | 2 +- arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts | 2 +- arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts | 2 +- arch/arm64/boot/dts/amlogic/sm1_pxp.dts | 2 +- arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts | 2 +- arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts | 2 +- .../amlogic/media/enhancement/amdolby_vision/amdolby_vision.c | 4 ++++ 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/sm1_pxp.dts b/arch/arm/boot/dts/amlogic/sm1_pxp.dts index 3aeb950847b1..2a9a9293109b 100644 --- a/arch/arm/boot/dts/amlogic/sm1_pxp.dts +++ b/arch/arm/boot/dts/amlogic/sm1_pxp.dts @@ -237,7 +237,7 @@ tx_op_color_primary = <0>; }; amdolby_vision { - compatible = "amlogic, dolby_vision_g12a"; + compatible = "amlogic, dolby_vision_sm1"; dev_name = "aml_amdolby_vision_driver"; status = "okay"; tv_mode = <0>;/*1:enabel ;0:disable*/ diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts index fede40d59590..3c7b68863737 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -513,7 +513,7 @@ }; amdolby_vision { - compatible = "amlogic, dolby_vision_g12a"; + compatible = "amlogic, dolby_vision_sm1"; dev_name = "aml_amdolby_vision_driver"; status = "okay"; tv_mode = <0>;/*1:enabel ;0:disable*/ diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts index efc1009eca9e..1c32cc855e5f 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts @@ -513,7 +513,7 @@ }; amdolby_vision { - compatible = "amlogic, dolby_vision_g12a"; + compatible = "amlogic, dolby_vision_sm1"; dev_name = "aml_amdolby_vision_driver"; status = "okay"; tv_mode = <0>;/*1:enabel ;0:disable*/ diff --git a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts index ab80a59aec2a..727d2031e884 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts @@ -238,7 +238,7 @@ tx_op_color_primary = <0>; }; amdolby_vision { - compatible = "amlogic, dolby_vision_g12a"; + compatible = "amlogic, dolby_vision_sm1"; dev_name = "aml_amdolby_vision_driver"; status = "okay"; tv_mode = <0>;/*1:enabel ;0:disable*/ diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts index 951fb0584935..bfe3669aa5f3 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -511,7 +511,7 @@ }; amdolby_vision { - compatible = "amlogic, dolby_vision_g12a"; + compatible = "amlogic, dolby_vision_sm1"; dev_name = "aml_amdolby_vision_driver"; status = "okay"; tv_mode = <0>;/*1:enabel ;0:disable*/ diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts index 3f934807aa0c..872403d91df9 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts @@ -511,7 +511,7 @@ }; amdolby_vision { - compatible = "amlogic, dolby_vision_g12a"; + compatible = "amlogic, dolby_vision_sm1"; dev_name = "aml_amdolby_vision_driver"; status = "okay"; tv_mode = <0>;/*1:enabel ;0:disable*/ diff --git a/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c b/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c index fb51c0682f21..d578896b2020 100644 --- a/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c +++ b/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c @@ -6645,6 +6645,10 @@ static const struct of_device_id amlogic_dolby_vision_match[] = { .compatible = "amlogic, dolby_vision_g12b", .data = &dolby_vision_g12, }, + { + .compatible = "amlogic, dolby_vision_sm1", + .data = &dolby_vision_g12, + }, {}, };