github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 00:22:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ARM: dts: omap updates for v6.16

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmgg0Q0ACgkQWTcYmtP7
 xmWO8Q//Rv/pq7J+oWy15HUPKZ1iUmvJMPnjMFnVFLdsloHMUHjTd7SLbnx/yQQE
 Ie2R0CDR7riHwSUwwsMKvRFuXlJpnfACjOAgMlZwuhP6QgDK511c+w8FtUls8hAi
 3mTWHC1lp/TQoOdsFfw3mjmN/JzK5Wu0ciJAJLcuaWx2b7jUdbgnU5bxH7+u29Al
 anskZP2BjZCLDy+WarE3QbhpxeBgZ6tyFeAsM/e4wgAMRG+Ywnf2UXIeg520Zfor
 FVY2Rzt9c/rHM9MnbafPGIWdGqFaOB/Hp/kMkwUB/CVt6MhRZzsauwANWm81wKrW
 vVgGYwWFcVIjo50gqlarOZ/w2lmffysKnOJtq+gL9wXSTyCPcsTDDpKxsb8lE29Y
 pjXEeGZvgBYXfPYZ66SchDem/RBPlR1C2IFDXBSEt6JM4eB4mBpio3SVX1x/wOc8
 j7fKzYl0yAF97PvRGNil0uGba+zmNNyc4bUz3abdF7J3TLSVBJ1Purma44gZpqpW
 AaYZNZhBhG5JhyxiwEdm1QyPBH1YWb7ean3bl+ZiB/LLZu+IIONFM1RT9xTk1r1I
 PZJkgdJAf18RSLWs48xmQ1ydpKhYaVehWhY6KtiBw6X/WVbHnQZUkOdNldKP0Mha
 4u0LHD1/5K9ySq28b7Kb62MqpJHAg+iQrxZjuyJz1ZPiw+CVq0w=
 =B5CB
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmghr0IACgkQYKtH/8kJ
 UieqIRAAv8ANlPb/hXWIZA9cBCitaESxr2euRGbS+mM3XgeLj9wujDHs4y5ckpZM
 l1qrhJKvDAW+A6dDfCAEJJxuLNT9VUrKjoTAXh2Wze/AvqQAQS3ZATlb22oW74KM
 0yVvBV/y+loknOf2v9BL1mXXAii5KHgq8v192+t3XH/aJZyWd3PIq75z9p5yl5cw
 MdatL426Y4K3+Ik0s+Xjc7r7nEVmOy1UzPzhayxnBYaWCzKb3QsUreC8LP7jeRUj
 dN1wpwgt28FuWdWPYRdGXv1a15RK9IAbyGOC7BahD+QJkBggPhkNu82s83yn3tjo
 v5aESbzs5P+xjblMSI/I2keh9+zVaP3hECob+T3dni1zS2HMzRTQ7UkTcvOAsen+
 b+KkxSnYLmRmqocqZQWCwyveT5iBIt5qAAM4Cw4dvs+rkcH+5erEtBemQMIXWjS9
 DORgCQTBPpEggdZJdPx5AJiURszV021w7Z6lUUiPRMIH6s2clB6ATJcspnhs3F0V
 5VOQMUOXZdSnRwdMLHgNrVQaWiNwZSKSD+yldSE9CwpGgxawgFjjpld2AF2refqS
 gFEjDdkjO8DaC/UbFC+82jjMOWFpiwI7briqCGim11fvvVflQ42Y4LlOiONUUNMV
 SxiW9dpMM2/Zw4/yIVYIiYEgf/d8WSJFN5aZTOegTIetwMXKPbA=
 =YpBL
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v6.16/dt-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/dt

ARM: dts: omap updates for v6.16

* tag 'omap-for-v6.16/dt-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
  ARM: dts: am335x: Set wakeup-source for UART0
  ARM: dts: omap4: panda: cleanup bluetooth
  ARM: dts: omap4: panda: fix resources needed for Wifi
  ARM: dts: nokia n900: remove useless io-channel-cells property

Link: https://lore.kernel.org/r/7hecwvrtmx.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-05-12 10:20:13 +02:00
commit 153e2d0791
4 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/ti/omap/am335x-evm.dts
View File

@ -388,7 +388,7 @@ AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT_PULLDOWN, MUX_MODE2) /* uart0_rt
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins>;
wakeup-source;
status = "okay";
};

2
arch/arm/boot/dts/ti/omap/omap3-n900.dts
View File

@ -816,8 +816,6 @@ ad5820: dac@c {
reg = <0x0c>;
VANA-supply = <&vaux4>;
#io-channel-cells = <0>;
};
};

39
arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi
View File

@ -130,6 +130,12 @@ hsusb1_phy: hsusb1_phy {
clock-frequency = <19200000>;
};
wl12xx_pwrseq: wl12xx-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&twl 0>;
clock-names = "ext_clock";
};
/* regulator for wl12xx on sdio5 */
wl12xx_vmmc: wl12xx_vmmc {
pinctrl-names = "default";
@ -361,10 +367,8 @@ OMAP4_IOPAD(0x130, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */
*/
wl12xx_gpio: wl12xx-gpio-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x066, PIN_OUTPUT | MUX_MODE3) /* gpmc_a19.gpio_43 */
OMAP4_IOPAD(0x06c, PIN_OUTPUT | MUX_MODE3) /* gpmc_a22.gpio_46 */
OMAP4_IOPAD(0x066, PIN_OUTPUT | MUX_MODE3) /* gpmc_a19.gpio_43 - WLAN_EN */
OMAP4_IOPAD(0x070, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a24.gpio_48 */
OMAP4_IOPAD(0x072, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a25.gpio_49 */
>;
};
@ -387,6 +391,22 @@ button_pins: button-pins {
OMAP4_IOPAD(0x114, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_121 */
>;
};
bt_pins: bt-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x06c, PIN_OUTPUT | MUX_MODE3) /* gpmc_a22.gpio_46 - BTEN */
OMAP4_IOPAD(0x072, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a25.gpio_49 - BTWAKEUP */
>;
};
uart2_pins: uart2-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x118, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts - HCI */
OMAP4_IOPAD(0x11a, PIN_OUTPUT | MUX_MODE0) /* uart2_rts.uart2_rts */
OMAP4_IOPAD(0x11c, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_rx.uart2_rx */
OMAP4_IOPAD(0x11e, PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */
>;
};
};
&omap4_pmx_wkup {
@ -408,6 +428,7 @@ twl: twl@48 {
reg = <0x48>;
/* IRQ# = 7 */
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_1N cascaded to gic */
#clock-cells = <1>;
system-power-controller;
};
@ -488,6 +509,7 @@ &mmc5 {
non-removable;
bus-width = <4>;
cap-power-off-card;
mmc-pwrseq = <&wl12xx_pwrseq>;
#address-cells = <1>;
#size-cells = <0>;
@ -523,8 +545,19 @@ &twl_usb_comparator {
};
&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
interrupts-extended = <&wakeupgen GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH
&omap4_pmx_core OMAP4_UART2_RX>;
bluetooth {
compatible = "ti,wl1271-st";
pinctrl-names = "default";
pinctrl-0 = <&bt_pins>;
enable-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; /* GPIO_46 */
clocks = <&twl 0>;
clock-names = "ext_clock";
};
};
&uart3 {

32
arch/arm/boot/dts/ti/omap/omap4-panda-es.dts
View File

@ -49,22 +49,6 @@ button_pins: button-pins {
OMAP4_IOPAD(0x0fc, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_113 */
>;
};
bt_pins: bt-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x06c, PIN_OUTPUT | MUX_MODE3) /* gpmc_a22.gpio_46 - BTEN */
OMAP4_IOPAD(0x072, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a25.gpio_49 - BTWAKEUP */
>;
};
uart2_pins: uart2-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x118, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts - HCI */
OMAP4_IOPAD(0x11a, PIN_OUTPUT | MUX_MODE0) /* uart2_rts.uart2_rts */
OMAP4_IOPAD(0x11c, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_rx.uart2_rx */
OMAP4_IOPAD(0x11e, PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */
>;
};
};
&led_wkgpio_pins {
@ -96,19 +80,3 @@ buttonS2 {
&gpio1_target {
ti,no-reset-on-init;
};
&wl12xx_gpio {
pinctrl-single,pins = <
OMAP4_IOPAD(0x066, PIN_OUTPUT | MUX_MODE3) /* gpmc_a19.gpio_43 */
OMAP4_IOPAD(0x070, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a24.gpio_48 */
>;
};
&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins &bt_pins>;
bluetooth: tiwi {
compatible = "ti,wl1271-st";
enable-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; /* GPIO_46 */
};
};