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

Commit 049a40c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "Another batch of fixes for ARM SoC platforms.  Most are smaller fixes.

  Two areas that are worth pointing out are:

   - OMAP had a handful of changes to voltage specs that caused a bit of
     churn, most of volume of change in this branch is due to this.

   - There are a couple of _rcuidle fixes from Paul that touch common
     code and came in through the OMAP tree since they were the ones who
     saw the problems.

 The rest is smaller changes across a handful of platforms"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits)
  ARM: dts: STi: stih407-family: Disable reserved-memory co-processor nodes
  ARM: dts: am437x-sk-evm: Reduce i2c0 bus speed for tps65218
  ARM: OMAP2+: timer: add probe for clocksources
  ARM: OMAP1: fix ams-delta FIQ handler to work with sparse IRQ
  memory: omap-gpmc: Fix omap gpmc EXTRADELAY timing
  arm: Use _rcuidle for smp_cross_call() tracepoints
  MAINTAINERS: Add myself as reviewer of ARM FSL/NXP
  ARM: OMAP: DRA7: powerdomain data: Remove unused pwrsts_mem_ret
  ARM: OMAP: DRA7: powerdomain data: Remove unused pwrsts_logic_ret
  ARM: OMAP: DRA7: powerdomain data: Set L3init and L4per to ON
  ARM: imx6ul: Fix Micrel PHY mask
  ARM: OMAP2+: Select OMAP_INTERCONNECT for SOC_AM43XX
  ARM: dts: DRA74x: fix DSS PLL2 addresses
  ARM: OMAP2: Enable Errata 430973 for OMAP3
  ARM: dts: socfpga: Add missing PHY phandle
  ARM: dts: exynos: Fix port nodes names for Exynos5420 Peach Pit board
  ARM: dts: exynos: Fix port nodes names for Exynos5250 Snow board
  ARM: dts: sun6i: yones-toptech-bs1078-v2: Drop constraints on dc1sw regulator
  ARM: dts: sun6i: primo81: Drop constraints on dc1sw regulator
  ARM: dts: sunxi: Add OLinuXino Lime2 eMMC to the Makefile
  ...
parents c141afd1 8fd09767

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1159,6 +1159,7 @@ F: arch/arm/mach-footbridge/ 
ARM/FREESCALE IMX / MXC ARM ARCHITECTURE

M:	Shawn Guo <shawnguo@kernel.org>

M:	Sascha Hauer <kernel@pengutronix.de>

R:	Fabio Estevam <fabio.estevam@nxp.com>

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

S:	Maintained

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

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -741,6 +741,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-olimex-som-evb.dtb \

	sun7i-a20-olinuxino-lime.dtb \

	sun7i-a20-olinuxino-lime2.dtb \

	sun7i-a20-olinuxino-lime2-emmc.dtb \

	sun7i-a20-olinuxino-micro.dtb \

	sun7i-a20-orangepi.dtb \

	sun7i-a20-orangepi-mini.dtb \

