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

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
...@@ -14,6 +14,10 @@ / { ...@@ -14,6 +14,10 @@ / {
compatible = "grinn,am335x-chiliboard", "grinn,am335x-chilisom", compatible = "grinn,am335x-chiliboard", "grinn,am335x-chilisom",
"ti,am33xx"; "ti,am33xx";
chosen {
stdout-path = &uart0;
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
// SPDX-License-Identifier: GPL-2.0
/* /*
* support for the bosch am335x based shc c3 board * support for the bosch am335x based shc c3 board
* *
* Copyright, C) 2015 Heiko Schocher <hs@denx.de> * 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/; /dts-v1/;
......
...@@ -288,8 +288,6 @@ phy_sel: cpsw-phy-sel@650 { ...@@ -288,8 +288,6 @@ phy_sel: cpsw-phy-sel@650 {
am33xx_pinmux: pinmux@800 { am33xx_pinmux: pinmux@800 {
compatible = "pinctrl-single"; compatible = "pinctrl-single";
reg = <0x800 0x238>; reg = <0x800 0x238>;
#address-cells = <1>;
#size-cells = <0>;
#pinctrl-cells = <1>; #pinctrl-cells = <1>;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
pinctrl-single,function-mask = <0x7f>; pinctrl-single,function-mask = <0x7f>;
......
...@@ -71,7 +71,7 @@ matrix_keypad: matrix_keypad0 { ...@@ -71,7 +71,7 @@ matrix_keypad: matrix_keypad0 {
pinctrl-0 = <&matrix_keypad_default>; pinctrl-0 = <&matrix_keypad_default>;
pinctrl-1 = <&matrix_keypad_sleep>; pinctrl-1 = <&matrix_keypad_sleep>;
linux,wakeup; wakeup-source;
row-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH /* Bank0, pin3 */ row-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH /* Bank0, pin3 */
&gpio4 3 GPIO_ACTIVE_HIGH /* Bank4, pin3 */ &gpio4 3 GPIO_ACTIVE_HIGH /* Bank4, pin3 */
......
...@@ -122,6 +122,7 @@ &mmc1 { ...@@ -122,6 +122,7 @@ &mmc1 {
}; };
&mmc2 { &mmc2 {
interrupts-extended = <&intc 86 &omap3_pmx_core 0x12e>;
vmmc-supply = <&wl12xx_vmmc>; vmmc-supply = <&wl12xx_vmmc>;
non-removable; non-removable;
bus-width = <4>; bus-width = <4>;
...@@ -132,8 +133,10 @@ &mmc2 { ...@@ -132,8 +133,10 @@ &mmc2 {
wlcore: wlcore@2 { wlcore: wlcore@2 {
compatible = "ti,wl1271"; compatible = "ti,wl1271";
reg = <2>; reg = <2>;
interrupt-parent = <&gpio5>; /* gpio_149 with uart1_rts pad as wakeirq */
interrupts = <21 IRQ_TYPE_EDGE_RISING>; /* gpio 149 */ interrupts-extended = <&gpio5 21 IRQ_TYPE_EDGE_RISING>,
<&omap3_pmx_core 0x14e>;
interrupt-names = "irq", "wakeup";
ref-clock-frequency = <38400000>; ref-clock-frequency = <38400000>;
}; };
}; };
......
...@@ -86,6 +86,10 @@ OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0.sdmmc2_da ...@@ -86,6 +86,10 @@ OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0.sdmmc2_da
OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */ OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */
OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */ OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */
OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */ OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */
OMAP3_CORE1_IOPAD(0x2164, PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat4.sdmmc2_dir_dat0 */
OMAP3_CORE1_IOPAD(0x2166, PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat5.sdmmc2_dir_dat1 */
OMAP3_CORE1_IOPAD(0x2168, PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat6.sdmmc2_dir_cmd */
OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT | MUX_MODE1) /* sdmmc2_dat7.sdmmc2_clkin */
>; >;
}; };
...@@ -127,9 +131,13 @@ OMAP3_CORE1_IOPAD(0x21de, PIN_INPUT_PULLDOWN | MUX_MODE3) ...@@ -127,9 +131,13 @@ OMAP3_CORE1_IOPAD(0x21de, PIN_INPUT_PULLDOWN | MUX_MODE3)
>; >;
}; };
/*
* Note that gpio_150 pulled high with internal pull to prevent wlcore
* reset on return from off mode in idle.
*/
wl12xx_gpio: pinmux_wl12xx_gpio { wl12xx_gpio: pinmux_wl12xx_gpio {
pinctrl-single,pins = < pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x2180, PIN_OUTPUT | MUX_MODE4) /* uart1_cts.gpio_150 */ OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE7) /* uart1_cts.gpio_150 */
OMAP3_CORE1_IOPAD(0x217e, PIN_INPUT | MUX_MODE4) /* uart1_rts.gpio_149 */ OMAP3_CORE1_IOPAD(0x217e, PIN_INPUT | MUX_MODE4) /* uart1_rts.gpio_149 */
>; >;
}; };
......
...@@ -359,20 +359,24 @@ &mmc2 { ...@@ -359,20 +359,24 @@ &mmc2 {
&mmc3 { &mmc3 {
vmmc-supply = <&wl12xx_vmmc>; vmmc-supply = <&wl12xx_vmmc>;
/* uart2_tx.sdmmc3_dat1 pad as wakeirq */
interrupts-extended = <&wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH interrupts-extended = <&wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH
&omap4_pmx_core 0xde>; &omap4_pmx_core 0xde>;
interrupt-names = "irq", "wakeup";
non-removable; non-removable;
bus-width = <4>; bus-width = <4>;
cap-power-off-card; cap-power-off-card;
keep-power-in-suspend;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
wlcore: wlcore@2 { wlcore: wlcore@2 {
compatible = "ti,wl1285", "ti,wl1283"; compatible = "ti,wl1285", "ti,wl1283";
reg = <2>; reg = <2>;
interrupt-parent = <&gpio4>; /* gpio_100 with gpmc_wait2 pad as wakeirq */
interrupts = <4 IRQ_TYPE_EDGE_RISING>; /* gpio100 */ interrupts-extended = <&gpio4 4 IRQ_TYPE_EDGE_RISING>,
<&omap4_pmx_core 0x4e>;
interrupt-names = "irq", "wakeup";
ref-clock-frequency = <26000000>; ref-clock-frequency = <26000000>;
tcxo-clock-frequency = <26000000>; tcxo-clock-frequency = <26000000>;
}; };
......
...@@ -485,8 +485,10 @@ &mmc5 { ...@@ -485,8 +485,10 @@ &mmc5 {
wlcore: wlcore@2 { wlcore: wlcore@2 {
compatible = "ti,wl1271"; compatible = "ti,wl1271";
reg = <2>; reg = <2>;
interrupt-parent = <&gpio2>; /* gpio_53 with gpmc_ncs3 pad as wakeup */
interrupts = <21 IRQ_TYPE_EDGE_RISING>; /* gpio 53 */ interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_RISING>,
<&omap4_pmx_core 0x3a>;
interrupt-names = "irq", "wakeup";
ref-clock-frequency = <38400000>; ref-clock-frequency = <38400000>;
}; };
}; };
......
...@@ -26,6 +26,9 @@ aliases { ...@@ -26,6 +26,9 @@ aliases {
}; };
vdd_eth: fixedregulator-vdd-eth { vdd_eth: fixedregulator-vdd-eth {
pinctrl-names = "default";
pinctrl-0 = <&enet_enable_gpio>;
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "VDD_ETH"; regulator-name = "VDD_ETH";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -352,6 +355,29 @@ OMAP4_IOPAD(0x150, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_dat2.sdmmc5_dat2 */ ...@@ -352,6 +355,29 @@ OMAP4_IOPAD(0x150, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_dat2.sdmmc5_dat2 */
OMAP4_IOPAD(0x152, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_dat3.sdmmc5_dat3 */ OMAP4_IOPAD(0x152, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_dat3.sdmmc5_dat3 */
>; >;
}; };
/* gpio_48 for ENET_ENABLE */
enet_enable_gpio: pinmux_enet_enable_gpio {
pinctrl-single,pins = <
OMAP4_IOPAD(0x070, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* gpmc_a24.gpio_48 */
>;
};
ks8851_pins: pinmux_ks8851_pins {
pinctrl-single,pins = <
/* ENET_INT */
OMAP4_IOPAD(0x054, PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_ad10.gpio_34 */
/*
* Misterious pin which makes the ethernet working
* The legacy board file requested this pin on boot
* (ETH_KS8851_QUART) and set it to high, similarly to
* the ENET_ENABLE pin.
* We could use gpio-hog to keep it high, but let's use
* it as a reset GPIO for ks8851.
*/
OMAP4_IOPAD(0x13a, PIN_OUTPUT_PULLUP | MUX_MODE3) /* mcspi1_cs1.gpio_138 */
>;
};
}; };
&i2c1 { &i2c1 {
...@@ -452,12 +478,16 @@ &mcspi1 { ...@@ -452,12 +478,16 @@ &mcspi1 {
pinctrl-0 = <&mcspi1_pins>; pinctrl-0 = <&mcspi1_pins>;
eth@0 { eth@0 {
pinctrl-names = "default";
pinctrl-0 = <&ks8851_pins>;
compatible = "ks8851"; compatible = "ks8851";
spi-max-frequency = <24000000>; spi-max-frequency = <24000000>;
reg = <0>; reg = <0>;
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>; /* gpio line 34 */ interrupts = <2 IRQ_TYPE_LEVEL_LOW>; /* gpio line 34 */
vdd-supply = <&vdd_eth>; vdd-supply = <&vdd_eth>;
reset-gpios = <&gpio5 10 GPIO_ACTIVE_HIGH>;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment