Commit fdccc4fc authored Aug 18, 2017 by Arnd Bergmann

Merge tag 'zte-dt-4.14' of...

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

parents 3d12971e 8cb46bd2

arch/arm/boot/dts/zx296702-ad1.dts

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;