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

Commit e2647b6d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.11/fixes-rc6-signed' of... 

Merge tag 'omap-for-v4.11/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Regression fix for omap interconnect code for deferred probe.
Without this fix we can get PM related warnings for devices that
use deferred probe. If necessary, this fix can wait for the
v4.12 merge window no problem.

* tag 'omap-for-v4.11/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: omap_device: Sync omap_device and pm_runtime after probe defer
  ARM: omap2+: Revert omap-smp.c changes resetting CPU1 during boot
  ARM: dts: am335x-evmsk: adjust mmc2 param to allow suspend
  ARM: dts: ti: fix PCI bus dtc warnings
  ARM: dts: am335x-baltos: disable EEE for Atheros 8035 PHY
  ARM: dts: OMAP3: Fix MFG ID EEPROM

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5fa22a6e 04abaf07

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

+2 −0
Original line number Diff line number Diff line
@@ -371,6 +371,8 @@ 


	phy1: ethernet-phy@1 {

		reg = <7>;

		eee-broken-100tx;

		eee-broken-1000t;

	};

};

arch/arm/boot/dts/am335x-evmsk.dts

+1 −0
Original line number Diff line number Diff line
@@ -672,6 +672,7 @@ 
	ti,non-removable;

	bus-width = <4>;

	cap-power-off-card;

	keep-power-in-suspend;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

arch/arm/boot/dts/dra7.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x20013000 0x13000 0 0xffed000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

				linux,pci-domain = <0>;
@@ -319,6 +320,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x30013000 0x13000 0 0xffed000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

				linux,pci-domain = <1>;

arch/arm/boot/dts/logicpd-torpedo-som.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 
&i2c3 {

	clock-frequency = <400000>;

	at24@50 {

		compatible = "at24,24c02";

		compatible = "atmel,24c64";

		readonly;

		reg = <0x50>;

	};

arch/arm/mach-omap2/common.h

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ extern const struct smp_operations omap4_smp_ops; 
extern int omap4_mpuss_init(void);

extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state);

extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state);

extern u32 omap4_get_cpu1_ns_pa_addr(void);

#else

static inline int omap4_enter_lowpower(unsigned int cpu,

					unsigned int power_state)