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

Commit 0314df77 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Device tree changes for omaps for v4.6 merge window. Mostly just
adding board specific devices and few new boards:

- N900 improvments for adp1653 and gpio keys

- Add missing bandgap data for omap3

- Add more devices for compulab cm-t335

- Add n950 WLAN support, enable modem, add pinctrl for SSI

- Correct dm814x and dra62x auxclk rate, add support for GPMC and NAND

- Add syscon node for PHY's on dra7

- Add support more devices on logicpd torpedo

- Add USB host support for igep and specify boot console

- Fix audio clock for am335x-sl50 and specify boot console

- Remove deprecated tx-fifo-resize for dwc3 that was only used on
  omap5 es1.0

- Add dra7 thermal data

- Update am43x-epos-evm compatible string to am438

- Add support for logicpd dm3730 som-lv

* tag 'omap-for-v4.6/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (38 commits)
  ARM: dts: am57xx-beagle-x15: Add eeprom information
  ARM: dts: Add HSUSB2 EHCI Support to Logic PD DM37xx SOM-LV
  ARM: dts: n900: Use linux input defines instead hardcoded constants
  ARM: DTS: Add minimal Support for Logic PD DM3730 SOM-LV
  ARM: dts: omap3logic: Add PWM-Backlight
  ARM: dts: omap3-n900: Allow gpio keys to be disabled
  ARM: dts: am43x-epos-evm: Add the am438 compatible string
  ARM: dts: DRA7: Add missing IVA and DSPEVE thermal domain data
  ARM: dts: DRA7: Add IVA thermal data
  ARM: dts: DRA7: Add DSPEVE thermal data
  ARM: dts: remove deprecated property dwc3
  ARM: dts: OMAP3-N950-N9: Add ssi idle pinctrl state
  ARM: dts: am335x-sl50: Fix audio codec setup.
  ARM: dts: am335x-sl50: Specify the device to be used for boot console output.
  ARM: dts: omap3-igep0030-common: Add USB Host support
  ARM: dts: igep00x0: Specify the device to be used for boot console output.
  ARM: dts: LogicPD Torpedo: Set HSUSB0 Pin Mux
  ARM: dts: OMAP3-N950-N9: Enable modem
  ARM: dts: OMAP3-N950-N9: Enable SSI module
  ARM: dts: LogicPD Torpedo: Add SPI EEPROM
  ...
parents 1df1e5bf b9d3ec1d

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

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ Boards: 
  compatible = "compulab,am437x-sbc-t43", "compulab,am437x-cm-t43", "ti,am4372", "ti,am43"



- AM43x EPOS EVM

  compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"

  compatible = "ti,am43x-epos-evm", "ti,am43", "ti,am438x"



- AM437x GP EVM

  compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"

arch/arm/boot/dts/am335x-cm-t335.dts

+171 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
/dts-v1/;



#include "am33xx.dtsi"

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	model = "CompuLab CM-T335";
@@ -40,12 +41,51 @@ 
		regulator-max-microvolt = <3300000>;

	};



	/* Regulator for WiFi */

	vwlan_fixed: fixedregulator@2 {

		compatible = "regulator-fixed";

		regulator-name = "vwlan_fixed";

		gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>; /* gpio0_20 */

		enable-active-high;

		regulator-boot-off;

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&ecap0 0 50000 0>;

		brightness-levels = <0 51 53 56 62 75 101 152 255>;

		default-brightness-level = <8>;

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "cm-t335";



		simple-audio-card,widgets =

			"Microphone", "Mic Jack",

			"Line", "Line In",

			"Headphone", "Headphone Jack";



		simple-audio-card,routing =

			"Headphone Jack", "LHPOUT",

			"Headphone Jack", "RHPOUT",

			"LLINEIN", "Line In",

			"RLINEIN", "Line In",

			"MICIN", "Mic Jack";



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

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

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



		simple-audio-card,cpu {

			sound-dai = <&mcasp1>;

		};



		sound_master: simple-audio-card,codec {

			sound-dai = <&tlv320aic23>;

			system-clock-frequency = <12000000>;

		};

	};

};



&am33xx_pinmux {
@@ -134,6 +174,24 @@ 
		>;

	};



	dcan0_pins: pinmux_dcan0_pins {

		pinctrl-single,pins = <

			/* uart1_ctsn.dcan0_tx */

			AM33XX_IOPAD(0x978, PIN_OUTPUT | MUX_MODE2)

			/* uart1_rtsn.dcan0_rx */

			AM33XX_IOPAD(0x97C, PIN_INPUT | MUX_MODE2)

		>;

	};



	dcan1_pins: pinmux_dcan1_pins {

		pinctrl-single,pins = <

			/* uart1_rxd.dcan1_tx */

			AM33XX_IOPAD(0x980, PIN_OUTPUT | MUX_MODE2)

			/* uart1_txd.dcan1_rx */

			AM33XX_IOPAD(0x984, PIN_INPUT | MUX_MODE2)

		>;

	};



	ecap0_pins: pinmux_ecap0_pins {

		pinctrl-single,pins = <

			/* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
@@ -223,6 +281,21 @@ 
		>;

	};



	spi0_pins: pinmux_spi0_pins {

		pinctrl-single,pins = <

			/* spi0_sclk.spi0_sclk */

			AM33XX_IOPAD(0x950, PIN_INPUT | MUX_MODE0)

			/* spi0_d0.spi0_d0 */

			AM33XX_IOPAD(0x954, PIN_OUTPUT_PULLUP | MUX_MODE0)

			/* spi0_d1.spi0_d1 */

			AM33XX_IOPAD(0x958, PIN_INPUT | MUX_MODE0)

			/* spi0_cs0.spi0_cs0 */

			AM33XX_IOPAD(0x95C, PIN_OUTPUT | MUX_MODE0)

			/* spi0_cs1.spi0_cs1 */

			AM33XX_IOPAD(0x960, PIN_OUTPUT | MUX_MODE0)

		>;

	};



	/* wl1271 bluetooth */

	bluetooth_pins: pinmux_bluetooth_pins {

		pinctrl-single,pins = <
@@ -230,6 +303,30 @@ 
			AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLUP | MUX_MODE7)

		>;

	};



	/* TLV320AIC23B codec */

	mcasp1_pins: pinmux_mcasp1_pins {

		pinctrl-single,pins = <

			/* MII1_CRS.mcasp1_aclkx */

			AM33XX_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE4)

			/* MII1_RX_ER.mcasp1_fsx */

			AM33XX_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE4)

			/* MII1_COL.mcasp1_axr2 */

			AM33XX_IOPAD(0x908, PIN_INPUT_PULLDOWN | MUX_MODE4)

			/* RMII1_REF_CLK.mcasp1_axr3 */

			AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE4)

		>;

	};



	/* wl1271 WiFi */

	wifi_pins: pinmux_wifi_pins {

		pinctrl-single,pins = <

			/* EMU1.gpio3_8 - WiFi IRQ */

			AM33XX_IOPAD(0x9e8, PIN_INPUT_PULLUP | MUX_MODE7)

			/* XDMA_EVENT_INTR1.gpio0_20 - WiFi enable */

			AM33XX_IOPAD(0x9b4, PIN_OUTPUT | MUX_MODE7)

		>;

	};

};



&uart0 {
@@ -264,6 +361,13 @@ status = "okay"; 
		compatible = "emmicro,em3027";

		reg = <0x56>;

	};

	/* Audio codec */

	tlv320aic23: codec@1a {

		compatible = "ti,tlv320aic23";

		reg = <0x1a>;

		#sound-dai-cells= <0>;

		status = "okay";

	};

};



&usb {
@@ -394,3 +498,70 @@ status = "okay"; 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

};



&dcan0 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&dcan0_pins>;

};



&dcan1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&dcan1_pins>;

};



/* Touschscreen and analog digital converter */

&tscadc {

	status = "okay";

	tsc {

		ti,wires = <4>;

		ti,x-plate-resistance = <200>;

		ti,coordinate-readouts = <5>;

		ti,wire-config = <0x01 0x10 0x23 0x32>;

		ti,charge-delay = <0x400>;

	};



	adc {

		ti,adc-channels = <4 5 6 7>;

	};

};



