Commit 6b848e26 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-dts-for-v5.9-1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents b61010a1 537b9118

arch/arm/boot/dts/ste-ab8500.dtsi

+13 −1
Original line number Diff line number Diff line
@@ -201,7 +201,19 @@ 
					compatible = "stericsson,ab8500-sysctrl";

				};



				ab8500-pwm {

				ab8500-pwm-1 {

					compatible = "stericsson,ab8500-pwm";

					clocks = <&ab8500_clock AB8500_SYSCLK_INT>;

					clock-names = "intclk";

				};



				ab8500-pwm-2 {

					compatible = "stericsson,ab8500-pwm";

					clocks = <&ab8500_clock AB8500_SYSCLK_INT>;

					clock-names = "intclk";

				};



				ab8500-pwm-3 {

					compatible = "stericsson,ab8500-pwm";

					clocks = <&ab8500_clock AB8500_SYSCLK_INT>;

					clock-names = "intclk";

arch/arm/boot/dts/ste-dbx5x0.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ 
			reg = <0x80150000 0x2000>;

		};



		L2: l2-cache {

		L2: cache-controller {

			compatible = "arm,pl310-cache";

			reg = <0xa0412000 0x1000>;

			interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
		    <0x08000000 0x04000000>;

	};



	L2: l2-cache {

	L2: cache-controller {

		compatible = "arm,l210-cache";

		reg = <0x10210000 0x1000>;

		interrupt-parent = <&vica>;

arch/arm/boot/dts/ste-ux500-samsung-golden.dts

+45 −0
Original line number Diff line number Diff line
@@ -24,6 +24,32 @@ 
		stdout-path = &serial2;

	};



	i2c-gpio-0 {

		compatible = "i2c-gpio";

		sda-gpios = <&gpio2 14 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;

		scl-gpios = <&gpio2 13 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;



		pinctrl-names = "default";

		pinctrl-0 = <&i2c_gpio_0_default>;



		#address-cells = <1>;

		#size-cells = <0>;



		touchkey@20 {

			compatible = "coreriver,tc360-touchkey";

			reg = <0x20>;

			vdd-supply = <&ab8500_ldo_aux4_reg>;

			vcc-supply = <&ab8500_ldo_aux6_reg>;



			interrupt-parent = <&gpio2>;

			interrupts = <15 IRQ_TYPE_EDGE_FALLING>;



			pinctrl-names = "default";

			pinctrl-0 = <&touchkey_default>;

			linux,keycodes = <KEY_MENU KEY_BACK>;

		};

	};



	i2c-gpio-1 {

		compatible = "i2c-gpio";

		sda-gpios = <&gpio4 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -403,6 +429,16 @@ 
		};

	};



	i2c-gpio-0 {

		i2c_gpio_0_default: i2c_gpio_0 {

			golden_cfg1 {

				pins = "GPIO77",	/* TOUCHKEY_SCL */

				       "GPIO78";	/* TOUCHKEY_SDA */

				ste,config = <&gpio_in_nopull>;

			};

		};

	};



	i2c-gpio-1 {

		i2c_gpio_1_default: i2c_gpio_1 {

			golden_cfg1 {
@@ -413,6 +449,15 @@ 
		};

	};



	touchkey {

		touchkey_default: touchkey_default {

			golden_cfg1 {

				pins = "GPIO79";	/* TOUCHKEY_INT */

				ste,config = <&gpio_in_nopull>;

			};

		};

	};



	sdi0 {

		sd_level_translator_default: sd_level_translator_default {

			golden_cfg1 {

arch/arm/boot/dts/ste-ux500-samsung-skomer.dts

+2 −2
Original line number Diff line number Diff line
@@ -349,8 +349,8 @@ 
				interrupt-parent = <&gpio7>;

				interrupts = <0 IRQ_TYPE_EDGE_RISING>;



				mount-matrix = "0", "1", "0",

					       "-1", "0", "0",

				mount-matrix = "0", "-1", "0",

					      "1", "0", "0",

					       "0", "0", "1";

				vdd-supply = <&ab8500_ldo_aux1_reg>;

				vddio-supply = <&ab8500_ldo_aux8_reg>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE