linux-surface/kernel/arch/arm/boot/dts/sun6i-a31-hummingbird.dts.rej
2017-09-04 22:31:27 -04:00

34 lines
794 B
Plaintext

--- scripts/dtc/include-prefixes/arm/sun6i-a31-hummingbird.dts 2017-08-30 04:32:30.000000000 -0400
+++ scripts/dtc/include-prefixes/arm/sun6i-a31-hummingbird.dts 2017-09-03 16:56:17.000000000 -0400
@@ -253,6 +253,10 @@
#include "axp22x.dtsi"
+&ac_power_supply {
+ status = "okay";
+};
+
&reg_aldo1 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -319,7 +323,6 @@
&tcon0 {
pinctrl-names = "default";
pinctrl-0 = <&lcd0_rgb888_pins>;
- status = "okay";
};
&tcon0_out {
@@ -344,11 +347,6 @@
status = "okay";
};
-&usb1_vbus_pin_a {
- /* different pin from sunxi-common-regulators */
- pins = "PH24";
-};
-
&usbphy {
usb0_id_det-gpio = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */
usb0_vbus_det-gpio = <&pio 0 16 GPIO_ACTIVE_HIGH>; /* PA16 */