Commit 33d2f131 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-h3-h5-for-4.18' of... 

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

Allwinner H3/H5 support for 4.18

Here is our usual bunch of changes for the H3 and H5 SoCs that share the
same SoC design but with different CPUs.

This time, most of the changes are about supporting CPUFreq on these SoCs,
with voltage scaling being enabled for a number of boards.

* tag 'sunxi-h3-h5-for-4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  ARM: dts: sun8i: h3: Add SY8106A regulator to Orange Pi PC
  arm64: dts: allwinner: Add dts file for Libre Computer Board ALL-H3-CC H5 ver.
  arm64: dts: allwinner: Sort dtb entries in Makefile
  arm64: dts: allwinner: h5: Add cpu0 label for first cpu
  ARM: dts: sun8i: h2+: Add Libre Computer Board ALL-H3-CC H2+ ver.
  ARM: dts: sun8i: h2-plus: Sort dtb entries in Makefile
  arm: dts: sun8i: h3: libretech-all-h3-cc: Move board definition to common dtsi
  ARM: dts: sun8i: h3: fix ALL-H3-CC H3 ver VCC-1V2 regulator voltage
  ARM: dts: sun8i: h3: set the cpu-supply to VDD-CPUX on ALL-H3-CC H3 ver
  ARM: dts: sun8i: h3: fix ALL-H3-CC H3 ver VDD-CPUX voltage
  ARM: dts: sun8i: h3: add SY8113B regulator used by Orange Pi One board
  ARM: dts: sun8i: h2+: add SY8113B regulator used by Orange Pi Zero board
  ARM: dts: sun8i: h3: add operating-points-v2 table for CPU
  ARM: dts: sunxi: h3/h5: Add r_i2c I2C controller
  ARM: dts: sunxi: h3/h5: Add r_i2c pinmux node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 541162ff 06139c82

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -1000,8 +1000,9 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-a83t-bananapi-m3.dtb \

	sun8i-a83t-cubietruck-plus.dtb \

	sun8i-a83t-tbs-a711.dtb \

	sun8i-h2-plus-orangepi-r1.dtb \

	sun8i-h2-plus-bananapi-m2-zero.dtb \

	sun8i-h2-plus-libretech-all-h3-cc.dtb \

	sun8i-h2-plus-orangepi-r1.dtb \

	sun8i-h2-plus-orangepi-zero.dtb \

	sun8i-h3-bananapi-m2-plus.dtb \

	sun8i-h3-beelink-x2.dtb \

arch/arm/boot/dts/sun8i-h2-plus-libretech-all-h3-cc.dts

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

/*

 * Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org>

 */



/dts-v1/;

#include "sun8i-h3.dtsi"

#include "sunxi-libretech-all-h3-cc.dtsi"



/ {

	model = "Libre Computer Board ALL-H3-CC H2+";

	compatible = "libretech,all-h3-cc-h2-plus", "allwinner,sun8i-h2-plus";

};

arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts

+21 −0
Original line number Diff line number Diff line
@@ -89,6 +89,23 @@ 
		gpio = <&pio 0 20 GPIO_ACTIVE_HIGH>;

	};



	reg_vdd_cpux: vdd-cpux-regulator {

		compatible = "regulator-gpio";

		regulator-name = "vdd-cpux";

		regulator-type = "voltage";

		regulator-boot-on;

		regulator-always-on;

		regulator-min-microvolt = <1100000>;

		regulator-max-microvolt = <1300000>;

		regulator-ramp-delay = <50>; /* 4ms */



		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */

		enable-active-high;

		gpios-states = <1>;

		states = <1100000 0

			  1300000 1>;

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>;
@@ -96,6 +113,10 @@ 
	};

};



&cpu0 {

	cpu-supply = <&reg_vdd_cpux>;

};



&ehci0 {

	status = "okay";

};

arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts

+1 −205
Original line number Diff line number Diff line
@@ -6,213 +6,9 @@ 


/dts-v1/;

#include "sun8i-h3.dtsi"



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

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

#include "sunxi-libretech-all-h3-cc.dtsi"



/ {

	model = "Libre Computer Board ALL-H3-CC H3";

	compatible = "libretech,all-h3-cc-h3", "allwinner,sun8i-h3";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_con_in: endpoint {

				remote-endpoint = <&hdmi_out_con>;

			};

		};

	};



	leds {

		compatible = "gpio-leds";



		pwr_led {

			label = "librecomputer:green:pwr";

			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */

			default-state = "on";

		};



		status_led {

			label = "librecomputer:blue:status";

			gpios = <&pio 0 7 GPIO_ACTIVE_HIGH>; /* PA7 */

		};

	};



	gpio_keys {

		compatible = "gpio-keys";



		power {

			label = "power";

			linux,code = <KEY_POWER>;

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

		};

	};



	reg_vcc1v2: vcc1v2 {

		compatible = "regulator-fixed";

		regulator-name = "vcc1v2";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&reg_vcc5v0>;

		gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */

		enable-active-high;

	};



	reg_vcc3v3: vcc3v3 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&reg_vcc5v0>;

	};



	/* This represents the board's 5V input */

	reg_vcc5v0: vcc5v0 {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	reg_vcc_dram: vcc-dram {

		compatible = "regulator-fixed";

		regulator-name = "vcc-dram";

		regulator-min-microvolt = <1500000>;

		regulator-max-microvolt = <1500000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&reg_vcc5v0>;

		gpio = <&r_pio 0 9 GPIO_ACTIVE_HIGH>; /* PL9 */

		enable-active-high;

	};



	reg_vcc_io: vcc-io {

		compatible = "regulator-fixed";

		regulator-name = "vcc-io";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&reg_vcc3v3>;

		gpio = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL5 */

	};



	reg_vdd_cpux: vdd-cpux {

		compatible = "regulator-fixed";

		regulator-name = "vdd-cpux";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&reg_vcc5v0>;

		gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */

		enable-active-high;

	};

};



&codec {

	allwinner,audio-routing =

		"Line Out", "LINEOUT",

		"MIC1", "Mic",

		"Mic",  "MBIAS";

	status = "okay";

};



&de {

	status = "okay";

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&ehci2 {

	status = "okay";

};



&ehci3 {

	status = "okay";

};



&emac {

	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};



&hdmi {

	status = "okay";

};



&hdmi_out {

	hdmi_out_con: endpoint {

		remote-endpoint = <&hdmi_con_in>;

	};

};



&ir {

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;

	status = "okay";

};



&mmc0 {

	vmmc-supply = <&reg_vcc_io>;

	bus-width = <4>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */

	status = "okay";

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&ohci3 {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&usb_otg {

	dr_mode = "host";

	status = "okay";

};



&usbphy {

	/* VBUS on USB ports are always on */

	usb0_vbus-supply = <&reg_vcc5v0>;

	usb1_vbus-supply = <&reg_vcc5v0>;

	usb2_vbus-supply = <&reg_vcc5v0>;

	usb3_vbus-supply = <&reg_vcc5v0>;

	status = "okay";

};

arch/arm/boot/dts/sun8i-h3-orangepi-one.dts

+21 −0
Original line number Diff line number Diff line
@@ -99,6 +99,27 @@ 
			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;

		};

	};



	reg_vdd_cpux: vdd-cpux-regulator {

		compatible = "regulator-gpio";

		regulator-name = "vdd-cpux";

		regulator-type = "voltage";

		regulator-boot-on;

		regulator-always-on;

		regulator-min-microvolt = <1100000>;

		regulator-max-microvolt = <1300000>;

		regulator-ramp-delay = <50>; /* 4ms */



		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */

		enable-active-high;

		gpios-states = <0x1>;

		states = <1100000 0x0

			  1300000 0x1>;

	};

};



&cpu0 {

	cpu-supply = <&reg_vdd_cpux>;

};



&de {

CRA Git | Maintained and supported by SUSTech CRA and CCSE