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

Commit 67ef6265 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Kevin Hilman:
 - MSM: GPIO fixes (includes old code removal)
 - OMAP: earlyprintk regression, AM33xx cpgmac PM regression
 - OMAP5: urgent fix for potentially harmful voltage regulator values
 - Renesas: gpio-keys fix, fix SD card detection, fix shdma calculation
   error
 - STi: critical SMP boot fix
 - tegra: DTS fix for usb-phy
 - a couple MAINTAINERS updates

(Arnd is on paternity leave, Kevin is stepping up to help arm-soc
maintenance)

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  MAINTAINERS: add TI Keystone ARM platform
  MAINTAINERS: delete Srinidhi from ux500
  ARM: tegra: enable ULPI phy on Colibri T20
  ARM: STi: remove sti_secondary_start from INIT section.
  ARM: STi: Fix cpu nodes with correct device_type.
  ARM: shmobile: lager: do not annotate gpio_buttons as __initdata
  ARM: shmobile: BOCK-W: fix SDHI0 PFC settings
  shdma: fixup sh_dmae_get_partial() calculation error
  ARM: OMAP2+: hwmod: AM335x: fix cpgmac address space
  ARM: OMAP2+: hwmod: rt address space index for DT
  ARM: OMAP2+: Sync hwmod state with the pm_runtime and omap_device state
  ARM: OMAP2+: Avoid idling memory controllers with no drivers
  ARM: OMAP2+: hwmod: Fix a crash in _setup_reset() with DEBUG_LL
  ARM: dts: omap5-uevm: update optional/unused regulator configurations
  ARM: dts: omap5-uevm: fix regulator configurations mandatory for SoC
  ARM: dts: omap5-uevm: document regulator signals used on the actual board
  ARM: msm: Consolidate gpiomux for older architectures
  ARM: shmobile: armadillo800eva: Don't request GPIO 166 in board code
  ARM: msm: dts: Fix the gpio register address for msm8960
parents 37090506 1154f858

MAINTAINERS

+6 −1
Original line number Diff line number Diff line
@@ -965,6 +965,12 @@ M: Lennert Buytenhek <kernel@wantstofly.org> 
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>

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

S:	Maintained

F:	arch/arm/mach-keystone/



ARM/LOGICPD PXA270 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1259,7 +1265,6 @@ F: drivers/rtc/rtc-coh901331.c 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git



ARM/Ux500 ARM ARCHITECTURE

M:	Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>

M:	Linus Walleij <linus.walleij@linaro.org>

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

S:	Maintained

arch/arm/boot/dts/msm8960-cdp.dts

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
		cpu-offset = <0x80000>;

	};



	msmgpio: gpio@fd510000 {

	msmgpio: gpio@800000 {

		compatible = "qcom,msm-gpio";

		gpio-controller;

		#gpio-cells = <2>;
@@ -34,7 +34,7 @@ 
		interrupts = <0 32 0x4>;

		interrupt-controller;

		#interrupt-cells = <2>;

		reg = <0xfd510000 0x4000>;

		reg = <0x800000 0x4000>;

	};



	serial@16440000 {

arch/arm/boot/dts/omap5-uevm.dts

+49 −29
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ 
};



&mmc1 {

	vmmc-supply = <&vmmcsd_fixed>;

	vmmc-supply = <&ldo9_reg>;

	bus-width = <4>;

};
@@ -282,6 +282,7 @@ 


			regulators {

				smps123_reg: smps123 {

					/* VDD_OPP_MPU */

					regulator-name = "smps123";

					regulator-min-microvolt = < 600000>;

					regulator-max-microvolt = <1500000>;
@@ -290,6 +291,7 @@ 
				};



				smps45_reg: smps45 {

					/* VDD_OPP_MM */

					regulator-name = "smps45";

					regulator-min-microvolt = < 600000>;

					regulator-max-microvolt = <1310000>;
@@ -298,6 +300,7 @@ 
				};



				smps6_reg: smps6 {

					/* VDD_DDR3 - over VDD_SMPS6 */

					regulator-name = "smps6";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;
@@ -306,6 +309,7 @@ 
				};



				smps7_reg: smps7 {

					/* VDDS_1v8_OMAP over VDDS_1v8_MAIN */

					regulator-name = "smps7";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -314,6 +318,7 @@ 
				};



				smps8_reg: smps8 {

					/* VDD_OPP_CORE */

					regulator-name = "smps8";

					regulator-min-microvolt = < 600000>;

					regulator-max-microvolt = <1310000>;
@@ -322,15 +327,15 @@ 
				};



				smps9_reg: smps9 {

					/* VDDA_2v1_AUD over VDD_2v1 */

					regulator-name = "smps9";

					regulator-min-microvolt = <2100000>;

					regulator-max-microvolt = <2100000>;

					regulator-always-on;

					regulator-boot-on;

					ti,smps-range = <0x80>;

				};



				smps10_reg: smps10 {

					/* VBUS_5V_OTG */

					regulator-name = "smps10";

					regulator-min-microvolt = <5000000>;

					regulator-max-microvolt = <5000000>;
@@ -339,38 +344,40 @@ 
				};



				ldo1_reg: ldo1 {

					/* VDDAPHY_CAM: vdda_csiport */

					regulator-name = "ldo1";

					regulator-min-microvolt = <2800000>;

					regulator-max-microvolt = <2800000>;

					regulator-always-on;

					regulator-boot-on;

					regulator-min-microvolt = <1500000>;

					regulator-max-microvolt = <1800000>;

				};



				ldo2_reg: ldo2 {

					/* VCC_2V8_DISP: Does not go anywhere */

					regulator-name = "ldo2";

					regulator-min-microvolt = <2900000>;

					regulator-max-microvolt = <2900000>;

					regulator-always-on;

					regulator-boot-on;

					regulator-min-microvolt = <2800000>;

					regulator-max-microvolt = <2800000>;

					/* Unused */

					status = "disabled";

				};



				ldo3_reg: ldo3 {

					/* VDDAPHY_MDM: vdda_lli */

					regulator-name = "ldo3";

					regulator-min-microvolt = <3000000>;

					regulator-max-microvolt = <3000000>;

					regulator-always-on;

					regulator-min-microvolt = <1500000>;

					regulator-max-microvolt = <1500000>;

					regulator-boot-on;

					/* Only if Modem is used */

					status = "disabled";

				};



				ldo4_reg: ldo4 {

					/* VDDAPHY_DISP: vdda_dsiport/hdmi */

					regulator-name = "ldo4";

					regulator-min-microvolt = <2200000>;

					regulator-max-microvolt = <2200000>;

					regulator-always-on;

					regulator-boot-on;

					regulator-min-microvolt = <1500000>;

					regulator-max-microvolt = <1800000>;

				};



				ldo5_reg: ldo5 {

					/* VDDA_1V8_PHY: usb/sata/hdmi.. */

					regulator-name = "ldo5";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -379,38 +386,43 @@ 
				};



				ldo6_reg: ldo6 {

					/* VDDS_1V2_WKUP: hsic/ldo_emu_wkup */

					regulator-name = "ldo6";

					regulator-min-microvolt = <1500000>;

					regulator-max-microvolt = <1500000>;

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo7_reg: ldo7 {

					/* VDD_VPP: vpp1 */

					regulator-name = "ldo7";

					regulator-min-microvolt = <1500000>;

					regulator-max-microvolt = <1500000>;

					regulator-always-on;

					regulator-boot-on;

					regulator-min-microvolt = <2000000>;

					regulator-max-microvolt = <2000000>;

					/* Only for efuse reprograming! */

					status = "disabled";

				};



				ldo8_reg: ldo8 {

					/* VDD_3v0: Does not go anywhere */

					regulator-name = "ldo8";

					regulator-min-microvolt = <1500000>;

					regulator-max-microvolt = <1500000>;

					regulator-always-on;

					regulator-min-microvolt = <3000000>;

					regulator-max-microvolt = <3000000>;

					regulator-boot-on;

					/* Unused */

					status = "disabled";

				};



				ldo9_reg: ldo9 {

					/* VCC_DV_SDIO: vdds_sdcard */

					regulator-name = "ldo9";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

					regulator-max-microvolt = <3000000>;

					regulator-boot-on;

				};



				ldoln_reg: ldoln {

					/* VDDA_1v8_REF: vdds_osc/mm_l4per.. */

					regulator-name = "ldoln";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -419,12 +431,20 @@ 
				};



				ldousb_reg: ldousb {

					/* VDDA_3V_USB: VDDA_USBHS33 */

					regulator-name = "ldousb";

					regulator-min-microvolt = <3250000>;

					regulator-max-microvolt = <3250000>;

					regulator-always-on;

					regulator-boot-on;

				};



				regen3_reg: regen3 {

					/* REGEN3 controls LDO9 supply to card */

					regulator-name = "regen3";

					regulator-always-on;

					regulator-boot-on;

				};

			};

		};

	};

arch/arm/boot/dts/stih41x.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -6,10 +6,12 @@ 
		#address-cells = <1>;

		#size-cells = <0>;

		cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

		};

		cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;

		};

arch/arm/boot/dts/tegra20-colibri-512.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ 
	};



	usb-phy@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};