Commit 10b97f38 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:
 "By far most of the fixes here are updates to DTS files to deal with
  some mostly minor bugs.

  There's also a fix to deal with non-PM kernel configs on i.MX, a
  regression fix for ethernet on PXA platforms and a dependency fix for
  OMAP"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  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: 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
  ARM: dts: omap3: overo: Update LCD panel names
  ARM: dts: cros-ec-keyboard: Add support for some Japanese keys
  ARM: imx6: gpc: always enable PU domain if CONFIG_PM is not set
  ARM: dts: imx53-qsb: fix TVE entry
  ARM: dts: mx23: fix iio-hwmon support
  ARM: dts: imx27: Adjust the GPT compatible string
  ARM: socfpga: dts: Fix entries order
  ARM: socfpga: dts: Fix adxl34x formating and compatible string
parents 9d37e667 3eae03da

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/imx23.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ 
				interrupts = <36 37 38 39 40 41 42 43 44>;

				status = "disabled";

				clocks = <&clks 26>;

				#io-channel-cells = <1>;

			};



			spdif@80054000 {

arch/arm/boot/dts/imx27.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
			};



			gpt1: timer@10003000 {

				compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";

				compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";

				reg = <0x10003000 0x1000>;

				interrupts = <26>;

				clocks = <&clks IMX27_CLK_GPT1_IPG_GATE>,
@@ -117,7 +117,7 @@ 
			};



			gpt2: timer@10004000 {

				compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";

				compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";

				reg = <0x10004000 0x1000>;

				interrupts = <25>;

				clocks = <&clks IMX27_CLK_GPT2_IPG_GATE>,
@@ -126,7 +126,7 @@ 
			};



			gpt3: timer@10005000 {

				compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";

				compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";

				reg = <0x10005000 0x1000>;

				interrupts = <24>;

				clocks = <&clks IMX27_CLK_GPT3_IPG_GATE>,
@@ -376,7 +376,7 @@ 
			};



			gpt4: timer@10019000 {

				compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";

				compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";

				reg = <0x10019000 0x1000>;

				interrupts = <4>;

				clocks = <&clks IMX27_CLK_GPT4_IPG_GATE>,
@@ -385,7 +385,7 @@ 
			};



			gpt5: timer@1001a000 {

				compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";

				compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";

				reg = <0x1001a000 0x1000>;

				interrupts = <3>;

				clocks = <&clks IMX27_CLK_GPT5_IPG_GATE>,
@@ -436,7 +436,7 @@ 
			};



			gpt6: timer@1001f000 {

				compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";

				compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";

				reg = <0x1001f000 0x1000>;

				interrupts = <2>;

				clocks = <&clks IMX27_CLK_GPT6_IPG_GATE>,

CRA Git | Maintained and supported by SUSTech CRA and CCSE