Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89bab02a authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Allwinner arm64 changes for 4.18

We mostly have some changes to support the H6, Allwinner latest SoC. We're
still in the preliminary phase, with I2C, pinctrl and clock support.

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

:
  arm64: allwinner: h6: add PCF8563 RTC on Pine H64 board
  arm64: allwinner: h6: add R_I2C controller
  arm64: allwinner: h6: add R_INTC interrupt controller
  arm64: allwinner: h6: add node for R_PIO pin controller
  arm64: allwinner: h6: add PRCM CCU device node
  arm64: dts: allwinner: a64: bananapi-m64: add usb otg
  arm64: dts: allwinner: axp803: Add drivevbus regulator
  arm64: allwinner: h6: restore the usage of CCU slice macros

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 33d2f131 17ebc33a

arch/arm64/boot/dts/allwinner/axp803.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -146,5 +146,10 @@ 
			regulator-max-microvolt = <3000000>;

			regulator-name = "rtc-ldo";

		};



		reg_drivevbus: drivevbus {

			regulator-name = "drivevbus";

			status = "disabled";

		};

	};

};

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

+21 −0
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ 
	};

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};
@@ -155,6 +159,10 @@ 
	status = "okay";

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};
@@ -167,6 +175,7 @@ 
		reg = <0x3a3>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

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

	};

};
@@ -254,6 +263,11 @@ 
	regulator-name = "vcc-wifi-io";

};



&reg_drivevbus {

	regulator-name = "usb0-vbus";

	status = "okay";

};



&reg_eldo1 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;
@@ -294,6 +308,13 @@ 
	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-h6-pine-h64.dts

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,16 @@ 
	};

};



&r_i2c {

	status = "okay";



	pcf8563: rtc@51 {

		compatible = "nxp,pcf8563";

		reg = <0x51>;

		#clock-cells = <0>;

	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_ph_pins>;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi

+61 −9
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
 */



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/clock/sun50i-h6-ccu.h>

#include <dt-bindings/reset/sun50i-h6-ccu.h>



/ {

	interrupt-parent = <&gic>;
@@ -115,7 +117,7 @@ 
				     <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu 26>, <&osc24M>, <&osc32k>;

			clocks = <&ccu CLK_APB1>, <&osc24M>, <&osc32k>;

			clock-names = "apb", "hosc", "losc";

			gpio-controller;

			#gpio-cells = <3>;
@@ -134,8 +136,8 @@ 
			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;

			reg-shift = <2>;

			reg-io-width = <4>;

			clocks = <&ccu 70>;

			resets = <&ccu 21>;

			clocks = <&ccu CLK_BUS_UART0>;

			resets = <&ccu RST_BUS_UART0>;

			status = "disabled";

		};
@@ -145,8 +147,8 @@ 
			interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

			reg-shift = <2>;

			reg-io-width = <4>;

			clocks = <&ccu 71>;

			resets = <&ccu 22>;

			clocks = <&ccu CLK_BUS_UART1>;

			resets = <&ccu RST_BUS_UART1>;

			status = "disabled";

		};
@@ -156,8 +158,8 @@ 
			interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

			reg-shift = <2>;

			reg-io-width = <4>;

			clocks = <&ccu 72>;

			resets = <&ccu 23>;

			clocks = <&ccu CLK_BUS_UART2>;

			resets = <&ccu RST_BUS_UART2>;

			status = "disabled";

		};
@@ -167,9 +169,59 @@ 
			interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

			reg-shift = <2>;

			reg-io-width = <4>;

			clocks = <&ccu 73>;

			resets = <&ccu 24>;

			clocks = <&ccu CLK_BUS_UART3>;

			resets = <&ccu RST_BUS_UART3>;

			status = "disabled";

		};



		r_ccu: clock@7010000 {

			compatible = "allwinner,sun50i-h6-r-ccu";

			reg = <0x07010000 0x400>;

			clocks = <&osc24M>, <&osc32k>, <&iosc>,

				 <&ccu CLK_PLL_PERIPH0>;

			clock-names = "hosc", "losc", "iosc", "pll-periph";

			#clock-cells = <1>;

			#reset-cells = <1>;

		};



		r_intc: interrupt-controller@7021000 {

			compatible = "allwinner,sun50i-h6-r-intc",

				     "allwinner,sun6i-a31-r-intc";

			interrupt-controller;

			#interrupt-cells = <2>;

			reg = <0x07021000 0x400>;

			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;

		};



		r_pio: pinctrl@7022000 {

			compatible = "allwinner,sun50i-h6-r-pinctrl";

			reg = <0x07022000 0x400>;

			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&r_ccu 2>, <&osc24M>, <&osc32k>;

			clock-names = "apb", "hosc", "losc";

			gpio-controller;

			#gpio-cells = <3>;

			interrupt-controller;

			#interrupt-cells = <3>;



			r_i2c_pins: r-i2c {

				pins = "PL0", "PL1";

				function = "s_i2c";

			};

		};



		r_i2c: i2c@7081400 {

			compatible = "allwinner,sun6i-a31-i2c";

			reg = <0x07081400 0x400>;

			interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&r_ccu 8>;

			resets = <&r_ccu 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&r_i2c_pins>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};

	};

};