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

Commit dd851084 authored Apr 19, 2017 by Olof Johansson

Merge tag 'amlogic-dt64-redo' of...

Merge tag 'amlogic-dt64-redo' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64

Amlogic 64-bit DT updates for v4.12
- pinctrl: new pins for audio
- clocks: more clocks exposed for GFX, audio
- new board: Khadas Vim (S905X)
- new board: HwaCom AmazeTV (S905X)
- ethernet phy: add GPIO resets

* tag 'amlogic-dt64-redo' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

: (41 commits)
  ARM64: dts: meson-gx: Add support for HDMI output
  ARM64: dts: meson-gx: Add shared CMA dma memory pool
  ARM64: dts: meson-gxbb-odroidc2: Enable SARADC node
  dt-bindings: clock: gxbb-clkc: Add GXL compatible variant
  clk: meson-gxbb: Expose GP0 dt-bindings clock id
  clk: meson-gxbb: Add MALI clock IDS
  dt-bindings: clk: gxbb: expose i2s output clock gates
  ARM64: dts: meson-gxl: add spdif output pins
  ARM64: dts: meson-gxl: add i2s output pins
  ARM64: dts: meson-gxbb: add spdif output pins
  ARM64: dts: meson-gxbb: add i2s output pins
  ARM64: dts: meson-gxbb: Add USB Hub GPIO hog
  ARM: dts: meson8b: Add gpio-ranges properties
  ARM: dts: meson8: Add gpio-ranges properties
  ARM64: dts: meson-gxl: Add gpio-ranges properties
  ARM64: dts: meson-gxbb: Add gpio-ranges properties
  ARM64: dts: meson-gx: Add Mali nodes for GXBB and GXL
  ARM64: dts: meson-gxl: Add missing pinctrl pins groups
  ARM64: dts: meson-gx: Prepend GX generic compatible like other nodes
  ARM64: dts: meson-gx: empty line cleanup
  ...

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

parents 9720a9a3 b2121170

Documentation/devicetree/bindings/arm/amlogic.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,8 +43,11 @@ Board compatible values:
	- "wetek,hub" (Meson gxbb)		- "wetek,hub" (Meson gxbb)
	- "wetek,play2" (Meson gxbb)		- "wetek,play2" (Meson gxbb)
	- "amlogic,p212" (Meson gxl s905x)		- "amlogic,p212" (Meson gxl s905x)
			- "khadas,vim" (Meson gxl s905x)

	- "amlogic,p230" (Meson gxl s905d)		- "amlogic,p230" (Meson gxl s905d)
	- "amlogic,p231" (Meson gxl s905d)		- "amlogic,p231" (Meson gxl s905d)
			- "hwacom,amazetv" (Meson gxl s905x)
	- "amlogic,q200" (Meson gxm s912)		- "amlogic,q200" (Meson gxm s912)
	- "amlogic,q201" (Meson gxm s912)		- "amlogic,q201" (Meson gxm s912)
	- "nexbox,a95x" (Meson gxbb or Meson gxl s905x)		- "nexbox,a95x" (Meson gxbb or Meson gxl s905x)

Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,8 @@ controllers within the SoC.

	Required Properties:		Required Properties:

	- compatible: should be "amlogic,gxbb-clkc"		- compatible: should be "amlogic,gxbb-clkc" for GXBB SoC,
			or "amlogic,gxl-clkc" for GXL and GXM SoC.
	- reg: physical base address of the clock controller and length of memory		- reg: physical base address of the clock controller and length of memory
	mapped region.		mapped region.

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -136,6 +136,7 @@ holt Holt Integrated Circuits, Inc.
	honeywell Honeywell		honeywell Honeywell
	hp Hewlett Packard		hp Hewlett Packard
	holtek Holtek Semiconductor, Inc.		holtek Holtek Semiconductor, Inc.
			hwacom HwaCom Systems Inc.
	i2se I2SE GmbH		i2se I2SE GmbH
	ibm International Business Machines (IBM)		ibm International Business Machines (IBM)
	idt Integrated Device Technologies, Inc.		idt Integrated Device Technologies, Inc.
	@@ -159,6 +160,7 @@ jedec JEDEC Solid State Technology Association
	karo Ka-Ro electronics GmbH		karo Ka-Ro electronics GmbH
	keithkoep Keith & Koep GmbH		keithkoep Keith & Koep GmbH
	keymile Keymile GmbH		keymile Keymile GmbH
			khadas Khadas
	kinetic Kinetic Technologies		kinetic Kinetic Technologies
	kosagi Sutajio Ko-Usagi PTE Ltd.		kosagi Sutajio Ko-Usagi PTE Ltd.
	kyo Kyocera Corporation		kyo Kyocera Corporation

arch/arm/boot/dts/meson8.dtsi

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -106,6 +106,7 @@
	reg-names = "mux", "pull", "pull-enable", "gpio";		reg-names = "mux", "pull", "pull-enable", "gpio";
	gpio-controller;		gpio-controller;
	#gpio-cells = <2>;		#gpio-cells = <2>;
			gpio-ranges = <&pinctrl_cbus 0 0 120>;
	};		};

	spi_nor_pins: nor {		spi_nor_pins: nor {
	@@ -148,6 +149,7 @@
	reg-names = "mux", "pull", "gpio";		reg-names = "mux", "pull", "gpio";
	gpio-controller;		gpio-controller;
	#gpio-cells = <2>;		#gpio-cells = <2>;
			gpio-ranges = <&pinctrl_aobus 0 120 16>;
	};		};

	uart_ao_a_pins: uart_ao_a {		uart_ao_a_pins: uart_ao_a {

arch/arm/boot/dts/meson8b.dtsi

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -198,6 +198,7 @@
	reg-names = "mux", "pull", "pull-enable", "gpio";		reg-names = "mux", "pull", "pull-enable", "gpio";
	gpio-controller;		gpio-controller;
	#gpio-cells = <2>;		#gpio-cells = <2>;
			gpio-ranges = <&pinctrl_cbus 0 0 130>;
	};		};
	};		};

	@@ -215,6 +216,7 @@
	reg-names = "mux", "pull", "gpio";		reg-names = "mux", "pull", "gpio";
	gpio-controller;		gpio-controller;
	#gpio-cells = <2>;		#gpio-cells = <2>;
			gpio-ranges = <&pinctrl_aobus 0 130 16>;
	};		};

	uart_ao_a_pins: uart_ao_a {		uart_ao_a_pins: uart_ao_a {