diff mbox series

[12/13] arm: dts: s5pv210: Correct FIMC definitions

Message ID BN6PR04MB0660823C87DE000BCDF36C3AA3AE0@BN6PR04MB0660.namprd04.prod.outlook.com (mailing list archive)
State New, archived
Headers show
Series [01/13] arm: dts: s5pv210: Add helper define for sleep gpio config | expand

Commit Message

Jonathan Bakker April 26, 2020, 6:36 p.m. UTC
The extended mainscaler is only available on FIMC1 and there
are minimum pixel alignments that differ from the default.
Additionally, the cam-if interface is available on all three
while FIMC2 has no rotators.  The lcd-wb interface is supported
on FIMC1.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
 arch/arm/boot/dts/s5pv210.dtsi | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Comments

Krzysztof Kozlowski April 28, 2020, 10:32 a.m. UTC | #1
On Sun, Apr 26, 2020 at 11:36:03AM -0700, Jonathan Bakker wrote:
> The extended mainscaler is only available on FIMC1 and there
> are minimum pixel alignments that differ from the default.
> Additionally, the cam-if interface is available on all three
> while FIMC2 has no rotators.  The lcd-wb interface is supported
> on FIMC1.
> 
> Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
> ---
>  arch/arm/boot/dts/s5pv210.dtsi | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
> index b3b6ad2889f9..3cbf6c05f42a 100644
> --- a/arch/arm/boot/dts/s5pv210.dtsi
> +++ b/arch/arm/boot/dts/s5pv210.dtsi
> @@ -626,7 +626,7 @@
>  				clock-names = "fimc",
>  						"sclk_fimc";
>  				samsung,pix-limits = <4224 8192 1920 4224>;
> -				samsung,mainscaler-ext;
> +				samsung,min-pix-alignment = <16 8>;
>  				samsung,cam-if;
>  			};
>  
> @@ -639,9 +639,11 @@
>  						<&clocks SCLK_FIMC1>;
>  				clock-names = "fimc",
>  						"sclk_fimc";
> -				samsung,pix-limits = <4224 8192 1920 4224>;
>  				samsung,mainscaler-ext;
> +				samsung,min-pix-alignment = <1 1>;
> +				samsung,pix-limits = <4224 8192 1920 4224>;

The line just moved around. I guess this was not intended?

Best regards,
Krzysztof

>  				samsung,cam-if;
> +				samsung,lcd-wb;
>  			};
>  
>  			fimc2: fimc@fb400000 {
> @@ -653,9 +655,10 @@
>  						<&clocks SCLK_FIMC2>;
>  				clock-names = "fimc",
>  						"sclk_fimc";
> -				samsung,pix-limits = <4224 8192 1920 4224>;
> -				samsung,mainscaler-ext;
> -				samsung,lcd-wb;
> +				samsung,pix-limits = <1920 8192 1280 1920>;
> +				samsung,min-pix-alignment = <16 8>;
> +				samsung,rotators = <0>;
> +				samsung,cam-if;
>  			};
>  		};
>  
> -- 
> 2.20.1
>
Jonathan Bakker April 28, 2020, 10:31 p.m. UTC | #2
Hi Krzysztof,

On 2020-04-28 3:32 a.m., Krzysztof Kozlowski wrote:
> On Sun, Apr 26, 2020 at 11:36:03AM -0700, Jonathan Bakker wrote:
>> The extended mainscaler is only available on FIMC1 and there
>> are minimum pixel alignments that differ from the default.
>> Additionally, the cam-if interface is available on all three
>> while FIMC2 has no rotators.  The lcd-wb interface is supported
>> on FIMC1.
>>
>> Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
>> ---
>>  arch/arm/boot/dts/s5pv210.dtsi | 13 ++++++++-----
>>  1 file changed, 8 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
>> index b3b6ad2889f9..3cbf6c05f42a 100644
>> --- a/arch/arm/boot/dts/s5pv210.dtsi
>> +++ b/arch/arm/boot/dts/s5pv210.dtsi
>> @@ -626,7 +626,7 @@
>>  				clock-names = "fimc",
>>  						"sclk_fimc";
>>  				samsung,pix-limits = <4224 8192 1920 4224>;
>> -				samsung,mainscaler-ext;
>> +				samsung,min-pix-alignment = <16 8>;
>>  				samsung,cam-if;
>>  			};
>>  
>> @@ -639,9 +639,11 @@
>>  						<&clocks SCLK_FIMC1>;
>>  				clock-names = "fimc",
>>  						"sclk_fimc";
>> -				samsung,pix-limits = <4224 8192 1920 4224>;
>>  				samsung,mainscaler-ext;
>> +				samsung,min-pix-alignment = <1 1>;
>> +				samsung,pix-limits = <4224 8192 1920 4224>;
> 
> The line just moved around. I guess this was not intended?

Correct, will fix in v2.

> 
> Best regards,
> Krzysztof
> 

Thanks,
Jonathan
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index b3b6ad2889f9..3cbf6c05f42a 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -626,7 +626,7 @@ 
 				clock-names = "fimc",
 						"sclk_fimc";
 				samsung,pix-limits = <4224 8192 1920 4224>;
-				samsung,mainscaler-ext;
+				samsung,min-pix-alignment = <16 8>;
 				samsung,cam-if;
 			};
 
@@ -639,9 +639,11 @@ 
 						<&clocks SCLK_FIMC1>;
 				clock-names = "fimc",
 						"sclk_fimc";
-				samsung,pix-limits = <4224 8192 1920 4224>;
 				samsung,mainscaler-ext;
+				samsung,min-pix-alignment = <1 1>;
+				samsung,pix-limits = <4224 8192 1920 4224>;
 				samsung,cam-if;
+				samsung,lcd-wb;
 			};
 
 			fimc2: fimc@fb400000 {
@@ -653,9 +655,10 @@ 
 						<&clocks SCLK_FIMC2>;
 				clock-names = "fimc",
 						"sclk_fimc";
-				samsung,pix-limits = <4224 8192 1920 4224>;
-				samsung,mainscaler-ext;
-				samsung,lcd-wb;
+				samsung,pix-limits = <1920 8192 1280 1920>;
+				samsung,min-pix-alignment = <16 8>;
+				samsung,rotators = <0>;
+				samsung,cam-if;
 			};
 		};