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

Commit 58e00a6c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes' into next/cleanup 

* fixes: (28 commits)
  ARM: ux500: add an SMP enablement type and move cpu nodes
  ARM: dts: keystone: fix dt bindings to use post div register for mainpll
  ARM: nomadik: disable UART0 on Nomadik boards
  ARM: dts: i.MX35: Fix can support.
  ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc
  ARM: dts: add CPU OPP and regulator supply property for exynos4210
  ARM: dts: Update video-phy node with syscon phandle for exynos3250
  ARM: keystone: dts: rename pcie nodes to help override status
  ARM: keystone: dts: fix dt bindings for PCIe
  ARM: pxa: fix dm9000 platform data regression
  ARM: DRA7: hwmod: fix gpmc hwmod
  ARM: dts: Correct audio input route & set mic bias for am335x-pepper
  ARM: OMAP2+: Add HAVE_ARM_SCU for AM43XX
  MAINTAINERS: digicolor: add dts files
  ARM: ux500: fix MMC/SD card regression
  ARM: ux500: define serial port aliases
  ARM: dts: OMAP5: Add #iommu-cells property to IOMMUs
  ARM: dts: OMAP4: Add #iommu-cells property to IOMMUs
  ARM: dts: Fix frequency scaling on Gumstix Pepper
  ARM: dts: configure regulators for Gumstix Pepper
  ...
parents ff20775d bf64dd26

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ nodes to be present and contain the properties described below. 
			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"

			    "rockchip,rk3066-smp"

			    "ste,dbx500-smp"



	- cpu-release-addr

		Usage: required for systems that have an "enable-method"

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,7 @@ ARM/CONEXANT DIGICOLOR MACHINE SUPPORT 
M:	Baruch Siach <baruch@tkos.co.il>

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

S:	Maintained

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

N:	digicolor



ARM/EBSA110 MACHINE SUPPORT

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

+13 −3
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
	audio_codec: tlv320aic3106@1b {

		compatible = "ti,tlv320aic3106";

		reg = <0x1b>;

		ai3x-micbias-vg = <0x2>;

	};



	accel: lis331dlh@1d {
@@ -153,7 +154,7 @@ 
	ti,audio-routing =

		"Headphone Jack",	"HPLOUT",

		"Headphone Jack",	"HPROUT",

		"LINE1L",		"Line In";

		"MIC3L",		"Mic3L Switch";

};



&mcasp0 {
@@ -438,41 +439,50 @@ 
	regulators {

		dcdc1_reg: regulator@0 {

			/* VDD_1V8 system supply */

			regulator-always-on;

		};



		dcdc2_reg: regulator@1 {

			/* VDD_CORE voltage limits 0.95V - 1.26V with +/-4% tolerance */

			regulator-name = "vdd_core";

			regulator-min-microvolt = <925000>;

			regulator-max-microvolt = <1325000>;

			regulator-max-microvolt = <1150000>;

			regulator-boot-on;

			regulator-always-on;

		};



		dcdc3_reg: regulator@2 {

			/* VDD_MPU voltage limits 0.95V - 1.1V with +/-4% tolerance */

			regulator-name = "vdd_mpu";

			regulator-min-microvolt = <925000>;

			regulator-max-microvolt = <1150000>;

			regulator-max-microvolt = <1325000>;

			regulator-boot-on;

			regulator-always-on;

		};



		ldo1_reg: regulator@3 {

			/* VRTC 1.8V always-on supply */

			regulator-name = "vrtc,vdds";

			regulator-always-on;

		};



		ldo2_reg: regulator@4 {

			/* 3.3V rail */

			regulator-name = "vdd_3v3aux";

			regulator-always-on;

		};



		ldo3_reg: regulator@5 {

			/* VDD_3V3A 3.3V rail */

			regulator-name = "vdd_3v3a";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

		};



		ldo4_reg: regulator@6 {

			/* VDD_3V3B 3.3V rail */

			regulator-name = "vdd_3v3b";

			regulator-always-on;

		};

	};

};

arch/arm/boot/dts/cros-ec-keyboard.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
			MATRIX_KEY(0x00, 0x02, KEY_F1)

			MATRIX_KEY(0x00, 0x03, KEY_B)

			MATRIX_KEY(0x00, 0x04, KEY_F10)

			MATRIX_KEY(0x00, 0x05, KEY_RO)

			MATRIX_KEY(0x00, 0x06, KEY_N)

			MATRIX_KEY(0x00, 0x08, KEY_EQUAL)

			MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT)
@@ -34,6 +35,7 @@ 
			MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE)

			MATRIX_KEY(0x01, 0x09, KEY_F9)

			MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE)

			MATRIX_KEY(0x01, 0x0c, KEY_HENKAN)



			MATRIX_KEY(0x02, 0x00, KEY_LEFTCTRL)

			MATRIX_KEY(0x02, 0x01, KEY_TAB)
@@ -45,6 +47,7 @@ 
			MATRIX_KEY(0x02, 0x07, KEY_102ND)

			MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)

			MATRIX_KEY(0x02, 0x09, KEY_F8)

			MATRIX_KEY(0x02, 0x0a, KEY_YEN)



			MATRIX_KEY(0x03, 0x01, KEY_GRAVE)

			MATRIX_KEY(0x03, 0x02, KEY_F2)
@@ -53,6 +56,7 @@ 
			MATRIX_KEY(0x03, 0x06, KEY_6)

			MATRIX_KEY(0x03, 0x08, KEY_MINUS)

			MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH)

			MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN)



			MATRIX_KEY(0x04, 0x00, KEY_RIGHTCTRL)

			MATRIX_KEY(0x04, 0x01, KEY_A)

arch/arm/boot/dts/exynos3250.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ 


		mipi_phy: video-phy@10020710 {

			compatible = "samsung,s5pv210-mipi-video-phy";

			reg = <0x10020710 8>;

			#phy-cells = <1>;

			syscon = <&pmu_system_controller>;

		};



		pd_cam: cam-power-domain@10023C00 {