Commit f6cfb905 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt64-for-4.20' of... 

Merge tag 'sunxi-dt64-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner arm64 DT changes for 4.20

Our usual set of DT changes for the arm64 Allwinner SoCs.

The most notable things are:
  - HDMI support on the A64
  - New boards: OrangePi One Plus

* tag 'sunxi-dt64-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

: (28 commits)
  arm64: dts: allwinner: a64: a64-olinuxino: set the PHY TX delay
  arm64: dts: allwinner: a64: Enable HDMI output on A64 boards w/ HDMI
  arm64: dts: allwinner: a64: Add display pipeline
  arm64: dts: allwinner: h6: add system controller device tree node
  arm64: dts: allwinner: h6: Add OrangePi One Plus initial support
  arm64: dts: allwinner: a64: Rename r_i2c_pins_a label to r_i2c_pl89_pins
  arm64: dts: allwinner: a64: Rename uart0_pins_a label to uart0_pb_pins
  arm64: dts: allwinner: a64: Split out data strobe pin from mmc2 pinmux
  arm64: dts: allwinner: a64: NanoPi-A64: Add blue status LED
  arm64: dts: allwinner: a64: NanoPi-A64: Add Wifi chip
  arm64: dts: allwinner: a64: NanoPi-A64: Add Ethernet
  arm64: dts: allwinner: a64: NanoPi-A64: Fix DCDC1 voltage
  arm64: dts: allwinner: a64: Olinuxino: enable USB
  arm64: dts: allwinner: a64: Olinuxino: add Ethernet nodes
  arm64: dts: allwinner: a64: Olinuxino: fix DRAM voltage
  arm64: dts: allwinner: a64: Orange Pi Win: Adjust CSI power rails
  arm64: dts: allwinner: a64: Orange Pi Win: Add SPI flash node
  arm64: dts: allwinner: a64: Orange Pi Win: Add SDIO node
  arm64: dts: allwinner: a64: Orange Pi Win: Add LED node
  arm64: dts: allwinner: a64: Orange Pi Win: Add UARTs
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 26220da2 67929449

arch/arm64/boot/dts/allwinner/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb 
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-nanopi-a64.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-olinuxino.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-orangepi-win.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-lts.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinebook.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb
@@ -17,4 +18,5 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb 
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb

arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ 


&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pb_pins>;

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+28 −2
Original line number Diff line number Diff line
@@ -60,6 +60,17 @@ 
		stdout-path = "serial0:115200n8";

	};



	hdmi-connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_con_in: endpoint {

				remote-endpoint = <&hdmi_out_con>;

			};

		};

	};



	leds {

		compatible = "gpio-leds";
@@ -86,6 +97,10 @@ 
	};

};



&de {

	status = "okay";

};



&ehci0 {

	status = "okay";

};
@@ -103,6 +118,17 @@ 
	status = "okay";

};



&hdmi {

	hvcc-supply = <&reg_dldo1>;

	status = "okay";

};



&hdmi_out {

	hdmi_out_con: endpoint {

		remote-endpoint = <&hdmi_con_in>;

	};

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;
@@ -151,7 +177,7 @@ 


&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

	pinctrl-0 = <&mmc2_pins>, <&mmc2_ds_pin>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <8>;

	non-removable;
@@ -302,7 +328,7 @@ 


&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pb_pins>;

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts

+81 −4
Original line number Diff line number Diff line
@@ -51,12 +51,44 @@ 
	compatible = "friendlyarm,nanopi-a64", "allwinner,sun50i-a64";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	hdmi-connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_con_in: endpoint {

				remote-endpoint = <&hdmi_out_con>;

			};

		};

	};



	leds {

		compatible = "gpio-leds";



		blue {

			label = "nanopi-a64:blue:status";

			gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */

		};

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&rtc 1>;

		clock-names = "ext_clock";

		reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */

	};

};



&de {

	status = "okay";

};



&ehci0 {
@@ -67,6 +99,26 @@ 
	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	phy-supply = <&reg_dcdc1>;

	status = "okay";

};



&hdmi {

	hvcc-supply = <&reg_dldo1>;

	status = "okay";

};



&hdmi_out {

	hdmi_out_con: endpoint {

		remote-endpoint = <&hdmi_con_in>;

	};

};



/* i2c1 connected with gpio headers like pine64, bananapi */

&i2c1 {

	pinctrl-names = "default";
@@ -78,6 +130,13 @@ 
	bias-pull-up;

};



&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <7>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;
@@ -88,6 +147,24 @@ 
	status = "okay";

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&reg_dcdc1>;

	vqmmc-supply = <&reg_dldo4>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	non-removable;

	status = "okay";



	rtl8189etv: wifi@1 {

		reg = <1>;

		interrupt-parent = <&r_pio>;

		interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>; /* PL3 */

		interrupt-names = "host-wake";

	};

};



&ohci0 {

	status = "okay";

};
@@ -125,9 +202,9 @@ 


&reg_dcdc1 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-3v";

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-3v3";

};



&reg_dcdc2 {
@@ -201,7 +278,7 @@ 


&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pb_pins>;

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts

+96 −3
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
	compatible = "olimex,a64-olinuxino", "allwinner,sun50i-a64";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

	};
@@ -58,12 +59,74 @@ 
		stdout-path = "serial0:115200n8";

	};



	hdmi-connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_con_in: endpoint {

				remote-endpoint = <&hdmi_out_con>;

			};

		};

	};



	reg_usb1_vbus: usb1-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb1-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-boot-on;

		enable-active-high;

		gpio = <&pio 6 9 GPIO_ACTIVE_HIGH>; /* PG9 */

		status = "okay";

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */

	};

};



&de {

	status = "okay";

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	phy-supply = <&reg_dcdc1>;

	allwinner,tx-delay-ps = <600>;

	status = "okay";

};



&hdmi {

	hvcc-supply = <&reg_dldo1>;

	status = "okay";

};



&hdmi_out {

	hdmi_out_con: endpoint {

		remote-endpoint = <&hdmi_con_in>;

	};

};



&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <1>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;
@@ -92,6 +155,14 @@ 
	};

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&r_rsb {

	status = "okay";
@@ -100,6 +171,7 @@ 
		reg = <0x3a3>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

		x-powers,drive-vbus-en;	/* set N_VBUSEN as output pin */

	};

};
@@ -142,10 +214,14 @@ 


/* DCDC3 is polyphased with DCDC2 */



/*

 * The board uses DDR3L DRAM chips. 1.36V is the closest to the nominal

 * 1.35V that the PMIC can drive.

 */

&reg_dcdc5 {

	regulator-always-on;

	regulator-min-microvolt = <1500000>;

	regulator-max-microvolt = <1500000>;

	regulator-min-microvolt = <1360000>;

	regulator-max-microvolt = <1360000>;

	regulator-name = "vcc-ddr3";

};
@@ -180,6 +256,11 @@ 
	regulator-name = "vcc-wifi-io";

};



&reg_drivevbus {

	regulator-name = "usb0-vbus";

	status = "okay";

};



&reg_eldo1 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;
@@ -220,6 +301,18 @@ 


&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pb_pins>;

	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usbphy {

	status = "okay";

	usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */

	usb0_vbus-supply = <&reg_drivevbus>;

	usb1_vbus-supply = <&reg_usb1_vbus>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE