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

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

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

Allwinner DT changes for 5.2

This PR is pretty significant, but it been mostly about:
  - Fixing the DTC warnings in most of our DT. We're now down to 2
    warnings, from several thousands.
  - Fixing a good number of minor issues, typos, and so on thanks to the DT
    validation tools
  - Describe the MBUS controller and the special DMA RAM mapping on the A13
  - Add support for the LRADC on the A83t
  - Add support for the I2C bus used for the PMIC on the A33
  - Start using the DT annotation /omit-if-no-ref/ on our pinctrl nodes

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

: (65 commits)
  ARM: dts: sun8i: a83t: Enable USB OTG controller on some boards
  ARM: dtsi: axp81x: add USB power supply node
  ARM: dts: sun5i: Reorder pinctrl nodes
  ARM: dts: sun6i: i7: Remove useless property
  ARM: dts: sun4i: lime: Fix the USB PHY ID detect GPIO properties
  ARM: dts: sun4i: protab2: Remove stale pinctrl-names entry
  ARM: dts: sunxi: Remove useless phy-names from EHCI and OHCI
  ARM: dts: sun8i: v40: bananapi-m2-berry: Sort device node dereferences.
  ARM: dts: sun5i: Add the MBUS controller
  dt-bindings: sunxi: Add compatible for OrangePi 3 board
  ARM: dts: sun8i: a83t: Add I2C2 pinmux setting for PE pins
  dt-bindings: arm: sunxi: Add Beelink GS1 board
  ARM: dts: sun8i: tbs-a711: Add support for volume keys input
  ARM: dts: sunxi: Add R_LRADC support for A83T
  ARM: dts: sunxi: Improve A33 NAND transfers by using DMA
  ARM: dts: sun8i: tbs-a711: Enable UART2 (for NEO-6M GPS module)
  ARM: dts: sunxi: Remove useless pinctrl nodes
  ARM: dts: sunxi: Remove pinctrl groups setting bias
  ARM: dts: sunxi: Remove useless address and size cells
  ARM: dts: sunxi: Conform to DT spec for NAND controller
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 14d55a3d 6e0c67e3

Documentation/devicetree/bindings/arm/sunxi.txt

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
Allwinner sunXi Platforms Device Tree Bindings



Each device tree must specify which Allwinner SoC it uses,

using one of the following compatible strings:



  allwinner,sun4i-a10

  allwinner,sun5i-a10s

  allwinner,sun5i-a13

  allwinner,sun5i-r8

  allwinner,sun6i-a31

  allwinner,sun7i-a20

  allwinner,sun8i-a23

  allwinner,sun8i-a33

  allwinner,sun8i-a83t

  allwinner,sun8i-h2-plus

  allwinner,sun8i-h3

  allwinner,sun8i-r40

  allwinner,sun8i-t3

  allwinner,sun8i-v3s

  allwinner,sun9i-a80

  allwinner,sun50i-a64

  allwinner,suniv-f1c100s

  nextthing,gr8

Documentation/devicetree/bindings/arm/sunxi.yaml

0 → 100644
+807 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/axp81x.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -171,4 +171,8 @@ 
			status = "disabled";

		};

	};



	usb_power_supply: usb-power-supply {

		compatible = "x-powers,axp813-usb-power-supply";

	};

};

arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts

+2 −18
Original line number Diff line number Diff line
@@ -131,20 +131,6 @@ 
	status = "okay";

};



&pio {

	usb0_id_detect_pin: usb0-id-detect-pin {

		pins = "PH4";

		function = "gpio_in";

		bias-pull-up;

	};



	usb0_vbus_detect_pin: usb0-vbus-detect-pin {

		pins = "PH5";

		function = "gpio_in";

		bias-pull-down;

	};

};



&reg_usb0_vbus {

	status = "okay";

};
@@ -165,10 +151,8 @@ 
};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */

	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */

	usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

arch/arm/boot/dts/sun4i-a10-cubieboard.dts

+1 −9
Original line number Diff line number Diff line
@@ -184,12 +184,6 @@ 
		function = "gpio_out";

		drive-strength = <20>;

	};



	usb0_id_detect_pin: usb0-id-detect-pin {

		pins = "PH4";

		function = "gpio_in";

		bias-pull-up;

	};

};



&reg_ahci_5v {
@@ -254,9 +248,7 @@ 
};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>;

	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE