Commit 2c94db38 authored Dec 12, 2018 by Olof Johansson

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

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

Allwinner DT changes for 4.21

This is a quite big pull request this time, with a huge number of changes
(and patches) due to us fixing the vast majority of the DTC warnings our DT
had.

We also have a bunch of other good, more meaningful, changes:
  - Support for the new Allwinner T3 (rebranded R40) and f1c100s (armv5)
    SoCs
  - AXP803 PMIC AC Power supply support
  - Rework of the oscillators tree
  - Two new boards: the t3-cqa3t-bv3 and Lichee Pi Nano

Plus a few enhancements here and there.

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

: (84 commits)
  ARM: dts: sunxi: Fix PMU compatible strings
  ARM: dts: sun8i: r40: Add RTC device node
  ARM: dts: sunxi: h3/h5: Fix up RTC device node and clock references
  ARM: dts: sun8i: a23/a33: Fix up RTC device node
  ARM: dts: sun8i: r40: Add clock accuracy for external oscillators
  ARM: dts: sunxi: h3/h5: Add clock accuracy for external oscillators
  ARM: dts: sun8i: a33: Drop audio codec oversampling rate to 128 fs
  ARM: dts: sun8i: h3: Remove unnecessary reserved memory node
  ARM: dts: sun8i: a33: Remove unnecessary reserved memory node
  ARM: dts: suniv: Add device tree for Lichee Pi Nano
  ARM: dts: suniv: add initial DTSI file for F1C100s
  ARM: dts: axp81x: add AC power supply subnode
  ARM: dts: sun8i: v3s: Remove skeleton and memory to avoid warnings
  ARM: dts: sun8i: v3s: Provide default muxing for relevant controllers
  ARM: dts: sun8i: v3s: Change pinctrl nodes to avoid warning
  ARM: dts: sun8i: v3s: Change LRADC node names to avoid warnings
  ARM: dts: sun8i: h3: Remove leading zeros from unit-addresses
  ARM: dts: sun8i: BPI-M2M: Remove i2c nodes
  ARM: dts: sun8i: a23/a33: Provide default muxing for relevant controllers
  ARM: dts: sunxi: reference: Move the muxing back to the common DTSI
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 91eac913 5719ac19

Documentation/devicetree/bindings/arm/sunxi.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,8 @@ using one of the following compatible strings:
		allwinner,sun8i-a83t
		allwinner,sun8i-h2-plus
		allwinner,sun8i-h3
		allwinner-sun8i-r40
		allwinner,sun8i-r40
		allwinner,sun8i-t3
		allwinner,sun8i-v3s
		allwinner,sun9i-a80
		allwinner,sun50i-a64

Documentation/devicetree/bindings/media/cedrus.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ reserved-memory {
		ranges;

		/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
		cma_pool: cma@4a000000 {
		cma_pool: default-pool {
		compatible = "shared-dma-pool";
		size = <0x6000000>;
		alloc-ranges = <0x4a000000 0x6000000>;

arch/arm/boot/dts/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -1069,12 +1069,15 @@ dtb-$(CONFIG_MACH_SUN8I) += \
		sun8i-r16-nintendo-super-nes-classic.dtb \
		sun8i-r16-parrot.dtb \
		sun8i-r40-bananapi-m2-ultra.dtb \
		sun8i-t3-cqa3t-bv3.dtb \
		sun8i-v3s-licheepi-zero.dtb \
		sun8i-v3s-licheepi-zero-dock.dtb \
		sun8i-v40-bananapi-m2-berry.dtb
		dtb-$(CONFIG_MACH_SUN9I) += \
		sun9i-a80-optimus.dtb \
		sun9i-a80-cubieboard4.dtb
		dtb-$(CONFIG_MACH_SUNIV) += \
		suniv-f1c100s-licheepi-nano.dtb
		dtb-$(CONFIG_ARCH_TANGO) += \
		tango4-vantage-1172.dtb
		dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \

arch/arm/boot/dts/axp81x.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,11 @@
		interrupt-controller;
		#interrupt-cells = <1>;

		ac_power_supply: ac-power-supply {
		compatible = "x-powers,axp813-ac-power-supply";
		status = "disabled";
		};

		axp_adc: adc {
		compatible = "x-powers,axp813-adc";
		#io-channel-cells = <1>;

arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

+0 −2

Original line number	Diff line number	Diff line
		@@ -63,8 +63,6 @@
		compatible = "gpio-keys-polled";
		pinctrl-names = "default";
		pinctrl-0 = <&key_pins_inet9f>;
		#address-cells = <1>;
		#size-cells = <0>;
		poll-interval = <20>;

		left-joystick-left {

Admin message