mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-21 22:37:01 +07:00
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 -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlxTIEkRHHRvbnlAYXRv bWlkZS5jb20ACgkQG9Q+yVyrpXM2BA//cCf3AQJ3NsQu0Ptg8gA9KE7QgJGNS2Om kyBr8lI5VKOS7BTNTvocplOTIzaAPLGivmQVlmcOl5AIk4CcfCjzo0Z67Z/9QM4Z JMmcrhLR+R5Ha6xpWMq0C9fYnV4gbPmZExr+MIg8vOx65ln6j4yYATFNX+2pc7SN BAXmj5AHr06CTKS6gjPYJ4Mb/YNNcf2WB2fgSmXff8TQ5zO75GnJU/RY80kdQyB4 aHD4KKg9exuRRJxf/mDnQMos6hkanUlciZ0I+QgIizL3/+z8T0psRjNIet5zoi/n 8yqlXT60T+C8t3s9KoVt7Ls2sdW5tZUz28V6Us7sYuEPi2BKXhaU5tm1mjrdRfTx Iny+d/otKgGMjiuX040GUezzJMdZUz5N5Ah/WaGCgCpyvGMuIosqprGxnBBOH+pp 2sN8Quaq80x6kKkVFwrU1fsU4QsBlc2vqEXMb/DSZRnT+aQn8Eek6DB++nl/bHuy RxlXR5xg/nFGN4XeFIlIEJjSEBYb6V+6erln4XkPPhbSE9v/Dj6ycFIF5W0B/lDB gtOHhTH0kn154A3Wtx6BB6sntjRQ+mr8LX2CcfR18VPg3Jh4L0rjpxJ4niIt5VG5 dPIkZPIPHE3fqJTLSpD1yFydIg3xsLv5MZ1i5Tz2B4cOMgwwNoR/kUN9xZATThA4 NE+4kOVt3rU= =6JIq -----END PGP SIGNATURE----- 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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
791ff5a935
@ -14,6 +14,10 @@ / {
|
||||
compatible = "grinn,am335x-chiliboard", "grinn,am335x-chilisom",
|
||||
"ti,am33xx";
|
||||
|
||||
chosen {
|
||||
stdout-path = &uart0;
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-names = "default";
|
||||
|
||||
@ -1,11 +1,9 @@
|
||||
// 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/;
|
||||
|
||||
|
||||
@ -288,8 +288,6 @@ phy_sel: cpsw-phy-sel@650 {
|
||||
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>;
|
||||
|
||||
@ -71,7 +71,7 @@ matrix_keypad: matrix_keypad0 {
|
||||
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 */
|
||||
|
||||
@ -122,6 +122,7 @@ &mmc1 {
|
||||
};
|
||||
|
||||
&mmc2 {
|
||||
interrupts-extended = <&intc 86 &omap3_pmx_core 0x12e>;
|
||||
vmmc-supply = <&wl12xx_vmmc>;
|
||||
non-removable;
|
||||
bus-width = <4>;
|
||||
@ -132,8 +133,10 @@ &mmc2 {
|
||||
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>;
|
||||
};
|
||||
};
|
||||
|
||||
@ -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(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(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)
|
||||
>;
|
||||
};
|
||||
|
||||
/*
|
||||
* 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 {
|
||||
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 */
|
||||
>;
|
||||
};
|
||||
|
||||
@ -359,20 +359,24 @@ &mmc2 {
|
||||
|
||||
&mmc3 {
|
||||
vmmc-supply = <&wl12xx_vmmc>;
|
||||
/* uart2_tx.sdmmc3_dat1 pad as wakeirq */
|
||||
interrupts-extended = <&wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH
|
||||
&omap4_pmx_core 0xde>;
|
||||
|
||||
interrupt-names = "irq", "wakeup";
|
||||
non-removable;
|
||||
bus-width = <4>;
|
||||
cap-power-off-card;
|
||||
keep-power-in-suspend;
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
wlcore: wlcore@2 {
|
||||
compatible = "ti,wl1285", "ti,wl1283";
|
||||
reg = <2>;
|
||||
interrupt-parent = <&gpio4>;
|
||||
interrupts = <4 IRQ_TYPE_EDGE_RISING>; /* gpio100 */
|
||||
/* gpio_100 with gpmc_wait2 pad as wakeirq */
|
||||
interrupts-extended = <&gpio4 4 IRQ_TYPE_EDGE_RISING>,
|
||||
<&omap4_pmx_core 0x4e>;
|
||||
interrupt-names = "irq", "wakeup";
|
||||
ref-clock-frequency = <26000000>;
|
||||
tcxo-clock-frequency = <26000000>;
|
||||
};
|
||||
|
||||
@ -485,8 +485,10 @@ &mmc5 {
|
||||
wlcore: wlcore@2 {
|
||||
compatible = "ti,wl1271";
|
||||
reg = <2>;
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupts = <21 IRQ_TYPE_EDGE_RISING>; /* gpio 53 */
|
||||
/* gpio_53 with gpmc_ncs3 pad as wakeup */
|
||||
interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_RISING>,
|
||||
<&omap4_pmx_core 0x3a>;
|
||||
interrupt-names = "irq", "wakeup";
|
||||
ref-clock-frequency = <38400000>;
|
||||
};
|
||||
};
|
||||
|
||||
@ -26,6 +26,9 @@ aliases {
|
||||
};
|
||||
|
||||
vdd_eth: fixedregulator-vdd-eth {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&enet_enable_gpio>;
|
||||
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "VDD_ETH";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
@ -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 */
|
||||
>;
|
||||
};
|
||||
|
||||
/* 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 {
|
||||
@ -452,12 +478,16 @@ &mcspi1 {
|
||||
pinctrl-0 = <&mcspi1_pins>;
|
||||
|
||||
eth@0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ks8851_pins>;
|
||||
|
||||
compatible = "ks8851";
|
||||
spi-max-frequency = <24000000>;
|
||||
reg = <0>;
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupts = <2 IRQ_TYPE_LEVEL_LOW>; /* gpio line 34 */
|
||||
vdd-supply = <&vdd_eth>;
|
||||
reset-gpios = <&gpio5 10 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user