diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2016-03-14 17:37:09 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2016-03-23 22:04:13 +0100 |
| commit | 80e5f83c0fc4bf42110cc55ce671ad7ddc7b08a4 (patch) | |
| tree | 39fe4223027504cf9fdfa54c2212401be4a95b92 /arch/arm/dts/sun5i-a10s-olinuxino-micro.dts | |
| parent | 4bb656e9dde2019cb42ac4c27b3a114a801ad127 (diff) | |
sunxi: Sync dts files with the upstream kernel
Sync dts files with the upstream kernel including
changes queued for 4.6:
https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/dt-for-4.6
Note this adds a number of new unused board dts files. I've asked the
authors of the kernel commits adding these to submit a matching defconfig
to u-boot.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch/arm/dts/sun5i-a10s-olinuxino-micro.dts')
| -rw-r--r-- | arch/arm/dts/sun5i-a10s-olinuxino-micro.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts index 5a422c1ff7..86d046a502 100644 --- a/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts +++ b/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts @@ -111,7 +111,7 @@ status = "okay"; at24@50 { - compatible = "at,24c16"; + compatible = "atmel,24c16"; pagesize = <16>; reg = <0x50>; read-only; |