arch/arm/boot/dts/am437x-sk-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	clock-frequency = <400000>;

	clock-frequency = <100000>;



	tps@24 {

		compatible = "ti,tps65218";

arch/arm/boot/dts/am57xx-idk-common.dtsi

+17 −15
Original line number Diff line number Diff line
@@ -60,10 +60,26 @@ 


		tps659038_pmic {

			compatible = "ti,tps659038-pmic";



			smps12-in-supply = <&vmain>;

			smps3-in-supply = <&vmain>;

			smps45-in-supply = <&vmain>;

			smps6-in-supply = <&vmain>;

			smps7-in-supply = <&vmain>;

			smps8-in-supply = <&vmain>;

			smps9-in-supply = <&vmain>;

			ldo1-in-supply = <&vmain>;

			ldo2-in-supply = <&vmain>;

			ldo3-in-supply = <&vmain>;

			ldo4-in-supply = <&vmain>;

			ldo9-in-supply = <&vmain>;

			ldoln-in-supply = <&vmain>;

			ldousb-in-supply = <&vmain>;

			ldortc-in-supply = <&vmain>;



			regulators {

				smps12_reg: smps12 {

					/* VDD_MPU */

					vin-supply = <&vmain>;

					regulator-name = "smps12";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <1250000>;
@@ -73,7 +89,6 @@ 


				smps3_reg: smps3 {

					/* VDD_DDR EMIF1 EMIF2 */

					vin-supply = <&vmain>;

					regulator-name = "smps3";

					regulator-min-microvolt = <1350000>;

					regulator-max-microvolt = <1350000>;
@@ -84,7 +99,6 @@ 
				smps45_reg: smps45 {

					/* VDD_DSPEVE on AM572 */

					/* VDD_IVA + VDD_DSP on AM571 */

					vin-supply = <&vmain>;

					regulator-name = "smps45";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <1250000>;
@@ -94,7 +108,6 @@ 


				smps6_reg: smps6 {

					/* VDD_GPU */

					vin-supply = <&vmain>;

					regulator-name = "smps6";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <1250000>;
@@ -104,7 +117,6 @@ 


				smps7_reg: smps7 {

					/* VDD_CORE */

					vin-supply = <&vmain>;

					regulator-name = "smps7";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <1150000>;
@@ -115,13 +127,11 @@ 
				smps8_reg: smps8 {

					/* 5728 - VDD_IVAHD */

					/* 5718 - N.C. test point */

					vin-supply = <&vmain>;

					regulator-name = "smps8";

				};



				smps9_reg: smps9 {

					/* VDD_3_3D */

					vin-supply = <&vmain>;

					regulator-name = "smps9";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;
@@ -132,7 +142,6 @@ 
				ldo1_reg: ldo1 {

					/* VDDSHV8 - VSDMMC  */

					/* NOTE: on rev 1.3a, data supply */

					vin-supply = <&vmain>;

					regulator-name = "ldo1";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <3300000>;
@@ -142,7 +151,6 @@ 


				ldo2_reg: ldo2 {

					/* VDDSH18V */

					vin-supply = <&vmain>;

					regulator-name = "ldo2";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -152,7 +160,6 @@ 


				ldo3_reg: ldo3 {

					/* R1.3a 572x V1_8PHY_LDO3: USB, SATA */

					vin-supply = <&vmain>;

					regulator-name = "ldo3";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -162,7 +169,6 @@ 


				ldo4_reg: ldo4 {

					/* R1.3a 572x V1_8PHY_LDO4: PCIE, HDMI*/

					vin-supply = <&vmain>;

					regulator-name = "ldo4";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -174,7 +180,6 @@ 


				ldo9_reg: ldo9 {

					/* VDD_RTC  */

					vin-supply = <&vmain>;

					regulator-name = "ldo9";

					regulator-min-microvolt = <840000>;

					regulator-max-microvolt = <1160000>;
@@ -184,7 +189,6 @@ 


				ldoln_reg: ldoln {

					/* VDDA_1V8_PLL */

					vin-supply = <&vmain>;

					regulator-name = "ldoln";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -194,7 +198,6 @@ 


				ldousb_reg: ldousb {

					/* VDDA_3V_USB: VDDA_USBHS33 */

					vin-supply = <&vmain>;

					regulator-name = "ldousb";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;
@@ -204,7 +207,6 @@ 


				ldortc_reg: ldortc {

					/* VDDA_RTC  */

					vin-supply = <&vmain>;

					regulator-name = "ldortc";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

arch/arm/boot/dts/dm8148-evm.dts

+8 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ 
	};

};



&mmc1 {

        status = "disabled";

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd1_pins>;
@@ -101,6 +105,10 @@ 
	cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;

};



&mmc3 {

        status = "disabled";

};



&pincntl {

	sd1_pins: pinmux_sd1_pins {

		pinctrl-single,pins = <