diff options
author | Grant Likely <grant.likely@linaro.org> | 2014-03-31 09:10:55 +0200 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-03-31 09:10:55 +0200 |
commit | d88cf7d7b4240b8df170ba105e414e476fb51cce (patch) | |
tree | 7efe976da6e0ec854eb0eeda82c1e9a275b8c69f /arch/arm/boot/dts/sun5i-a13.dtsi | |
parent | of: Add support for ePAPR "stdout-path" property (diff) | |
parent | of: add missing major vendors (diff) | |
download | linux-d88cf7d7b4240b8df170ba105e414e476fb51cce.tar.xz linux-d88cf7d7b4240b8df170ba105e414e476fb51cce.zip |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
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>; }; |