]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
ARM64: hawkeye: Update camera DT
authorFrank Chen <frankc@nvidia.com>
Thu, 19 Feb 2015 18:33:10 +0000 (10:33 -0800)
committerMitch Luban <mluban@nvidia.com>
Tue, 24 Feb 2015 04:40:07 +0000 (20:40 -0800)
Update camera DT files

Bug 1612782

Change-Id: I3226bff506bc5f6f4a06e98f5e8c4905df75cdc7
Signed-off-by: Frank Chen <frankc@nvidia.com>
Reviewed-on: http://git-master/r/709696
(cherry picked from commit c0e5f22d00a7cda7d6eb76ceb4b7685042dab598)
Reviewed-on: http://git-master/r/710189
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Tested-by: Mitch Luban <mluban@nvidia.com>
arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-hawkeye-camera-p2290-1100-a00.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-hawkeye-gpio-p2290-1100-a00.dtsi [new file with mode: 0644]

index 4929254d6a891ddc55f90a1a5778970116afd254..4c4987af338c480262cd3768cfb7dc621e6186f3 100644 (file)
 #include <dt-bindings/gpio/tegra-gpio.h>
 #include <dt-bindings/padctrl/tegra210-pads.h>
 
-/* camera control gpio definitions */
-#define CAM_PWDN_FQ    TEGRA_GPIO(T, 0)
-#define CAM_PWDN_RQ    TEGRA_GPIO(S, 7)
-#define CAM_RST                TEGRA_GPIO(S, 4)
-#define CAM_PWDN_AF    TEGRA_GPIO(S, 5)
-
 #include "tegra210-platforms/tegra210-prods.dtsi"
 #include "tegra210-platforms/tegra210-hawkeye-pinmux-p2290-1100-a00.dtsi"
+#include "tegra210-platforms/tegra210-hawkeye-gpio-p2290-1100-a00.dtsi"
 #include "tegra210-platforms/tegra210-hawkeye-power-tree-p2290-1100-a00.dtsi"
 #include "tegra210-platforms/tegra210-ers-keys-e2220-1100-a00.dtsi"
 #include "panel-a-wuxga-8-0.dtsi"
 
        camera-pcl {
                profiles {
-                       ov5693@2_0036 {
+                       ov5693@x_0036 {
                                use_of_node = "yes";
                                dev_name = "ov5693";
                                num = <1>;
                                vana-supply = <&max77620_ldo3>;
                                vif-supply = <&en_vdd_cam>;
-                               cam2-gpios = <&gpio CAM_PWDN_FQ 0>;
-                               reset-gpios = <&gpio CAM_RST 0>;
+                               cam2-gpios = <&gpio TEGRA_GPIO(T, 0) 0>;
                        };
-                       ov5693@2_0010 {
+                       ov5693@x_0010 {
                                use_of_node = "yes";
                                dev_name = "ov5693";
                                num = <0>;
-                               vana-supply = <&max77620_ldo3>;
-                               vif-supply = <&en_vdd_cam>;
-                               cam2-gpios = <&gpio CAM_PWDN_RQ 0>;
+                               avdd-supply = <&max77620_ldo3>;
+                               dvdd-supply = <&max77620_ldo3>;
+                               dovdd-supply = <&en_vdd_cam>;
+                               cam2-gpios = <&gpio TEGRA_GPIO(S, 7) 1>;
                        };
-                       ad5823@2_000c {
+                       ad5823@x_000c {
                                use_of_node = "yes";
                                vdd-supply = <&max77620_ldo3>;
                                vif-supply = <&en_vdd_cam>;
-                               af-pwdn-gpios = <&gpio CAM_PWDN_AF 0>;
+                               af-pwdn-gpios = <&gpio TEGRA_GPIO(S, 5) 1>;
                        };
                };
 
index 38e94da376f878c8973ab7a130cb79737dcb719b..394f1d38c2d2eeb5ab34bee26060509946250dbd 100644 (file)
@@ -1,7 +1,7 @@
 /*
- * tegra210-hawkeye-camera-p2290-1100-a00.dtsi: Hawkeye common dtsi.
+ * tegra210-hawkeye-camera-p2290-1100-a00.dtsi: Hawkeye camera dtsi.
  *
- * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@
                };
 
                profiles {
-                       ov5693_1: ov5693@2_0010 {
+                       ov5693_1: ov5693@x_0010 {
                                index = <1>;
                                chipname = "pcl_OV5693";
                                type = "sensor";
                                datalen = <2>;
                                pinmuxgrp = <0xFFFF>;
                                gpios = <3>;
-                               regulators = "vana", "vif";
+                               regulators = "avdd", "dovdd", "dvdd";
                                clocks = "cam_mclk1";
                                drivername = "ov5693";
                                detect = <0x0002 0x300A 0xFFFF 0x5690>;
                                devid = <0x5693>;
                                poweron = <
                                        CAMERA_IND_CLK_SET(10000)
-                                       CAMERA_GPIO_CLR(CAM_PWDN_RQ)
+                                       CAMERA_GPIO_CLR(TEGRA_GPIO(S, 7))
                                        CAMERA_WAITMS(1)
                                        CAMERA_REGULATOR_ON(0)
+                                       CAMERA_REGULATOR_ON(2)
                                        CAMERA_REGULATOR_ON(1)
                                        CAMERA_WAITMS(1)
-                                       CAMERA_GPIO_SET(CAM_PWDN_RQ)
+                                       CAMERA_GPIO_SET(TEGRA_GPIO(S, 7))
                                        CAMERA_WAITMS(10)
                                        CAMERA_END
                                        >;
                                poweroff = <
                                        CAMERA_IND_CLK_CLR
-                                       CAMERA_GPIO_CLR(CAM_PWDN_RQ)
+                                       CAMERA_GPIO_CLR(TEGRA_GPIO(S, 7))
                                        CAMERA_WAITUS(10)
                                        CAMERA_REGULATOR_OFF(1)
+                                       CAMERA_REGULATOR_OFF(2)
                                        CAMERA_REGULATOR_OFF(0)
                                        CAMERA_END
                                        >;
                                cap-clock_multiplier_1 = <0>;
                                cap-hdr-enabled;
                        };
-                       ov5693_2: ov5693@2_0036 {
+                       ov5693_2: ov5693@x_0036 {
                                index = <2>;
                                chipname = "pcl_OV5693";
                                type = "sensor";
                                devid = <0x5693>;
                                poweron = <
                                        CAMERA_IND_CLK_SET(10000)
-                                       CAMERA_GPIO_CLR(CAM_RST)
-                                       CAMERA_GPIO_CLR(CAM_PWDN_FQ)
+                                       CAMERA_GPIO_CLR(TEGRA_GPIO(S, 4))
+                                       CAMERA_GPIO_CLR(TEGRA_GPIO(T, 0))
                                        CAMERA_WAITMS(1)
                                        CAMERA_REGULATOR_ON(0)
                                        CAMERA_REGULATOR_ON(1)
                                        CAMERA_WAITMS(1)
-                                       CAMERA_GPIO_SET(CAM_PWDN_FQ)
-                                       CAMERA_GPIO_SET(CAM_RST)
+                                       CAMERA_GPIO_SET(TEGRA_GPIO(T, 0))
+                                       CAMERA_GPIO_SET(TEGRA_GPIO(S, 4))
                                        CAMERA_WAITMS(10)
                                        CAMERA_END
                                        >;
                                poweroff = <
                                        CAMERA_IND_CLK_CLR
-                                       CAMERA_GPIO_CLR(CAM_RST)
-                                       CAMERA_GPIO_CLR(CAM_PWDN_FQ)
+                                       CAMERA_GPIO_CLR(TEGRA_GPIO(S, 4))
+                                       CAMERA_GPIO_CLR(TEGRA_GPIO(T, 0))
                                        CAMERA_WAITUS(10)
                                        CAMERA_REGULATOR_OFF(1)
                                        CAMERA_REGULATOR_OFF(0)
                                cap-clock_multiplier_1 = <0>;
                                cap-hdr-enabled;
                        };
-                       ad5823_1: ad5823@2_000c {
+                       ad5823_1: ad5823@x_000c {
                                index = <3>;
                                chipname = "pcl_AD5823";
                                type = "focuser";
                                        CAMERA_REGULATOR_ON(1)
                                        CAMERA_REGULATOR_ON(0)
                                        CAMERA_WAITUS(10)
-                                       CAMERA_GPIO_SET(CAM_PWDN_AF)
+                                       CAMERA_GPIO_SET(TEGRA_GPIO(S, 5))
                                        CAMERA_WAITUS(10)
                                        CAMERA_END
                                        >;
                                poweroff = <
                                        CAMERA_REGULATOR_OFF(0)
                                        CAMERA_REGULATOR_OFF(1)
-                                       CAMERA_GPIO_CLR(CAM_PWDN_AF)
+                                       CAMERA_GPIO_CLR(TEGRA_GPIO(S, 5))
                                        CAMERA_WAITUS(10)
                                        CAMERA_END
                                        >;
diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-hawkeye-gpio-p2290-1100-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-hawkeye-gpio-p2290-1100-a00.dtsi
new file mode 100644 (file)
index 0000000..445a6d2
--- /dev/null
@@ -0,0 +1,83 @@
+/*
+ * tegra210-hawkeye-gpio-p2290-1100-a00.dtsi. hawkeye gpio dtsi
+ *
+ * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+#include <dt-bindings/gpio/tegra-gpio.h>
+
+/ {
+       gpio: gpio@6000d000 {
+               gpio-init-names = "default";
+               gpio-init-0 = <&gpio_default>;
+
+               gpio_default: default {
+                       gpio-input = <
+                               TEGRA_GPIO(BB, 4)
+                               TEGRA_GPIO(B, 4)
+                               TEGRA_GPIO(E, 6)
+                               TEGRA_GPIO(A, 5)
+                               TEGRA_GPIO(X, 3)
+                               TEGRA_GPIO(X, 4)
+                               TEGRA_GPIO(X, 2)
+                               TEGRA_GPIO(X, 1)
+                               TEGRA_GPIO(X, 0)
+                               TEGRA_GPIO(X, 5)
+                               TEGRA_GPIO(X, 6)
+                               TEGRA_GPIO(X, 7)
+                               TEGRA_GPIO(Y, 0)
+                               TEGRA_GPIO(Y, 1)
+                               TEGRA_GPIO(V, 3)
+                               TEGRA_GPIO(Z, 0)
+                               TEGRA_GPIO(K, 0)
+                               TEGRA_GPIO(K, 4)
+                               TEGRA_GPIO(K, 6)
+                               TEGRA_GPIO(H, 2)
+                               TEGRA_GPIO(H, 5)
+                               TEGRA_GPIO(I, 1)
+                               >;
+                       gpio-output-low = <
+                               TEGRA_GPIO(BB, 2)
+                               TEGRA_GPIO(BB, 3)
+                               TEGRA_GPIO(S, 4)
+                               TEGRA_GPIO(S, 5)
+                               TEGRA_GPIO(S, 6)
+                               TEGRA_GPIO(S, 7)
+                               TEGRA_GPIO(T, 0)
+                               TEGRA_GPIO(T, 1)
+                               TEGRA_GPIO(V, 6)
+                               TEGRA_GPIO(V, 5)
+                               TEGRA_GPIO(G, 2)
+                               TEGRA_GPIO(G, 3)
+                               TEGRA_GPIO(K, 1)
+                               TEGRA_GPIO(K, 2)
+                               TEGRA_GPIO(K, 3)
+                               TEGRA_GPIO(K, 5)
+                               TEGRA_GPIO(K, 7)
+                               TEGRA_GPIO(L, 0)
+                               TEGRA_GPIO(H, 0)
+                               TEGRA_GPIO(H, 1)
+                               TEGRA_GPIO(H, 3)
+                               TEGRA_GPIO(H, 4)
+                               TEGRA_GPIO(H, 6)
+                               TEGRA_GPIO(H, 7)
+                               TEGRA_GPIO(I, 0)
+                               TEGRA_GPIO(I, 2)
+                               TEGRA_GPIO(I, 3)
+                               TEGRA_GPIO(CC, 7)
+                               >;
+                       gpio-output-high = <
+                               >;
+                       gpio-suspend-output-low = <TEGRA_GPIO(V, 4)
+                               >;
+               };
+       };
+};