ARM: tegra: Reuse I2C3 for NVEC

Instead of duplicating the I2C3 node and adding NVEC specific
properties, reuse the I2C3 node, extend it with NVEC specific properties
and drop properties that are not needed by NVEC. This results in a DTB
that is a bit cleaner and avoids accidentally using I2C3 and NVEC which
would have them fight over the same hardware resources.

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

diff --git a/arch/arm/boot/dts/nvidia/tegra20-paz00.dts b/arch/arm/boot/dts/nvidia/tegra20-paz00.dts
index 898b4ad..afb922b 100644 (file)
--- a/arch/arm/boot/dts/nvidia/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/nvidia/tegra20-paz00.dts
@@ -311,20 +311,19 @@
                clock-frequency = <100000>;
        };
 
-       nvec@7000c500 {
+       i2c@7000c500 {
                compatible = "nvidia,nvec";
-               reg = <0x7000c500 0x100>;
-               interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
-               #address-cells = <1>;
-               #size-cells = <0>;
+
+               /delete-property/ #address-cells;
+               /delete-property/ #size-cells;
+               /delete-property/ dmas;
+               /delete-property/ dma-names;
+
                clock-frequency = <80000>;
                request-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
                slave-addr = <138>;
-               clocks = <&tegra_car TEGRA20_CLK_I2C3>,
-                        <&tegra_car TEGRA20_CLK_PLL_P_OUT3>;
-               clock-names = "div-clk", "fast-clk";
-               resets = <&tegra_car 67>;
-               reset-names = "i2c";
+
+               status = "okay";
        };
 
        i2c@7000d000 {