Commit c3bb12ba authored by Arnd Bergmann's avatar Arnd Bergmann

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

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

Devicetree changes for omaps for v5.16

These changes configure devices for am335x and dra7, and fixes
various devicetree check warnings for gta04:

- Update am335x-pocketbeagle to use pinconf-single

- A series of devicetree warning fixes for omap3 and gta04

- Configure bb2d Vivante GC 2D Accelerator for dra7

* tag 'omap-for-v5.16/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: dra7: add entry for bb2d module
  arm: dts: omap3-gta04: cleanup led node names
  arm: dts: omap3-gta04a4: accelerometer irq fix
  arm: dts: omap3-gta04a5: fix missing sensor supply
  arm: dts: omap3-gta04: fix missing sensor supply
  arm: dts: omap3-gta04: cleanup LCD definition
  ARM: dts: omap3: fix cpu thermal label name
  ARM: dts: am335x-pocketbeagle: switch to pinconf-single

Link: https://lore.kernel.org/r/pull-1633950030-501948@atomide.com-3Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 79619b79 02794dbd
......@@ -205,6 +205,7 @@ &gpio3 {
&am33xx_pinmux {
compatible = "pinconf-single";
pinctrl-names = "default";
pinctrl-0 = < &P2_03_gpio &P1_34_gpio &P2_19_gpio &P2_24_gpio
......
......@@ -965,6 +965,25 @@ hdmi: encoder@0 {
};
};
target-module@59000000 {
compatible = "ti,sysc-omap4", "ti,sysc";
reg = <0x59000020 0x4>;
reg-names = "rev";
clocks = <&dss_clkctrl DRA7_DSS_BB2D_CLKCTRL 0>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x59000000 0x1000>;
bb2d: gpu@0 {
compatible = "vivante,gc";
reg = <0x0 0x700>;
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&dss_clkctrl DRA7_BB2D_CLKCTRL 0>;
clock-names = "core";
};
};
aes1_target: target-module@4b500000 {
compatible = "ti,sysc-omap2", "ti,sysc";
reg = <0x4b500080 0x4>,
......
......@@ -10,7 +10,7 @@
#include <dt-bindings/thermal/thermal.h>
cpu_thermal: cpu_thermal {
cpu_thermal: cpu-thermal {
polling-delay-passive = <250>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */
coefficients = <0 20000>;
......
......@@ -104,16 +104,16 @@ gtm601_codec: gsm_codec {
#sound-dai-cells = <0>;
};
spi_lcd: spi_lcd {
spi_lcd: spi {
compatible = "spi-gpio";
#address-cells = <0x1>;
#size-cells = <0x0>;
pinctrl-names = "default";
pinctrl-0 = <&spi_gpio_pins>;
gpio-sck = <&gpio1 12 GPIO_ACTIVE_HIGH>;
gpio-miso = <&gpio1 18 GPIO_ACTIVE_HIGH>;
gpio-mosi = <&gpio1 20 GPIO_ACTIVE_HIGH>;
sck-gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
miso-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
mosi-gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;
cs-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
num-chipselects = <1>;
......@@ -508,6 +508,8 @@ bmp085@77 {
pinctrl-0 = <&bmp085_pins>;
interrupt-parent = <&gpio4>;
interrupts = <17 IRQ_TYPE_EDGE_RISING>; /* GPIO_113 */
vdda-supply = <&vio>;
vddd-supply = <&vio>;
};
/* accelerometer */
......@@ -515,7 +517,7 @@ bma180@41 {
compatible = "bosch,bma180";
reg = <0x41>;
pinctrl-names = "default";
pintcrl-0 = <&bma180_pins>;
pinctrl-0 = <&bma180_pins>;
interrupt-parent = <&gpio4>;
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */
};
......@@ -540,28 +542,29 @@ tca6507: tca6507@45 {
gpio-controller;
#gpio-cells = <2>;
gta04_led0: red_aux@0 {
gta04_led0: led@0 {
label = "gta04:red:aux";
reg = <0x0>;
};
gta04_led1: green_aux@1 {
gta04_led1: led@1 {
label = "gta04:green:aux";
reg = <0x1>;
};
gta04_led3: red_power@3 {
gta04_led3: led@3 {
label = "gta04:red:power";
reg = <0x3>;
linux,default-trigger = "default-on";
};
gta04_led4: green_power@4 {
gta04_led4: led@4 {
label = "gta04:green:power";
reg = <0x4>;
};
wifi_reset: wifi_reset@6 { /* reference as <&tca_gpios 0 0> since it is currently the only GPIO */
wifi_reset: led@6 {
/* reference as <&tca_gpios 0 0> since it is currently the only GPIO */
reg = <0x6>;
compatible = "gpio";
};
......
......@@ -133,5 +133,7 @@ bmc150@12 {
bme280@76 {
compatible = "bosch,bme280";
reg = <0x76>;
vdda-supply = <&vio>;
vddd-supply = <&vio>;
};
};
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