arm64: tegra: p3310: Use TEGRA186_ prefix for GPIO names

The new prefix allows the GPIOs to be uniquely identified on a per-chip
basis, which makes it easier to distinguish Tegra186 specific GPIOs from
those of later chips such as Tegra194 which supports a very different
set of GPIOs.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
index b539561e7877f23545cf16f7b54dd46a4b9c1d90..89a2da46efae8c60b99ddac7a2b74112718ea19c 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
@@ -34,7 +34,8 @@ memory {
        ethernet@2490000 {
                status = "okay";
 
-               phy-reset-gpios = <&gpio TEGRA_MAIN_GPIO(M, 4) GPIO_ACTIVE_LOW>;
+               phy-reset-gpios = <&gpio TEGRA186_MAIN_GPIO(M, 4)
+                                        GPIO_ACTIVE_LOW>;
                phy-handle = <&phy>;
                phy-mode = "rgmii";
 
@@ -46,7 +47,8 @@ phy: phy@0 {
                                compatible = "ethernet-phy-ieee802.3-c22";
                                reg = <0x0>;
                                interrupt-parent = <&gpio>;
-                               interrupts = <TEGRA_MAIN_GPIO(M, 5) IRQ_TYPE_LEVEL_LOW>;
+                               interrupts = <TEGRA186_MAIN_GPIO(M, 5)
+                                             IRQ_TYPE_LEVEL_LOW>;
                        };
                };
        };
@@ -91,8 +93,8 @@ i2c@31e0000 {
 
        /* SDMMC1 (SD/MMC) */
        sdhci@3400000 {
-               cd-gpios = <&gpio TEGRA_MAIN_GPIO(P, 5) GPIO_ACTIVE_LOW>;
-               wp-gpios = <&gpio TEGRA_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
+               cd-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 5) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
 
                vqmmc-supply = <&vddio_sdmmc1>;
        };