|
@@ -46,7 +46,6 @@
|
|
|
#include "sun9i-a80.dtsi"
|
|
|
|
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
|
-#include <dt-bindings/pinctrl/sun4i-a10.h>
|
|
|
|
|
|
/ {
|
|
|
model = "Merrii A80 Optimus Board";
|
|
@@ -63,11 +62,8 @@
|
|
|
|
|
|
leds {
|
|
|
compatible = "gpio-leds";
|
|
|
- pinctrl-names = "default";
|
|
|
- pinctrl-0 = <&led_pins_optimus>, <&led_r_pins_optimus>;
|
|
|
|
|
|
/* The LED names match those found on the board */
|
|
|
-
|
|
|
led2 {
|
|
|
label = "optimus:led2:usr";
|
|
|
gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>;
|
|
@@ -87,8 +83,6 @@
|
|
|
reg_usb1_vbus: usb1-vbus {
|
|
|
compatible = "regulator-fixed";
|
|
|
pinctrl-names = "default";
|
|
|
- pinctrl-0 = <&usb1_vbus_pin_optimus>;
|
|
|
- regulator-name = "usb1-vbus";
|
|
|
regulator-min-microvolt = <5000000>;
|
|
|
regulator-max-microvolt = <5000000>;
|
|
|
enable-active-high;
|
|
@@ -98,13 +92,19 @@
|
|
|
reg_usb3_vbus: usb3-vbus {
|
|
|
compatible = "regulator-fixed";
|
|
|
pinctrl-names = "default";
|
|
|
- pinctrl-0 = <&usb3_vbus_pin_optimus>;
|
|
|
- regulator-name = "usb3-vbus";
|
|
|
regulator-min-microvolt = <5000000>;
|
|
|
regulator-max-microvolt = <5000000>;
|
|
|
enable-active-high;
|
|
|
gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
|
|
|
};
|
|
|
+
|
|
|
+ wifi_pwrseq: wifi-pwrseq {
|
|
|
+ compatible = "mmc-pwrseq-simple";
|
|
|
+ clocks = <&ac100_rtc 1>;
|
|
|
+ clock-names = "ext_clock";
|
|
|
+ /* enables internal regulator and de-asserts reset */
|
|
|
+ reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 WL-PMU-EN */
|
|
|
+ };
|
|
|
};
|
|
|
|
|
|
&ehci0 {
|
|
@@ -112,7 +112,8 @@
|
|
|
};
|
|
|
|
|
|
&ehci1 {
|
|
|
- status = "okay";
|
|
|
+ /* Enable if HSIC peripheral is connected */
|
|
|
+ status = "disabled";
|
|
|
};
|
|
|
|
|
|
&ehci2 {
|
|
@@ -121,14 +122,28 @@
|
|
|
|
|
|
&mmc0 {
|
|
|
pinctrl-names = "default";
|
|
|
- pinctrl-0 = <&mmc0_pins>, <&mmc0_cd_pin_optimus>;
|
|
|
+ pinctrl-0 = <&mmc0_pins>;
|
|
|
vmmc-supply = <®_dcdc1>;
|
|
|
bus-width = <4>;
|
|
|
- cd-gpios = <&pio 7 18 GPIO_ACTIVE_HIGH>; /* PH8 */
|
|
|
- cd-inverted;
|
|
|
+ cd-gpios = <&pio 7 18 GPIO_ACTIVE_LOW>; /* PH8 */
|
|
|
+ status = "okay";
|
|
|
+};
|
|
|
+
|
|
|
+&mmc1 {
|
|
|
+ pinctrl-names = "default";
|
|
|
+ pinctrl-0 = <&mmc1_pins>;
|
|
|
+ vmmc-supply = <®_dldo1>;
|
|
|
+ vqmmc-supply = <®_cldo3>;
|
|
|
+ mmc-pwrseq = <&wifi_pwrseq>;
|
|
|
+ bus-width = <4>;
|
|
|
+ non-removable;
|
|
|
status = "okay";
|
|
|
};
|
|
|
|
|
|
+&mmc1_pins {
|
|
|
+ bias-pull-up;
|
|
|
+};
|
|
|
+
|
|
|
&mmc2 {
|
|
|
pinctrl-names = "default";
|
|
|
pinctrl-0 = <&mmc2_8bit_pins>;
|
|
@@ -141,7 +156,7 @@
|
|
|
|
|
|
&mmc2_8bit_pins {
|
|
|
/* Increase drive strength for DDR modes */
|
|
|
- allwinner,drive = <SUN4I_PINCTRL_40_MA>;
|
|
|
+ drive-strength = <40>;
|
|
|
};
|
|
|
|
|
|
&ohci0 {
|
|
@@ -152,49 +167,15 @@
|
|
|
status = "okay";
|
|
|
};
|
|
|
|
|
|
-&pio {
|
|
|
- led_pins_optimus: led-pins@0 {
|
|
|
- allwinner,pins = "PH0", "PH1";
|
|
|
- allwinner,function = "gpio_out";
|
|
|
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
|
|
|
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
|
|
|
- };
|
|
|
-
|
|
|
- mmc0_cd_pin_optimus: mmc0_cd_pin@0 {
|
|
|
- allwinner,pins = "PH18";
|
|
|
- allwinner,function = "gpio_in";
|
|
|
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
|
|
|
- allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
|
|
|
- };
|
|
|
-
|
|
|
- usb1_vbus_pin_optimus: usb1_vbus_pin@1 {
|
|
|
- allwinner,pins = "PH4";
|
|
|
- allwinner,function = "gpio_out";
|
|
|
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
|
|
|
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
|
|
|
- };
|
|
|
-
|
|
|
- usb3_vbus_pin_optimus: usb3_vbus_pin@1 {
|
|
|
- allwinner,pins = "PH5";
|
|
|
- allwinner,function = "gpio_out";
|
|
|
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
|
|
|
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
|
|
|
- };
|
|
|
+&osc32k {
|
|
|
+ /* osc32k input is from AC100 */
|
|
|
+ clocks = <&ac100_rtc 0>;
|
|
|
};
|
|
|
|
|
|
&r_ir {
|
|
|
status = "okay";
|
|
|
};
|
|
|
|
|
|
-&r_pio {
|
|
|
- led_r_pins_optimus: led-pins@1 {
|
|
|
- allwinner,pins = "PM15";
|
|
|
- allwinner,function = "gpio_out";
|
|
|
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
|
|
|
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
|
|
|
- };
|
|
|
-};
|
|
|
-
|
|
|
&r_rsb {
|
|
|
status = "okay";
|
|
|
|
|
@@ -320,6 +301,146 @@
|
|
|
reg_rtc_ldo: rtc_ldo {
|
|
|
regulator-name = "vcc-rtc-vdd1v8-io";
|
|
|
};
|
|
|
+
|
|
|
+ sw {
|
|
|
+ /* unused */
|
|
|
+ };
|
|
|
+ };
|
|
|
+ };
|
|
|
+
|
|
|
+ axp806: pmic@745 {
|
|
|
+ compatible = "x-powers,axp806";
|
|
|
+ reg = <0x745>;
|
|
|
+ interrupt-parent = <&nmi_intc>;
|
|
|
+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
|
+ interrupt-controller;
|
|
|
+ #interrupt-cells = <1>;
|
|
|
+ bldoin-supply = <®_dcdce>;
|
|
|
+
|
|
|
+ regulators {
|
|
|
+ reg_s_aldo1: aldo1 {
|
|
|
+ regulator-always-on;
|
|
|
+ regulator-min-microvolt = <3000000>;
|
|
|
+ regulator-max-microvolt = <3000000>;
|
|
|
+ regulator-name = "avcc";
|
|
|
+ };
|
|
|
+
|
|
|
+ aldo2 {
|
|
|
+ /*
|
|
|
+ * unused, but use a different name to
|
|
|
+ * avoid name clash with axp809's aldo's
|
|
|
+ */
|
|
|
+ regulator-name = "s_aldo2";
|
|
|
+ };
|
|
|
+
|
|
|
+ aldo3 {
|
|
|
+ /*
|
|
|
+ * unused, but use a different name to
|
|
|
+ * avoid name clash with axp809's aldo's
|
|
|
+ */
|
|
|
+ regulator-name = "s_aldo3";
|
|
|
+ };
|
|
|
+
|
|
|
+ reg_bldo1: bldo1 {
|
|
|
+ regulator-always-on;
|
|
|
+ regulator-min-microvolt = <1700000>;
|
|
|
+ regulator-max-microvolt = <1900000>;
|
|
|
+ regulator-name = "vcc18-efuse-adc-display-csi";
|
|
|
+ };
|
|
|
+
|
|
|
+ reg_bldo2: bldo2 {
|
|
|
+ regulator-always-on;
|
|
|
+ regulator-min-microvolt = <1700000>;
|
|
|
+ regulator-max-microvolt = <1900000>;
|
|
|
+ regulator-name =
|
|
|
+ "vdd18-drampll-vcc18-pll-cpvdd";
|
|
|
+ };
|
|
|
+
|
|
|
+ bldo3 {
|
|
|
+ /* unused */
|
|
|
+ };
|
|
|
+
|
|
|
+ reg_bldo4: bldo4 {
|
|
|
+ regulator-min-microvolt = <1100000>;
|
|
|
+ regulator-max-microvolt = <1300000>;
|
|
|
+ regulator-name = "vcc12-hsic";
|
|
|
+ };
|
|
|
+
|
|
|
+ reg_cldo1: cldo1 {
|
|
|
+ /*
|
|
|
+ * This was 3V in the original design, but
|
|
|
+ * 3.3V is the recommended supply voltage
|
|
|
+ * for the Ethernet PHY.
|
|
|
+ */
|
|
|
+ regulator-min-microvolt = <3300000>;
|
|
|
+ regulator-max-microvolt = <3300000>;
|
|
|
+ regulator-name = "vcc-gmac-phy";
|
|
|
+ };
|
|
|
+
|
|
|
+ reg_cldo2: cldo2 {
|
|
|
+ regulator-min-microvolt = <2800000>;
|
|
|
+ regulator-max-microvolt = <2800000>;
|
|
|
+ regulator-name = "afvcc-cam";
|
|
|
+ };
|
|
|
+
|
|
|
+ reg_cldo3: cldo3 {
|
|
|
+ regulator-min-microvolt = <3000000>;
|
|
|
+ regulator-max-microvolt = <3000000>;
|
|
|
+ regulator-name = "vcc-io-wifi-codec-io2";
|
|
|
+ };
|
|
|
+
|
|
|
+ reg_dcdca: dcdca {
|
|
|
+ regulator-always-on;
|
|
|
+ regulator-min-microvolt = <800000>;
|
|
|
+ regulator-max-microvolt = <1100000>;
|
|
|
+ regulator-name = "vdd-cpub";
|
|
|
+ };
|
|
|
+
|
|
|
+ reg_dcdcd: dcdcd {
|
|
|
+ regulator-always-on;
|
|
|
+ regulator-min-microvolt = <800000>;
|
|
|
+ regulator-max-microvolt = <1100000>;
|
|
|
+ regulator-name = "vdd-vpu";
|
|
|
+ };
|
|
|
+
|
|
|
+ reg_dcdce: dcdce {
|
|
|
+ regulator-always-on;
|
|
|
+ regulator-min-microvolt = <2100000>;
|
|
|
+ regulator-max-microvolt = <2100000>;
|
|
|
+ regulator-name = "vcc-bldo-codec-ldoin";
|
|
|
+ };
|
|
|
+
|
|
|
+ sw {
|
|
|
+ /*
|
|
|
+ * unused, but use a different name to
|
|
|
+ * avoid name clash with axp809's sw
|
|
|
+ */
|
|
|
+ regulator-name = "s_sw";
|
|
|
+ };
|
|
|
+ };
|
|
|
+ };
|
|
|
+
|
|
|
+ ac100: codec@e89 {
|
|
|
+ compatible = "x-powers,ac100";
|
|
|
+ reg = <0xe89>;
|
|
|
+
|
|
|
+ ac100_codec: codec {
|
|
|
+ compatible = "x-powers,ac100-codec";
|
|
|
+ interrupt-parent = <&r_pio>;
|
|
|
+ interrupts = <0 9 IRQ_TYPE_LEVEL_LOW>; /* PL9 */
|
|
|
+ #clock-cells = <0>;
|
|
|
+ clock-output-names = "4M_adda";
|
|
|
+ };
|
|
|
+
|
|
|
+ ac100_rtc: rtc {
|
|
|
+ compatible = "x-powers,ac100-rtc";
|
|
|
+ interrupt-parent = <&nmi_intc>;
|
|
|
+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
|
+ clocks = <&ac100_codec>;
|
|
|
+ #clock-cells = <1>;
|
|
|
+ clock-output-names = "cko1_rtc",
|
|
|
+ "cko2_rtc",
|
|
|
+ "cko3_rtc";
|
|
|
};
|
|
|
};
|
|
|
};
|
|
@@ -328,7 +449,7 @@
|
|
|
|
|
|
&uart0 {
|
|
|
pinctrl-names = "default";
|
|
|
- pinctrl-0 = <&uart0_pins_a>;
|
|
|
+ pinctrl-0 = <&uart0_ph_pins>;
|
|
|
status = "okay";
|
|
|
};
|
|
|
|
|
@@ -338,7 +459,9 @@
|
|
|
};
|
|
|
|
|
|
&usbphy2 {
|
|
|
- status = "okay";
|
|
|
+ phy-supply = <®_bldo4>;
|
|
|
+ /* Enable if HSIC peripheral is connected */
|
|
|
+ status = "disabled";
|
|
|
};
|
|
|
|
|
|
&usbphy3 {
|