From 9ad93c0c968c8e6cd1273b73c44ec7262c616408 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Sun, 5 Aug 2018 00:40:11 +0530 Subject: ARM: dts: sun8i: Update A23/A33/r16 dts(i) files from Linux-v4.18-rc3 Update all A23/A33/r16 devicetree dtsi and dtsi files from Linux-v4.18-rc3 with below commits. A23: commit bc3bd041fe766219a44688b182c260064007f0cc Author: Miquel Raynal Date: Tue Apr 24 17:55:02 2018 +0200 ARM: dts: sun8i: a23/a33: declare NAND pins A33: commit 88fe315d2c0a397ef42d7639addab0e021ae911d Author: Maxime Ripard Date: Wed Apr 4 11:57:15 2018 +0200 ARM: dts: sun8i: a33: Add the DSI-related nodes r16: commit 9621d0bd1b0d61167e1853ac68cf4869c31bcc96 Author: Miquel Raynal Date: Tue Apr 24 17:55:03 2018 +0200 ARM: dts: nes: add Nintendo NES/SuperNES Classic Edition support Note: - Drop pinctrl from sun8i-r16-nintendo-nes-classic-edition.dts since sun8i-a23-a33.dtsi is added with Linux sync. - Don't sync non U-Boot supported dts files sun8i-a23-ippo-q8h-v1.2.dts sun8i-a23-ippo-q8h-v5.dts sun8i-a33-et-q8-v1.6.dts sun8i-a33-ippo-q8h-v1.2.dts sun8i-r16-nintendo-nes-classic.dts sun8i-r16-nintendo-super-nes-classic.dts Signed-off-by: Jagan Teki --- arch/arm/dts/sun8i-r16-bananapi-m2m.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/dts/sun8i-r16-bananapi-m2m.dts') diff --git a/arch/arm/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/dts/sun8i-r16-bananapi-m2m.dts index eaf0966672..0dbdb29a8f 100644 --- a/arch/arm/dts/sun8i-r16-bananapi-m2m.dts +++ b/arch/arm/dts/sun8i-r16-bananapi-m2m.dts @@ -150,8 +150,7 @@ pinctrl-0 = <&mmc0_pins_a>; vmmc-supply = <®_dcdc1>; bus-width = <4>; - cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ - cd-inverted; + cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */ status = "okay"; }; -- cgit