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

ARM: dts: ux500: Split TVK DTSI files in two

The TVK1281618 was made in R1, R2 and R3 variants. The most
commonly used variants are R2 and R3 so split out these to
their own files.

The R3 version has a totally different display than R1 and
R2 and a different set of sensors.

Cc: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20191126124738.77690-2-linus.walleij@linaro.org

+141 -71
+79
arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
··· 1 + // SPDX-License-Identifier: GPL-2.0-or-later 2 + /* 3 + * Device Tree for the TVK1281618 R2 UIB 4 + */ 5 + 6 + #include "ste-href-tvk1281618.dtsi" 7 + 8 + / { 9 + soc { 10 + i2c@80128000 { 11 + lsm303dlh@18 { 12 + /* Accelerometer */ 13 + compatible = "st,lsm303dlh-accel"; 14 + st,drdy-int-pin = <1>; 15 + drive-open-drain; 16 + reg = <0x18>; 17 + vdd-supply = <&ab8500_ldo_aux1_reg>; 18 + vddio-supply = <&db8500_vsmps2_reg>; 19 + pinctrl-names = "default"; 20 + pinctrl-0 = <&accel_tvk_mode>; 21 + /* 22 + * These interrupts cannot be used: the other component 23 + * ST-Micro L3D4200D gyro that is connected to the same lines 24 + * cannot set its DRDY line to open drain, so it cannot be 25 + * shared with other peripherals. The should be defined for 26 + * the falling edge if they could be wired together. 27 + * 28 + * interrupts-extended = 29 + * <&gpio1 0 IRQ_TYPE_EDGE_FALLING>, 30 + * <&gpio2 19 IRQ_TYPE_EDGE_FALLING>; 31 + */ 32 + }; 33 + lsm303dlh@1e { 34 + /* Magnetometer */ 35 + compatible = "st,lsm303dlh-magn"; 36 + reg = <0x1e>; 37 + vdd-supply = <&ab8500_ldo_aux1_reg>; 38 + vddio-supply = <&db8500_vsmps2_reg>; 39 + /* 40 + * These interrupts cannot be used: the other component 41 + * ST-Micro L3D4200D gyro that is connected to the same lines 42 + * cannot set its DRDY line to open drain, so it cannot be 43 + * shared with other peripherals. The should be defined for 44 + * the falling edge if they could be wired together. 45 + * 46 + * interrupts-extended = 47 + * <&gpio1 0 IRQ_TYPE_EDGE_FALLING>, 48 + * <&gpio2 19 IRQ_TYPE_EDGE_FALLING>; 49 + */ 50 + }; 51 + lis331dl@1c { 52 + /* Accelerometer */ 53 + compatible = "st,lis331dl-accel"; 54 + st,drdy-int-pin = <1>; 55 + reg = <0x1c>; 56 + vdd-supply = <&ab8500_ldo_aux1_reg>; 57 + vddio-supply = <&db8500_vsmps2_reg>; 58 + pinctrl-names = "default"; 59 + pinctrl-0 = <&accel_tvk_mode>; 60 + interrupt-parent = <&gpio2>; 61 + /* INT2 would need to be open drain */ 62 + interrupts = <18 IRQ_TYPE_EDGE_RISING>, 63 + <19 IRQ_TYPE_EDGE_RISING>; 64 + }; 65 + }; 66 + mcde@a0350000 { 67 + status = "okay"; 68 + 69 + dsi@a0351000 { 70 + panel { 71 + compatible = "samsung,s6d16d0"; 72 + reg = <0>; 73 + vdd1-supply = <&ab8500_ldo_aux1_reg>; 74 + reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; 75 + }; 76 + }; 77 + }; 78 + }; 79 + };
+58
arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi
··· 1 + // SPDX-License-Identifier: GPL-2.0-or-later 2 + /* 3 + * Device Tree for the TVK1281618 R2 UIB 4 + */ 5 + 6 + #include "ste-href-tvk1281618.dtsi" 7 + 8 + / { 9 + soc { 10 + i2c@80128000 { 11 + /* Marked: 12 + * 129 13 + * M35 14 + * L3GD20 15 + */ 16 + l3gd20@6a { 17 + /* Gyroscope */ 18 + compatible = "st,l3gd20"; 19 + status = "disabled"; 20 + st,drdy-int-pin = <1>; 21 + drive-open-drain; 22 + reg = <0x6a>; // 0x6a or 0x6b 23 + vdd-supply = <&ab8500_ldo_aux1_reg>; 24 + vddio-supply = <&db8500_vsmps2_reg>; 25 + }; 26 + /* 27 + * Marked: 28 + * 2122 29 + * C3H 30 + * DQEEE 31 + * LIS3DH? 32 + */ 33 + lis3dh@18 { 34 + /* Accelerometer */ 35 + compatible = "st,lis3dh-accel"; 36 + st,drdy-int-pin = <1>; 37 + reg = <0x18>; 38 + vdd-supply = <&ab8500_ldo_aux1_reg>; 39 + vddio-supply = <&db8500_vsmps2_reg>; 40 + pinctrl-names = "default"; 41 + pinctrl-0 = <&accel_tvk_mode>; 42 + }; 43 + }; 44 + 45 + mcde@a0350000 { 46 + status = "okay"; 47 + 48 + dsi@a0351000 { 49 + panel { 50 + compatible = "sony,acx424akp"; 51 + reg = <0>; 52 + vddi-supply = <&ab8500_ldo_aux1_reg>; 53 + reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; 54 + }; 55 + }; 56 + }; 57 + }; 58 + };
+2 -69
arch/arm/boot/dts/ste-href-tvk1281618.dtsi
··· 2 2 /* 3 3 * Copyright 2012 ST-Ericsson AB 4 4 * 5 - * Device Tree for the TVK1281618 UIB 5 + * Device Tree for the TVK1281618 family of UIBs 6 6 */ 7 7 8 8 #include <dt-bindings/interrupt-controller/irq.h> ··· 81 81 }; 82 82 }; 83 83 }; 84 - /* Sensors mounted on this board variant */ 84 + /* Sensors mounted on all board variants */ 85 85 i2c@80128000 { 86 - lsm303dlh@18 { 87 - /* Accelerometer */ 88 - compatible = "st,lsm303dlh-accel"; 89 - st,drdy-int-pin = <1>; 90 - drive-open-drain; 91 - reg = <0x18>; 92 - vdd-supply = <&ab8500_ldo_aux1_reg>; 93 - vddio-supply = <&db8500_vsmps2_reg>; 94 - pinctrl-names = "default"; 95 - pinctrl-0 = <&accel_tvk_mode>; 96 - /* 97 - * These interrupts cannot be used: the other component 98 - * ST-Micro L3D4200D gyro that is connected to the same lines 99 - * cannot set its DRDY line to open drain, so it cannot be 100 - * shared with other peripherals. The should be defined for 101 - * the falling edge if they could be wired together. 102 - * 103 - * interrupts-extended = 104 - * <&gpio1 0 IRQ_TYPE_EDGE_FALLING>, 105 - * <&gpio2 19 IRQ_TYPE_EDGE_FALLING>; 106 - */ 107 - }; 108 - lsm303dlh@1e { 109 - /* Magnetometer */ 110 - compatible = "st,lsm303dlh-magn"; 111 - reg = <0x1e>; 112 - vdd-supply = <&ab8500_ldo_aux1_reg>; 113 - vddio-supply = <&db8500_vsmps2_reg>; 114 - /* 115 - * These interrupts cannot be used: the other component 116 - * ST-Micro L3D4200D gyro that is connected to the same lines 117 - * cannot set its DRDY line to open drain, so it cannot be 118 - * shared with other peripherals. The should be defined for 119 - * the falling edge if they could be wired together. 120 - * 121 - * interrupts-extended = 122 - * <&gpio1 0 IRQ_TYPE_EDGE_FALLING>, 123 - * <&gpio2 19 IRQ_TYPE_EDGE_FALLING>; 124 - */ 125 - }; 126 - lis331dl@1c { 127 - /* Accelerometer */ 128 - compatible = "st,lis331dl-accel"; 129 - st,drdy-int-pin = <1>; 130 - reg = <0x1c>; 131 - vdd-supply = <&ab8500_ldo_aux1_reg>; 132 - vddio-supply = <&db8500_vsmps2_reg>; 133 - pinctrl-names = "default"; 134 - pinctrl-0 = <&accel_tvk_mode>; 135 - interrupt-parent = <&gpio2>; 136 - /* INT2 would need to be open drain */ 137 - interrupts = <18 IRQ_TYPE_EDGE_RISING>, 138 - <19 IRQ_TYPE_EDGE_RISING>; 139 - }; 140 86 ak8974@f { 141 87 /* Magnetometer */ 142 88 compatible = "asahi-kasei,ak8974"; ··· 211 265 pins = "GPIO84_C2"; 212 266 ste,config = <&gpio_in_pu>; 213 267 }; 214 - }; 215 - }; 216 - }; 217 - 218 - mcde@a0350000 { 219 - status = "okay"; 220 - 221 - dsi@a0351000 { 222 - panel { 223 - compatible = "samsung,s6d16d0"; 224 - reg = <0>; 225 - vdd1-supply = <&ab8500_ldo_aux1_reg>; 226 - reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; 227 268 }; 228 269 }; 229 270 };
+1 -1
arch/arm/boot/dts/ste-hrefprev60-tvk.dts
··· 6 6 /dts-v1/; 7 7 #include "ste-db8500.dtsi" 8 8 #include "ste-hrefprev60.dtsi" 9 - #include "ste-href-tvk1281618.dtsi" 9 + #include "ste-href-tvk1281618-r2.dtsi" 10 10 11 11 / { 12 12 model = "ST-Ericsson HREF (pre-v60) and TVK1281618 UIB";
+1 -1
arch/arm/boot/dts/ste-hrefv60plus-tvk.dts
··· 8 8 /dts-v1/; 9 9 #include "ste-db8500.dtsi" 10 10 #include "ste-hrefv60plus.dtsi" 11 - #include "ste-href-tvk1281618.dtsi" 11 + #include "ste-href-tvk1281618-r2.dtsi" 12 12 13 13 / { 14 14 model = "ST-Ericsson HREF (v60+) and TVK1281618 UIB";