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

Commit 9855b3db authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.14-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers 

Pull "Mediatek: soc driver updates for v4.15" from Matthias Brugger:

- add 32 bit read/write support to pwrap
- add mt7622 support to pwrap
- test build all mediatek soc drivers
- fix compiler issues
- clean up Kconfig description

* tag 'v4.14-next-soc' of https://github.com/mbgg/linux-mediatek:
  soc: mediatek: pwrap: fix fatal compiler error
  soc: mediatek: pwrap: fix compiler errors
  arm64: mediatek: cleanup message for platform selection
  soc: Allow test-building of MediaTek drivers
  soc: mediatek: place Kconfig for all SoC drivers under menu
  soc: mediatek: pwrap: add support for MT7622 SoC
  soc: mediatek: pwrap: add common way for setup CS timing extenstion
  soc: mediatek: pwrap: add MediaTek MT6380 as one slave of pwrap
  soc: mediatek: pwrap: refactor pwrap_init for the various PMIC types
  soc: mediatek: pwrap: add pwrap_write32 for writing in 32-bit mode
  soc: mediatek: pwrap: add pwrap_read32 for reading in 32-bit mode
  dt-bindings: arm: mediatek: add MT7622 string to the PMIC wrapper doc
  ARM: mediatek: Cocci spatch "of_table"
  soc: mediatek: pwrap: fixup warnings from coding style
parents 84cbda2f f32fbbad

Documentation/devicetree/bindings/soc/mediatek/pwrap.txt

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ IP Pairing 
Required properties in pwrap device node.

- compatible:

	"mediatek,mt2701-pwrap" for MT2701/7623 SoCs

	"mediatek,mt7622-pwrap" for MT7622 SoCs

	"mediatek,mt8135-pwrap" for MT8135 SoCs

	"mediatek,mt8173-pwrap" for MT8173 SoCs

- interrupts: IRQ for pwrap in SOC
@@ -36,9 +37,12 @@ Required properties in pwrap device node. 
- clocks: Must contain an entry for each entry in clock-names.



Optional properities:

- pmic: Mediatek PMIC MFD is the child device of pwrap

- pmic: Using either MediaTek PMIC MFD as the child device of pwrap

  See the following for child node definitions:

  Documentation/devicetree/bindings/mfd/mt6397.txt

  or the regulator-only device as the child device of pwrap, such as MT6380.

  See the following definitions for such kinds of devices.

  Documentation/devicetree/bindings/regulator/mt6380-regulator.txt



Example:

	pwrap: pwrap@1000f000 {

arch/arm/mach-mediatek/platsmp.c

+2 −0
Original line number Diff line number Diff line
@@ -54,12 +54,14 @@ static const struct of_device_id mtk_tz_smp_boot_infos[] __initconst = { 
	{ .compatible   = "mediatek,mt8135", .data = &mtk_mt8135_tz_boot },

	{ .compatible   = "mediatek,mt8127", .data = &mtk_mt8135_tz_boot },

	{ .compatible   = "mediatek,mt2701", .data = &mtk_mt8135_tz_boot },

	{},

};



static const struct of_device_id mtk_smp_boot_infos[] __initconst = {

	{ .compatible   = "mediatek,mt6589", .data = &mtk_mt6589_boot },

	{ .compatible   = "mediatek,mt7623", .data = &mtk_mt7623_boot },

	{ .compatible   = "mediatek,mt7623a", .data = &mtk_mt7623_boot },

	{},

};



static void __iomem *mtk_smp_base;

arch/arm64/Kconfig.platforms

+3 −2
Original line number Diff line number Diff line
@@ -91,12 +91,13 @@ config ARCH_HISI 
	  This enables support for Hisilicon ARMv8 SoC family



config ARCH_MEDIATEK

	bool "Mediatek MT65xx & MT81xx ARMv8 SoC"

	bool "MediaTek SoC Family"

	select ARM_GIC

	select PINCTRL

	select MTK_TIMER

	help

	  Support for Mediatek MT65xx & MT81xx ARMv8 SoCs

	  This enables support for MediaTek MT27xx, MT65xx, MT76xx

	  & MT81xx ARMv8 SoCs



config ARCH_MESON

	bool "Amlogic Platforms"

drivers/soc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ obj-$(CONFIG_MACH_DOVE) += dove/ 
obj-y				+= fsl/

obj-$(CONFIG_ARCH_MXC)		+= imx/

obj-$(CONFIG_SOC_XWAY)		+= lantiq/

obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/

obj-y				+= mediatek/

obj-$(CONFIG_ARCH_MESON)	+= amlogic/

obj-$(CONFIG_ARCH_QCOM)		+= qcom/

obj-y				+= renesas/

drivers/soc/mediatek/Kconfig

+5 −3
Original line number Diff line number Diff line 
#

# MediaTek SoC drivers

#

menu "MediaTek SoC drivers"

	depends on ARCH_MEDIATEK || COMPILE_TEST



config MTK_INFRACFG

	bool "MediaTek INFRACFG Support"

	depends on ARCH_MEDIATEK || COMPILE_TEST

	select REGMAP

	help

	  Say yes here to add support for the MediaTek INFRACFG controller. The
@@ -12,7 +14,6 @@ config MTK_INFRACFG 


config MTK_PMIC_WRAP

	tristate "MediaTek PMIC Wrapper Support"

	depends on ARCH_MEDIATEK

	depends on RESET_CONTROLLER

	select REGMAP

	help
@@ -22,7 +23,6 @@ config MTK_PMIC_WRAP 


config MTK_SCPSYS

	bool "MediaTek SCPSYS Support"

	depends on ARCH_MEDIATEK || COMPILE_TEST

	default ARCH_MEDIATEK

	select REGMAP

	select MTK_INFRACFG
@@ -30,3 +30,5 @@ config MTK_SCPSYS 
	help

	  Say yes here to add support for the MediaTek SCPSYS power domain

	  driver.



endmenu