From ffecc4feba12caeab86b58b2f470d10405de02d5 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 16 Jun 2022 01:14:08 +0300 Subject: [PATCH 01/11] ARM: dts: omap: Use new media bus type macros Now that a header exists with macros for the media interface bus-type values, replace hardcoding numerical constants with the corresponding macros in the DT sources. Signed-off-by: Laurent Pinchart Message-Id: <20220615221410.27459-5-laurent.pinchart@ideasonboard.com> Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-n900.dts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 6ba2e8f81973..c97c72da3757 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -9,6 +9,7 @@ #include "omap34xx.dtsi" #include #include +#include /* * 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 = ; clock-lanes = <1>; data-lanes = <0>; lane-polarity = <0 0>; @@ -835,7 +836,7 @@ cam1: camera@3e { port { csi_cam1: endpoint { - bus-type = <3>; /* CCP2 */ + bus-type = ; strobe = <1>; clock-inv = <0>; crc = <1>; From 0973bdfce750e63e9ae18f4897cfecf418718ddf Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Fri, 2 Dec 2022 17:49:16 +0100 Subject: [PATCH 02/11] ARM: dts: ti: Fix pca954x i2c-mux node names "make dtbs_check": arch/arm/boot/dts/am3874-iceboard.dtb: pca9548@70: $nodename:0: 'pca9548@70' does not match '^(i2c-?)?mux' From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml arch/arm/boot/dts/am3874-iceboard.dtb: pca9548@70: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'i2c@0', 'i2c@1', 'i2c@2', 'i2c@3', 'i2c@4', 'i2c@5', 'i2c@6', 'i2c@7' were unexpected) From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml ... Fix this by renaming PCA954x nodes to "i2c-mux", to match the I2C bus multiplexer/switch DT bindings and the Generic Names Recommendation in the Devicetree Specification. Signed-off-by: Geert Uytterhoeven Message-Id: Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am3874-iceboard.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am3874-iceboard.dts b/arch/arm/boot/dts/am3874-iceboard.dts index d039af879367..791478e81c5a 100644 --- a/arch/arm/boot/dts/am3874-iceboard.dts +++ b/arch/arm/boot/dts/am3874-iceboard.dts @@ -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>; From bd08103e93a441f6a0ae6149efe9099bba5beb56 Mon Sep 17 00:00:00 2001 From: Mark Jackson Date: Wed, 30 Nov 2022 14:05:43 +0000 Subject: [PATCH 03/11] ARM: dts: am335x-nano: Fix GPIO settings for RTS/CTS pins on UART3 & 4 The NanoBone platform uses GPIO pins for RTS/CTS control. The DTS still uses the hardware RTS/CTS pins so this needs fixing. Signed-off-by: Mark Jackson Message-Id: <20221130140547.295859-2-mpfj@newflow.co.uk> Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am335x-nano.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts index b6f2567bd65a..05cbfe24f778 100644 --- a/arch/arm/boot/dts/am335x-nano.dts +++ b/arch/arm/boot/dts/am335x-nano.dts @@ -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 */ >; From af5ec6ab2e6c920a568ba09f961c3d429741c5c9 Mon Sep 17 00:00:00 2001 From: Mark Jackson Date: Wed, 30 Nov 2022 14:05:44 +0000 Subject: [PATCH 04/11] ARM: dts: am335x-nano: Enable RS485 mode for UART3 & 4 UART3 & 4 are both RS485 ports. So we need to configure and enable this by default. Signed-off-by: Mark Jackson Message-Id: <20221130140547.295859-3-mpfj@newflow.co.uk> Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am335x-nano.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts index 05cbfe24f778..cecc2afaeff4 100644 --- a/arch/arm/boot/dts/am335x-nano.dts +++ b/arch/arm/boot/dts/am335x-nano.dts @@ -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"; }; From 7094c9d8aa5d084754078de698832b4d20a91dc3 Mon Sep 17 00:00:00 2001 From: Mark Jackson Date: Wed, 30 Nov 2022 14:05:45 +0000 Subject: [PATCH 05/11] ARM: dts: am335x-nano: Enable I2C temperature sensor The NanoBone platform supports a temperature sensor on the I2C bus. Signed-off-by: Mark Jackson Message-Id: <20221130140547.295859-4-mpfj@newflow.co.uk> Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am335x-nano.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts index cecc2afaeff4..960ef1384bbe 100644 --- a/arch/arm/boot/dts/am335x-nano.dts +++ b/arch/arm/boot/dts/am335x-nano.dts @@ -230,6 +230,11 @@ tps: tps@24 { reg = <0x24>; }; + temperature-sensor@48 { + compatible = "lm75"; + reg = <0x48>; + }; + eeprom@53 { compatible = "microchip,24c02", "atmel,24c02"; reg = <0x53>; From d7a6aebb233794432ebfc46fc75222868f6d49b7 Mon Sep 17 00:00:00 2001 From: Mark Jackson Date: Wed, 30 Nov 2022 14:05:46 +0000 Subject: [PATCH 06/11] ARM: dts: am335x-nano: Fix GPIO settings for MMC pins The MMC slot uses GPIO pins for Write Protext and Card Detect. Define these so everything works correctly. Signed-off-by: Mark Jackson Message-Id: <20221130140547.295859-5-mpfj@newflow.co.uk> Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am335x-nano.dts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts index 960ef1384bbe..58062cec39c0 100644 --- a/arch/arm/boot/dts/am335x-nano.dts +++ b/arch/arm/boot/dts/am335x-nano.dts @@ -418,8 +418,9 @@ &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>; }; #include "tps65217.dtsi" From 7c70306b7dbbee7009aa5cd2749e6fe9dd84781b Mon Sep 17 00:00:00 2001 From: Mark Jackson Date: Wed, 30 Nov 2022 14:05:47 +0000 Subject: [PATCH 07/11] ARM: dts: am335x-nano: Enable USB host Add missing entry to enable the USB host. Signed-off-by: Mark Jackson Message-Id: <20221130140547.295859-6-mpfj@newflow.co.uk> Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am335x-nano.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts index 58062cec39c0..c447aebd8d86 100644 --- a/arch/arm/boot/dts/am335x-nano.dts +++ b/arch/arm/boot/dts/am335x-nano.dts @@ -423,6 +423,10 @@ &mmc1 { wp-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; }; +&usb0 { + dr_mode = "host"; +}; + #include "tps65217.dtsi" &tps { From ecbeccdc61700f9da38e25c6ed49212dfb529b05 Mon Sep 17 00:00:00 2001 From: "Sicelo A. Mhlongo" Date: Thu, 29 Dec 2022 19:13:47 +0200 Subject: [PATCH 08/11] ARM: dts: n900: rename accelerometer node Use generic node naming for lis302dl accelerometer, and drop its label that is not used anywhere else. Acked-by: Krzysztof Kozlowski Signed-off-by: Sicelo A. Mhlongo Message-Id: <20221229171348.3543327-2-absicsz@gmail.com> Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-n900.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index c97c72da3757..2279a74d3ee5 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -768,7 +768,7 @@ &i2c3 { clock-frequency = <400000>; - lis302dl: lis3lv02d@1d { + accelerometer@1d { compatible = "st,lis3lv02d"; reg = <0x1d>; From 14a213dcb004fe28befcf36bb02e52a89242a821 Mon Sep 17 00:00:00 2001 From: "Sicelo A. Mhlongo" Date: Thu, 29 Dec 2022 19:13:48 +0200 Subject: [PATCH 09/11] ARM: dts: n900: use iio driver for accelerometer The accelerometer in the N900 is supported by the iio-framework since commit 8a7449d68670a8f9 ("iio: accel: add support for LIS302DL variant). This commit switches to it and updates node properties to match the bindings of the new compatible. Acked-by: Krzysztof Kozlowski Signed-off-by: Sicelo A. Mhlongo Message-Id: <20221229171348.3543327-3-absicsz@gmail.com> Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-n900.dts | 52 +++++--------------------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 2279a74d3ee5..f9f9eca0c56c 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -769,55 +769,19 @@ &i2c3 { clock-frequency = <400000>; accelerometer@1d { - compatible = "st,lis3lv02d"; + 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 { From 9151b7670d1ad990d644832a092658016a0ef338 Mon Sep 17 00:00:00 2001 From: Andreas Kemnade Date: Tue, 17 Jan 2023 23:30:02 +0100 Subject: [PATCH 10/11] ARM: dts: omap: gta04: add BNO055 IMU chip There is finally a driver upstreamed, so add the device. Signed-off-by: Andreas Kemnade Message-Id: <20230117223002.2609301-1-andreas@kemnade.info> Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04a5.dts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/omap3-gta04a5.dts b/arch/arm/boot/dts/omap3-gta04a5.dts index 0b5bd7388877..1ecdc985fa05 100644 --- a/arch/arm/boot/dts/omap3-gta04a5.dts +++ b/arch/arm/boot/dts/omap3-gta04a5.dts @@ -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 */ + >; + }; }; /* @@ -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 */ + }; }; From 9dd320f0075fc765c6f35eb52f2a0cc73bf38a3f Mon Sep 17 00:00:00 2001 From: Andreas Kemnade Date: Tue, 17 Jan 2023 23:30:59 +0100 Subject: [PATCH 11/11] ARM: dts: omap: gta04a5: cleanup i2c node names Use generic node names. Signed-off-by: Andreas Kemnade Message-Id: <20230117223059.2609390-1-andreas@kemnade.info> Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04a5.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/omap3-gta04a5.dts b/arch/arm/boot/dts/omap3-gta04a5.dts index 1ecdc985fa05..425081201fd4 100644 --- a/arch/arm/boot/dts/omap3-gta04a5.dts +++ b/arch/arm/boot/dts/omap3-gta04a5.dts @@ -120,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>; };