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

Commit cafc8702 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Allwinner arm64 DT changes for 4.17" from Maxime Ripard:

We've had for this release a pretty good progress on the arm64 front as
well:
  - The A64 now has SPDIF support
  - The H6 is now supported (even though at an early stage)
  - The TERES-I laptop from Olimex has seen some early support as well

* tag 'sunxi-dt64-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: a64: Add support for TERES-I laptop
  arm64: dts: allwinner: a64: add simplefb for A64 SoC
  arm64: dts: allwinner: a64: Add watchdog
  arm64: dts: allwinner: a64: Add i2c0 pins
  arm64: allwinner: h6: add support for Pine H64 board
  arm64: allwinner: h6: add the basical Allwinner H6 DTSI file
  arm64: dts: sunxi: Switch MMC nodes away from cd-inverted property
  arm64: dts: allwinner: a64: Add DAI nodes
  arm64: dts: allwinner: a64: Add SPDIF to the Pine64
  arm64: dts: allwinner: a64: Add SPDIF to the A64
  arm64: dts: allwinner: a64: Add the SPDIF block and pin
parents 2b7bee1a c916eb95

Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt

+4 −2
Original line number Diff line number Diff line
@@ -2,8 +2,10 @@ Allwinner SoCs Watchdog timer 


Required properties:



- compatible : should be either "allwinner,sun4i-a10-wdt" or

- compatible : should be one of

	"allwinner,sun4i-a10-wdt"

	"allwinner,sun6i-a31-wdt"

	"allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"

- reg : Specifies base physical address and size of the registers.



Example:

arch/arm64/boot/dts/allwinner/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -5,8 +5,10 @@ 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-sopine-baseboard.dtb

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

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-plus2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb

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

+1 −2
Original line number Diff line number Diff line
@@ -120,8 +120,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

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

	disable-wp;

	bus-width = <4>;

	status = "okay";

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

+1 −2
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

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

	disable-wp;

	bus-width = <4>;

	status = "okay";

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

+1 −2
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

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

	disable-wp;

	bus-width = <4>;

	status = "okay";