Commit 1a7022f1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-dt-for-arm-soc' of... 

Merge tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

Merge "Device Tree changes for Ux500" from Linus Walleij:

- Push the Rohm touchscreen to the STUIB, as the TVK UIB has
  a Synaptics RMI4 touchscreen.
- Set up the right sensor IRQs for the Snowball, so that
  periodic data ready-IRQ capture starts working.
- Use wakeup-source consequently.
- Remove legacy regulator-compatible strings.
- Define the sensors on the HREFP TVK board properly.

* tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: configure the sensors on the TVK board correctly
  ARM: u300: remove regulator-compatible usage
  ARM: ux500: remove regulator-compatible usage
  ARM: ux500: replace legacy *,wakeup property with wakeup-source
  ARM: ux500: Assign proper sensor IRQs for Snowball
  ARM: ux500: push down Rohm TS to STUIB
parents 406ca449 2f23cda3

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

+0 −33
Original line number Diff line number Diff line
@@ -512,63 +512,51 @@ 


				// DB8500_REGULATOR_VAPE

				db8500_vape_reg: db8500_vape {

					regulator-compatible = "db8500_vape";

					regulator-always-on;

				};



				// DB8500_REGULATOR_VARM

				db8500_varm_reg: db8500_varm {

					regulator-compatible = "db8500_varm";

				};



				// DB8500_REGULATOR_VMODEM

				db8500_vmodem_reg: db8500_vmodem {

					regulator-compatible = "db8500_vmodem";

				};



				// DB8500_REGULATOR_VPLL

				db8500_vpll_reg: db8500_vpll {

					regulator-compatible = "db8500_vpll";

				};



				// DB8500_REGULATOR_VSMPS1

				db8500_vsmps1_reg: db8500_vsmps1 {

					regulator-compatible = "db8500_vsmps1";

				};



				// DB8500_REGULATOR_VSMPS2

				db8500_vsmps2_reg: db8500_vsmps2 {

					regulator-compatible = "db8500_vsmps2";

				};



				// DB8500_REGULATOR_VSMPS3

				db8500_vsmps3_reg: db8500_vsmps3 {

					regulator-compatible = "db8500_vsmps3";

				};



				// DB8500_REGULATOR_VRF1

				db8500_vrf1_reg: db8500_vrf1 {

					regulator-compatible = "db8500_vrf1";

				};



				// DB8500_REGULATOR_SWITCH_SVAMMDSP

				db8500_sva_mmdsp_reg: db8500_sva_mmdsp {

					regulator-compatible = "db8500_sva_mmdsp";

				};



				// DB8500_REGULATOR_SWITCH_SVAMMDSPRET

				db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {

					regulator-compatible = "db8500_sva_mmdsp_ret";

				};



				// DB8500_REGULATOR_SWITCH_SVAPIPE

				db8500_sva_pipe_reg: db8500_sva_pipe {

					regulator-compatible = "db8500_sva_pipe";

				};



				// DB8500_REGULATOR_SWITCH_SIAMMDSP

				db8500_sia_mmdsp_reg: db8500_sia_mmdsp {

					regulator-compatible = "db8500_sia_mmdsp";

				};



				// DB8500_REGULATOR_SWITCH_SIAMMDSPRET
@@ -577,39 +565,32 @@ 


				// DB8500_REGULATOR_SWITCH_SIAPIPE

				db8500_sia_pipe_reg: db8500_sia_pipe {

					regulator-compatible = "db8500_sia_pipe";

				};



				// DB8500_REGULATOR_SWITCH_SGA

				db8500_sga_reg: db8500_sga {

					regulator-compatible = "db8500_sga";

					vin-supply = <&db8500_vape_reg>;

				};



				// DB8500_REGULATOR_SWITCH_B2R2_MCDE

				db8500_b2r2_mcde_reg: db8500_b2r2_mcde {

					regulator-compatible = "db8500_b2r2_mcde";

					vin-supply = <&db8500_vape_reg>;

				};



				// DB8500_REGULATOR_SWITCH_ESRAM12

				db8500_esram12_reg: db8500_esram12 {

					regulator-compatible = "db8500_esram12";

				};



				// DB8500_REGULATOR_SWITCH_ESRAM12RET

				db8500_esram12_ret_reg: db8500_esram12_ret {

					regulator-compatible = "db8500_esram12_ret";

				};



				// DB8500_REGULATOR_SWITCH_ESRAM34

				db8500_esram34_reg: db8500_esram34 {

					regulator-compatible = "db8500_esram34";

				};



				// DB8500_REGULATOR_SWITCH_ESRAM34RET

				db8500_esram34_ret_reg: db8500_esram34_ret {

					regulator-compatible = "db8500_esram34_ret";

				};

			};
@@ -721,7 +702,6 @@ 
					compatible = "stericsson,ab8500-ext-regulator";



					ab8500_ext1_reg: ab8500_ext1 {

						regulator-compatible = "ab8500_ext1";

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

						regulator-boot-on;
@@ -729,7 +709,6 @@ 
					};



					ab8500_ext2_reg: ab8500_ext2 {

						regulator-compatible = "ab8500_ext2";

						regulator-min-microvolt = <1360000>;

						regulator-max-microvolt = <1360000>;

						regulator-boot-on;
@@ -737,7 +716,6 @@ 
					};



					ab8500_ext3_reg: ab8500_ext3 {

						regulator-compatible = "ab8500_ext3";

						regulator-min-microvolt = <3400000>;

						regulator-max-microvolt = <3400000>;

						regulator-boot-on;
@@ -750,7 +728,6 @@ 


					// supplies to the display/camera

					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

						regulator-compatible = "ab8500_ldo_aux1";

						regulator-min-microvolt = <2500000>;

						regulator-max-microvolt = <2900000>;

						regulator-boot-on;
@@ -760,56 +737,46 @@ 


					// supplies to the on-board eMMC

					ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {

						regulator-compatible = "ab8500_ldo_aux2";

						regulator-min-microvolt = <1100000>;

						regulator-max-microvolt = <3300000>;

					};



					// supply for VAUX3; SDcard slots

					ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {

						regulator-compatible = "ab8500_ldo_aux3";

						regulator-min-microvolt = <1100000>;

						regulator-max-microvolt = <3300000>;

					};



					// supply for v-intcore12; VINTCORE12 LDO

					ab8500_ldo_intcore_reg: ab8500_ldo_intcore {

						regulator-compatible = "ab8500_ldo_intcore";

					};



					// supply for tvout; gpadc; TVOUT LDO

					ab8500_ldo_tvout_reg: ab8500_ldo_tvout {

						regulator-compatible = "ab8500_ldo_tvout";

					};



					// supply for ab8500-usb; USB LDO

					ab8500_ldo_usb_reg: ab8500_ldo_usb {

						regulator-compatible = "ab8500_ldo_usb";

					};



					// supply for ab8500-vaudio; VAUDIO LDO

					ab8500_ldo_audio_reg: ab8500_ldo_audio {

						regulator-compatible = "ab8500_ldo_audio";

					};



					// supply for v-anamic1 VAMIC1 LDO

					ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {

						regulator-compatible = "ab8500_ldo_anamic1";

					};



					// supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1

					ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {

						regulator-compatible = "ab8500_ldo_anamic2";

					};



					// supply for v-dmic; VDMIC LDO

					ab8500_ldo_dmic_reg: ab8500_ldo_dmic {

						regulator-compatible = "ab8500_ldo_dmic";

					};



					// supply for U8500 CSI/DSI; VANA LDO

					ab8500_ldo_ana_reg: ab8500_ldo_ana {

						regulator-compatible = "ab8500_ldo_ana";

					};

				};

			};

arch/arm/boot/dts/ste-href-stuib.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ 
				rohm,touch-max-x = <384>;

				rohm,touch-max-y = <704>;

				rohm,flip-y;

				pinctrl-names = "default";

				pinctrl-0 = <&touch_rohm_mode>;

			};



			bu21013_tp@5d {
@@ -124,6 +126,8 @@ 
				rohm,touch-max-x = <384>;

				rohm,touch-max-y = <704>;

				rohm,flip-y;

				pinctrl-names = "default";

				pinctrl-0 = <&touch_rohm_mode>;

			};

		};
@@ -166,6 +170,25 @@ 
					};

				};

			};

			touch {

				touch_rohm_mode: touch_rohm {

					/*

					 * ROHM touch screen uses GPIO 143 for

					 * RST1, GPIO 146 for RST2 and

					 * GPIO 67 for interrupts. Pull-up

					 * the IRQ line and drive both

					 * reset signals low.

					 */

					stuib_cfg1 {

						pins = "GPIO143_D12", "GPIO146_D13";

						ste,config = <&gpio_out_lo>;

					};

					stuib_cfg2 {

						pins = "GPIO67_G2";

						ste,config = <&gpio_in_pu>;

					};

				};

			};

		};

	};

};

arch/arm/boot/dts/ste-href-tvk1281618.dtsi

+44 −8
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
					keypad,num-columns = <8>;

					keypad,num-rows = <8>;

					linux,no-autorepeat;

					linux,wakeup;

					wakeup-source;

					linux,keymap = <0x0301006b

						        0x04010066

							0x06040072
