Răsfoiți Sursa

ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled

During a Device Tree boot, all probing will now be completed on parse
of the Device Tree binary. In the same patch we remove platform
registration of the Real Time Clock.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Lee Jones 13 ani în urmă
părinte
comite
ddb3b99c53
2 a modificat fișierele cu 1 adăugiri și 2 ștergeri
  1. 1 1
      arch/arm/boot/dts/db8500.dtsi
  2. 0 1
      arch/arm/mach-ux500/cpu-db8500.c

+ 1 - 1
arch/arm/boot/dts/db8500.dtsi

@@ -48,7 +48,7 @@
 		};
 
 		rtc@80154000 {
-			compatible = "stericsson,db8500-rtc";
+			compatible = "arm,rtc-pl031", "arm,primecell";
 			reg = <0x80154000 0x1000>;
 			interrupts = <0 18 0x4>;
 		};

+ 0 - 1
arch/arm/mach-ux500/cpu-db8500.c

@@ -237,7 +237,6 @@ struct device * __init u8500_of_init_devices(void)
 
 	parent = db8500_soc_device_init();
 
-	db8500_add_rtc(parent);
 	db8500_add_usb(parent, usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg);
 
 	platform_device_register_data(parent,