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

Commit fbc36477 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'for_3.13_late/dts_signed' of... 

Merge tag 'for_3.13_late/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.13/dt

Add i2c aliases
Add McASP and audio support
Add reset/idle on init bindings for OMAP
Add more nodes for AM4272
parents c49f4984 6a968678

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:

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>;

};

arch/arm/boot/dts/am335x-igep0033.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -44,6 +44,13 @@ 
		regulator-max-microvolt = <5000000>;

		regulator-boot-on;

	};



	vmmc: fixedregulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "vmmc";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};

};



&am33xx_pinmux {
@@ -180,6 +187,12 @@ 
	};

};



&mmc1 {

	status = "okay";

	vmmc-supply = <&vmmc>;

	bus-width = <4>;

};



&uart0 {

	status = "okay";

	pinctrl-names = "default";

arch/arm/boot/dts/am33xx.dtsi

+33 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
	interrupt-parent = <&intc>;



	aliases {

		i2c0 = &i2c0;

		i2c1 = &i2c1;

		i2c2 = &i2c2;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;
@@ -674,6 +677,7 @@ 
			reg = <0x44d00000 0x4000	/* M3 UMEM */

			       0x44d80000 0x2000>;	/* M3 DMEM */

			ti,hwmods = "wkup_m3";

			ti,no-reset-on-init;

		};



		elm: elm@48080000 {
@@ -713,6 +717,7 @@ 
		gpmc: gpmc@50000000 {

			compatible = "ti,am3352-gpmc";

			ti,hwmods = "gpmc";

			ti,no-idle-on-init;

			reg = <0x50000000 0x2000>;

			interrupts = <100>;

			gpmc,num-cs = <7>;
@@ -740,5 +745,33 @@ 
			       <&edma 5>;

			dma-names = "tx", "rx";

		};



		mcasp0: mcasp@48038000 {

			compatible = "ti,am33xx-mcasp-audio";

			ti,hwmods = "mcasp0";

			reg = <0x48038000 0x2000>,

			      <0x46000000 0x400000>;

			reg-names = "mpu", "dat";

			interrupts = <80>, <81>;

			interrupts-names = "tx", "rx";

			status = "disabled";

			dmas = <&edma 8>,

				<&edma 9>;

			dma-names = "tx", "rx";

		};



		mcasp1: mcasp@4803C000 {

			compatible = "ti,am33xx-mcasp-audio";

			ti,hwmods = "mcasp1";

			reg = <0x4803C000 0x2000>,

			      <0x46400000 0x400000>;

			reg-names = "mpu", "dat";

			interrupts = <82>, <83>;

			interrupts-names = "tx", "rx";

			status = "disabled";

			dmas = <&edma 10>,

				<&edma 11>;

			dma-names = "tx", "rx";

		};

	};

};