]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
projects / sojka / nv-tegra / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cedd743)
Revert "arm: tegra: set Tegra RTC as hctosys device"
authorMrutyunjay Sawant <msawant@nvidia.com>
Tue, 16 Feb 2016 13:10:34 +0000 (05:10 -0800)
committermobile promotions <svcmobile_promotions@nvidia.com>
Tue, 16 Feb 2016 13:28:49 +0000 (05:28 -0800)
This reverts commit 2be578092e89b0298739081150b0a0c4b6b6ca03.

bug 1731008

Change-Id: I99f9103c57753997f5b4d4872e7aa0aa1b5b1a47
Reviewed-on: http://git-master/r/1012305
Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com>
Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>
arch/arm64/boot/dts/tegra210-soc-shield.dtsi patch | blob | history
arch/arm64/configs/tegra21_android_defconfig patch | blob | history

diff --git a/arch/arm64/boot/dts/tegra210-soc-shield.dtsi b/arch/arm64/boot/dts/tegra210-soc-shield.dtsi
index 9d1ab6ef6de79da38f160dab19e2242a727a1f5b..bc9a7db28eae6f3b7bdfdbd61d5d110605b2101d 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-soc-shield.dtsi
+++ b/arch/arm64/boot/dts/tegra210-soc-shield.dtsi
@@ -37,8 +37,6 @@
                udc0 = &udc;
                ehci0 = &ehci1;
                ehci1 = &ehci2;
-               rtc0 = "/rtc";
-               rtc1 = "/i2c@7000d000/max77620@3c";
        };
 
        cpus {
diff --git a/arch/arm64/configs/tegra21_android_defconfig b/arch/arm64/configs/tegra21_android_defconfig
index 2bb7e2bdb22e24681c5a030cb7cfe66aba397687..fa609450853a18fe7cdb7bdb992fd273008a6854 100644 (file)
--- a/arch/arm64/configs/tegra21_android_defconfig
+++ b/arch/arm64/configs/tegra21_android_defconfig
@@ -556,8 +556,6 @@ CONFIG_LEDS_PWM=y
 CONFIG_LEDS_CY8C=y
 CONFIG_SWITCH=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_BACKUP_HCTOSYS_DEVICE="rtc1"
 CONFIG_RTC_DRV_MAX77620=y
 CONFIG_DMADEVICES=y
 CONFIG_TEGRA20_APB_DMA=y