diff options
author | Hans de Goede <hdegoede@redhat.com> | 2016-08-18 20:51:12 +0200 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2016-08-26 16:58:36 +0200 |
commit | 860fbdd41f010348757926ca8f9c65dd00616d1e (patch) | |
tree | eb92453773199d5077ced5b2fa53f3c79769ba67 /arch/arm/dts/sun8i-r16-parrot.dts | |
parent | a1243f78519f91ec4da7dd70daccfdfae9100cd0 (diff) |
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/sun8i-r16-parrot.dts')
-rw-r--r-- | arch/arm/dts/sun8i-r16-parrot.dts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/dts/sun8i-r16-parrot.dts b/arch/arm/dts/sun8i-r16-parrot.dts index 39c40be5f0..47553e5229 100644 --- a/arch/arm/dts/sun8i-r16-parrot.dts +++ b/arch/arm/dts/sun8i-r16-parrot.dts @@ -93,7 +93,10 @@ pinctrl-0 = <&i2c1_pins_a>; status = "okay"; - /* FIXME: An as-yet-unknown accelerometer is connected to this i2c bus. */ + /* + * FIXME: An as-yet-unknown accelerometer is connected to this + * i2c bus. + */ }; &lradc { |