From 860fbdd41f010348757926ca8f9c65dd00616d1e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 18 Aug 2016 20:51:12 +0200 Subject: sunxi: Sync dts files with upstream kernel Sync dts files with the current (Aug 18th 2016) state of Maxime's linux/sunxi/for-next repo. Note this commit also updates configs/MSI_Primo81_defconfig, adding: "# CONFIG_REQUIRE_SERIAL_CONSOLE is not set", this is necessary because the tablet does not have a reachable uart so the dts sync drops its serial0 alias. Signed-off-by: Hans de Goede Acked-by: Ian Campbell --- arch/arm/dts/sun6i-a31s-primo81.dts | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'arch/arm/dts/sun6i-a31s-primo81.dts') diff --git a/arch/arm/dts/sun6i-a31s-primo81.dts b/arch/arm/dts/sun6i-a31s-primo81.dts index 379746a397..73c133f5e7 100644 --- a/arch/arm/dts/sun6i-a31s-primo81.dts +++ b/arch/arm/dts/sun6i-a31s-primo81.dts @@ -53,14 +53,6 @@ / { model = "MSI Primo81 tablet"; compatible = "msi,primo81", "allwinner,sun6i-a31s"; - - aliases { - serial0 = &uart0; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; }; &cpu0 { @@ -184,8 +176,6 @@ }; ®_dc1sw { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; regulator-name = "vcc-lcd"; }; -- cgit v1.2.3