evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Lee Jones 2012-05-26 07:01:31 +01:00
parent d4b29ac189
commit ddb3b99c53
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/db8500.dtsi
View file

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

1
arch/arm/mach-ux500/cpu-db8500.c
View file

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