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

Commit c913fc41 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC late DT updates from Arnd Bergmann:
 "These updates have been kept in a separate branch mostly because they
  rely on updates to the respective clk drivers to keep the shared
  header files in sync.

   - The Renesas r8a7796 (R-Car M3-W) platform gets added, this is an
     automotive SoC similar to the ⅹ8a7795 chip we already support, but
     the dts changes rely on a clock driver change that has been merged
     for v4.9 through the clk tree.

   - The Amlogic meson-gxbb (S905) platform gains support for a few
     drivers merged through our tree, in particular the network and usb
     driver changes are required and included here, and also the clk
     tree changes.

   - The Allwinner platforms have seen a large-scale change to their clk
     drivers and the dts file updates must come after that. This
     includes the newly added Nextthing GR8 platform, which is derived
     from sun5i/A13.

   - Some integrator (arm32) changes rely on clk driver changes.

   - A single patch for lpc32xx has no such dependency but wasn't added
     until just before the merge window"

* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (99 commits)
  ARM: dts: lpc32xx: add device node for IRAM on-chip memory
  ARM: dts: sun8i: Add accelerometer to polaroid-mid2407pxe03
  ARM: dts: sun8i: enable UART1 for iNet D978 Rev2 board
  ARM: dts: sun8i: add pinmux for UART1 at PG
  dts: sun8i-h3: add I2C0-2 peripherals to H3 SOC
  dts: sun8i-h3: add pinmux definitions for I2C0-2
  dts: sun8i-h3: associate exposed UARTs on Orange Pi Boards
  dts: sun8i-h3: split off RTS/CTS for UART1 in seperate pinmux
  dts: sun8i-h3: add pinmux definitions for UART2-3
  ARM: dts: sun9i: a80-optimus: Disable EHCI1
  ARM: dts: sun9i: cubieboard4: Add AXP806 PMIC device node and regulators
  ARM: dts: sun9i: a80-optimus: Add AXP806 PMIC device node and regulators
  ARM: dts: sun9i: cubieboard4: Declare AXP809 SW regulator as unused
  ARM: dts: sun9i: a80-optimus: Declare AXP809 SW regulator as unused
  ARM: dts: sun8i: Add touchscreen node for sun8i-a33-ga10h
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-polaroid-mid2809pxe04
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-polaroid-mid2407pxe03
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-inet86dz
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-gt90h
  ARM64: dts: meson-gxbb-vega-s95: Enable USB Nodes
  ...
parents a439f8f2 8185041f

Documentation/devicetree/bindings/arm/shmobile.txt

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ Boards: 
    compatible = "renesas,genmai", "renesas,r7s72100"

  - Gose

    compatible = "renesas,gose", "renesas,r8a7793"

  - H3ULCB (RTP0RC7795SKB00010S)

    compatible = "renesas,h3ulcb", "renesas,r8a7795";

  - Henninger

    compatible = "renesas,henninger", "renesas,r8a7791"

  - Koelsch (RTP0RC7791SEB00010S)

Documentation/devicetree/bindings/firmware/meson/meson_sm.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
* Amlogic Secure Monitor



In the Amlogic SoCs the Secure Monitor code is used to provide access to the

NVMEM, enable JTAG, set USB boot, etc...



Required properties for the secure monitor node:

- compatible: Should be "amlogic,meson-gxbb-sm"



Example:



	firmware {

		sm: secure-monitor {

			compatible = "amlogic,meson-gxbb-sm";

		};

	};

Documentation/devicetree/bindings/media/meson-ir.txt

+4 −1
Original line number Diff line number Diff line 
* Amlogic Meson IR remote control receiver



Required properties:

 - compatible	: should be "amlogic,meson6-ir"

 - compatible	: depending on the platform this should be one of:

		  - "amlogic,meson6-ir"

		  - "amlogic,meson8b-ir"

		  - "amlogic,meson-gxbb-ir"

 - reg		: physical base address and length of the device registers

 - interrupts	: a single specifier for the interrupt from the device

Documentation/devicetree/bindings/net/meson-dwmac.txt

+37 −8
Original line number Diff line number Diff line 
* Amlogic Meson DWMAC Ethernet controller



The device inherits all the properties of the dwmac/stmmac devices

described in the file net/stmmac.txt with the following changes.

described in the file stmmac.txt in the current directory with the

following changes.



Required properties:

Required properties on all platforms:



- compatible: should be "amlogic,meson6-dwmac" along with "snps,dwmac"

	      and any applicable more detailed version number

	      described in net/stmmac.txt

- compatible:	Depending on the platform this should be one of:

			- "amlogic,meson6-dwmac"

			- "amlogic,meson8b-dwmac"

			- "amlogic,meson-gxbb-dwmac"

		Additionally "snps,dwmac" and any applicable more

		detailed version number described in net/stmmac.txt

		should be used.



- reg: should contain a register range for the dwmac controller and

       another one for the Amlogic specific configuration

- reg:	The first register range should be the one of the DWMAC

	controller. The second range is is for the Amlogic specific

	configuration (for example the PRG_ETHERNET register range

	on Meson8b and newer)



Example:

Required properties on Meson8b and newer:

- clock-names:	Should contain the following:

		- "stmmaceth" - see stmmac.txt

		- "clkin0" - first parent clock of the internal mux

		- "clkin1" - second parent clock of the internal mux





Example for Meson6:



	ethmac: ethernet@c9410000 {

		compatible = "amlogic,meson6-dwmac", "snps,dwmac";
@@ -23,3 +37,18 @@ Example: 
		clocks = <&clk81>;

		clock-names = "stmmaceth";

	}



Example for GXBB:

	ethmac: ethernet@c9410000 {

		compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";

		reg = <0x0 0xc9410000 0x0 0x10000>,

			<0x0 0xc8834540 0x0 0x8>;

		interrupts = <0 8 1>;

		interrupt-names = "macirq";

		clocks = <&clkc CLKID_ETH>,

				<&clkc CLKID_FCLK_DIV2>,

				<&clkc CLKID_MPLL2>;

		clock-names = "stmmaceth", "clkin0", "clkin1";

		phy-mode = "rgmii";

		status = "disabled";

	};

Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
= Amlogic eFuse device tree bindings =



Required properties:

- compatible: should be "amlogic,meson-gxbb-efuse"



= Data cells =

Are child nodes of eFuse, bindings of which as described in

bindings/nvmem/nvmem.txt



Example:



	efuse: efuse {

		compatible = "amlogic,meson-gxbb-efuse";

		#address-cells = <1>;

		#size-cells = <1>;



		sn: sn@14 {

			reg = <0x14 0x10>;

		};



		eth_mac: eth_mac@34 {

			reg = <0x34 0x10>;

		};



		bid: bid@46 {

			reg = <0x46 0x30>;

		};

	};



= Data consumers =

Are device nodes which consume nvmem data cells.



For example:



	eth_mac {

		...

		nvmem-cells = <&eth_mac>;

		nvmem-cell-names = "eth_mac";

	};