[PATCH v6 5/6] ARM: tegra: Convert to new media orientation definitions
Kieran Bingham <[email protected]>
| Newsgroups | org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-media,org.kernel.vger.linux-renesas-soc,org.kernel.vger.linux-tegra |
|---|---|
| Message-ID | <[email protected]> |
From: Kieran Bingham <[email protected]> The orientation property for video interface devices now has definitions to prevent hardcoded integer values for the enum options. Update the users throughout the nvidia device trees to use the new definitions. Reviewed-by: Laurent Pinchart <[email protected]> Signed-off-by: Kieran Bingham <[email protected]> --- v2: - Fix MEDIA_ORIENTATION_REAR to MEDIA_ORIENTATION_BACK --- arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-common.dtsi | 3 ++- arch/arm/boot/dts/nvidia/tegra30-asus-transformer-common.dtsi | 3 ++- arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts | 4 +++- arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-common.dtsi b/arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-common.dtsi index 892d718294dd..a7fdd194300c 100644 --- a/arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-common.dtsi +++ b/arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-common.dtsi @@ -3,6 +3,7 @@ #include <dt-bindings/input/gpio-keys.h> #include <dt-bindings/input/input.h> #include <dt-bindings/media/video-interfaces.h> +#include <dt-bindings/media/video-interface-devices.h> #include <dt-bindings/power/summit,smb347-charger.h> #include <dt-bindings/thermal/thermal.h> @@ -991,7 +992,7 @@ front-camera@48 { vdd-supply = <&vddio_cam>; vaa-supply = <&avdd_cam1>; - orientation = <0>; /* Front camera */ + orientation = <MEDIA_ORIENTATION_FRONT>; assigned-clocks = <&tegra_car TEGRA30_CLK_VI_SENSOR>, <&tegra_car TEGRA30_CLK_CSUS>; diff --git a/arch/arm/boot/dts/nvidia/tegra30-asus-transformer-common.dtsi b/arch/arm/boot/dts/nvidia/tegra30-asus-transformer-common.dtsi index bf1c3a31d406..76286e15684c 100644 --- a/arch/arm/boot/dts/nvidia/tegra30-asus-transformer-common.dtsi +++ b/arch/arm/boot/dts/nvidia/tegra30-asus-transformer-common.dtsi @@ -3,6 +3,7 @@ #include <dt-bindings/input/gpio-keys.h> #include <dt-bindings/input/input.h> #include <dt-bindings/media/video-interfaces.h> +#include <dt-bindings/media/video-interface-devices.h> #include <dt-bindings/thermal/thermal.h> #include "tegra30.dtsi" @@ -1262,7 +1263,7 @@ front-camera@48 { vdd-supply = <&vdd_1v8_cam>; vaa-supply = <&avdd_2v85_fcam>; - orientation = <0>; /* Front camera */ + orientation = <MEDIA_ORIENTATION_FRONT>; assigned-clocks = <&tegra_car TEGRA30_CLK_VI_SENSOR>, <&tegra_car TEGRA30_CLK_CSUS>; diff --git a/arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts b/arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts index 896639599c12..28680063bcc0 100644 --- a/arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts +++ b/arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; +#include <dt-bindings/media/video-interface-devices.h> + #include "tegra30-lg-x3.dtsi" / { @@ -132,7 +134,7 @@ front-camera@48 { vdd-supply = <&vt_1v8_front>; vaa-supply = <&vt_2v8_front>; - orientation = <0>; /* Front camera */ + orientation = <MEDIA_ORIENTATION_FRONT>; assigned-clocks = <&tegra_car TEGRA30_CLK_VI_SENSOR>, <&tegra_car TEGRA30_CLK_CSUS>; diff --git a/arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi b/arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi index 60e8a19aa70e..77cab695d3da 100644 --- a/arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi +++ b/arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi @@ -4,6 +4,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/leds/common.h> #include <dt-bindings/media/video-interfaces.h> +#include <dt-bindings/media/video-interface-devices.h> #include <dt-bindings/mfd/max77620.h> #include <dt-bindings/thermal/thermal.h> @@ -1216,7 +1217,7 @@ rear-camera@10 { dvdd-supply = <&vdd_1v2_rear>; avdd-supply = <&vdd_2v7_rear>; - orientation = <1>; /* Rear camera */ + orientation = <MEDIA_ORIENTATION_BACK>; rotation = <90>; nvmem = <&m24c08>; -- 2.52.0