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

Pull ARM SoC platform updates from Arnd Bergmann:
 "These are mostly minor bugfixes, cleanup and many defconfig updates to
  support added drivers. In particular OMAP and PXA keep cleaning up the
  legacy code base, as usual.

  Nvidia adds some more SoC support code for Tegra 186.

  For the first time on years, we are actually adding a non-DT platform
  for the EP93xx based Liebherr controller BK3.1. It's a minor variation
  of the EP93xx reference design and in active use, while EP93xx
  apparently doesn't have enough new development to have any device tree
  support"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
  ARM: omap: hwmod: fix section mismatch warnings
  ARM: pxa/tosa-bt: add MODULE_LICENSE tag
  arm64: defconfig: enable CONFIG_ACPI_APEI_EINJ
  arm64: defconfig: enable EDAC GHES option
  arm64: defconfig: enable CONFIG_ACPI_APEI_MEMORY_FAILURE
  ARM: imx_v6_v7_defconfig: enable CONFIG_CPU_FREQ_STAT
  Wind down ARM/TANGO port
  ARM: davinci: constify gpio_led
  ARM: davinci: drop unneeded newline
  soc: Add SoC driver for Gemini
  ARM: SAMSUNG: Add SPDX license identifiers
  ARM: S5PV210: Add SPDX license identifiers
  ARM: S3C64XX: Add SPDX license identifiers
  ARM: S3C24XX: Add SPDX license identifiers
  ARM: EXYNOS: Add SPDX license identifiers
  ARM: imx: remove unused imx3 pm definitions
  ARM: imx: don't abort MMDC probe if power saving status doesn't match
  ARM: imx_v6_v7_defconfig: enable RTC_DRV_MXC_V2
  ARM: imx_v6_v7_defconfig: Add missing config for DART-MX6 SoM
  ARM: davinci: Use PTR_ERR_OR_ZERO()
  ...

3 files changed, 16 insertions, 14 deletions

diff --git a/include/linux/i2c/pxa-i2c.h b/include/linux/platform_data/i2c-pxa.h
index 53aab243cbd8..5236f216dfae 100644
--- a/include/linux/i2c/pxa-i2c.h
+++ b/include/linux/platform_data/i2c-pxa.h
@@ -71,15 +71,4 @@ struct i2c_pxa_platform_data {
         unsigned char           master_code;
         unsigned long           rate;
 };
-
-extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info);
-
-#ifdef CONFIG_PXA27x
-extern void pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info);
-#endif
-
-#ifdef CONFIG_PXA3xx
-extern void pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info);
-#endif
-
 #endif
diff --git a/include/linux/soc/mediatek/infracfg.h b/include/linux/soc/mediatek/infracfg.h
index e8d9f0d52933..b0a507d356ef 100644
--- a/include/linux/soc/mediatek/infracfg.h
+++ b/include/linux/soc/mediatek/infracfg.h
@@ -28,7 +28,8 @@
 #define MT7622_TOP_AXI_PROT_EN_WB               (BIT(2) | BIT(6) | \
                                                  BIT(7) | BIT(8))
 
-int mtk_infracfg_set_bus_protection(struct regmap *infracfg, u32 mask);
-int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask);
-
+int mtk_infracfg_set_bus_protection(struct regmap *infracfg, u32 mask,
+                bool reg_update);
+int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask,
+                bool reg_update);
 #endif /* __SOC_MEDIATEK_INFRACFG_H */
diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h
index 1c3982bc558f..c32bf91c23e6 100644
--- a/include/soc/tegra/pmc.h
+++ b/include/soc/tegra/pmc.h
@@ -83,6 +83,7 @@ enum tegra_io_pad {
         TEGRA_IO_PAD_BB,
         TEGRA_IO_PAD_CAM,
         TEGRA_IO_PAD_COMP,
+        TEGRA_IO_PAD_CONN,
         TEGRA_IO_PAD_CSIA,
         TEGRA_IO_PAD_CSIB,
         TEGRA_IO_PAD_CSIC,
@@ -92,31 +93,42 @@ enum tegra_io_pad {
         TEGRA_IO_PAD_DBG,
         TEGRA_IO_PAD_DEBUG_NONAO,
         TEGRA_IO_PAD_DMIC,
+        TEGRA_IO_PAD_DMIC_HV,
         TEGRA_IO_PAD_DP,
         TEGRA_IO_PAD_DSI,
         TEGRA_IO_PAD_DSIB,
         TEGRA_IO_PAD_DSIC,
         TEGRA_IO_PAD_DSID,
+        TEGRA_IO_PAD_EDP,
         TEGRA_IO_PAD_EMMC,
         TEGRA_IO_PAD_EMMC2,
         TEGRA_IO_PAD_GPIO,
         TEGRA_IO_PAD_HDMI,
+        TEGRA_IO_PAD_HDMI_DP0,
+        TEGRA_IO_PAD_HDMI_DP1,
         TEGRA_IO_PAD_HSIC,
         TEGRA_IO_PAD_HV,
         TEGRA_IO_PAD_LVDS,
         TEGRA_IO_PAD_MIPI_BIAS,
         TEGRA_IO_PAD_NAND,
         TEGRA_IO_PAD_PEX_BIAS,
+        TEGRA_IO_PAD_PEX_CLK_BIAS,
         TEGRA_IO_PAD_PEX_CLK1,
         TEGRA_IO_PAD_PEX_CLK2,
+        TEGRA_IO_PAD_PEX_CLK3,
         TEGRA_IO_PAD_PEX_CNTRL,
         TEGRA_IO_PAD_SDMMC1,
+        TEGRA_IO_PAD_SDMMC1_HV,
+        TEGRA_IO_PAD_SDMMC2,
+        TEGRA_IO_PAD_SDMMC2_HV,
         TEGRA_IO_PAD_SDMMC3,
+        TEGRA_IO_PAD_SDMMC3_HV,
         TEGRA_IO_PAD_SDMMC4,
         TEGRA_IO_PAD_SPI,
         TEGRA_IO_PAD_SPI_HV,
         TEGRA_IO_PAD_SYS_DDC,
         TEGRA_IO_PAD_UART,
+        TEGRA_IO_PAD_UFS,
         TEGRA_IO_PAD_USB0,
         TEGRA_IO_PAD_USB1,
         TEGRA_IO_PAD_USB2,