From 7514ed33d21318edb5d28ab0f4afc23625fd3530 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Wed, 4 Jul 2018 14:16:36 +0100 Subject: sunxi: DT: update device tree files for Allwinner H3 and H5 SoCs Update the device tree files from the Linux tree as of v4.18-rc3, exactly Linux commit: commit 55c5ba5e49a0a124ed416880e8227b493474495e Author: Chen-Yu Tsai Date: Tue Apr 24 19:34:22 2018 +0800 arm64: dts: allwinner: h5: Add cpu0 label for first cpu Since the H3 and H5 are very similar (aside from the actual ARM cores), they share most the SoC .dtsi and thus have to be updated together. One tiny change is the removal of the "arm/" prefix from the include path in the sun50i-h5.dtsi, which is needed because we don't share the same sophisticated DT directory layout of Linux. Also we need to fix up the board .dts files already, since the .dtsi removes some pins, so the .dts can't reference them anymore. This is to maintain bisectability. Signed-off-by: Andre Przywara Acked-by: Maxime Ripard Acked-by: Jagan Teki --- arch/arm/dts/sun50i-h5-orangepi-prime.dts | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/arm/dts/sun50i-h5-orangepi-prime.dts') diff --git a/arch/arm/dts/sun50i-h5-orangepi-prime.dts b/arch/arm/dts/sun50i-h5-orangepi-prime.dts index 131d8058c4..540e5c7d93 100644 --- a/arch/arm/dts/sun50i-h5-orangepi-prime.dts +++ b/arch/arm/dts/sun50i-h5-orangepi-prime.dts @@ -84,8 +84,6 @@ compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc", "allwinner,sun5i-a13-mmc"; - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; -- cgit v1.2.3