diff options
| author | Frank Chen <frankc@nvidia.com> | 2016-07-05 14:04:29 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2016-08-19 11:23:13 -0700 |
| commit | 5c0ed9b2c8afd18825a13b61d37e9875b51be3d2 (patch) | |
| tree | 89e56be2e858ebaddb849a5b5677ffd204a86987 | |
| parent | 230b60212abc38b04999b95be2cc9e693254b121 (diff) | |
| download | tegra-5c0ed9b2c8afd18825a13b61d37e9875b51be3d2.tar.gz | |
dts: flounder: remove camera dtsi files.
Remove camera related device tree files to
stop using camera.pcl auto detect feature.
Bug: 30204201
Signed-off-by: Frank Chen <frankc@nvidia.com>
Change-Id: Ifcad110201a49983202c799c9cee22f65d33b57e
| -rw-r--r-- | arch/arm64/boot/dts/tegra132-flounder-camera.dtsi | 175 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/tegra132-flounder-generic.dtsi | 1 |
2 files changed, 0 insertions, 176 deletions
diff --git a/arch/arm64/boot/dts/tegra132-flounder-camera.dtsi b/arch/arm64/boot/dts/tegra132-flounder-camera.dtsi deleted file mode 100644 index 904d107cd7bf..000000000000 --- a/arch/arm64/boot/dts/tegra132-flounder-camera.dtsi +++ /dev/null @@ -1,175 +0,0 @@ -#include <dt-bindings/media/camera.h> - -/ { - camera-pcl { - compatible = "nvidia,tegra124-camera", "simple-bus"; - configuration = <0xAA55AA55>; - - modules { - module1: module1@modules { - compatible = "sensor,rear"; - badge_info = "flounder_rear_camera"; - - sensor { - profile = <&imx219_1>; - platformdata = "flounder_imx219_pdata"; - }; - focuser { - profile = <&drv201_1>; - platformdata = "flounder_drv201_pdata"; - }; - flash { - profile = <&tps61310_1>; - platformdata = "flounder_tps61310_pdata"; - }; - }; - module2: module4@modules { - compatible = "sensor,front"; - badge_info = "flounder_front_camera"; - - sensor { - profile = <&ov9760_1>; - platformdata = "flounder_ov9760_pdata"; - }; - }; - }; - - profiles { - imx219_1: imx219@2_0010 { - index = <1>; - chipname = "pcl_IMX219"; - type = "sensor"; - guid = "s_IMX219"; - position = <0>; - bustype = "i2c"; - busnum = <2>; - addr = <0x10>; - datalen = <2>; - pinmuxgrp = <0xFFFF>; - gpios = <3>; - clocks = "mclk"; - drivername = "imx219"; - detect = <0x0002 0x0000 0xFFFF 0x0219>; - devid = <0x0219>; - poweron = < - CAMERA_IND_CLK_SET(10000) - CAMERA_GPIO_CLR(119) - CAMERA_GPIO_SET(59) - CAMERA_WAITMS(10) - CAMERA_GPIO_SET(58) - CAMERA_GPIO_SET(62) - CAMERA_GPIO_SET(63) - CAMERA_WAITMS(1) - CAMERA_GPIO_SET(119) - CAMERA_WAITMS(20) - CAMERA_END - >; - poweroff = < - CAMERA_IND_CLK_CLR - CAMERA_GPIO_CLR(119) - CAMERA_WAITUS(1) - CAMERA_GPIO_CLR(63) - CAMERA_GPIO_CLR(62) - CAMERA_GPIO_CLR(58) - CAMERA_GPIO_CLR(59) - CAMERA_END - >; - }; - ov9760_1: ov9760@2_0036 { - index = <2>; - chipname = "pcl_OV9760"; - type = "sensor"; - guid = "s_OV9760"; - position = <1>; - bustype = "i2c"; - busnum = <2>; - addr = <0x36>; - datalen = <2>; - pinmuxgrp = <0xFFFF>; - clocks = "mclk2"; - drivername = "ov9760"; - detect = <0x0002 0x300A 0xFFFF 0x9760>; - devid = <0x9760>; - poweron = < - CAMERA_IND_CLK_SET(10000) - CAMERA_GPIO_CLR(219) - CAMERA_GPIO_SET(59) - CAMERA_WAITMS(10) - CAMERA_GPIO_SET(58) - CAMERA_GPIO_SET(62) - CAMERA_GPIO_SET(63) - CAMERA_WAITMS(1) - CAMERA_GPIO_SET(219) - CAMERA_WAITMS(20) - CAMERA_END - >; - poweroff = < - CAMERA_IND_CLK_CLR - CAMERA_GPIO_CLR(219) - CAMERA_WAITUS(1) - CAMERA_GPIO_CLR(63) - CAMERA_GPIO_CLR(62) - CAMERA_GPIO_CLR(58) - CAMERA_GPIO_CLR(59) - CAMERA_END - >; - }; - tps61310_1: tps61310@0_0033 { - index = <3>; - chipname = "pcl_TPS61310"; - type = "flash"; - guid = "l_NVCAM0"; - position = <0>; - bustype = "i2c"; - busnum = <0>; - addr = <0x33>; - datalen = <1>; - pinmuxgrp = <0xFFFF>; - drivername = "tps61310"; - detect = <0x0001 0x0003 0x00F0 0x00C0>; - devid = <0x6131>; - poweron = < - CAMERA_END - >; - poweroff = < - CAMERA_END - >; - }; - drv201_1: drv201@2_000e { - index = <4>; - chipname = "pcl_DRV201"; - type = "focuser"; - guid = "f_NVCAM0"; - position = <0>; - bustype = "i2c"; - busnum = <2>; - addr = <0xe>; - datalen = <1>; - pinmuxgrp = <0xFFFF>; - drivername = "drv201"; - detect = <0x0001 0x0007 0x00FF 0x0083>; - devid = <0x0201>; - poweron = < - CAMERA_GPIO_SET(59) - CAMERA_WAITMS(10) - CAMERA_GPIO_SET(58) - CAMERA_GPIO_SET(62) - CAMERA_GPIO_SET(63) - CAMERA_WAITMS(1) - CAMERA_GPIO_SET(223) - CAMERA_WAITMS(10) - CAMERA_END - >; - poweroff = < - CAMERA_GPIO_CLR(223) - CAMERA_GPIO_CLR(63) - CAMERA_GPIO_CLR(62) - CAMERA_GPIO_CLR(58) - CAMERA_GPIO_CLR(59) - CAMERA_END - >; - }; - }; - }; -}; - diff --git a/arch/arm64/boot/dts/tegra132-flounder-generic.dtsi b/arch/arm64/boot/dts/tegra132-flounder-generic.dtsi index dc16c6d38ccd..5309b0cd190a 100644 --- a/arch/arm64/boot/dts/tegra132-flounder-generic.dtsi +++ b/arch/arm64/boot/dts/tegra132-flounder-generic.dtsi @@ -3,7 +3,6 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include "tegra132.dtsi" -#include "tegra132-flounder-camera.dtsi" #include "tegra132-flounder-trusty.dtsi" #include "tegra132-flounder-sysedp.dtsi" #include "tegra132-flounder-powermon.dtsi" |