Commit 7b306892 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "I've been bad at collecting fixes this release cycle, so this is a
  fairly large batch that's been trickling in for a while.

  It's the usual mix, more or less.

  Some of the bigger things fixed:

   - Voltage fix for MMC on TI DRA7 that sometimes would overvoltage
     cards

   - Regression fixes for D_CAN on am355x

   - i.MX6SX cpuidle fix to deal with wakeup latency (dropped uart
     chars)

   - DT fixes for some DRA7 variants that don't share the superset of
     blocks on the chip

  plus the usual mix of stuff: minor build/warning fixes, Kconfig
  dependencies, and some DT fixlets"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (28 commits)
  soc: ixp4xx: npe: Fix an IS_ERR() vs NULL check in probe
  ARM: ixp4xx: include irqs.h where needed
  ARM: ixp4xx: mark ixp4xx_irq_setup as __init
  ARM: ixp4xx: don't select SERIAL_OF_PLATFORM
  firmware: trusted_foundations: add ARMv7 dependency
  MAINTAINERS: Change QCOM repo location
  ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
  ARM: davinci: da850-evm: call regulator_has_full_constraints()
  ARM: mvebu_v7_defconfig: fix Ethernet on Clearfog
  ARM: dts: am335x phytec boards: Fix cd-gpios active level
  ARM: dts: dra72x: Disable usb4_tm target module
  arm64: arch_k3: Fix kconfig dependency warning
  ARM: dts: Drop bogus CLKSEL for timer12 on dra7
  MAINTAINERS: Update Stefan Wahren email address
  ARM: dts: bcm: Add missing device_type = "memory" property
  soc: bcm: brcmstb: biuctrl: Register writes require a barrier
  soc: brcmstb: Fix error path for unsupported CPUs
  ARM: dts: dra71x: Disable usb4_tm target module
  ARM: dts: dra71x: Disable rtc target module
  ARM: dts: dra76x: Disable usb4_tm target module
  ...
parents 915ed932 cd3967be

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2085,7 +2085,7 @@ F: drivers/tty/serial/msm_serial.c 
F:	drivers/usb/dwc3/dwc3-qcom.c

F:	include/dt-bindings/*/qcom*

F:	include/linux/*/qcom*

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git



ARM/RADISYS ENP2611 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>
@@ -3121,7 +3121,7 @@ F: arch/arm/mach-bcm/ 


BROADCOM BCM2835 ARM ARCHITECTURE

M:	Eric Anholt <eric@anholt.net>

M:	Stefan Wahren <stefan.wahren@i2se.com>

M:	Stefan Wahren <wahrenst@gmx.net>

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

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

T:	git git://github.com/anholt/linux

arch/arm/boot/dts/am335x-pcm-953.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ 
	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;

	status = "okay";

};

arch/arm/boot/dts/am335x-wega.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ 
	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;

	status = "okay";

};

arch/arm/boot/dts/am33xx-l4.dtsi

+6 −8
Original line number Diff line number Diff line
@@ -1759,11 +1759,10 @@ 
		target-module@cc000 {			/* 0x481cc000, ap 60 46.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "d_can0";

			reg = <0xcc000 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>;

			clock-names = "fck";

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>,

				 <&dcan0_fck>;

			clock-names = "fck", "osc";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0xcc000 0x2000>;
@@ -1782,11 +1781,10 @@ 
		target-module@d0000 {			/* 0x481d0000, ap 62 42.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "d_can1";

			reg = <0xd0000 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>;

			clock-names = "fck";

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>,

				 <&dcan1_fck>;

			clock-names = "fck", "osc";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0xd0000 0x2000>;

arch/arm/boot/dts/am437x-l4.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -1575,8 +1575,6 @@ 
		target-module@cc000 {			/* 0x481cc000, ap 50 46.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "d_can0";

			reg = <0xcc000 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN0_CLKCTRL 0>;

			clock-names = "fck";
@@ -1596,8 +1594,6 @@ 
		target-module@d0000 {			/* 0x481d0000, ap 52 3a.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "d_can1";

			reg = <0xd0000 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN1_CLKCTRL 0>;

			clock-names = "fck";

CRA Git | Maintained and supported by SUSTech CRA and CCSE