mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-27 06:58:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Devicetree related changes for omaps for v6.3

Updates for am335x-nano, n900, and gta04 for the connected peripherals.
Also few corrections for node names.

* tag 'omap-for-v6.3/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap: gta04a5: cleanup i2c node names
  ARM: dts: omap: gta04: add BNO055 IMU chip
  ARM: dts: n900: use iio driver for accelerometer
  ARM: dts: n900: rename accelerometer node
  ARM: dts: am335x-nano: Enable USB host
  ARM: dts: am335x-nano: Fix GPIO settings for MMC pins
  ARM: dts: am335x-nano: Enable I2C temperature sensor
  ARM: dts: am335x-nano: Enable RS485 mode for UART3 & 4
  ARM: dts: am335x-nano: Fix GPIO settings for RTS/CTS pins on UART3 & 4
  ARM: dts: ti: Fix pca954x i2c-mux node names
  ARM: dts: omap: Use new media bus type macros

Link: https://lore.kernel.org/r/pull-1674566471-434733@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-01-24 18:08:04 +01:00
parent 6932b6ed40 9dd320f007
commit 6e3347ecd4
4 changed files with 56 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm/boot/dts/am335x-nano.dts
View File

@@ -120,8 +120,8 @@ AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE1) /* spi0_d0.uart2_txd
uart3_pins: uart3_pins {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_INPUT_PULLUP, MUX_MODE6) /* lcd_data10.uart3_ctsn */
AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE6) /* lcd_data11.uart3_rtsn */
AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_INPUT_PULLUP, MUX_MODE7) /* lcd_data10.gpio2[16] */
AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE7) /* lcd_data11.gpio2[17] */
AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT, MUX_MODE1) /* spi0_cs1.uart3_rxd */
AM33XX_PADCONF(AM335X_PIN_ECAP0_IN_PWM0_OUT, PIN_OUTPUT, MUX_MODE1) /* ecap0_in_pwm0_out.uart3_txd */
>;
@@ -129,8 +129,8 @@ AM33XX_PADCONF(AM335X_PIN_ECAP0_IN_PWM0_OUT, PIN_OUTPUT, MUX_MODE1) /* ecap0_in
uart4_pins: uart4_pins {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_INPUT_PULLUP, MUX_MODE6) /* lcd_data12.uart4_ctsn */
AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE6) /* lcd_data13.uart4_rtsn */
AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_INPUT_PULLUP, MUX_MODE7) /* lcd_data12.gpio0[8] */
AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE7) /* lcd_data13.gpio0[9] */
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT, MUX_MODE1) /* uart0_ctsn.uart4_rxd */
AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_OUTPUT, MUX_MODE1) /* uart0_rtsn.uart4_txd */
>;
@@ -187,12 +187,22 @@ &uart2 {
&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins>;
rts-gpio = <&gpio2 17 GPIO_ACTIVE_HIGH>;
rs485-rts-active-high;
rs485-rx-during-tx;
rs485-rts-delay = <1 1>;
linux,rs485-enabled-at-boot-time;
status = "okay";
};
&uart4 {
pinctrl-names = "default";
pinctrl-0 = <&uart4_pins>;
rts-gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>;
rs485-rts-active-high;
rs485-rx-during-tx;
rs485-rts-delay = <1 1>;
linux,rs485-enabled-at-boot-time;
status = "okay";
};
@@ -220,6 +230,11 @@ tps: tps@24 {
reg = <0x24>;
};
temperature-sensor@48 {
compatible = "lm75";
reg = <0x48>;
};
eeprom@53 {
compatible = "microchip,24c02", "atmel,24c02";
reg = <0x53>;
@@ -403,8 +418,13 @@ &mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
bus-width = <4>;
cd-gpios = <&gpio3 8 0>;
wp-gpios = <&gpio3 18 0>;
cd-debounce-delay-ms = <5>;
cd-gpios = <&gpio3 8 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
};
&usb0 {
dr_mode = "host";
};
#include "tps65217.dtsi"

4
arch/arm/boot/dts/am3874-iceboard.dts
View File

@@ -106,7 +106,7 @@ &i2c1 {
* "i2c-mux-idle-disconnect" is important.
*/
pca9548@70 {
i2c-mux@70 {
compatible = "nxp,pca9548";
reg = <0x70>;
#address-cells = <1>;
@@ -256,7 +256,7 @@ u59: pca9575@23 {
};
&i2c2 {
pca9548@71 {
i2c-mux@71 {
compatible = "nxp,pca9548";
reg = <0x71>;
#address-cells = <1>;

19
arch/arm/boot/dts/omap3-gta04a5.dts
View File

@@ -75,6 +75,11 @@ OMAP3_CORE1_IOPAD(0x2138, PIN_INPUT | MUX_MODE4) /* gpin114 */
>;
};
bno050_pins: pinmux-bno050-pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x2136, PIN_INPUT | MUX_MODE4) /* gpin113 */
>;
};
};
/*
@@ -115,17 +120,17 @@ &i2c2 {
/delete-node/ itg3200@68;
/delete-node/ hmc5843@1e;
bmg160@69 {
gyrometer@69 {
compatible = "bosch,bmg160";
reg = <0x69>;
};
bmc150@10 {
accelerometer@10 {
compatible = "bosch,bmc150_accel";
reg = <0x10>;
};
bmc150@12 {
magnetometer@12 {
compatible = "bosch,bmc150_magn";
reg = <0x12>;
};
@@ -136,4 +141,12 @@ bme280@76 {
vdda-supply = <&vio>;
vddd-supply = <&vio>;
};
imu@29 {
compatible = "bosch,bno055";
reg = <0x29>;
pinctrl-names = "default";
pinctrl-0 = <&bno050_pins>;
/* interrupt at &gpio4 17 */
};
};

59
arch/arm/boot/dts/omap3-n900.dts
View File

@@ -9,6 +9,7 @@
#include "omap34xx.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/media/video-interfaces.h>
/*
* Default secure signed bootloader (Nokia X-Loader) does not enable L3 firewall
@@ -194,7 +195,7 @@ port@1 {
csi_isp: endpoint {
remote-endpoint = <&csi_cam1>;
bus-type = <3>; /* CCP2 */
bus-type = <MEDIA_BUS_TYPE_CCP2>;
clock-lanes = <1>;
data-lanes = <0>;
lane-polarity = <0 0>;
@@ -767,56 +768,20 @@ &i2c3 {
clock-frequency = <400000>;
lis302dl: lis3lv02d@1d {
compatible = "st,lis3lv02d";
accelerometer@1d {
compatible = "st,lis302dl";
reg = <0x1d>;
Vdd-supply = <&vaux1>;
Vdd_IO-supply = <&vio>;
vdd-supply = <&vaux1>;
vddio-supply = <&vio>;
interrupt-parent = <&gpio6>;
interrupts = <21 20>; /* 181 and 180 */
interrupts = <21 IRQ_TYPE_EDGE_RISING>,
<20 IRQ_TYPE_EDGE_RISING>; /* 181 and 180 */
/* click flags */
st,click-single-x;
st,click-single-y;
st,click-single-z;
/* Limits are 0.5g * value */
st,click-threshold-x = <8>;
st,click-threshold-y = <8>;
st,click-threshold-z = <10>;
/* Click must be longer than time limit */
st,click-time-limit = <9>;
/* Kind of debounce filter */
st,click-latency = <50>;
/* Interrupt line 2 for click detection */
st,irq2-click;
st,wakeup-x-hi;
st,wakeup-y-hi;
st,wakeup-threshold = <(800/18)>; /* millig-value / 18 to get HW values */
st,wakeup2-z-hi;
st,wakeup2-threshold = <(900/18)>; /* millig-value / 18 to get HW values */
st,hipass1-disable;
st,hipass2-disable;
st,axis-x = <1>; /* LIS3_DEV_X */
st,axis-y = <(-2)>; /* LIS3_INV_DEV_Y */
st,axis-z = <(-3)>; /* LIS3_INV_DEV_Z */
st,min-limit-x = <(-32)>;
st,min-limit-y = <3>;
st,min-limit-z = <3>;
st,max-limit-x = <(-3)>;
st,max-limit-y = <32>;
st,max-limit-z = <32>;
mount-matrix = "-1", "0", "0",
"0", "1", "0",
"0", "0", "1";
};
cam1: camera@3e {
@@ -835,7 +800,7 @@ cam1: camera@3e {
port {
csi_cam1: endpoint {
bus-type = <3>; /* CCP2 */
bus-type = <MEDIA_BUS_TYPE_CCP2>;
strobe = <1>;
clock-inv = <0>;
crc = <1>;