diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 23:59:11 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-03 21:20:06 +0400 |
| commit | 56e9e0f3a3c558b42db2dd5120d3a839e4beb282 (patch) | |
| tree | f639ac890abbbf990aa7d3ddee0830eae8f8d7a0 /arch/arm | |
| parent | 103c6a71207f80e6ecfeba2c21d6246687bb0ee4 (diff) | |
| parent | 620f5e1cbfc16aa1bd39c2c5386aee4d00850641 (diff) | |
| download | linux-56e9e0f3a3c558b42db2dd5120d3a839e4beb282.tar.xz | |
Merge branch 'socfpga/dt' into next/dt
SoCFPGA DT changes from Dinh Nguyen.
* socfpga/dt:
dts: Rename DW APB timer compatible strings
dts: Deprecate ALTR as a vendor prefix
of: add vendor prefix for Altera Corp.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/socfpga.dtsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index bee62a2cf6d6..e273fa993b8c 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -476,25 +476,25 @@ }; timer0: timer0@ffc08000 { - compatible = "snps,dw-apb-timer-sp"; + compatible = "snps,dw-apb-timer"; interrupts = <0 167 4>; reg = <0xffc08000 0x1000>; }; timer1: timer1@ffc09000 { - compatible = "snps,dw-apb-timer-sp"; + compatible = "snps,dw-apb-timer"; interrupts = <0 168 4>; reg = <0xffc09000 0x1000>; }; timer2: timer2@ffd00000 { - compatible = "snps,dw-apb-timer-osc"; + compatible = "snps,dw-apb-timer"; interrupts = <0 169 4>; reg = <0xffd00000 0x1000>; }; timer3: timer3@ffd01000 { - compatible = "snps,dw-apb-timer-osc"; + compatible = "snps,dw-apb-timer"; interrupts = <0 170 4>; reg = <0xffd01000 0x1000>; }; |