/* CPU audio */

&mcasp1 {

		pinctrl-names = "default";

		pinctrl-0 = <&mcasp1_pins>;



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

		tdm-slots = <2>;

		/* 16 serializers */

		num-serializer = <16>;

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

			0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0

		>;

		tx-num-evt = <1>;

		rx-num-evt = <1>;



		#sound-dai-cells= <0>;

		status = "okay";

};



&spi0 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&spi0_pins>;

	ti,pindir-d0-out-d1-in = <1>;

	/* WLS1271 WiFi */

	wlcore: wlcore@1 {

		compatible = "ti,wl1271";

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_pins>;

		reg = <1>;

		spi-max-frequency = <48000000>;

		clock-xtal;

		ref-clock-frequency = <38400000>;

		interrupt-parent = <&gpio3>;

		interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;

		vwlan-supply = <&vwlan_fixed>;

	};

};

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

+22 −2
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
		};

	};



	chosen {

		stdout-path = &uart0;

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";
@@ -63,12 +67,28 @@ 
		default-brightness-level = <6>;

	};



	clocks {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		/* audio external oscillator */

		tlv320aic3x_mclk: oscillator@0 {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency  = <24576000>;	/* 24.576MHz */

		};

	};



	sound {

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

		ti,model = "AM335x-SL50";

		ti,audio-codec = <&audio_codec>;

		ti,mcasp-controller = <&mcasp0>;

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



		clocks = <&tlv320aic3x_mclk>;

		clock-names = "mclk";



		ti,audio-routing =

			"Headphone Jack",	"HPLOUT",

			"Headphone Jack",	"HPROUT",
@@ -226,7 +246,7 @@ 
			AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp0_fsx.mcasp0_fsx */

			AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp0_aclkx.mcasp0_aclkx */

			AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp0_axr0.mcasp0_axr0 */

			AM33XX_IOPAD(0x99c, PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mcasp0_ahclkr.mcasp0_axr2*/

			AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mcasp0_ahclkr.mcasp0_axr2 */

		>;

	};

arch/arm/boot/dts/am4372.dtsi

+2 −14
Original line number Diff line number Diff line
@@ -897,18 +897,6 @@ 
			status = "disabled";

		};



		am43xx_control_usb2phy1: control-phy@44e10620 {

			compatible = "ti,control-phy-usb2-am437";

			reg = <0x44e10620 0x4>;

			reg-names = "power";

		};



		am43xx_control_usb2phy2: control-phy@0x44e10628 {

			compatible = "ti,control-phy-usb2-am437";

			reg = <0x44e10628 0x4>;

			reg-names = "power";

		};



		ocp2scp0: ocp2scp@483a8000 {

			compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";

			#address-cells = <1>;
@@ -919,7 +907,7 @@ 
			usb2_phy1: phy@483a8000 {

				compatible = "ti,am437x-usb2";

				reg = <0x483a8000 0x8000>;

				ctrl-module = <&am43xx_control_usb2phy1>;

				syscon-phy-power = <&scm_conf 0x620>;

				clocks = <&usb_phy0_always_on_clk32k>,

					 <&usb_otg_ss0_refclk960m>;

				clock-names = "wkupclk", "refclk";
@@ -938,7 +926,7 @@ 
			usb2_phy2: phy@483e8000 {

				compatible = "ti,am437x-usb2";

				reg = <0x483e8000 0x8000>;

				ctrl-module = <&am43xx_control_usb2phy2>;

				syscon-phy-power = <&scm_conf 0x628>;

				clocks = <&usb_phy1_always_on_clk32k>,

					 <&usb_otg_ss1_refclk960m>;

				clock-names = "wkupclk", "refclk";

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


/ {

	model = "TI AM43x EPOS EVM";

	compatible = "ti,am43x-epos-evm","ti,am4372","ti,am43";

	compatible = "ti,am43x-epos-evm","ti,am438x","ti,am43";



	aliases {

		display0 = &lcd0;