Commit 409b6294 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-dts-v5.8' of... 

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

Ux500 DTS updates for the v5.8 kernel series:

- Add proximity sensor and magnetometer to the Samsung Golden
  devicetree.
- Add magnetometer and touchscreen to the Samsung Skomer
  devicetree.

* tag 'ux500-dts-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: dts: ux500: Add touchscreen to the Skomer
  ARM: dts: ux500: samsung-skomer: Add magnetometer
  ARM: dts: ux500: samsung-golden: Add magnetometer
  ARM: dts: ux500: samsung-golden: Add proximity sensor

Link: https://lore.kernel.org/r/CACRpkdbukO33SxAZ_yn-1N8=hq3hF5OBOtP_V0fbjRT-fAa87A@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 25880899 4908471e

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

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

	};



	i2c-gpio-1 {

		compatible = "i2c-gpio";

		sda-gpios = <&gpio4 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;

		scl-gpios = <&gpio4 23 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;



		pinctrl-names = "default";

		pinctrl-0 = <&i2c_gpio_1_default>;



		#address-cells = <1>;

		#size-cells = <0>;



		magnetometer@c {

			compatible = "alps,hscdtd008a";

			reg = <0x0c>;



			avdd-supply = <&ab8500_ldo_aux1_reg>;

			dvdd-supply = <&ab8500_ldo_aux8_reg>;

		};

	};



	soc {

		/* External Micro SD card slot */

		sdi0_per1@80126000 {
@@ -146,6 +166,32 @@ 
			pinctrl-1 = <&u2rxtx_c_1_sleep>;

		};



		i2c@80004000 {

			status = "okay";



			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&i2c0_a_1_default>;

			pinctrl-1 = <&i2c0_a_1_sleep>;



			proximity@44 {

				compatible = "sharp,gp2ap002s00f";

				reg = <0x44>;



				/* GPIO146 (PS_INT) */

				interrupt-parent = <&gpio4>;

				interrupts = <18 IRQ_TYPE_EDGE_FALLING>;



				vdd-supply = <&ab8500_ldo_aux1_reg>;

				vio-supply = <&ab8500_ldo_aux8_reg>;



				pinctrl-names = "default";

				pinctrl-0 = <&proximity_default>;



				sharp,proximity-far-hysteresis = <0x40>;

				sharp,proximity-close-hysteresis = <0x0f>;

			};

		};



		i2c@80128000 {

			status = "okay";
@@ -357,6 +403,16 @@ 
		};

	};



	i2c-gpio-1 {

		i2c_gpio_1_default: i2c_gpio_1 {

			golden_cfg1 {

				pins = "GPIO151",	/* COMP_SCL */

				       "GPIO152";	/* COMP_SDA */

				ste,config = <&gpio_in_nopull>;

			};

		};

	};



	sdi0 {

		sd_level_translator_default: sd_level_translator_default {

			golden_cfg1 {
@@ -375,6 +431,15 @@ 
		};

	};



	proximity {

		proximity_default: proximity_default {

			golden_cfg1 {

				pins = "GPIO146_D13";	/* PS_INT */

				ste,config = <&gpio_in_nopull>;

			};

		};

	};



	imu {

		imu_default: imu_default {

			golden_cfg1 {

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

+37 −2
Original line number Diff line number Diff line
@@ -140,7 +140,12 @@ 
		pinctrl-0 = <&i2c_gpio_1_default>;

		#address-cells = <1>;

		#size-cells = <0>;

		/* TODO: this should be used by the ALPS HSCDTD008A compass sensor */

		magnetometer@c {

			compatible = "alps,hscdtd008a";

			reg = <0x0c>;

			avdd-supply = <&ab8500_ldo_aux1_reg>;

			dvdd-supply = <&ab8500_ldo_aux8_reg>;

		};

	};



	soc {
@@ -362,7 +367,28 @@ 
			pinctrl-0 = <&i2c3_c_2_default>;

			pinctrl-1 = <&i2c3_c_2_sleep>;



			/* TODO: this should be used by the Cypress TMA140 touchscreen */

			/* Cypress CY8CTMA140 touchscreen */

			touchscreen@20 {

				compatible = "cypress,cy8ctma140";

				clock-frequency = <400000>;

				reg = <0x20>;



				touchscreen-size-x = <480>;

				touchscreen-size-y = <800>;

				touchscreen-max-pressure = <255>;



				/* GPIO218 for IRQ */

				interrupt-parent = <&gpio6>;

				interrupts = <26 IRQ_TYPE_EDGE_FALLING>;



				/* VDD is "digital supply" nominally 1.71-3.6V */

				vdd-supply = <&ab8500_ldo_aux2_reg>;

				/* VCPIN is "analog supply", 2.7-3.6 V */

				vcpin-supply = <&ab8500_ldo_aux2_reg>;



				pinctrl-names = "default";

				pinctrl-0 = <&tma140_skomer_default>;

			};

		};



		mcde@a0350000 {
@@ -557,6 +583,15 @@ 
			};

		};

	};

	/* Interrupt line for the Cypress TMA140 touchscreen */

	touchscreen {

		tma140_skomer_default: tma140_skomer {

			skomer_cfg1 {

				pins = "GPIO218_AH11";

				ste,config = <&gpio_in_nopull>;

			};

		};

	};

};



&ab8505_gpio {

CRA Git | Maintained and supported by SUSTech CRA and CCSE