diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 08:32:01 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 08:32:01 +1000 |
| commit | afc6e5e89773413bb2df1fa9148b0f76706073aa (patch) | |
| tree | 4fe385062d80eb971ac4801eac727ea4cb475be2 /arch/arm/boot/dts/sun5i-r8-chip.dts | |
| parent | 75f873c5bd757fe3be49bbf1e25f984d26fd4a59 (diff) | |
| parent | 5675caea945d205c7abbac476300028f949eb5f2 (diff) | |
| download | linux-next-afc6e5e89773413bb2df1fa9148b0f76706073aa.tar.gz | |
Merge remote-tracking branch 'sunxi/sunxi/for-next'
Diffstat (limited to 'arch/arm/boot/dts/sun5i-r8-chip.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun5i-r8-chip.dts | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts index e86fa46fdd45..d0785602663b 100644 --- a/arch/arm/boot/dts/sun5i-r8-chip.dts +++ b/arch/arm/boot/dts/sun5i-r8-chip.dts @@ -128,6 +128,10 @@ #include "axp209.dtsi" +&ac_power_supply { + status = "okay"; +}; + &i2c1 { pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins_a>; @@ -281,7 +285,7 @@ &uart3 { pinctrl-names = "default"; pinctrl-0 = <&uart3_pins_a>, - <&uart3_pins_cts_rts_a>; + <&uart3_cts_rts_pins_a>; status = "okay"; }; |