From f79675e581a4abda12db31cde3ee71d44016b981 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 28 Oct 2014 19:15:06 +0100 Subject: dtb: move trdx pinmux definitions into trdx files The Freescale provided files imx6qdl.dtsi, imx6q.dtsi provide among other things pinmux definitions. We added missing definitions to these files, however that could become a merging nightmare in the future. Move our additions into apalis/colibri files and use names which likely do not collide with future upstream additions. --- arch/arm/boot/dts/imx6q-apalis-eval.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/imx6q-apalis-eval.dts') diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index 446c08f0324f..9026d54f4fcc 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -23,7 +23,7 @@ aliases { rtc0 = &rtc_i2c; - rtc1 = &snvs_rtc; + rtc1 = "/soc/aips-bus@02000000/snvs@020cc000/snvs-rtc-lp@34"; }; aliases { -- cgit v1.2.3