diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-03-18 10:12:31 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-18 10:12:31 +0100 |
| commit | bcc298bc924e0a990f853ba3e19f8b5a833cba7e (patch) | |
| tree | 1c87c8f73dc41fd11ee3dacb1b91a7cc8b4798bb /arch/arm/boot/dts/sun5i-a13.dtsi | |
| parent | Merge branch 'drm-docs' of ssh://people.freedesktop.org/~danvet/drm into drm-... (diff) | |
| parent | Linux 3.14-rc7 (diff) | |
| download | linux-bcc298bc924e0a990f853ba3e19f8b5a833cba7e.tar.xz linux-bcc298bc924e0a990f853ba3e19f8b5a833cba7e.zip | |
Merge tag 'v3.14-rc7' into drm-next
Linux 3.14-rc7
Backmerge to help out Intel guys.
Diffstat (limited to 'arch/arm/boot/dts/sun5i-a13.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a13.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 320335abfccd..c463fd730c91 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -346,7 +346,7 @@ }; rtp: rtp@01c25000 { - compatible = "allwinner,sun4i-ts"; + compatible = "allwinner,sun4i-a10-ts"; reg = <0x01c25000 0x100>; interrupts = <29>; }; |