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

Commit 5f55c317 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.13/dt-late' of... 

Merge tag 'omap-for-v3.13/dt-late' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Some more dts changes from Benoit Cousson <bcousson@baylibre.com> via
Tony Lindgren:

- Add a lot of N900 nodes
- Add OPP table to OMAP5/DRA7
- Add support for Newflow NanoBone board
- Add i2c aliases
- Add McASP and audio support
- Add reset/idle on init bindings for OMAP
- Add more nodes for AM4272

* tag 'omap-for-v3.13/dt-late' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (42 commits)
  ARM: dts: omap5-uevm: Remove pinmux for dmic pins
  ARM: dts: omap5-uevm: Correct twl6040 reset GPIO pinmux
  ARM: dts: TWL4030: Add power button support
  ARM: dts: omap3-n900: Add LP5523 support
  ARM: dts: omap3-n900: Add TLV320AIC3X support
  ARM: dts: omap3-n900:: Mux RX51_LCD_RESET_GPIO in DTS
  ARM: dts: omap3-n900: Add NAND support
  ARM: dts: omap3-n900: Specify regulator info
  ARM: dts: TWL4030: Add missing regulators
  ARM: dts: omap3-n900: Add LP5523 support
  ARM: dts: omap3-n900: Add vibrator device
  ARM: dts: omap3-n900: GPIO key definitions
  ARM: dts: omap3-n900: Add support for SD cards
  ARM: dts: omap3-n900: Add UART support
  ARM: dts: omap3-n900: Fix i2c bus speed
  ARM: dts: omap3-n900: Add pinctrl for i2c devices
  ARM: dts: DRA7: Add CPU OPP table
  ARM: dts: OMAP5: Add CPU OPP table
  ARM: dts: dra7-evm: add smps123 supply for CPU
  ARM: dts: omap5-uevm: add smps123 supply for CPU
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 137f66ee b4887e16

Documentation/devicetree/bindings/arm/omap/omap.txt

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ Required properties: 
Optional properties:

- ti,no_idle_on_suspend: When present, it prevents the PM to idle the module

  during suspend.



- ti,no-reset-on-init: When present, the module should not be reset at init

- ti,no-idle-on-init: When present, the module should not be idled at init



Example:

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -6088,6 +6088,12 @@ L: linux-omap@vger.kernel.org 
S:	Maintained

F:	drivers/gpio/gpio-omap.c



OMAP/NEWFLOW NANOBONE MACHINE SUPPORT

M:	Mark Jackson <mpfj@newflow.co.uk>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/boot/dts/am335x-nano.dts



OMFS FILESYSTEM

M:	Bob Copeland <me@bobcopeland.com>

L:	linux-karma-devel@lists.sourceforge.net

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	am335x-evmsk.dtb \

	am335x-bone.dtb \

	am335x-boneblack.dtb \

	am335x-nano.dtb \

	am335x-base0033.dtb \

	am3517-evm.dtb \

	am3517_mt_ventoux.dtb \

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

+50 −0
Original line number Diff line number Diff line
@@ -119,6 +119,19 @@ 
			};

		};

	};



	sound {

		compatible = "ti,da830-evm-audio";

		ti,model = "AM335x-EVM";

		ti,audio-codec = <&tlv320aic3106>;

		ti,mcasp-controller = <&mcasp1>;

		ti,codec-clock-rate = <12000000>;

		ti,audio-routing =

			"Headphone Jack",       "HPLOUT",

			"Headphone Jack",       "HPROUT",

			"LINE1L",               "Line In",

			"LINE1R",               "Line In";

	};

};



&am33xx_pinmux {
@@ -279,6 +292,15 @@ 
			0xec 0x00	/* lcd_ac_bias_en.lcd_ac_bias_en, OUTPUT | MODE0 */

		>;

	};



	am335x_evm_audio_pins: am335x_evm_audio_pins {

		pinctrl-single,pins = <

			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rx_dv.mcasp1_aclkx */

			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_txd3.mcasp1_fsx */

			0x108 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */

			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */

		>;

	};

};



&uart0 {
@@ -373,6 +395,18 @@ 
		compatible = "ti,tmp275";

		reg = <0x48>;

	};



	tlv320aic3106: tlv320aic3106@1b {

		compatible = "ti,tlv320aic3106";

		reg = <0x1b>;

		status = "okay";



		/* Regulators */

		AVDD-supply = <&vaux2_reg>;

		IOVDD-supply = <&vaux2_reg>;

		DRVDD-supply = <&vaux2_reg>;

		DVDD-supply = <&vbat>;

	};

};



&lcdc {
@@ -476,6 +510,22 @@ 


#include "tps65910.dtsi"



&mcasp1 {

		pinctrl-names = "default";

		pinctrl-0 = <&am335x_evm_audio_pins>;



		status = "okay";



		op-mode = <0>;          /* MCASP_IIS_MODE */

		tdm-slots = <2>;

		/* 4 serializers */

		serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */

			0 0 1 2

		>;

		tx-num-evt = <1>;

		rx-num-evt = <1>;

};



&tps {

	vcc1-supply = <&vbat>;

	vcc2-supply = <&vbat>;

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

+52 −0
Original line number Diff line number Diff line
@@ -115,6 +115,17 @@ 
		brightness-levels = <0 58 61 66 75 90 125 170 255>;

		default-brightness-level = <8>;

	};



	sound {

		compatible = "ti,da830-evm-audio";

		ti,model = "AM335x-EVMSK";

		ti,audio-codec = <&tlv320aic3106>;

		ti,mcasp-controller = <&mcasp1>;

		ti,codec-clock-rate = <24576000>;

		ti,audio-routing =

			"Headphone Jack",       "HPLOUT",

			"Headphone Jack",       "HPROUT";

	};

};



&am33xx_pinmux {
@@ -244,6 +255,15 @@ 
			0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)

		>;

	};



	mcasp1_pins: mcasp1_pins {

		pinctrl-single,pins = <

			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */

			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */

			0x108 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */

			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */

		>;

	};

};



&uart0 {
@@ -291,6 +311,18 @@ 
		st,max-limit-y = <550>;

		st,max-limit-z = <750>;

	};



	tlv320aic3106: tlv320aic3106@1b {

		compatible = "ti,tlv320aic3106";

		reg = <0x1b>;

		status = "okay";



		/* Regulators */

		AVDD-supply = <&vaux2_reg>;

		IOVDD-supply = <&vaux2_reg>;

		DRVDD-supply = <&vaux2_reg>;

		DVDD-supply = <&vbat>;

	};

};



&usb {
@@ -433,3 +465,23 @@ 
&aes {

	status = "okay";

};



&gpio0 {

	ti,no-reset-on-init;

};



&mcasp1 {

		pinctrl-names = "default";

		pinctrl-0 = <&mcasp1_pins>;



		status = "okay";



		op-mode = <0>;          /* MCASP_IIS_MODE */

		tdm-slots = <2>;

		/* 4 serializers */

		serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */

			0 0 1 2

		>;

		tx-num-evt = <1>;

		rx-num-evt = <1>;

};