Commit 74e828c8 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Allwinner arm64 DT changes for 4.19

Some interesting changes, especially:

  - MMC support for the H6
  - PMIC support for the PineH64
  - HDMI simplefb support for the A64
  - PWM support for the A64
  - New board: Pinebook, Amarula A64-Relic

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

: (22 commits)
  arm64: allwinner: h6: enable MMC0/2 on Pine H64
  arm64: allwinner: h6: add device tree nodes for MMC controllers
  dt-binding: mmc: sunxi: add H6 compatible (with A64 fallback)
  arm64: dts: allwinner: a64: Remove unused address-cells/size-cells of dwmac-sun8i
  arm64: dts: allwinner: h6: enable AXP805 PMIC on Pine H64
  arm64: dts: allwinner: h6: Use macros for R_CCU clock and reset indices
  arm64: dts: allwinner: a64: add HDMI regulator to all DTs' simplefb_hdmi
  arm64: dts: allwinner: a64: add device tree node for HDMI simplefb
  arm64: dts: allwinner: a64: add necessary device tree nodes for DE2 CCU
  arm64: dts: allwinner: h6: Add LED device nodes for Pine H64
  arm64: allwinner: a64: allow laptops to wake up from lid
  arm64: allwinner: a64: change TERES-I DLDO3's name to start with "vdd"
  arm64: allwinner: a64-sopine: Add cd-gpios to mmc0 node
  arm64: dts: allwinner: a64: add SRAM controller device tree node
  arm64: dts: allwinner: add support for Pinebook
  arm64: dts: allwinner: a64: Add PWM controllers
  arm64: dts: allwinner: a64: add R_I2C controller
  arm64: allwinner: a64-amarula-relic: Enable AP6330 WiFi support
  arm64: allwinner: a64: Add RTC clock to phandle 32kHz external oscillator
  arm64: allwinner: a64: Add Amarula A64-Relic initial support
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ba8e2b94 ecbd6118

Documentation/devicetree/bindings/mmc/sunxi-mmc.txt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ Required properties: 
   * "allwinner,sun9i-a80-mmc"

   * "allwinner,sun50i-a64-emmc"

   * "allwinner,sun50i-a64-mmc"

   * "allwinner,sun50i-h6-emmc", "allwinner.sun50i-a64-emmc"

   * "allwinner,sun50i-h6-mmc", "allwinner.sun50i-a64-mmc"

 - reg : mmc controller base registers

 - clocks : a list with 4 phandle + clock specifier pairs

 - clock-names : must contain "ahb", "mmc", "output" and "sample"

arch/arm64/boot/dts/allwinner/Makefile

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-amarula-relic.dtb

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-plus.dtb sun50i-a64-pine64.dtb

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

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-libretech-all-h3-cc.dtb

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

0 → 100644
+219 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (C) 2018 Amarula Solutions B.V.

 * Author: Jagan Teki <jagan@amarulasolutions.com>

 */



/dts-v1/;



#include "sun50i-a64.dtsi"



#include <dt-bindings/gpio/gpio.h>



/ {

	model = "Amarula A64-Relic";

	compatible = "amarula,a64-relic", "allwinner,sun50i-a64";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	wifi_pwrseq: wifi-pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&rtc 1>;

		clock-names = "ext_clock";

		reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* WL-PMU-EN: PL2 */

	};

};



&ehci0 {

	status = "okay";

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&reg_dcdc1>;

	/*

	 * Schematic shows both dldo4 and eldo1 connected for vcc-io-wifi, but

	 * dldo4 connection shows DNP(Do Not Populate) and eldo1 connected with

	 * 0Ohm register to vcc-io-wifi so eldo1 is used.

	 */

	vqmmc-supply = <&reg_eldo1>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	non-removable;

	status = "okay";



	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&r_pio>;

		interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>;	/* WL-WAKE-AP: PL3 */

		interrupt-names = "host-wake";

	};

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <8>;

	non-removable;

	cap-mmc-hw-reset;

	status = "okay";

};



&ohci0 {

	status = "okay";

};



&r_rsb {

	status = "okay";



	axp803: pmic@3a3 {

		compatible = "x-powers,axp803";

		reg = <0x3a3>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

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

	};

};



#include "axp803.dtsi"



&reg_aldo1 {

	regulator-always-on;

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

	regulator-name = "avdd-csi";

};



&reg_aldo2 {

	regulator-always-on;

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-pl";

};



&reg_aldo3 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-pll-avcc";

};



&reg_dcdc1 {

	regulator-always-on;

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-3v3";

};



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1040000>;

	regulator-max-microvolt = <1300000>;

	regulator-name = "vdd-cpux";

};



/* DCDC3 is polyphased with DCDC2 */



&reg_dcdc5 {

	regulator-always-on;

	regulator-min-microvolt = <1500000>;

	regulator-max-microvolt = <1500000>;

	regulator-name = "vcc-dram";

};



&reg_dcdc6 {

	regulator-always-on;

	regulator-min-microvolt = <1100000>;

	regulator-max-microvolt = <1100000>;

	regulator-name = "vdd-sys";

};



&reg_dldo1 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-hdmi-dsi-sensor";

};



&reg_dldo2 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-mipi";

};



&reg_dldo3 {

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

	regulator-name = "dovdd-csi";

};



&reg_dldo4 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-wifi-io";

};



&reg_drivevbus {

	regulator-name = "usb0-vbus";

	status = "okay";

};



&reg_eldo1 {

	regulator-always-on;

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-name = "cpvdd";

};



&reg_eldo3 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-name = "dvdd-csi";

};



&reg_fldo1 {

	regulator-min-microvolt = <1200000>;

	regulator-max-microvolt = <1200000>;

	regulator-name = "vcc-1v2-hsic";

};



/*

 * The A64 chip cannot work without this regulator off, although

 * it seems to be only driving the AR100 core.

 * Maybe we don't still know well about CPUs domain.

 */

&reg_fldo2 {

	regulator-always-on;

	regulator-min-microvolt = <1100000>;

	regulator-max-microvolt = <1100000>;

	regulator-name = "vdd-cpus";

};



&reg_rtc_ldo {

	regulator-name = "vcc-rtc";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usbphy {

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

	usb0_vbus-supply = <&reg_drivevbus>;

	status = "okay";

};

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

+4 −0
Original line number Diff line number Diff line
@@ -296,6 +296,10 @@ 
	regulator-name = "vcc-rtc";

};



&simplefb_hdmi {

	vcc-hdmi-supply = <&reg_dldo1>;

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

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

+4 −0
Original line number Diff line number Diff line
@@ -195,6 +195,10 @@ 
	regulator-name = "vcc-rtc";

};



&simplefb_hdmi {

	vcc-hdmi-supply = <&reg_dldo1>;

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE