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

Merge tag 'omap-for-v4.3/dt-pt1' of... 

Merge tag 'omap-for-v4.3/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "omap dts changes for v4.3, part 1" from Tony Lindgren:

Omap dts changes for v4.3 merge window. There are also related
changes for reemoteproc platform_data and audio options for
omap2plus_defconfig to keep audio working when changing boards
to use SIMPLE_CARD. The summary of changes is:

- A large set of audio related changes for SIMPLE_CARD from
  Peter Ujfalusi <peter.ujfalusi@ti.com> for am335x and am437x

- Pinctrl dts defines for dra7 virtual mode to configure timings

- Change to use cpsw slave0 for dra7 Ethernet

- Remove unconfigured and wrong l3-mux entry for dm816x

- Add support for Gumstix Palo35 and TobiDuo boards, and  Overo
  PoP NAND and McBSP2

- Start using new HDMI binding for tilcdc

- Start using new sDMA crossbar for dra7

- Start using rproc for am335x and am437x M3 coprocessor

* tag 'omap-for-v4.3/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (32 commits)
  ARM: dts: am335x-evm: Switch using simple-audio-card for audio support
  ARM: dts: am335x-evm: Add sleep pin settings for mcasp1
  ARM: dts: am335x-evm: Rename pinctrl section for McASP1
  ARM: dts: am335x-evm: Fix mcasp1 node's indentation
  ARM: dts: am335x-evmsk: Switch using simple-audio-card for audio support
  ARM: dts: am335x-evmsk: Add sleep pin settings for mcasp1
  ARM: dts: am335x-evmsk: Fix mcasp1 node's indentation
  ARM: dts: am437x-gp-evm: Enable analog audio via simple-card
  ARM: dts: am437x-gp-evm: McASP1 node for audio support
  ARM: dts: am437x-gp-evm: Add node for tlv320aic3106 audio codec
  ARM: dts: am437x-gp-evm: Rename fixed regulator vmmcsd_fixed to evm_v3_3d
  ARM: dts: am437x-gp-evm: Add gpio-hog for configuring the display/audio mux
  ARM: dts: am43xx-epos-evm: Enable analog audio via simple-card
  ARM: dts: am43xx-epos-evm: Add node for tlv320aic3111 audio codec
  ARM: dts: am43xx-epos-evm: McASP1 node for audio support
  ARM: dts: am43xx-epos-evm: Add regulator for VBAT and DCDC4 of tps65218
  ARM: dts: am43xx-epos-evm: Add gpio-hog for configuring the display/audio mux
  ARM: dts: am437x-sk-evm: Switch using simple-audio-card for audio support
  ARM: dts: am437x-sk-evm: Add sleep pin settings for mcasp1
  ARM: omap2plus_defconfig: Enable audio related config options
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 216883a4 80edaaea

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -409,15 +409,19 @@ dtb-$(CONFIG_ARCH_OMAP3) += \ 
	omap3-overo-alto35.dtb \

	omap3-overo-chestnut43.dtb \

	omap3-overo-gallop43.dtb \

	omap3-overo-palo35.dtb \

	omap3-overo-palo43.dtb \

	omap3-overo-storm-alto35.dtb \

	omap3-overo-storm-chestnut43.dtb \

	omap3-overo-storm-gallop43.dtb \

	omap3-overo-storm-palo35.dtb \

	omap3-overo-storm-palo43.dtb \

	omap3-overo-storm-summit.dtb \

	omap3-overo-storm-tobi.dtb \

	omap3-overo-storm-tobiduo.dtb \

	omap3-overo-summit.dtb \

	omap3-overo-tobi.dtb \

	omap3-overo-tobiduo.dtb \

	omap3-pandora-600mhz.dtb \

	omap3-pandora-1ghz.dtb \

	omap3-sbc-t3517.dtb \

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

+15 −5
Original line number Diff line number Diff line
@@ -68,16 +68,26 @@ 


&lcdc {

	status = "okay";

	port {

		lcdc_0: endpoint@0 {

			remote-endpoint = <&hdmi_0>;

		};

	};

};



