Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

+56 -58
+26 -6
arch/arm/boot/dts/am335x-nano.dts
··· 120 120 121 121 uart3_pins: uart3_pins { 122 122 pinctrl-single,pins = < 123 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_INPUT_PULLUP, MUX_MODE6) /* lcd_data10.uart3_ctsn */ 124 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE6) /* lcd_data11.uart3_rtsn */ 123 + AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_INPUT_PULLUP, MUX_MODE7) /* lcd_data10.gpio2[16] */ 124 + AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE7) /* lcd_data11.gpio2[17] */ 125 125 AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT, MUX_MODE1) /* spi0_cs1.uart3_rxd */ 126 126 AM33XX_PADCONF(AM335X_PIN_ECAP0_IN_PWM0_OUT, PIN_OUTPUT, MUX_MODE1) /* ecap0_in_pwm0_out.uart3_txd */ 127 127 >; ··· 129 129 130 130 uart4_pins: uart4_pins { 131 131 pinctrl-single,pins = < 132 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_INPUT_PULLUP, MUX_MODE6) /* lcd_data12.uart4_ctsn */ 133 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE6) /* lcd_data13.uart4_rtsn */ 132 + AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_INPUT_PULLUP, MUX_MODE7) /* lcd_data12.gpio0[8] */ 133 + AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE7) /* lcd_data13.gpio0[9] */ 134 134 AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT, MUX_MODE1) /* uart0_ctsn.uart4_rxd */ 135 135 AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_OUTPUT, MUX_MODE1) /* uart0_rtsn.uart4_txd */ 136 136 >; ··· 187 187 &uart3 { 188 188 pinctrl-names = "default"; 189 189 pinctrl-0 = <&uart3_pins>; 190 + rts-gpio = <&gpio2 17 GPIO_ACTIVE_HIGH>; 191 + rs485-rts-active-high; 192 + rs485-rx-during-tx; 193 + rs485-rts-delay = <1 1>; 194 + linux,rs485-enabled-at-boot-time; 190 195 status = "okay"; 191 196 }; 192 197 193 198 &uart4 { 194 199 pinctrl-names = "default"; 195 200 pinctrl-0 = <&uart4_pins>; 201 + rts-gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; 202 + rs485-rts-active-high; 203 + rs485-rx-during-tx; 204 + rs485-rts-delay = <1 1>; 205 + linux,rs485-enabled-at-boot-time; 196 206 status = "okay"; 197 207 }; 198 208 ··· 228 218 229 219 tps: tps@24 { 230 220 reg = <0x24>; 221 + }; 222 + 223 + temperature-sensor@48 { 224 + compatible = "lm75"; 225 + reg = <0x48>; 231 226 }; 232 227 233 228 eeprom@53 { ··· 418 403 pinctrl-names = "default"; 419 404 pinctrl-0 = <&mmc1_pins>; 420 405 bus-width = <4>; 421 - cd-gpios = <&gpio3 8 0>; 422 - wp-gpios = <&gpio3 18 0>; 406 + cd-debounce-delay-ms = <5>; 407 + cd-gpios = <&gpio3 8 GPIO_ACTIVE_LOW>; 408 + wp-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; 409 + }; 410 + 411 + &usb0 { 412 + dr_mode = "host"; 423 413 }; 424 414 425 415 #include "tps65217.dtsi"
+2 -2
arch/arm/boot/dts/am3874-iceboard.dts
··· 106 106 * "i2c-mux-idle-disconnect" is important. 107 107 */ 108 108 109 - pca9548@70 { 109 + i2c-mux@70 { 110 110 compatible = "nxp,pca9548"; 111 111 reg = <0x70>; 112 112 #address-cells = <1>; ··· 256 256 }; 257 257 258 258 &i2c2 { 259 - pca9548@71 { 259 + i2c-mux@71 { 260 260 compatible = "nxp,pca9548"; 261 261 reg = <0x71>; 262 262 #address-cells = <1>;
+16 -3
arch/arm/boot/dts/omap3-gta04a5.dts
··· 75 75 >; 76 76 }; 77 77 78 + bno050_pins: pinmux-bno050-pins { 79 + pinctrl-single,pins = < 80 + OMAP3_CORE1_IOPAD(0x2136, PIN_INPUT | MUX_MODE4) /* gpin113 */ 81 + >; 82 + }; 78 83 }; 79 84 80 85 /* ··· 120 115 /delete-node/ itg3200@68; 121 116 /delete-node/ hmc5843@1e; 122 117 123 - bmg160@69 { 118 + gyrometer@69 { 124 119 compatible = "bosch,bmg160"; 125 120 reg = <0x69>; 126 121 }; 127 122 128 - bmc150@10 { 123 + accelerometer@10 { 129 124 compatible = "bosch,bmc150_accel"; 130 125 reg = <0x10>; 131 126 }; 132 127 133 - bmc150@12 { 128 + magnetometer@12 { 134 129 compatible = "bosch,bmc150_magn"; 135 130 reg = <0x12>; 136 131 }; ··· 140 135 reg = <0x76>; 141 136 vdda-supply = <&vio>; 142 137 vddd-supply = <&vio>; 138 + }; 139 + 140 + imu@29 { 141 + compatible = "bosch,bno055"; 142 + reg = <0x29>; 143 + pinctrl-names = "default"; 144 + pinctrl-0 = <&bno050_pins>; 145 + /* interrupt at &gpio4 17 */ 143 146 }; 144 147 };
+12 -47
arch/arm/boot/dts/omap3-n900.dts
··· 9 9 #include "omap34xx.dtsi" 10 10 #include <dt-bindings/input/input.h> 11 11 #include <dt-bindings/leds/common.h> 12 + #include <dt-bindings/media/video-interfaces.h> 12 13 13 14 /* 14 15 * Default secure signed bootloader (Nokia X-Loader) does not enable L3 firewall ··· 195 194 196 195 csi_isp: endpoint { 197 196 remote-endpoint = <&csi_cam1>; 198 - bus-type = <3>; /* CCP2 */ 197 + bus-type = <MEDIA_BUS_TYPE_CCP2>; 199 198 clock-lanes = <1>; 200 199 data-lanes = <0>; 201 200 lane-polarity = <0 0>; ··· 768 767 769 768 clock-frequency = <400000>; 770 769 771 - lis302dl: lis3lv02d@1d { 772 - compatible = "st,lis3lv02d"; 770 + accelerometer@1d { 771 + compatible = "st,lis302dl"; 773 772 reg = <0x1d>; 774 773 775 - Vdd-supply = <&vaux1>; 776 - Vdd_IO-supply = <&vio>; 774 + vdd-supply = <&vaux1>; 775 + vddio-supply = <&vio>; 777 776 778 777 interrupt-parent = <&gpio6>; 779 - interrupts = <21 20>; /* 181 and 180 */ 778 + interrupts = <21 IRQ_TYPE_EDGE_RISING>, 779 + <20 IRQ_TYPE_EDGE_RISING>; /* 181 and 180 */ 780 780 781 - /* click flags */ 782 - st,click-single-x; 783 - st,click-single-y; 784 - st,click-single-z; 785 - 786 - /* Limits are 0.5g * value */ 787 - st,click-threshold-x = <8>; 788 - st,click-threshold-y = <8>; 789 - st,click-threshold-z = <10>; 790 - 791 - /* Click must be longer than time limit */ 792 - st,click-time-limit = <9>; 793 - 794 - /* Kind of debounce filter */ 795 - st,click-latency = <50>; 796 - 797 - /* Interrupt line 2 for click detection */ 798 - st,irq2-click; 799 - 800 - st,wakeup-x-hi; 801 - st,wakeup-y-hi; 802 - st,wakeup-threshold = <(800/18)>; /* millig-value / 18 to get HW values */ 803 - 804 - st,wakeup2-z-hi; 805 - st,wakeup2-threshold = <(900/18)>; /* millig-value / 18 to get HW values */ 806 - 807 - st,hipass1-disable; 808 - st,hipass2-disable; 809 - 810 - st,axis-x = <1>; /* LIS3_DEV_X */ 811 - st,axis-y = <(-2)>; /* LIS3_INV_DEV_Y */ 812 - st,axis-z = <(-3)>; /* LIS3_INV_DEV_Z */ 813 - 814 - st,min-limit-x = <(-32)>; 815 - st,min-limit-y = <3>; 816 - st,min-limit-z = <3>; 817 - 818 - st,max-limit-x = <(-3)>; 819 - st,max-limit-y = <32>; 820 - st,max-limit-z = <32>; 781 + mount-matrix = "-1", "0", "0", 782 + "0", "1", "0", 783 + "0", "0", "1"; 821 784 }; 822 785 823 786 cam1: camera@3e { ··· 800 835 801 836 port { 802 837 csi_cam1: endpoint { 803 - bus-type = <3>; /* CCP2 */ 838 + bus-type = <MEDIA_BUS_TYPE_CCP2>; 804 839 strobe = <1>; 805 840 clock-inv = <0>; 806 841 crc = <1>;