ARM64: hawkeye: Remove gpio dtsi file

Delete hawkeye gpio dtsi file and move camera
gpio to common file.

Bug 1612782

Change-Id: I870d6ea5d4a050db5e2a8b003af3accd35ab8ace
Signed-off-by: Frank Chen <frankc@nvidia.com>
Reviewed-on: http://git-master/r/714419
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>

diff --git a/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi b/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi
index b85652e4766d5bff43ad605e7d5c103ccee58cc2..bbdf8abaa053a103396f2875d2ffa6433f42c5b2 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi
+++ b/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi
@@ -25,7 +25,6 @@
 
 #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-1170-a00.dtsi"
 #include "panel-a-wuxga-8-0.dtsi"
@@ -60,6 +59,16 @@
        };
 
        gpio@6000d000 {
+               camera_control {
+                       gpio-output-low = <
+                               TEGRA_GPIO(S, 4)
+                               TEGRA_GPIO(S, 5)
+                               TEGRA_GPIO(S, 6)
+                               TEGRA_GPIO(S, 7)
+                               TEGRA_GPIO(T, 0)
+                               >;
+               };
+
                audio_over_jack {
                        gpio-output-high = <TEGRA_GPIO(DD, 0)>;
                };

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
deleted file mode 100644 (file)
index 445a6d2..0000000
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-hawkeye-gpio-p2290-1100-a00.dtsi
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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)
-                               >;
-               };
-       };
-};