/ {

	hdmi {

		compatible = "ti,tilcdc,slave";

		i2c = <&i2c0>;

&i2c0 {

	tda19988 {

		compatible = "nxp,tda998x";

		reg = <0x70>;

		pinctrl-names = "default", "off";

		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;

		pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;

		status = "okay";



		port {

			hdmi_0: endpoint@0 {

				remote-endpoint = <&lcdc_0>;

			};

		};

	};

};

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

+47 −22
Original line number Diff line number Diff line
@@ -136,16 +136,29 @@ 
	};



	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 =

		compatible = "simple-audio-card";

		simple-audio-card,name = "AM335x-EVM";

		simple-audio-card,widgets =

			"Headphone", "Headphone Jack",

			"Line", "Line In";

		simple-audio-card,routing =

			"Headphone Jack",	"HPLOUT",

			"Headphone Jack",	"HPROUT",

			"LINE1L",		"Line In",

			"LINE1R",		"Line In";

		simple-audio-card,format = "dsp_b";

		simple-audio-card,bitclock-master = <&sound_master>;

		simple-audio-card,frame-master = <&sound_master>;

		simple-audio-card,bitclock-inversion;



		simple-audio-card,cpu {

			sound-dai = <&mcasp1>;

		};



		sound_master: simple-audio-card,codec {

			sound-dai = <&tlv320aic3106>;

			system-clock-frequency = <12000000>;

		};

	};

};
@@ -342,7 +355,7 @@ 
		>;

	};



	am335x_evm_audio_pins: am335x_evm_audio_pins {

	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 */
@@ -351,6 +364,15 @@ 
		>;

	};



	mcasp1_pins_sleep: mcasp1_pins_sleep {

		pinctrl-single,pins = <

			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE7)

			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)

			0x108 (PIN_INPUT_PULLDOWN | MUX_MODE7)

			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE7)

		>;

	};



	dcan1_pins_default: dcan1_pins_default {

		pinctrl-single,pins = <

			0x168 (PIN_OUTPUT | MUX_MODE2) /* uart0_ctsn.d_can1_tx */
@@ -460,6 +482,7 @@ 
	};



	tlv320aic3106: tlv320aic3106@1b {

		#sound-dai-cells = <0>;

		compatible = "ti,tlv320aic3106";

		reg = <0x1b>;

		status = "okay";
@@ -575,8 +598,10 @@ 
#include "tps65910.dtsi"



&mcasp1 {

		pinctrl-names = "default";

		pinctrl-0 = <&am335x_evm_audio_pins>;

	#sound-dai-cells = <0>;

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&mcasp1_pins>;

	pinctrl-1 = <&mcasp1_pins_sleep>;



	status = "okay";

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

+43 −19
Original line number Diff line number Diff line
@@ -141,14 +141,26 @@ 
	};



	sound {

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

		ti,model = "AM335x-EVMSK";

		ti,audio-codec = <&tlv320aic3106>;

		ti,mcasp-controller = <&mcasp1>;

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

		ti,audio-routing =

		compatible = "simple-audio-card";

		simple-audio-card,name = "AM335x-EVMSK";

		simple-audio-card,widgets =

			"Headphone", "Headphone Jack";

		simple-audio-card,routing =

			"Headphone Jack",	"HPLOUT",

			"Headphone Jack",	"HPROUT";

		simple-audio-card,format = "dsp_b";

		simple-audio-card,bitclock-master = <&sound_master>;

		simple-audio-card,frame-master = <&sound_master>;

		simple-audio-card,bitclock-inversion;



		simple-audio-card,cpu {

			sound-dai = <&mcasp1>;

		};



		sound_master: simple-audio-card,codec {

			sound-dai = <&tlv320aic3106>;

			system-clock-frequency = <24000000>;

		};

	};



	panel {
@@ -396,6 +408,15 @@ 
		>;

	};



	mcasp1_pins_sleep: mcasp1_pins_sleep {

		pinctrl-single,pins = <

			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE7)

			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)

			0x108 (PIN_INPUT_PULLDOWN | MUX_MODE7)

			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE7)

		>;

	};



	mmc2_pins: pinmux_mmc2_pins {

		pinctrl-single,pins = <

			0x74 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpio0_31 */
@@ -462,6 +483,7 @@ 
	};



	tlv320aic3106: tlv320aic3106@1b {

		#sound-dai-cells = <0>;

		compatible = "ti,tlv320aic3106";

		reg = <0x1b>;

		status = "okay";
@@ -661,8 +683,10 @@ 
};



&mcasp1 {

		pinctrl-names = "default";

	#sound-dai-cells = <0>;

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&mcasp1_pins>;

	pinctrl-1 = <&mcasp1_pins_sleep>;



	status = "okay";

arch/arm/boot/dts/am33xx.dtsi

+9 −8
Original line number Diff line number Diff line
@@ -103,6 +103,15 @@ 
			#size-cells = <1>;

			ranges = <0 0x44c00000 0x280000>;



			wkup_m3: wkup_m3@100000 {

				compatible = "ti,am3352-wkup-m3";

				reg = <0x100000 0x4000>,

				      <0x180000	0x2000>;

				reg-names = "umem", "dmem";

				ti,hwmods = "wkup_m3";

				ti,pm-firmware = "am335x-pm-firmware.elf";

			};



			prcm: prcm@200000 {

				compatible = "ti,am3-prcm";

				reg = <0x200000 0x4000>;
@@ -762,14 +771,6 @@ 
			reg = <0x40300000 0x10000>; /* 64k */

		};



		wkup_m3: wkup_m3@44d00000 {

			compatible = "ti,am3353-wkup-m3";

			reg = <0x44d00000 0x4000	/* M3 UMEM */

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

			ti,hwmods = "wkup_m3";

			ti,no-reset-on-init;

		};



		elm: elm@48080000 {

			compatible = "ti,am3352-elm";

			reg = <0x48080000 0x2000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE