Commit 791ff5a9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.1/dt-signed' of... 

Merge tag 'omap-for-v5.1/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

dts updates for omap variants for v5.1 merge window

This series contains board specific dts updates and few minor
clean-up changes:

- add stdout-path for am335x-chiliboard

- add wlcore wakeirq for omap3-evm, pandaboard and omap4-droid4

- remove unnecessary address-cells and io-cells for am33xx

- replace deprecated linux,wakeup with wakeup-source property

- use spdx license for am335x-shc

- configure ethernet pins for omap4-sdp

* tag 'omap-for-v5.1/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: omap4-sdp: Make ethernet working even if booted with latest u-boot
  ARM: dts: am335x-shc.dts: Switch to SPDX identifier
  ARM: dts: am437x: replace linux,wakeup with wakeup-source property
  ARM: dts: am33xx: Remove unnecessary properties
  ARM: dts: omap4-droid4: Configure wlcore wakeirq
  ARM: dts: Configure wlcore wakeirq for pandaboard
  ARM: dts: Add wlcore wakeirq for omap3-evm
  ARM: dts: am335x-chiliboard: Add stdout-path property

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 14ef3575 b4c30df0

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

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
	compatible = "grinn,am335x-chiliboard", "grinn,am335x-chilisom",

		     "ti,am33xx";



	chosen {

		stdout-path = &uart0;

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

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

+1 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * support for the bosch am335x based shc c3 board

 *

 * Copyright, C) 2015 Heiko Schocher <hs@denx.de>

 *

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

arch/arm/boot/dts/am33xx-l4.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -288,8 +288,6 @@ 
				am33xx_pinmux: pinmux@800 {

					compatible = "pinctrl-single";

					reg = <0x800 0x238>;

					#address-cells = <1>;

					#size-cells = <0>;

					#pinctrl-cells = <1>;

					pinctrl-single,register-width = <32>;

					pinctrl-single,function-mask = <0x7f>;

arch/arm/boot/dts/am437x-gp-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
		pinctrl-0 = <&matrix_keypad_default>;

		pinctrl-1 = <&matrix_keypad_sleep>;



		linux,wakeup;

		wakeup-source;



		row-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH /* Bank0, pin3 */

				&gpio4 3 GPIO_ACTIVE_HIGH /* Bank4, pin3 */

arch/arm/boot/dts/omap3-evm-common.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ 
};



&mmc2 {

	interrupts-extended = <&intc 86 &omap3_pmx_core 0x12e>;

	vmmc-supply = <&wl12xx_vmmc>;

	non-removable;

	bus-width = <4>;
@@ -132,8 +133,10 @@ 
	wlcore: wlcore@2 {

		compatible = "ti,wl1271";

		reg = <2>;

		interrupt-parent = <&gpio5>;

		interrupts = <21 IRQ_TYPE_EDGE_RISING>; /* gpio 149 */

		/* gpio_149 with uart1_rts pad as wakeirq */

		interrupts-extended = <&gpio5 21 IRQ_TYPE_EDGE_RISING>,

				      <&omap3_pmx_core 0x14e>;

		interrupt-names = "irq", "wakeup";

		ref-clock-frequency = <38400000>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE