Commit b76cabc9 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Allwinner arm64 DT changes for 5.2

Our usual bunch of patches, the most notable one being:
  - Fixing the DTC warnings
  - Fix DT bindings not being properly respected, thanks to the DT
    validation
  - New Board: Oceanic 5205, Beelink GS1, Orange Pi3

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

: (22 commits)
  arm64: dts: allwinner: a64-amarula-relic: Add OV5640 camera node
  arm64: dts: allwinner: a64: Add pinmux setting for CSI MCLK on PE1
  arm64: dts: allwinner: Fix DE2 bus node name
  arm64: dts: allwinner: Remove useless phy-names from EHCI and OHCI
  arm64: dts: allwinner: h6: Add MMC1 pins
  arm64: dts: allwinner: h6: Add Orange Pi 3 DTS
  arm64: dts: allwinner: h6: Introduce Beelink GS1 board
  dt-bindings: vendor-prefixes: add AZW
  arm64: dts: allwinner: h6: move MMC pinctrl to dtsi
  arm64: dts: allwinner: h6: Add device node for SID
  arm64: dts: allwinner: a64: Fix the Codec I2S binding
  arm64: dts: allwinner: a64: Add default dr_mode
  arm64: dts: allwinner: Fix pinctrl node names
  arm64: dts: allwinner: a64: Add missing PIO clocks
  arm64: dts: allwinner: a64: Fix display pipeline endpoints
  arm64: dts: allwinner: a64: Fix the TCON output clock
  arm64: dts: allwinner: h6: Add Video Engine node
  arm64: dts: allwinner: a64: Add cross links for the mixers
  arm64: allwinner: a64: Add Oceanic 5205 5inMFD initial support
  dt-bindings: Add vendor prefix for oceanic
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f5d6e8c0 7cc399f2

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ avic Shanghai AVIC Optoelectronics Co., Ltd. 
avnet	Avnet, Inc.

axentia	Axentia Technologies AB

axis	Axis Communications AB

azw     Shenzhen AZW Technology Co., Ltd.

bananapi BIPAI KEJI LIMITED

bhf	Beckhoff Automation GmbH & Co. KG

bitmain	Bitmain Technologies
@@ -287,6 +288,7 @@ nuvoton Nuvoton Technology Corporation 
nvd	New Vision Display

nvidia	NVIDIA

nxp	NXP Semiconductors

oceanic	Oceanic Systems (UK) Ltd.

okaya	Okaya Electric America, Inc.

oki	Oki Electric Industry Co., Ltd.

olimex	OLIMEX Ltd.

arch/arm64/boot/dts/allwinner/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
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-oceanic-5205-5inmfd.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
@@ -19,6 +20,8 @@ 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-beelink-gs1.dtb

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

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.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

+65 −0
Original line number Diff line number Diff line
@@ -22,6 +22,41 @@ 
		stdout-path = "serial0:115200n8";

	};



	i2c {

		compatible = "i2c-gpio";

		sda-gpios = <&pio 4 13 GPIO_ACTIVE_HIGH>;

		scl-gpios = <&pio 4 12 GPIO_ACTIVE_HIGH>;

		i2c-gpio,delay-us = <5>;

		#address-cells = <1>;

		#size-cells = <0>;



		ov5640: camera@3c {

			compatible = "ovti,ov5640";

			reg = <0x3c>;

			pinctrl-names = "default";

			pinctrl-0 = <&csi_mclk_pin>;

			clocks = <&ccu CLK_CSI_MCLK>;

			clock-names = "xclk";



			AVDD-supply = <&reg_aldo1>;

			DOVDD-supply = <&reg_dldo3>;

			DVDD-supply = <&reg_eldo3>;

			reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>; /* CSI-RST-R: PE14 */

			powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; /* CSI-STBY-R: PE15 */



			port {

				ov5640_ep: endpoint {

					remote-endpoint = <&csi_ep>;

					bus-width = <8>;

					hsync-active = <1>; /* Active high */

					vsync-active = <0>; /* Active low */

					data-active = <1>;  /* Active high */

					pclk-sample = <1>;  /* Rising */

				};

			};

		};

	};



	wifi_pwrseq: wifi-pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&rtc 1>;
@@ -30,10 +65,40 @@ 
	};

};



&csi {

	status = "okay";



	port {

		csi_ep: endpoint {

			remote-endpoint = <&ov5640_ep>;

			bus-width = <8>;

			hsync-active = <1>; /* Active high */

			vsync-active = <0>; /* Active low */

			data-active = <1>;  /* Active high */

			pclk-sample = <1>;  /* Rising */

		};

	};

};



&ehci0 {

	status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	sensor@48 {

		compatible = "st,stlm75";

		reg = <0x48>;

	};

};



&i2c0_pins {

	bias-pull-up;

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts

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

/*

 * Copyright (C) 2019 Oceanic Systems (UK) Ltd.

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

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

 */



/dts-v1/;



#include "sun50i-a64-sopine.dtsi"



/ {

	model = "Oceanic 5205 5inMFD";

	compatible = "oceanic,5205-5inmfd", "allwinner,sun50i-a64";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&ehci0 {

	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	phy-supply = <&reg_dc1sw>;

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

	status = "okay";

};



&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

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

		reg = <1>;

	};

};



&ohci0 {

	status = "okay";

};



&reg_dc1sw {

	regulator-name = "vcc-phy";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pb_pins>;

	status = "okay";

};



&usb_otg {

	dr_mode = "host";

	status = "okay";

};



&usbphy {

	status = "okay";

};

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

+0 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ 


&ehci0 {

	phys = <&usbphy 0>;

	phy-names = "usb";

	status = "okay";

};
@@ -151,7 +150,6 @@ 


&ohci0 {

	phys = <&usbphy 0>;

	phy-names = "usb";

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE