aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-09-02 06:09:03 -0400
committerThierry Reding <treding@nvidia.com>2018-09-26 10:55:18 -0400
commit8f4a8e0931b8e57a6a962c8cf89796b715aba37c (patch)
tree80b30dfb20b8fa28e5184ca37c3121d4630d7255
parent613953abdf65789eddbdcde7880de88155f7516a (diff)
ARM: tegra: colibri_t20: rename tps6586x@34 and drop unused pmic label
Rename tps6586x@34 to pmic@34 and drop the unused pmic label. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--arch/arm/boot/dts/tegra20-colibri-iris.dts2
-rw-r--r--arch/arm/boot/dts/tegra20-colibri.dtsi2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts
index 00fd2603d780..d8004d68efa0 100644
--- a/arch/arm/boot/dts/tegra20-colibri-iris.dts
+++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts
@@ -11,7 +11,7 @@
11 11
12 aliases { 12 aliases {
13 rtc0 = "/i2c@7000c000/rtc@68"; 13 rtc0 = "/i2c@7000c000/rtc@68";
14 rtc1 = "/i2c@7000d000/tps6586x@34"; 14 rtc1 = "/i2c@7000d000/pmic@34";
15 rtc2 = "/rtc@7000e000"; 15 rtc2 = "/rtc@7000e000";
16 serial0 = &uarta; 16 serial0 = &uarta;
17 serial1 = &uartd; 17 serial1 = &uartd;
diff --git a/arch/arm/boot/dts/tegra20-colibri.dtsi b/arch/arm/boot/dts/tegra20-colibri.dtsi
index 36463fb3c0b3..473f32f20d8d 100644
--- a/arch/arm/boot/dts/tegra20-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri.dtsi
@@ -472,7 +472,7 @@
472 status = "okay"; 472 status = "okay";
473 clock-frequency = <100000>; 473 clock-frequency = <100000>;
474 474
475 pmic: tps6586x@34 { 475 pmic@34 {
476 compatible = "ti,tps6586x"; 476 compatible = "ti,tps6586x";
477 reg = <0x34>; 477 reg = <0x34>;
478 interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; 478 interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;