diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-08-18 23:01:42 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 23:01:42 +0200 |
| commit | fdccc4fc45141cf0542966ca80a076b3192dbf7d (patch) | |
| tree | d12ec33bd8cc9eca3a64f44a3f80f011c2da5694 | |
| parent | Merge tag 'imx-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt (diff) | |
| parent | ARM: dts: zte: remove num-slots from zx296702-ad1 (diff) | |
| download | linux-dev-fdccc4fc45141cf0542966ca80a076b3192dbf7d.tar.xz linux-dev-fdccc4fc45141cf0542966ca80a076b3192dbf7d.zip | |
Merge tag 'zte-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "ZTE device tree updates for 4.14" from Shawn Guo:
- A clean up patch from Shawn Lin to remove the deprecated dwmmc
property 'num-slots'.
* tag 'zte-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: zte: remove num-slots from zx296702-ad1
| -rw-r--r-- | arch/arm/boot/dts/zx296702-ad1.dts | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/zx296702-ad1.dts b/arch/arm/boot/dts/zx296702-ad1.dts index 081f980cfbe6..b0183c3a1d7c 100644 --- a/arch/arm/boot/dts/zx296702-ad1.dts +++ b/arch/arm/boot/dts/zx296702-ad1.dts @@ -18,7 +18,6 @@ }; &mmc0 { - num-slots = <1>; supports-highspeed; non-removable; disable-wp; @@ -31,7 +30,6 @@ }; &mmc1 { - num-slots = <1>; supports-highspeed; non-removable; disable-wp; |