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

Commit 4d3639ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "A batch of fixes that have come in during the merge window.

  Some of them are defconfig updates for things that have now landed,
  some errata additions and a few general scattered fixes.

  There's also a qcom DT update that adds support for SATA on AP148, and
  basic support for Sony Xperia Z1 and CM-QS600 platforms that seemed
  isolated enough that we could merge it even if it's late"

* tag 'arm-soc-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  MAINTAINERS: corrected bcm2835 search
  ARM: dts: Explicitly set dr_mode on exynos5420-arndale-octa
  ARM: dts: Explicitly set dr_mode on exynos Peach boards
  ARM: dts: qcom: add CM-QS600 board
  ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone
  ARM: dts: qcom: Add SATA support on IPQ8064/AP148
  MAINTAINERS: Update Santosh Shilimkar's email id
  ARM: sunxi_defconfig: enable CONFIG_REGULATOR
  ARM: dts: Disable smc91x on n900 until bootloader dependency is removed
  ARM: omap2plus_defconfig: Enable ARM erratum 430973 for omap3
  ARM: exynos_defconfig: enable USB gadget support
  ARM: exynos_defconfig: Enable Maxim 77693 and I2C GPIO drivers
  ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops
  ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n
  ARM: SAMSUNG: Restore Samsung PM Debug functionality
  ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12
  ARM: exynos_defconfig: Enable SBS battery support
  ARM: exynos_defconfig: Enable Control Groups support
  ARM: exynos_defconfig: Enable Atmel maXTouch support
  ARM: exynos_defconfig: Enable MAX77802
parents ab074ade 57764512

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ sitronix Sitronix Technology Corporation 
smsc	Standard Microsystems Corporation

snps 	Synopsys, Inc.

solidrun	SolidRun

sony	Sony Corporation

spansion	Spansion Inc.

st	STMicroelectronics

ste	ST-Ericsson

MAINTAINERS

+10 −13
Original line number Diff line number Diff line
@@ -1088,33 +1088,33 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained



ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

M:	Santosh Shilimkar <ssantosh@kernel.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-keystone/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git



ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

M:	Santosh Shilimkar <ssantosh@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/clk/keystone/



ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

M:	Santosh Shilimkar <ssantosh@kernel.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/clocksource/timer-keystone.c



ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

M:	Santosh Shilimkar <ssantosh@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/power/reset/keystone-reset.c



ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

M:	Santosh Shilimkar <ssantosh@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/memory/*emif*
@@ -2062,17 +2062,14 @@ F: arch/arm/configs/bcm_defconfig 
F:	drivers/mmc/host/sdhci-bcm-kona.c

F:	drivers/clocksource/bcm_kona_timer.c



BROADCOM BCM2835 ARM ARCHICTURE

BROADCOM BCM2835 ARM ARCHITECTURE

M:	Stephen Warren <swarren@wwwdotorg.org>

L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git

S:	Maintained

F:	arch/arm/mach-bcm/board_bcm2835.c

F:	arch/arm/boot/dts/bcm2835*

F:	arch/arm/configs/bcm2835_defconfig

F:	drivers/*/*bcm2835*

N:	bcm2835



BROADCOM BCM5301X ARM ARCHICTURE

BROADCOM BCM5301X ARM ARCHITECTURE

M:	Hauke Mehrtens <hauke@hauke-m.de>

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained
@@ -6687,7 +6684,7 @@ F: arch/arm/*omap*/usb* 


OMAP GPIO DRIVER

M:	Javier Martinez Canillas <javier@dowhile0.org>

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

M:	Santosh Shilimkar <ssantosh@kernel.org>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	linux-omap@vger.kernel.org

S:	Maintained
@@ -9274,7 +9271,7 @@ F: drivers/mmc/host/tifm_sd.c 
F:	include/linux/tifm.h



TI KEYSTONE MULTICORE NAVIGATOR DRIVERS

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

M:	Santosh Shilimkar <ssantosh@kernel.org>

L:	linux-kernel@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -354,13 +354,15 @@ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \ 
	orion5x-rd88f5182-nas.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_QCOM) += \

	qcom-apq8064-cm-qs600.dtb \

	qcom-apq8064-ifc6410.dtb \

	qcom-apq8074-dragonboard.dtb \

	qcom-apq8084-ifc6540.dtb \

	qcom-apq8084-mtp.dtb \

	qcom-ipq8064-ap148.dtb \

	qcom-msm8660-surf.dtb \

	qcom-msm8960-cdp.dtb

	qcom-msm8960-cdp.dtb \

	qcom-msm8974-sony-xperia-honami.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += \

	rk3066a-bqcurie2.dtb \

	rk3188-radxarock.dtb \

arch/arm/boot/dts/exynos4x12-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ 
		sd4_bus8: sd4-bus-width8 {

			samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";

			samsung,pin-function = <4>;

			samsung,pin-pud = <4>;

			samsung,pin-pud = <3>;

			samsung,pin-drv = <3>;

		};

arch/arm/boot/dts/exynos5420-arndale-octa.dts

+4 −0
Original line number Diff line number Diff line
@@ -368,3 +368,7 @@ 
		};

	};

};



&usbdrd_dwc3_1 {

	dr_mode = "host";

};