Commit ce541f04 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.16/dt-signed' of... 

Merge tag 'omap-for-v4.16/dt-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "Dts related changes for omaps for v4.16 merge window" from Tony
Lindgren:

These changes are mostly improvments for various devices.
Note that these are based on my earlier fixes branch
omap-for-v4.15/fixes-dt to avoid a pointless merge conflict
between a fix and removal. The summary of changes is:

- Fix audio codec reset pin for am335x-pepper and n900, this
  has been always broken and won't get fixed until the related
  driver changes are also merged in for v4.16, so not urgent

- Fix tps65917 powerhold property for dra76-evm

- Changes to logicpd boards to remove MTD partition information
  and to add support for omap35xx variants by setting up common
  dts files for the logicpd boards

- Disable dra7 USB metastability workaround, this won't do
  anything until the related driver changes are also merged
  into v4.16, so not urgent

* tag 'omap-for-v4.16/dt-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Move move WiFi bindings to logicpd-torpedo-37xx-devkit
  ARM: dts: Add minimal support for LogicPD OMAP35xx Torpedo devkit
  ARM: dts: Move most of logicpd-torpedo-37xx-devkit to logicpd-torpedo-baseboard
  ARM: dts: Add minimal support for LogicPD OMAP35xx SOM-LV devkit
  ARM: dts: Move most of logicpd-som-lv-37xx-devkit.dts to logicpd-som-lv-baseboard.dtsi
  ARM: dts: dra7: Add missing hdmi audio DMA channel information
  ARM: dts: dra7: Disable USB metastability workaround for USB2
  ARM: dts: omap3: logicpd kits: Remove partition information
  ARM: dts: DRA76-EVM: Set powerhold property for tps65917
  ARM: dts: omap3-n900: Fix the audio CODEC's reset pin
  ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin
parents 24ff73a0 a3886730

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

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ 
&audio_codec {

	status = "okay";



	gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>;

	reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

	AVDD-supply = <&ldo3_reg>;

	IOVDD-supply = <&ldo3_reg>;

	DRVDD-supply = <&ldo3_reg>;

arch/arm/boot/dts/dra7.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -1561,6 +1561,7 @@ 
				dr_mode = "otg";

				snps,dis_u3_susphy_quirk;

				snps,dis_u2_susphy_quirk;

				snps,dis_metastability_quirk;

			};

		};
@@ -1929,6 +1930,8 @@ 
				clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 9>,

					 <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 10>;

				clock-names = "fck", "sys_clk";

				dmas = <&sdma_xbar 76>;

				dma-names = "audio_tx";

			};

		};

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

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
		compatible = "ti,tps65917";

		reg = <0x58>;

		ti,system-power-controller;

		ti,palmas-override-powerhold;

		interrupt-controller;

		#interrupt-cells = <2>;

arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts

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

 * 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 "omap34xx.dtsi"

#include "logicpd-som-lv.dtsi"

#include "logicpd-som-lv-baseboard.dtsi"

#include "omap-gpmc-smsc9221.dtsi"



/ {

	model = "LogicPD Zoom OMAP35xx SOM-LV Development Kit";

	compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3";

};

arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts

+1 −248
Original line number Diff line number Diff line
@@ -8,257 +8,10 @@ 


#include "omap36xx.dtsi"

#include "logicpd-som-lv.dtsi"

#include "logicpd-som-lv-baseboard.dtsi"

#include "omap-gpmc-smsc9221.dtsi"



/ {

	model = "LogicPD Zoom DM3730 SOM-LV Development Kit";

	compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3630", "ti,omap3";



	gpio_keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&gpio_key_pins>;



		sysboot2 {

			label = "gpio3";

			gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;	/* gpio_111 / uP_GPIO_3 */

			linux,code = <BTN_0>;

			wakeup-source;

		};

	};



	sound {

		compatible = "ti,omap-twl4030";

		ti,model = "omap3logic";

		ti,mcbsp = <&mcbsp2>;

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins &led_pins_wkup>;



		led1 {

			label = "led1";

			gpios = <&gpio5 5 GPIO_ACTIVE_LOW>;	/* gpio133 */

			linux,default-trigger = "cpu0";

		};



		led2 {

			label = "led2";

			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;	/* gpio11 */

			linux,default-trigger = "none";

		};

	};

};



&vaux1 {

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

};



&vaux4 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

};



&mcbsp2 {

	status = "okay";

};



&charger {

	ti,bb-uvolt = <3200000>;

	ti,bb-uamp = <150>;

};



&gpmc {

	ranges = <0 0 0x30000000 0x1000000	/* CS0: 16MB for NAND */

		  1 0 0x2c000000 0x1000000>;	/* CS1: 16MB for LAN9221 */



	ethernet@gpmc {

		pinctrl-names = "default";

		pinctrl-0 = <&lan9221_pins>;

		interrupt-parent = <&gpio5>;

		interrupts = <24 IRQ_TYPE_LEVEL_LOW>;		/* gpio_152 */

		reg = <1 0 0xff>;

	};

};



&vpll2 {

	regulator-always-on;

};



&dss {

	status = "ok";

	vdds_dsi-supply = <&vpll2>;

	vdda_video-supply = <&video_reg>;

	pinctrl-names = "default";

	pinctrl-0 = <&dss_dpi_pins1>;

	port {

		dpi_out: endpoint {

			remote-endpoint = <&lcd_in>;

			data-lines = <16>;

		};

	};

};



/ {

	aliases {

		display0 = &lcd0;

	};



	video_reg: video_reg {

		compatible = "regulator-fixed";

		regulator-name = "fixed-supply";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	lcd0: display@0 {

		compatible = "panel-dpi";

		label = "28";

		status = "okay";

		/* default-on; */

		pinctrl-names = "default";

		pinctrl-0 = <&lcd_enable_pin>;

		enable-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>;	/* gpio155, lcd INI */

		port {

			lcd_in: endpoint {

				remote-endpoint = <&dpi_out>;

			};

		};



		panel-timing {

			clock-frequency = <9000000>;

			hactive = <480>;

			vactive = <272>;

			hfront-porch = <3>;

			hback-porch = <2>;

			hsync-len = <42>;

			vback-porch = <3>;

			vfront-porch = <2>;

			vsync-len = <11>;

			hsync-active = <1>;

			vsync-active = <1>;

			de-active = <1>;

			pixelclk-active = <0>;

		};

	};



	bl: backlight {

		compatible = "pwm-backlight";

		pinctrl-names = "default";

		pinctrl-0 = <&backlight_pins>;

		pwms = <&twl_pwm 0 5000000>;

		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;

		default-brightness-level = <7>;

		enable-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; /* gpio_8 */

	};

};



&mmc1 {

	interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>;		/* gpio_126 */

	cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>;		/* gpio_110 */

	vmmc-supply = <&vmmc1>;

	bus-width = <4>;

	cap-power-off-card;

};



&omap3_pmx_core {

	gpio_key_pins: pinmux_gpio_key_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x212e, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_xclkb.gpio_111 / uP_GPIO_3*/

		>;

	};



	led_pins: pinmux_led_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x215e, PIN_OUTPUT_PULLUP | MUX_MODE4)	/* sdmmc2_dat1.gpio_133 / uP_GPIO_0 */

		>;

	};



	lan9221_pins: pinmux_lan9221_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4)	/* mcbsp4_clkx.gpio_152 */

		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2144, PIN_OUTPUT | MUX_MODE0)	/* sdmmc1_clk.sdmmc1_clk */

			OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT | MUX_MODE0)	/* sdmmc1_cmd.sdmmc1_cmd */

			OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT | MUX_MODE0)	/* sdmmc1_dat0.sdmmc1_dat0 */

			OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT | MUX_MODE0)	/* sdmmc1_dat1.sdmmc1_dat1 */

			OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT | MUX_MODE0)	/* sdmmc1_dat2.sdmmc1_dat2 */

			OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT | MUX_MODE0)	/* sdmmc1_dat3.sdmmc1_dat3 */

			OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_strobe.gpio_126 */

			OMAP3_CORE1_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_d11.gpio_110 */

		>;

	};



	lcd_enable_pin: pinmux_lcd_enable_pin {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x218a, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4)       /* mcbsp4_fs.gpio_155 */

		>;

	};



	dss_dpi_pins1: pinmux_dss_dpi_pins1 {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_pclk.dss_pclk */

			OMAP3_CORE1_IOPAD(0x20d6, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_hsync.dss_hsync */

			OMAP3_CORE1_IOPAD(0x20d8, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_vsync.dss_vsync */

			OMAP3_CORE1_IOPAD(0x20da, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_acbias.dss_acbias */



			OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data0.dss_data0 */

			OMAP3_CORE1_IOPAD(0x20de, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data1.dss_data1 */

			OMAP3_CORE1_IOPAD(0x20e0, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data2.dss_data2 */

			OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data3.dss_data3 */

			OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data4.dss_data4 */

			OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data5.dss_data5 */

			OMAP3_CORE1_IOPAD(0x20e8, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data6.dss_data6 */

			OMAP3_CORE1_IOPAD(0x20ea, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data7.dss_data7 */

			OMAP3_CORE1_IOPAD(0x20ec, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data8.dss_data8 */

			OMAP3_CORE1_IOPAD(0x20ee, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data9.dss_data9 */

			OMAP3_CORE1_IOPAD(0x20f0, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data10.dss_data10 */

			OMAP3_CORE1_IOPAD(0x20f2, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data11.dss_data11 */

			OMAP3_CORE1_IOPAD(0x20f4, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data12.dss_data12 */

			OMAP3_CORE1_IOPAD(0x20f6, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data13.dss_data13 */

			OMAP3_CORE1_IOPAD(0x20f8, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data14.dss_data14 */

			OMAP3_CORE1_IOPAD(0x20fa, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0)   /* dss_data15.dss_data15 */

		>;

	};

};



&omap3_pmx_wkup {

	led_pins_wkup: pinmux_led_pins_wkup {

		pinctrl-single,pins = <

			OMAP3_WKUP_IOPAD(0x2a24, PIN_OUTPUT_PULLUP | MUX_MODE4)	/* jtag_emu0.gpio_11 / uP_GPIO_1 */

		>;

	};



	backlight_pins: pinmux_backlight_pins {

		pinctrl-single,pins = <

			OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4)       /* sys_boot6.gpio_8 */

		>;

	};

};





&uart1 {

	interrupts-extended = <&intc 72 &omap3_pmx_core OMAP3_UART1_RX>;

};



/* Wired to the tps65950 on the SOM, only the USB connector is on the devkit */

&usb_otg_hs {

	pinctrl-names = "default";

	pinctrl-0 = <&hsusb_otg_pins>;

	interface-type = <0>;

	usb-phy = <&usb2_phy>;

	phys = <&usb2_phy>;

	phy-names = "usb2-phy";

	mode = <3>;

	power = <50>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE