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

Merge tag 'ux500-dts-for-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into arm/dt

Ux500 DTS changes for the v5.9 kernel series:

- Add touchkey to the Samsung Golden.
- Fix up the supply nodes for the AB8500 PWM devices.
- Fix up the cache controller node names.
- Fix the Samsing Skomer accelerometer mounting matrix.

* tag 'ux500-dts-for-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: dts: ux500-skomer: Correct accel mounting matrix
ARM: dts: ste: Align L2 cache-controller nodename with dtschema
ARM: dts: ux500: Supply nodes for the other 2 AB8500 PWM devices
ARM: dts: ux500: samsung-golden: Add touchkey

Link: https://lore.kernel.org/r/CACRpkdZZgZ1LeOK5zFj5Z6Mh=RVz37hZ-7Z4DQNGC1uaiEVTeA@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+62 -5
+13 -1
arch/arm/boot/dts/ste-ab8500.dtsi
··· 201 201 compatible = "stericsson,ab8500-sysctrl"; 202 202 }; 203 203 204 - ab8500-pwm { 204 + ab8500-pwm-1 { 205 + compatible = "stericsson,ab8500-pwm"; 206 + clocks = <&ab8500_clock AB8500_SYSCLK_INT>; 207 + clock-names = "intclk"; 208 + }; 209 + 210 + ab8500-pwm-2 { 211 + compatible = "stericsson,ab8500-pwm"; 212 + clocks = <&ab8500_clock AB8500_SYSCLK_INT>; 213 + clock-names = "intclk"; 214 + }; 215 + 216 + ab8500-pwm-3 { 205 217 compatible = "stericsson,ab8500-pwm"; 206 218 clocks = <&ab8500_clock AB8500_SYSCLK_INT>; 207 219 clock-names = "intclk";
+1 -1
arch/arm/boot/dts/ste-dbx5x0.dtsi
··· 260 260 reg = <0x80150000 0x2000>; 261 261 }; 262 262 263 - L2: l2-cache { 263 + L2: cache-controller { 264 264 compatible = "arm,pl310-cache"; 265 265 reg = <0xa0412000 0x1000>; 266 266 interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+1 -1
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
··· 15 15 <0x08000000 0x04000000>; 16 16 }; 17 17 18 - L2: l2-cache { 18 + L2: cache-controller { 19 19 compatible = "arm,l210-cache"; 20 20 reg = <0x10210000 0x1000>; 21 21 interrupt-parent = <&vica>;
+45
arch/arm/boot/dts/ste-ux500-samsung-golden.dts
··· 24 24 stdout-path = &serial2; 25 25 }; 26 26 27 + i2c-gpio-0 { 28 + compatible = "i2c-gpio"; 29 + sda-gpios = <&gpio2 14 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; 30 + scl-gpios = <&gpio2 13 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; 31 + 32 + pinctrl-names = "default"; 33 + pinctrl-0 = <&i2c_gpio_0_default>; 34 + 35 + #address-cells = <1>; 36 + #size-cells = <0>; 37 + 38 + touchkey@20 { 39 + compatible = "coreriver,tc360-touchkey"; 40 + reg = <0x20>; 41 + vdd-supply = <&ab8500_ldo_aux4_reg>; 42 + vcc-supply = <&ab8500_ldo_aux6_reg>; 43 + 44 + interrupt-parent = <&gpio2>; 45 + interrupts = <15 IRQ_TYPE_EDGE_FALLING>; 46 + 47 + pinctrl-names = "default"; 48 + pinctrl-0 = <&touchkey_default>; 49 + linux,keycodes = <KEY_MENU KEY_BACK>; 50 + }; 51 + }; 52 + 27 53 i2c-gpio-1 { 28 54 compatible = "i2c-gpio"; 29 55 sda-gpios = <&gpio4 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; ··· 429 403 }; 430 404 }; 431 405 406 + i2c-gpio-0 { 407 + i2c_gpio_0_default: i2c_gpio_0 { 408 + golden_cfg1 { 409 + pins = "GPIO77", /* TOUCHKEY_SCL */ 410 + "GPIO78"; /* TOUCHKEY_SDA */ 411 + ste,config = <&gpio_in_nopull>; 412 + }; 413 + }; 414 + }; 415 + 432 416 i2c-gpio-1 { 433 417 i2c_gpio_1_default: i2c_gpio_1 { 434 418 golden_cfg1 { 435 419 pins = "GPIO151", /* COMP_SCL */ 436 420 "GPIO152"; /* COMP_SDA */ 421 + ste,config = <&gpio_in_nopull>; 422 + }; 423 + }; 424 + }; 425 + 426 + touchkey { 427 + touchkey_default: touchkey_default { 428 + golden_cfg1 { 429 + pins = "GPIO79"; /* TOUCHKEY_INT */ 437 430 ste,config = <&gpio_in_nopull>; 438 431 }; 439 432 };
+2 -2
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
··· 349 349 interrupt-parent = <&gpio7>; 350 350 interrupts = <0 IRQ_TYPE_EDGE_RISING>; 351 351 352 - mount-matrix = "0", "1", "0", 353 - "-1", "0", "0", 352 + mount-matrix = "0", "-1", "0", 353 + "1", "0", "0", 354 354 "0", "0", "1"; 355 355 vdd-supply = <&ab8500_ldo_aux1_reg>; 356 356 vddio-supply = <&ab8500_ldo_aux8_reg>;