@@ -104,13 +104,40 @@ 
					     <19 IRQ_TYPE_EDGE_RISING>;

			};

			lsm303dlh@1e {

				/* Magnetometer */

				/*

				 * This magnetometer is packaged with

				 * the accelerometer, and has a DRDY line,

				 * however it is not connected on this

				 * board so it can not generate interrupts.

				 */

				compatible = "st,lsm303dlh-magn";

				reg = <0x1e>;

				vdd-supply = <&ab8500_ldo_aux1_reg>;

				vddio-supply = <&db8500_vsmps2_reg>;

			};

			lis331dl@1c {

				/* Accelerometer */

				compatible = "st,lis331dl-accel";

				st,drdy-int-pin = <1>;

				reg = <0x1c>;

				vdd-supply = <&ab8500_ldo_aux1_reg>;

				vddio-supply = <&db8500_vsmps2_reg>;

				pinctrl-names = "default";

				pinctrl-0 = <&accel_tvk_mode>;

				interrupt-parent = <&gpio2>;

				interrupts = <18 IRQ_TYPE_EDGE_RISING>,

					     <19 IRQ_TYPE_EDGE_RISING>;

			};

			ak8974@0f {

				/* Magnetometer */

				compatible = "asahi-kasei,ak8974";

				reg = <0x0f>;

				vdd-supply = <&ab8500_ldo_aux1_reg>;

				vddio-supply = <&db8500_vsmps2_reg>;

				pinctrl-names = "default";

				pinctrl-0 = <&magneto_tvk_mode>;

				pinctrl-0 = <&gyro_magn_tvk_mode>;

				interrupt-parent = <&gpio1>;

				interrupts = <0 IRQ_TYPE_EDGE_RISING>;

			};

			l3g4200d@68 {

				/* Gyroscope */
@@ -119,6 +146,10 @@ 
				reg = <0x68>;

				vdd-supply = <&ab8500_ldo_aux1_reg>;

				vddio-supply = <&db8500_vsmps2_reg>;

				pinctrl-names = "default";

				pinctrl-0 = <&gyro_magn_tvk_mode>;

				interrupt-parent = <&gpio1>;

				interrupts = <0 IRQ_TYPE_EDGE_RISING>;

			};

			lsp001wm@5c {

				/* Barometer/pressure sensor */
@@ -159,17 +190,22 @@ 
					/* Accelerometer interrupt lines 1 & 2 */

					tvk_cfg {

						pins = "GPIO82_C1", "GPIO83_D3";

						ste,config = <&gpio_in_pu>;

						ste,config = <&gpio_in_pd>;

					};

				};

			};

			magnetometer {

				magneto_tvk_mode: magneto_tvk {

					/* Magnetometer uses GPIO 31 and 32, pull these up/down respectively */

			gyroscope {

				/*

				 * These lines are shared between Gyroscope l3g400dh

				 * and AK8974 magnetometer.

				 */

				gyro_magn_tvk_mode: gyro_magn_tvk {

					 /* GPIO 31 used for INT pull down the line */

					tvk_cfg1 {

						pins = "GPIO31_V3";

						ste,config = <&gpio_in_pu>;

						ste,config = <&gpio_in_pd>;

					};

					/* GPIO 32 used for DRDY, pull this down */

					tvk_cfg2 {

						pins = "GPIO32_V2";

						ste,config = <&gpio_in_pd>;

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

+0 −18
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
				  <&vaudio_hf_hrefv60_mode>,

				  <&gbf_hrefv60_mode>,

				  <&hdtv_hrefv60_mode>,

				  <&touch_hrefv60_mode>,

				  <&gpios_hrefv60_mode>;



			sdi0 {
@@ -190,23 +189,6 @@ 
					};

				 };

			};

			touch {

				touch_hrefv60_mode: touch_hrefv60 {

					/*

					 * Touch screen uses GPIO 143 for RST1, GPIO 146 for RST2 and

					 * GPIO 67 for interrupts. Pull-up the IRQ line and drive both

					 * reset signals low.

					 */

					hrefv60_cfg1 {

						pins = "GPIO143_D12", "GPIO146_D13";

						ste,config = <&gpio_out_lo>;

					};

					hrefv60_cfg2 {

						pins = "GPIO67_G2";

						ste,config = <&gpio_in_pu>;

					};

				};

			};

			mcde {

				lcd_hrefv60_mode: lcd_hrefv60 {

					/*

arch/arm/boot/dts/ste-nomadik-s8815.dts

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ 
			label = "user_button";

			gpios = <&gpio0 3 0x1>;

			linux,code = <1>; /* KEY_ESC */

			gpio-key,wakeup;

			wakeup-source;

			pinctrl-names = "default";

			pinctrl-0 = <&user_button_default_mode>;

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE