arch: arm64: boot: dts: T210 camera devnames
Bhanu Murthy V [Mon, 18 Jul 2016 22:49:34 +0000 (15:49 -0700)]
Add devnames instead of devnodes to improve
flexibility in binding userspace and kernel drivers.

Bug 1758789
Bug 200219854

Change-Id: I680a5a968e1c5dc32783470dfcc881b791491934
Signed-off-by: Bhanu Murthy V <bmurthyv@nvidia.com>
Reviewed-on: http://git-master/r/1151351
(cherry picked from commit 457c67e29e7a5892bb6ace057059e803470fd83d)
Reviewed-on: http://git-master/r/1183082
GVS: Gerrit_Virtual_Submit
Reviewed-by: Jihoon Bang <jbang@nvidia.com>

arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-e3322-a00.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-e3323-a00.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-e3326-a00.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-e3333-a00.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-imx274.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-li-mipi-adpt-a00.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-camera-e2249-1002-a00.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-hawkeye-camera-p2290-1100-a00.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-e-camera-p2530-0930-e03.dtsi
arch/arm64/boot/dts/tegra210-plugin-manager/tegra210-jetson-cv-camera-plugin-manager.dtsi

index 7b0d711..94807c8 100644 (file)
@@ -87,7 +87,6 @@
                                                avdd-reg = "vana";
                                                dvdd-reg = "vdig";
                                                iovdd-reg = "dovdd";
-                                               devnode = "video0";
 
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                /* sensor crop settings. Some sensors send corrupt frames after applying */
                                                avdd-reg = "vana";
                                                dvdd-reg = "vdig";
                                                iovdd-reg = "dovdd";
-                                               devnode = "video1";
 
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                /* sensor crop settings. Some sensors send corrupt frames after applying */
                                                avdd-reg = "vana";
                                                dvdd-reg = "vdig";
                                                iovdd-reg = "dovdd";
-                                               devnode = "video2";
 
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                /* sensor crop settings. Some sensors send corrupt frames after applying */
                                                avdd-reg = "vana";
                                                dvdd-reg = "vdig";
                                                iovdd-reg = "dovdd";
-                                               devnode = "video3";
 
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                /* sensor crop settings. Some sensors send corrupt frames after applying */
                                                avdd-reg = "vana";
                                                dvdd-reg = "vdig";
                                                iovdd-reg = "dovdd";
-                                               devnode = "video4";
 
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                /* sensor crop settings. Some sensors send corrupt frames after applying */
                                                avdd-reg = "vana";
                                                dvdd-reg = "vdig";
                                                iovdd-reg = "dovdd";
-                                               devnode = "video5";
 
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                /* sensor crop settings. Some sensors send corrupt frames after applying */
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 30-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@0/imx219_a@10";
                                };
                        };
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 31-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@1/imx219_b@10";
                                };
                        };
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 32-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@2/imx219_c@10";
                                };
                        };
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 33-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@3/imx219_d@10";
                                };
                        };
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 34-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@4/imx219_e@10";
                                };
                        };
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 35-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@5/imx219_f@10";
                                };
                        };
index 65837a3..901d33b 100644 (file)
@@ -74,7 +74,6 @@
                                dvdd-reg = "vdig";
                                iovdd-reg = "vif";
                                vcmvdd-reg = "vvcm";
-                               devnode = "video0";
 
                                /* Defines number of frames to be dropped by driver internally after applying */
                                /* sensor crop settings. Some sensors send corrupt frames after applying */
                                reg = <0x72>;
 
                                /* physical camera layer interface tags */
-                               devnode = "video2";
                                /**
                                * Type specifies the control features supported by
                                * the focuser driver.
                        dvdd-reg = "vdig";
                        iovdd-reg = "vif";
                        vcmvdd-reg = "vvcm";
-                       devnode = "video1";
 
                        /* Defines number of frames to be dropped by driver internally after applying */
                        /* sensor crop settings. Some sensors send corrupt frames after applying */
                        reg = <0x72>;
 
                        /* physical camera layer interface tags */
-                       devnode = "video3";
                        type = "default";
                        min_focus_distance = "10.0"; /* 1.0f/0.1f */
                        hyper_focal = "0.2"; /* 1.0f/5.0f */
                                drivernode0 {
                                        /* Declare PCL support driver (classically known as guid)  */
                                        pcl_id = "v4l2_sensor";
+                                       /* Driver's v4l2 device name */
+                                       devname = "ov23850 6-0010";
                                        /* Declare the device-tree hierarchy to driver instance */
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/ov23850_a@10";
                                };
                                drivernode1 {
                                        /* Declare PCL support driver (classically known as guid)  */
                                        pcl_id = "v4l2_focuser";
+                                       /* Driver's v4l2 device name */
+                                       devname = "lc898212 6-0072";
                                        /* Declare the device-tree hierarchy to driver instance */
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/lc898212@72";
                                };
                                drivernode0 {
                                        /* Declare PCL support driver (classically known as guid)  */
                                        pcl_id = "v4l2_sensor";
+                                       /* Driver's v4l2 device name */
+                                       devname = "ov23850 0-0036";
                                        /* Declare the device-tree hierarchy to driver instance */
                                        proc-device-tree = "/proc/device-tree/i2c@7000c000/ov23850_c@36";
                                };
                                drivernode1 {
                                        /* Declare PCL support driver (classically known as guid)  */
                                        pcl_id = "v4l2_focuser";
+                                       /* Driver's v4l2 device name */
+                                       devname = "lc898212 0-0072";
                                        /* Declare the device-tree hierarchy to driver instance */
                                        proc-device-tree = "/proc/device-tree/i2c@7000c000/lc898212@72";
                                };
index 27a1828..1dfa349 100644 (file)
@@ -45,9 +45,6 @@
                                /* I2C device address */
                                reg = <0x36>;
 
-                               /* V4L2 device node location */
-                               devnode = "video0";
-
                                /* Physical dimensions of sensor */
                                physical_w = "3.674";
                                physical_h = "2.738";
                                drivernode0 {
                                        /* Declare PCL support driver (classically known as guid)  */
                                        pcl_id = "v4l2_sensor";
+                                       /* Driver's v4l2 device name */
+                                       devname = "ov5693 6-0036";
                                        /* Declare the device-tree hierarchy to driver instance */
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/ov5693_c@36";
                                };
index c2cc9ed..a6dcc71 100644 (file)
@@ -89,7 +89,6 @@
                                                reg = <0x36>;
                                                avdd-reg = "vana";
                                                iovdd-reg = "vif";
-                                               devnode = "video0";
                                                physical_w = "3.674";
                                                physical_h = "2.738";
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                reg = <0x36>;
                                                avdd-reg = "vana";
                                                iovdd-reg = "vif";
-                                               devnode = "video1";
                                                physical_w = "3.674";
                                                physical_h = "2.738";
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                reg = <0x36>;
                                                avdd-reg = "vana";
                                                iovdd-reg = "vif";
-                                               devnode = "video2";
                                                physical_w = "3.674";
                                                physical_h = "2.738";
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                reg = <0x36>;
                                                avdd-reg = "vana";
                                                iovdd-reg = "vif";
-                                               devnode = "video3";
                                                physical_w = "3.674";
                                                physical_h = "2.738";
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                reg = <0x36>;
                                                avdd-reg = "vana";
                                                iovdd-reg = "vif";
-                                               devnode = "video4";
                                                physical_w = "3.674";
                                                physical_h = "2.738";
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                                reg = <0x36>;
                                                avdd-reg = "vana";
                                                iovdd-reg = "vif";
-                                               devnode = "video5";
                                                physical_w = "3.674";
                                                physical_h = "2.738";
                                                /* Defines number of frames to be dropped by driver internally after applying */
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 30-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@0/ov5693_a@36";
                                };
                        };
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 31-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@1/ov5693_b@36";
                                };
                        };
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 32-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@2/ov5693_c@36";
                                };
                        };
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 33-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@3/ov5693_d@36";
                                };
                        };
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 34-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@4/ov5693_e@36";
                                };
                        };
                                orientation = "1";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 35-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@5/ov5693_f@36";
                                };
                        };
index 4a59baf..1be3106 100644 (file)
@@ -59,9 +59,6 @@
                                /* I2C device address */
                                reg = <0x1a>;
 
-                               /* V4L2 device node location */
-                               devnode = "video0";
-
                                /* Physical dimensions of sensor */
                                physical_w = "3.674";
                                physical_h = "2.738";
 
                                /* Sensor Model */
                                sensor_model ="tc358840";
-                               devnode ="video1";
                                ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
                                drivernode0 {
                                        /* Declare PCL support driver (classically known as guid)  */
                                        pcl_id = "v4l2_sensor";
+                                       /* Driver's v4l2 device name */
+                                       devname = "imx274 6-001a";
                                        /* Declare the device-tree hierarchy to driver instance */
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/imx274_a@1a";
                                };
index d071ab6..cf9fca0 100644 (file)
@@ -50,7 +50,6 @@
                                                compatible = "nvidia,imx185";
 
                                                reg = <0x1a>;
-                                               devnode = "video0";
 
                                                /* Physical dimensions of sensor */
                                                physical_w = "15.0";
                                drivernode0 {
                                        /* Declare PCL support driver (classically known as guid)  */
                                        pcl_id = "v4l2_sensor";
+                                       /* Driver's v4l2 device name */
+                                       devname = "imx185 6-001a";
                                        /* Declare the device-tree hierarchy to driver instance */
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9546@70/i2c@0/imx185_a@1a";
                                };
index 41e39a2..aef0e55 100644 (file)
@@ -60,9 +60,6 @@
 
                                /* Sensor Model */
                                sensor_model ="imx214";
-
-                               /* V4L2 device node location */
-                               devnode = "video0";
                                has-eeprom = <1>;
 
                                /* Defines number of frames to be dropped by driver internally after applying */
                                /* Sensor Model */
                                sensor_model ="ov5693";
 
-                               /* V4L2 device node location */
-                               devnode = "video1";
-
                                /* Define any required hw resources needed by driver */
                                /* ie. clocks, io pins, power sources */
                                /* mclk-index indicates the index of the */
                                        * Device tree hierarchy to driver
                                        */
                                        pcl_id = "v4l2_sensor";
+                                       /* Driver's v4l2 device name */
+                                       devname = "imx214 6-001a";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/imx214@1a";
                                };
                                drivernode1 {
                                orientation = "0";
                                drivernode0 {
                                        pcl_id = "v4l2_sensor";
+                                       /* Driver's v4l2 device name */
+                                       devname = "ov5693 6-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/ov5693_c@36";
                                };
                                drivernode1 {
index 8552377..816993e 100644 (file)
@@ -42,9 +42,6 @@
                                /* I2C device address */
                                reg = <0x10>;
 
-                               /* V4L2 device node location */
-                               devnode = "video0";
-
                                /* Physical dimensions of sensor */
                                physical_w = "3.674";
                                physical_h = "2.738";
                                drivernode0 {
                                        /* Declare PCL support driver (classically known as guid)  */
                                        pcl_id = "v4l2_sensor";
+                                       /* Driver's v4l2 device name */
+                                       devname = "ov5693 6-0010";
                                        /* Declare the device-tree hierarchy to driver instance */
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/ov5693_c@10";
                                };
index 8f89dbb..315651c 100644 (file)
@@ -88,9 +88,6 @@
                                /* I2C device address */
                                reg = <0x10>;
 
-                               /* V4L2 device node location */
-                               devnode = "video0";
-
                                /* Physical dimensions of sensor */
                                physical_w = "3.674";
                                physical_h = "2.738";
                                /* I2C device address */
                                reg = <0x36>;
 
-                               /* V4L2 device node location */
-                               devnode = "video1";
-
                                /* Physical dimensions of sensor */
                                physical_w = "3.674";
                                physical_h = "2.738";
                                drivernode0 {
                                        /* Declare PCL support driver (classically known as guid)  */
                                        pcl_id = "v4l2_sensor";
+                                       /* Driver's v4l2 device name */
+                                       devname = "ov5693 6-0010";
                                        /* Declare the device-tree hierarchy to driver instance */
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/ov5693_a@10";
                                };
                                drivernode0 {
                                        /* Declare PCL support driver (classically known as guid)  */
                                        pcl_id = "v4l2_sensor";
+                                       /* Driver's v4l2 device name */
+                                       devname = "ov5693 6-0036";
                                        /* Declare the device-tree hierarchy to driver instance */
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/ov5693_c@36";
                                };
index 2237351..044ab7d 100644 (file)
@@ -37,6 +37,7 @@
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 6-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/ov5693_c@36";
                                };
                        };
@@ -95,6 +96,7 @@
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov23850 6-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/ov23850_a@10";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov23850 0-0036";
                                        proc-device-tree = "/proc/device-tree/i2c@7000c000/ov23850_c@36";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_focuser";
+                                       devname = "lc898212 6-0072";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/lc898212@72";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_focuser";
+                                       devname = "lc898212 0-0072";
                                        proc-device-tree = "/proc/device-tree/i2c@7000c000/lc898212@72";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 30-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@0/imx219_a@10";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 31-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@1/imx219_b@10";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 32-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@2/imx219_c@10";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 33-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@3/imx219_d@10";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 34-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@4/imx219_e@10";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "imx219 35-0010";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@5/imx219_f@10";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 30-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@0/ov5693_a@36";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 31-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@1/ov5693_b@36";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 32-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@2/ov5693_c@36";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 33-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@3/ov5693_d@36";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 34-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@4/ov5693_e@36";
                                };
                        };
                                _overlay_ {
                                        status = "okay";
                                        pcl_id = "v4l2_sensor";
+                                       devname = "ov5693 35-0036";
                                        proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9548@77/i2c@5/ov5693_f@36";
                                };
                        };