diff options
author | Hans de Goede <hdegoede@redhat.com> | 2016-08-18 18:51:12 (GMT) |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2016-08-26 14:58:36 (GMT) |
commit | 860fbdd41f010348757926ca8f9c65dd00616d1e (patch) | |
tree | eb92453773199d5077ced5b2fa53f3c79769ba67 /arch/arm/dts/sun6i-a31s-primo81.dts | |
parent | a1243f78519f91ec4da7dd70daccfdfae9100cd0 (diff) | |
download | u-boot-860fbdd41f010348757926ca8f9c65dd00616d1e.tar.xz |
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 <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch/arm/dts/sun6i-a31s-primo81.dts')
-rw-r--r-- | arch/arm/dts/sun6i-a31s-primo81.dts | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/dts/sun6i-a31s-primo81.dts b/arch/arm/dts/sun6i-a31s-primo81.dts index 379746a..73c133f 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"; }; |