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

Merge tag 'omap-fixes-against-v3.18-rc4' of... 

Merge tag 'omap-fixes-against-v3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "omap fixes against v3.18-rc4" from Tony Lindgren:

Few omap fixes for hangs and wrong pinctrl defines, and update
MAINTAINERS file to avoid missing PMIC and SoC related patches:

- Fix random hangs on am437x because of incorrect default
  value for the DDR regulator

- Fix wrong partition name for NAND on am335x-evm

- Fix wrong pinctrl defines for dra7xx

- Update maintainers entries for PMICs and SoCs

* tag 'omap-fixes-against-v3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  pinctrl: dra: dt-bindings: Fix output pull up/down
  MAINTAINERS: Update entry for omap related .dts files to cover new SoCs
  MAINTAINERS: add more files under OMAP SUPPORT
  ARM: dts: AM437x-SK-EVM: Fix DCDC3 voltage
  ARM: dts: AM437x-GP-EVM: Fix DCDC3 voltage
  ARM: dts: AM43x-EPOS-EVM: Fix DCDC3 voltage
  ARM: dts: am335x-evm: Fix 5th NAND partition's name

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ae8f5041 73b3a665

MAINTAINERS

+20 −0
Original line number Diff line number Diff line
@@ -6596,6 +6596,23 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git 
S:	Maintained

F:	arch/arm/*omap*/

F:	drivers/i2c/busses/i2c-omap.c

F:	drivers/irqchip/irq-omap-intc.c

F:	drivers/mfd/*omap*.c

F:	drivers/mfd/menelaus.c

F:	drivers/mfd/palmas.c

F:	drivers/mfd/tps65217.c

F:	drivers/mfd/tps65218.c

F:	drivers/mfd/tps65910.c

F:	drivers/mfd/twl-core.[ch]

F:	drivers/mfd/twl4030*.c

F:	drivers/mfd/twl6030*.c

F:	drivers/mfd/twl6040*.c

F:	drivers/regulator/palmas-regulator*.c

F:	drivers/regulator/pbias-regulator.c

F:	drivers/regulator/tps65217-regulator.c

F:	drivers/regulator/tps65218-regulator.c

F:	drivers/regulator/tps65910-regulator.c

F:	drivers/regulator/twl-regulator.c

F:	include/linux/i2c-omap.h



OMAP DEVICE TREE SUPPORT
@@ -6606,6 +6623,9 @@ L: devicetree@vger.kernel.org 
S:	Maintained

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

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

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

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

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



OMAP CLOCK FRAMEWORK SUPPORT

M:	Paul Walmsley <paul@pwsan.com>

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

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ 
			reg = <0x00060000 0x00020000>;

		};

		partition@4 {

			label = "NAND.u-boot-spl";

			label = "NAND.u-boot-spl-os";

			reg = <0x00080000 0x00040000>;

		};

		partition@5 {

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

+2 −2
Original line number Diff line number Diff line
@@ -291,8 +291,8 @@ 
		dcdc3: regulator-dcdc3 {

			compatible = "ti,tps65218-dcdc3";

			regulator-name = "vdcdc3";

			regulator-min-microvolt = <1350000>;

			regulator-max-microvolt = <1350000>;

			regulator-min-microvolt = <1500000>;

			regulator-max-microvolt = <1500000>;

			regulator-boot-on;

			regulator-always-on;

		};

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

+2 −2
Original line number Diff line number Diff line
@@ -363,8 +363,8 @@ 
		dcdc3: regulator-dcdc3 {

			compatible = "ti,tps65218-dcdc3";

			regulator-name = "vdds_ddr";

			regulator-min-microvolt = <1350000>;

			regulator-max-microvolt = <1350000>;

			regulator-min-microvolt = <1500000>;

			regulator-max-microvolt = <1500000>;

			regulator-boot-on;

			regulator-always-on;

		};

arch/arm/boot/dts/am43x-epos-evm.dts

+2 −2
Original line number Diff line number Diff line
@@ -358,8 +358,8 @@ 
		dcdc3: regulator-dcdc3 {

			compatible = "ti,tps65218-dcdc3";

			regulator-name = "vdcdc3";

			regulator-min-microvolt = <1350000>;

			regulator-max-microvolt = <1350000>;

			regulator-min-microvolt = <1500000>;

			regulator-max-microvolt = <1500000>;

			regulator-boot-on;

			regulator-always-on;

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE