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

Commit 1bd49882 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'gpio-key-wakeup-fix' into omap-for-v4.11/fixes

parents 03417352 48385896

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

+3 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ Boards: 
- AM335X SBC-T335 : single board computer, built around the Sitara AM3352/4

  compatible = "compulab,sbc-t335", "compulab,cm-t335", "ti,am33xx"



- AM335X phyCORE-AM335x: Development kit

  compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx"



- OMAP5 EVM : Evaluation Module

  compatible = "ti,omap5-evm", "ti,omap5"

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -564,7 +564,9 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-base0033.dtb \

	am335x-bone.dtb \

	am335x-boneblack.dtb \

	am335x-boneblack-wireless.dtb \

	am335x-bonegreen.dtb \

	am335x-bonegreen-wireless.dtb \

	am335x-chiliboard.dtb \

	am335x-cm-t335.dtb \

	am335x-evm.dtb \
@@ -573,6 +575,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-lxm.dtb \

	am335x-nano.dtb \

	am335x-pepper.dtb \

	am335x-phycore-rdk.dtb \

	am335x-shc.dtb \

	am335x-sbc-t335.dtb \

	am335x-sl50.dtb \

arch/arm/boot/dts/am335x-bone-common.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ 
&usb0 {

	status = "okay";

	dr_mode = "peripheral";

	interrupts-extended = <&intc 18 &tps 0>;

	interrupt-names = "mc", "vbus";

};



&usb1 {

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

0 → 100644
+163 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <dt-bindings/display/tda998x.h>



&ldo3_reg {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-always-on;

};



&mmc1 {

	vmmc-supply = <&vmmcsd_fixed>;

};



&mmc2 {

	vmmc-supply = <&vmmcsd_fixed>;

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_pins>;

	bus-width = <8>;

	status = "okay";

};



&am33xx_pinmux {

	nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr0 */

			AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data0.lcd_data0 */

			AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data1.lcd_data1 */

			AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data2.lcd_data2 */

			AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0)		/* lcd_data3.lcd_data3 */

			AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data4.lcd_data4 */

			AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data5.lcd_data5 */

			AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data6.lcd_data6 */

			AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data7.lcd_data7 */

			AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data8.lcd_data8 */

			AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data9.lcd_data9 */

			AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data10.lcd_data10 */

			AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data11.lcd_data11 */

			AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data12.lcd_data12 */

			AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data13.lcd_data13 */

			AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data14.lcd_data14 */

			AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data15.lcd_data15 */

			AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_vsync.lcd_vsync */

			AM33XX_IOPAD(0x8e4, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_hsync.lcd_hsync */

			AM33XX_IOPAD(0x8e8, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_pclk.lcd_pclk */

			AM33XX_IOPAD(0x8ec, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_ac_bias_en.lcd_ac_bias_en */

		>;

	};



	nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr0 */

		>;

	};



	mcasp0_pins: mcasp0_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */

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

			AM33XX_IOPAD(0x994, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */

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

			AM33XX_IOPAD(0x86c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */

		>;

	};

};



&lcdc {

	status = "okay";



	/* If you want to get 24 bit RGB and 16 BGR mode instead of

	 * current 16 bit RGB and 24 BGR modes, set the propety

	 * below to "crossed" and uncomment the video-ports -property

	 * in tda19988 node.

	 */

	blue-and-red-wiring = "straight";



	port {

		lcdc_0: endpoint@0 {

			remote-endpoint = <&hdmi_0>;

		};

	};

};



&i2c0 {

	tda19988: tda19988 {

		compatible = "nxp,tda998x";

		reg = <0x70>;



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

		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;

		pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;



		/* Convert 24bit BGR to RGB, e.g. cross red and blue wiring */

		/* video-ports = <0x234501>; */



		#sound-dai-cells = <0>;

		audio-ports = <	TDA998x_I2S	0x03>;



		ports {

			port@0 {

				hdmi_0: endpoint@0 {

					remote-endpoint = <&lcdc_0>;

				};

			};

		};

	};

};



&rtc {

	system-power-controller;

};



&mcasp0	{

	#sound-dai-cells = <0>;

	pinctrl-names = "default";

	pinctrl-0 = <&mcasp0_pins>;

	status = "okay";

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

	tdm-slots = <2>;

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

			0 0 1 0

		>;

	tx-num-evt = <32>;

	rx-num-evt = <32>;

};



/ {

	clk_mcasp0_fixed: clk_mcasp0_fixed {

		#clock-cells = <0>;

		compatible = "fixed-clock";

		clock-frequency = <24576000>;

	};



	clk_mcasp0: clk_mcasp0 {

		#clock-cells = <0>;

		compatible = "gpio-gate-clock";

		clocks = <&clk_mcasp0_fixed>;

		enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "TI BeagleBone Black";

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

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

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



		dailink0_master: simple-audio-card,cpu {

			sound-dai = <&mcasp0>;

			clocks = <&clk_mcasp0>;

		};



		simple-audio-card,codec {

			sound-dai = <&tda19988>;

		};

	};

};

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

0 → 100644
+109 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

/dts-v1/;



#include "am33xx.dtsi"

#include "am335x-bone-common.dtsi"

#include "am335x-boneblack-common.dtsi"

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



/ {

	model = "TI AM335x BeagleBone Black Wireless";

	compatible = "ti,am335x-bone-black-wireless", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";



	wlan_en_reg: fixedregulator@2 {

		compatible = "regulator-fixed";

		regulator-name = "wlan-en-regulator";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		startup-delay-us= <70000>;



		/* WL_EN */

		gpio = <&gpio3 9 0>;

		enable-active-high;

	};

};



&am33xx_pinmux {

	bt_pins: pinmux_bt_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gmii1_txd0.gpio0_28 - BT_EN */

		>;

	};



	mmc3_pins: pinmux_mmc3_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x93c, PIN_INPUT_PULLUP | MUX_MODE6 ) /* (L15) gmii1_rxd1.mmc2_clk */

			AM33XX_IOPAD(0x914, PIN_INPUT_PULLUP | MUX_MODE6 ) /* (J16) gmii1_txen.mmc2_cmd */

			AM33XX_IOPAD(0x918, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (J17) gmii1_rxdv.mmc2_dat0 */

			AM33XX_IOPAD(0x91c, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (J18) gmii1_txd3.mmc2_dat1 */

			AM33XX_IOPAD(0x920, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (K15) gmii1_txd2.mmc2_dat2 */

			AM33XX_IOPAD(0x908, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (H16) gmii1_col.mmc2_dat3 */

		>;

	};



	uart3_pins: pinmux_uart3_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x934, PIN_INPUT_PULLUP | MUX_MODE1)	/* gmii1_rxd3.uart3_rxd */

			AM33XX_IOPAD(0x938, PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* gmii1_rxd2.uart3_txd */

			AM33XX_IOPAD(0x948, PIN_INPUT | MUX_MODE3)		/* mdio_data.uart3_ctsn */

			AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* mdio_clk.uart3_rtsn */

		>;

	};



	wl18xx_pins: pinmux_wl18xx_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gmii1_txclk.gpio3_9 WL_EN */

			AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_refclk.gpio0_29 WL_IRQ */

			AM33XX_IOPAD(0x930, PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gmii1_rxclk.gpio3_10 LS_BUF_EN */

		>;

	};

};



&mac {

	status = "disabled";

};



&mmc3 {

	dmas = <&edma_xbar 12 0 1

		&edma_xbar 13 0 2>;

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

	status = "okay";

	vmmc-supply = <&wlan_en_reg>;

	bus-width = <4>;

	non-removable;

	cap-power-off-card;

	ti,needs-special-hs-handling;

	keep-power-in-suspend;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins &wl18xx_pins>;



	#address-cells = <1>;

	#size-cells = <0>;

	wlcore: wlcore@2 {

		compatible = "ti,wl1835";

		reg = <2>;

		interrupt-parent = <&gpio0>;

		interrupts = <29 IRQ_TYPE_EDGE_RISING>;

	};

};



&uart3 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins &bt_pins>;

	status = "okay";

};



&gpio3 {

	ls_buf_en {

		gpio-hog;

		gpios = <10 GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "LS_BUF_EN";

	};

};