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-h3-orangepi-pc.dts | |
parent | a1243f78519f91ec4da7dd70daccfdfae9100cd0 (diff) | |
download | u-boot-imx-860fbdd41f010348757926ca8f9c65dd00616d1e.zip u-boot-imx-860fbdd41f010348757926ca8f9c65dd00616d1e.tar.gz u-boot-imx-860fbdd41f010348757926ca8f9c65dd00616d1e.tar.bz2 |
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-h3-orangepi-pc.dts')
-rw-r--r-- | arch/arm/dts/sun8i-h3-orangepi-pc.dts | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/arch/arm/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/dts/sun8i-h3-orangepi-pc.dts index 0a74a91..24f8e97 100644 --- a/arch/arm/dts/sun8i-h3-orangepi-pc.dts +++ b/arch/arm/dts/sun8i-h3-orangepi-pc.dts @@ -63,34 +63,26 @@ leds { compatible = "gpio-leds"; pinctrl-names = "default"; - pinctrl-0 = <&leds_opc>; + pinctrl-0 = <&leds_opc>, <&leds_r_opc>; - status_led { - label = "status:red:user"; - gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; - }; - }; - - r_leds { - compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&leds_r_opc>; - - tx { - label = "pwr:green:user"; + pwr_led { + label = "orangepi:green:pwr"; gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; default-state = "on"; }; + + status_led { + label = "orangepi:red:status"; + gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; + }; }; r_gpio_keys { compatible = "gpio-keys"; - input-name = "sw4"; - pinctrl-names = "default"; pinctrl-0 = <&sw_r_opc>; - sw4@0 { + sw4 { label = "sw4"; linux,code = <BTN_0>; gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; @@ -156,7 +148,7 @@ }; sw_r_opc: key_pins@0 { - allwinner,pins = "PL03"; + allwinner,pins = "PL3"; allwinner,function = "gpio_in"; allwinner,drive = <SUN4I_PINCTRL_10_MA>; allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; @@ -177,10 +169,8 @@ &emac { phy = <&phy1>; phy-mode = "mii"; - allwinner,use-internal-phy; allwinner,leds-active-low; status = "okay"; - phy1: ethernet-phy@1 { reg = <1>; }; |