Merge tag 'amlogic-drivers' of...

  - "amlogic,q201" (Meson gxm s912)

  - "kingnovel,r-box-pro" (Meson gxm S912)

  - "nexbox,a1" (Meson gxm s912)

Amlogic Meson Firmware registers Interface

------------------------------------------

The Meson SoCs have a register bank with status and data shared with the

secure firmware.

Required properties:

 - compatible: For Meson GX SoCs, must be "amlogic,meson-gx-ao-secure", "syscon"

Properties should indentify components of this register interface :

Meson GX SoC Information

------------------------

A firmware register encodes the SoC type, package and revision information on

the Meson GX SoCs.

If present, the following property should be added :

Optional properties:

  - amlogic,has-chip-id: If present, the interface gives the current SoC version.

Example

-------

ao-secure@140 {

	compatible = "amlogic,meson-gx-ao-secure", "syscon";

	reg = <0x0 0x140 0x0 0x140>;

	amlogic,has-chip-id;

};

menu "SOC (System On Chip) specific Drivers"

source "drivers/soc/actions/Kconfig"

source "drivers/soc/amlogic/Kconfig"

source "drivers/soc/atmel/Kconfig"

source "drivers/soc/bcm/Kconfig"

source "drivers/soc/fsl/Kconfig"

obj-y				+= fsl/

obj-$(CONFIG_ARCH_MXC)		+= imx/

obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/

obj-$(CONFIG_ARCH_MESON)	+= amlogic/

obj-$(CONFIG_ARCH_QCOM)		+= qcom/

obj-y				+= renesas/

obj-$(CONFIG_ARCH_ROCKCHIP)	+= rockchip/

menu "Amlogic SoC drivers"

config MESON_GX_SOCINFO

	bool "Amlogic Meson GX SoC Information driver"

	depends on ARCH_MESON || COMPILE_TEST

	default ARCH_MESON

	select SOC_BUS

	help

	  Say yes to support decoding of Amlogic Meson GX SoC family

	  information about the type, package and version.

endmenu

obj-$(CONFIG_MESON_GX_SOCINFO) += meson-gx-socinfo.o