From b9d59d08a6c7362a9558dd5f67cdf85cc3a1b7c8 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Sun, 5 Aug 2018 00:40:10 +0530 Subject: ARM: dts: sun7i: Update A20 dts(i) files from Linux-v4.18-rc3 Update all A10 devicetree dtsi and dtsi files from Linux-v4.18-rc3 with below commit: commit 5d9ef839f874f4e3923c8a9ae7b136c6c3912cd5 Author: Stefan Mavrodiev Date: Wed May 16 14:38:08 2018 +0300 ARM: dts: sun7i: Add Olimex A20-SOM-EVB-eMMC board Note: - Update sun7i-a20-primo73.dts as per Linux, since this dts is U-Boot specific. - Drop sun7i-a20-olimex-som-evb-emmc.dts since no board added for this. Signed-off-by: Jagan Teki --- arch/arm/dts/sun7i-a20-primo73.dts | 58 ++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 34 deletions(-) (limited to 'arch/arm/dts/sun7i-a20-primo73.dts') diff --git a/arch/arm/dts/sun7i-a20-primo73.dts b/arch/arm/dts/sun7i-a20-primo73.dts index 0658f82675b..b7294e0348c 100644 --- a/arch/arm/dts/sun7i-a20-primo73.dts +++ b/arch/arm/dts/sun7i-a20-primo73.dts @@ -60,43 +60,33 @@ chosen { stdout-path = "serial0:115200n8"; }; +}; - soc@01c00000 { - mmc0: mmc@01c0f000 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; - vmmc-supply = <®_vcc3v3>; - bus-width = <4>; - cd-gpios = <&pio 7 1 0>; /* PH1 */ - cd-inverted; - status = "okay"; - }; - - usbphy: phy@01c13400 { - usb2_vbus-supply = <®_usb2_vbus>; - status = "okay"; - }; +&ehci1 { + status = "okay"; +}; - ehci1: usb@01c1c000 { - /* rtl8188etv wifi is connected here */ - status = "okay"; - }; +&mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ + status = "okay"; +}; - pinctrl@01c20800 { - usb2_vbus_pin_a: usb2_vbus_pin@0 { - allwinner,pins = "PH12"; - }; - }; +®_usb2_vbus { + gpio = <&pio 7 12 0>; /* PH12 */ + status = "okay"; +}; - uart0: serial@01c28000 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; - status = "okay"; - }; - }; +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; +}; - reg_usb2_vbus: usb2-vbus { - gpio = <&pio 7 12 0>; /* PH12 */ - status = "okay"; - }; +&usbphy { + usb2_vbus-supply = <®_usb2_vbus>; + status = "okay"; }; -- cgit v1.2.3