Commit fb755b07 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Some Ux500 DTS updates for v5.14:
- Fix interrupt cells, GPIO controller node names in accordance
  with new YAML schemas.
- Add proper compatible strings for Broadcomm Wifi and BT.
- Fix upp and add some mount matrices for accelerometers so
  e.g. UI:s work as they should.
- Drop the DRDY pin assignment for a non-existing pin on a
  magnetometer.

* tag 'ux500-dts-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: ux500: Fix orientation of Janice accelerometer
  ARM: dts: href: Mount matrices for TVK R2
  ARM: dts: ux500: Fix some compatible strings
  ARM: dts: ux500: Drop drdy pin assignment from magnetometer
  ARM: dts: ux500: Fix orientation of accelerometer
  ARM: dts: ux500: Rename gpio-controller node
  ARM: dts: ux500: Fix interrupt cells

Link: https://lore.kernel.org/r/CACRpkdYh9kZJU6PAxghPRGBco_61wRZgUnTZr_3qvySPCo5rBw@mail.gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 93d84763 e409c1e1

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

+14 −14
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ ab8500_clock: clock-controller { 
					#clock-cells = <1>;

				};



				ab8500_gpio: ab8500-gpio {

				ab8500_gpio: ab8500-gpiocontroller {

					compatible = "stericsson,ab8500-gpio";

					gpio-controller;

					#gpio-cells = <2>;
@@ -42,15 +42,15 @@ ab8500_gpio: ab8500-gpio { 


				ab8500-rtc {

					compatible = "stericsson,ab8500-rtc";

					interrupts = <17 IRQ_TYPE_LEVEL_HIGH

						      18 IRQ_TYPE_LEVEL_HIGH>;

					interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,

						     <18 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "60S", "ALARM";

				};



				gpadc: ab8500-gpadc {

					compatible = "stericsson,ab8500-gpadc";

					interrupts = <32 IRQ_TYPE_LEVEL_HIGH

						      39 IRQ_TYPE_LEVEL_HIGH>;

					interrupts = <32 IRQ_TYPE_LEVEL_HIGH>,

						     <39 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "HW_CONV_END", "SW_CONV_END";

					vddadc-supply = <&ab8500_ldo_tvout_reg>;

					#address-cells = <1>;
@@ -219,13 +219,13 @@ ab8500_chargalg { 


				ab8500_usb {

					compatible = "stericsson,ab8500-usb";

					interrupts = < 90 IRQ_TYPE_LEVEL_HIGH

						       96 IRQ_TYPE_LEVEL_HIGH

						       14 IRQ_TYPE_LEVEL_HIGH

						       15 IRQ_TYPE_LEVEL_HIGH

						       79 IRQ_TYPE_LEVEL_HIGH

						       74 IRQ_TYPE_LEVEL_HIGH

						       75 IRQ_TYPE_LEVEL_HIGH>;

					interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,

						     <96 IRQ_TYPE_LEVEL_HIGH>,

						     <14 IRQ_TYPE_LEVEL_HIGH>,

						     <15 IRQ_TYPE_LEVEL_HIGH>,

						     <79 IRQ_TYPE_LEVEL_HIGH>,

						     <74 IRQ_TYPE_LEVEL_HIGH>,

						     <75 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "ID_WAKEUP_R",

							  "ID_WAKEUP_F",

							  "VBUS_DET_F",
@@ -242,8 +242,8 @@ ab8500_usb { 


				ab8500-ponkey {

					compatible = "stericsson,ab8500-poweron-key";

					interrupts = <6 IRQ_TYPE_LEVEL_HIGH

						      7 IRQ_TYPE_LEVEL_HIGH>;

					interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,

						     <7 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "ONKEY_DBF", "ONKEY_DBR";

				};

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

+12 −12
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ ab8500_clock: clock-controller { 
					#clock-cells = <1>;

				};



				ab8505_gpio: ab8505-gpio {

				ab8505_gpio: ab8505-gpiocontroller {

					compatible = "stericsson,ab8505-gpio";

					gpio-controller;

					#gpio-cells = <2>;
@@ -39,8 +39,8 @@ ab8505_gpio: ab8505-gpio { 


				ab8500-rtc {

					compatible = "stericsson,ab8500-rtc";

					interrupts = <17 IRQ_TYPE_LEVEL_HIGH

						      18 IRQ_TYPE_LEVEL_HIGH>;

					interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,

						     <18 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "60S", "ALARM";

				};
@@ -182,13 +182,13 @@ ab8500_chargalg { 


				ab8500_usb: ab8500_usb {

					compatible = "stericsson,ab8500-usb";

					interrupts = < 90 IRQ_TYPE_LEVEL_HIGH

						       96 IRQ_TYPE_LEVEL_HIGH

						       14 IRQ_TYPE_LEVEL_HIGH

						       15 IRQ_TYPE_LEVEL_HIGH

						       79 IRQ_TYPE_LEVEL_HIGH

						       74 IRQ_TYPE_LEVEL_HIGH

						       75 IRQ_TYPE_LEVEL_HIGH>;

					interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,

						     <96 IRQ_TYPE_LEVEL_HIGH>,

						     <14 IRQ_TYPE_LEVEL_HIGH>,

						     <15 IRQ_TYPE_LEVEL_HIGH>,

						     <79 IRQ_TYPE_LEVEL_HIGH>,

						     <74 IRQ_TYPE_LEVEL_HIGH>,

						     <75 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "ID_WAKEUP_R",

							  "ID_WAKEUP_F",

							  "VBUS_DET_F",
@@ -205,8 +205,8 @@ ab8500_usb: ab8500_usb { 


				ab8500-ponkey {

					compatible = "stericsson,ab8500-poweron-key";

					interrupts = <6 IRQ_TYPE_LEVEL_HIGH

						      7 IRQ_TYPE_LEVEL_HIGH>;

					interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,

						     <7 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "ONKEY_DBF", "ONKEY_DBR";

				};

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

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ / { 
	soc {

		prcmu@80157000 {

			ab8500 {

				ab8500-gpio {

				ab8500-gpiocontroller {

					/* Hog a few default settings */

					pinctrl-names = "default";

					pinctrl-0 = <&gpio2_default_mode>,

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

+6 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ accelerometer@18 { 
				 * <&gpio1 0 IRQ_TYPE_EDGE_FALLING>,

				 * <&gpio2 19 IRQ_TYPE_EDGE_FALLING>;

				 */

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

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

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

			};

			magnetometer@1e {

				/* Magnetometer */
@@ -136,6 +139,9 @@ accelerometer@1c { 
				/* INT2 would need to be open drain */

				interrupts = <18 IRQ_TYPE_EDGE_RISING>,

					     <19 IRQ_TYPE_EDGE_RISING>;

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

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

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

			};

			magnetometer@f {

				/* Magnetometer */

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

+3 −1
Original line number Diff line number Diff line
@@ -89,10 +89,12 @@ accelerometer@19 { 
					     <19 IRQ_TYPE_EDGE_RISING>;

				pinctrl-names = "default";

				pinctrl-0 = <&accel_tvk_mode>;

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

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

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

			};

			magnetometer@1e {

				compatible = "st,lsm303dlm-magn";

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

				reg = <0x1e>;

				vdd-supply = <&ab8500_ldo_aux1_reg>;

				vddio-supply = <&db8500_vsmps2_reg>;