Skip to content

L
linux
Commit 67b25638 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

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

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

Device tree changes for omaps for v5.9 merge window

This series of changes configures the GPIO line names for am335x beaglebone
black and pocketbeagle to make it easier to configure the pins. To make use
of the pins, we also add the gpio-ranges for am335x.

We also enable IPU and DSP repmoteproc for am5729-beaglebone-ai, and then
there are two non-urgent dtschema validator warning fixes.

* tag 'omap-for-v5.9/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-pocketbeagle: add gpio-line-names
  ARM: dts: am335x-boneblack: add gpio-line-names
  ARM: dts: am33xx-l4: add gpio-ranges
  ARM: dts: am5729-beaglebone-ai: Disable ununsed mailboxes
  ARM: dts: am5729-beaglebone-ai: Enable IPU & DSP rprocs
  ARM: dts: am: Align L2 cache-controller nodename with dtschema
  ARM: dts: omap: Align L2 cache-controller nodename with dtschema

Link: https://lore.kernel.org/r/pull-1594402929-762188@atomide.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents dfe2a4cf e14d2c76
Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 54 deletions
arch/arm/boot/dts/am335x-boneblack.dts
View file @ 67b25638
......@@ -23,3 +23,147 @@ oppnitro-1000000000 {
opp-supported-hw = <0x06 0x0100>;
};
};
&gpio0 {
gpio-line-names =
"[ethernet]",
"[ethernet]",
"P9_22 [spi0_sclk]",
"P9_21 [spi0_d0]",
"P9_18 [spi0_d1]",
"P9_17 [spi0_cs0]",
"[sd card]",
"P9_42A [ecappwm0]",
"P8_35 [hdmi]",
"P8_33 [hdmi]",
"P8_31 [hdmi]",
"P8_32 [hdmi]",
"P9_20 [i2c2_sda]",
"P9_19 [i2c2_scl]",
"P9_26 [uart1_rxd]",
"P9_24 [uart1_txd]",
"[ethernet]",
"[ethernet]",
"[usb]",
"[hdmi]",
"P9_41B",
"[ethernet]",
"P8_19 [ehrpwm2a]",
"P8_13 [ehrpwm2b]",
"[NC]",
"[NC]",
"P8_14",
"P8_17",
"[ethernet]",
"[ethernet]",
"P9_11 [uart4_rxd]",
"P9_13 [uart4_txd]";
};
&gpio1 {
gpio-line-names =
"P8_25 [emmc]",
"[emmc]",
"P8_5 [emmc]",
"P8_6 [emmc]",
"P8_23 [emmc]",
"P8_22 [emmc]",
"P8_3 [emmc]",
"P8_4 [emmc]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"P8_12",
"P8_11",
"P8_16",
"P8_15",
"P9_15A",
"P9_23",
"P9_14 [ehrpwm1a]",
"P9_16 [ehrpwm1b]",
"[emmc]",
"[usr0 led]",
"[usr1 led]",
"[usr2 led]",
"[usr3 led]",
"[hdmi]",
"[usb]",
"[hdmi audio]",
"P9_12",
"P8_26",
"P8_21 [emmc]",
"P8_20 [emmc]";
};
&gpio2 {
gpio-line-names =
"P9_15B",
"P8_18",
"P8_7",
"P8_8",
"P8_10",
"P8_9",
"P8_45 [hdmi]",
"P8_46 [hdmi]",
"P8_43 [hdmi]",
"P8_44 [hdmi]",
"P8_41 [hdmi]",
"P8_42 [hdmi]",
"P8_39 [hdmi]",
"P8_40 [hdmi]",
"P8_37 [hdmi]",
"P8_38 [hdmi]",
"P8_36 [hdmi]",
"P8_34 [hdmi]",
"[ethernet]",
"[ethernet]",
"[ethernet]",
"[ethernet]",
"P8_27 [hdmi]",
"P8_29 [hdmi]",
"P8_28 [hdmi]",
"P8_30 [hdmi]",
"[emmc]",
"[emmc]",
"[emmc]",
"[emmc]",
"[emmc]",
"[emmc]";
};
&gpio3 {
gpio-line-names =
"[ethernet]",
"[ethernet]",
"[ethernet]",
"[ethernet]",
"[ethernet]",
"[i2c0]",
"[i2c0]",
"[emu]",
"[emu]",
"[ethernet]",
"[ethernet]",
"[NC]",
"[NC]",
"[usb]",
"P9_31 [spi1_sclk]",
"P9_29 [spi1_d0]",
"P9_30 [spi1_d1]",
"P9_28 [spi1_cs0]",
"P9_42B [ecappwm0]",
"P9_27",
"P9_41A",
"P9_25",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]";
};
arch/arm/boot/dts/am335x-pocketbeagle.dts
View file @ 67b25638
......@@ -59,6 +59,150 @@ vmmcsd_fixed: fixedregulator0 {
};
};
&gpio0 {
gpio-line-names =
"[NC]",
"[NC]",
"P1.08 [SPI0_CLK]",
"P1.10 [SPI0_MISO]",
"P1.12 [SPI0_MOSI]",
"P1.06 [SPI0_CS]",
"[MMC0_CD]",
"P2.29 [SPI1_CLK]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"P1.26 [I2C2_SDA]",
"P1.28 [I2C2_SCL]",
"P2.11 [I2C1_SDA]",
"P2.09 [I2C1_SCL]",
"[NC]",
"[NC]",
"[NC]",
"P2.31 [SPI1_CS]",
"P1.20 [PRU0.16]",
"[NC]",
"[NC]",
"P2.03",
"[NC]",
"[NC]",
"P1.34",
"P2.19",
"[NC]",
"[NC]",
"P2.05 [UART4_RX]",
"P2.07 [UART4_TX]";
};
&gpio1 {
gpio-line-names =
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"P2.25 [SPI1_MOSI]",
"P1.32 [UART0_RX]",
"P1.30 [UART0_TX]",
"P2.24",
"P2.33",
"P2.22",
"P2.18",
"[NC]",
"[NC]",
"P2.01 [PWM1A]",
"[NC]",
"P2.10",
"[USR LED 0]",
"[USR LED 1]",
"[USR LED 2]",
"[USR LED 3]",
"P2.06",
"P2.04",
"P2.02",
"P2.08",
"[NC]",
"[NC]",
"[NC]";
};
&gpio2 {
gpio-line-names =
"P2.20",
"P2.17",
"[NC]",
"[NC]",
"[NC]",
"[EEPROM_WP]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[SYSBOOT]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"P2.35 [AIN5]",
"P1.02 [AIN6]",
"P1.35 [PRU1.10]",
"P1.04 [PRU1.11]",
"[MMC0_DAT3]",
"[MMC0_DAT2]",
"[MMC0_DAT1]",
"[MMC0_DAT0]",
"[MMC0_CLK]",
"[MMC0_CMD]";
};
&gpio3 {
gpio-line-names =
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[I2C0_SDA]",
"[I2C0_SCL]",
"[JTAG]",
"[JTAG]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"P1.03 [USB1]",
"P1.36 [PWM0A]",
"P1.33 [PRU0.1]",
"P2.32 [PRU0.2]",
"P2.30 [PRU0.3]",
"P1.31 [PRU0.4]",
"P2.34 [PRU0.5]",
"P2.28 [PRU0.6]",
"P1.29 [PRU0.7]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]",
"[NC]";
};
&am33xx_pinmux {
i2c2_pins: pinmux-i2c2-pins {
pinctrl-single,pins = <
......
arch/arm/boot/dts/am33xx-l4.dtsi
View file @ 67b25638
......@@ -151,6 +151,18 @@ SYSC_OMAP2_SOFTRESET |
gpio0: gpio@0 {
compatible = "ti,omap4-gpio";
gpio-ranges = <&am33xx_pinmux 0 82 8>,
<&am33xx_pinmux 8 52 4>,
<&am33xx_pinmux 12 94 4>,
<&am33xx_pinmux 16 71 2>,
<&am33xx_pinmux 18 135 1>,
<&am33xx_pinmux 19 108 2>,
<&am33xx_pinmux 21 73 1>,
<&am33xx_pinmux 22 8 2>,
<&am33xx_pinmux 26 10 2>,
<&am33xx_pinmux 28 74 1>,
<&am33xx_pinmux 29 81 1>,
<&am33xx_pinmux 30 28 2>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
......@@ -1296,6 +1308,10 @@ SYSC_OMAP2_SOFTRESET |
gpio1: gpio@0 {
compatible = "ti,omap4-gpio";
gpio-ranges = <&am33xx_pinmux 0 0 8>,
<&am33xx_pinmux 8 90 4>,
<&am33xx_pinmux 12 12 16>,
<&am33xx_pinmux 28 30 4>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
......@@ -1698,6 +1714,9 @@ SYSC_OMAP2_SOFTRESET |
gpio2: gpio@0 {
compatible = "ti,omap4-gpio";
gpio-ranges = <&am33xx_pinmux 0 34 18>,
<&am33xx_pinmux 18 77 4>,
<&am33xx_pinmux 22 56 10>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
......@@ -1731,6 +1750,11 @@ SYSC_OMAP2_SOFTRESET |
gpio3: gpio@0 {
compatible = "ti,omap4-gpio";
gpio-ranges = <&am33xx_pinmux 0 66 5>,
<&am33xx_pinmux 5 98 2>,
<&am33xx_pinmux 7 75 2>,
<&am33xx_pinmux 13 141 1>,
<&am33xx_pinmux 14 100 8>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
......
arch/arm/boot/dts/am4372.dtsi
View file @ 67b25638
......@@ -153,7 +153,7 @@ local_timer: timer@48240600 {
clocks = <&mpu_periphclk>;
};
l2-cache-controller@48242000 {
cache-controller@48242000 {
compatible = "arm,pl310-cache";
reg = <0x48242000 0x1000>;
cache-unified;
......
arch/arm/boot/dts/am5729-beagleboneai.dts
View file @ 67b25638
......@@ -8,6 +8,7 @@
#include "dra74x.dtsi"
#include "am57xx-commercial-grade.dtsi"
#include "dra74x-mmc-iodelay.dtsi"
#include "dra74-ipu-dsp-common.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/dra.h>
......@@ -629,58 +630,6 @@ &bandgap {
status = "okay";
};
&mailbox1 {
status = "okay";
};
&mailbox2 {
status = "okay";
};
&mailbox3 {
status = "okay";
};
&mailbox4 {
status = "okay";
};
&mailbox5 {
status = "okay";
};
&mailbox6 {
status = "okay";
};
&mailbox7 {
status = "okay";
};
&mailbox8 {
status = "okay";
};
&mailbox9 {
status = "okay";
};
&mailbox10 {
status = "okay";
};
&mailbox11 {
status = "okay";
};
&mailbox12 {
status = "okay";
};
&mailbox13 {
status = "okay";
};
&cpu_alert0 {
temperature = <55000>; /* milliCelsius */
};
......@@ -729,3 +678,23 @@ opp_slow-500000000 {
opp-shared;
};
};
&ipu2 {
status = "okay";
memory-region = <&ipu2_memory_region>;
};
&ipu1 {
status = "okay";
memory-region = <&ipu1_memory_region>;
};
&dsp1 {
status = "okay";
memory-region = <&dsp1_memory_region>;
};
&dsp2 {
status = "okay";
memory-region = <&dsp2_memory_region>;
};
arch/arm/boot/dts/omap4.dtsi
View file @ 67b25638
......@@ -71,7 +71,7 @@ gic: interrupt-controller@48241000 {
interrupt-parent = <&gic>;
};
L2: l2-cache-controller@48242000 {
L2: cache-controller@48242000 {
compatible = "arm,pl310-cache";
reg = <0x48242000 0x1000>;
cache-unified;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7