Commit 0c09604d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Ux500 DTS updates for the v5.12 kernel cycle:

- A new DTS file for the Samsung GT-I9070 (Janice)
- Fix up ADC channel name attributes
- Add charger interrupts
- Add thermistors to the HREF boards
- Remove the non-existing AB8505 HW ADC IRQ
- Push down the VMMCI setting to each board
- Add the die temperature channel to teh AB8505
- Fix up the MMC host names to follow the standard
  naming convention

* tag 'ux500-dts-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: Fix up MMC host node names
  ARM: dts: ux500: Add die temperature to AB8505
  ARM: dts: ux500: Push VMMCI down to each tree
  ARM: dts: ux500: Remove the GPADC HW IRQ
  ARM: dts: ux500: Add thermistors to the HREF
  ARM: dts: ux500: Add interrupts to charger
  ARM: dts: ux500: Fix channel names attributes
  ARM: dts: ux500: Add a device tree for Janice

Link: https://lore.kernel.org/r/CACRpkdbn=P63V9aEO2wKu2DwvVUcbjwCEV_JvKwWZ0netT75ig@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 83676118 28734f87

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1278,6 +1278,7 @@ dtb-$(CONFIG_ARCH_U8500) += \ 
	ste-hrefv60plus-tvk.dtb \

	ste-href520-tvk.dtb \

	ste-ux500-samsung-golden.dtb \

	ste-ux500-samsung-janice.dtb \

	ste-ux500-samsung-skomer.dtb

dtb-$(CONFIG_ARCH_UNIPHIER) += \

	uniphier-ld4-ref.dtb \

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

+57 −7
Original line number Diff line number Diff line
@@ -122,9 +122,11 @@ bat_temp_and_ibat: channel@1f { 


				ab8500_temp {

					compatible = "stericsson,abx500-temp";

					interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "ABX500_TEMP_WARM";

					io-channels = <&gpadc 0x06>,

						      <&gpadc 0x07>;

					io-channel-name = "aux1", "aux2";

					io-channel-names = "aux1", "aux2";

				};



				ab8500_battery: ab8500_battery {
@@ -134,29 +136,77 @@ ab8500_battery: ab8500_battery { 


				ab8500_fg {

					compatible = "stericsson,ab8500-fg";

					interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,

						     <8 IRQ_TYPE_LEVEL_HIGH>,

						     <28 IRQ_TYPE_LEVEL_HIGH>,

						     <27 IRQ_TYPE_LEVEL_HIGH>,

						     <26 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "NCONV_ACCU",

							  "BATT_OVV",

							  "LOW_BAT_F",

							  "CC_INT_CALIB",

							  "CCEOC";

					battery = <&ab8500_battery>;

					io-channels = <&gpadc 0x08>;

					io-channel-name = "main_bat_v";

					io-channel-names = "main_bat_v";

				};



				ab8500_btemp {

					compatible = "stericsson,ab8500-btemp";

					interrupts = <20 IRQ_TYPE_LEVEL_HIGH>,

						     <80 IRQ_TYPE_LEVEL_HIGH>,

						     <83 IRQ_TYPE_LEVEL_HIGH>,

						     <81 IRQ_TYPE_LEVEL_HIGH>,

						     <82 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "BAT_CTRL_INDB",

							  "BTEMP_LOW",

							  "BTEMP_HIGH",

							  "BTEMP_LOW_MEDIUM",

							  "BTEMP_MEDIUM_HIGH";

					battery = <&ab8500_battery>;

					io-channels = <&gpadc 0x02>,

						      <&gpadc 0x01>;

					io-channel-name = "btemp_ball",

					io-channel-names = "btemp_ball",

							"bat_ctrl";

				};



				ab8500_charger {

					compatible = "stericsson,ab8500-charger";

					interrupts = <10 IRQ_TYPE_LEVEL_HIGH>,

						     <11 IRQ_TYPE_LEVEL_HIGH>,

						     <0 IRQ_TYPE_LEVEL_HIGH>,

						     <107 IRQ_TYPE_LEVEL_HIGH>,

						     <106 IRQ_TYPE_LEVEL_HIGH>,

						     <14 IRQ_TYPE_LEVEL_HIGH>,

						     <15 IRQ_TYPE_LEVEL_HIGH>,

						     <79 IRQ_TYPE_LEVEL_HIGH>,

						     <105 IRQ_TYPE_LEVEL_HIGH>,

						     <104 IRQ_TYPE_LEVEL_HIGH>,

						     <89 IRQ_TYPE_LEVEL_HIGH>,

						     <22 IRQ_TYPE_LEVEL_HIGH>,

						     <21 IRQ_TYPE_LEVEL_HIGH>,

						     <16 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "MAIN_CH_UNPLUG_DET",

							  "MAIN_CHARGE_PLUG_DET",

							  "MAIN_EXT_CH_NOT_OK",

							  "MAIN_CH_TH_PROT_R",

							  "MAIN_CH_TH_PROT_F",

							  "VBUS_DET_F",

							  "VBUS_DET_R",

							  "USB_LINK_STATUS",

							  "USB_CH_TH_PROT_R",

							  "USB_CH_TH_PROT_F",

							  "USB_CHARGER_NOT_OKR",

							  "VBUS_OVV",

							  "CH_WD_EXP",

							  "VBUS_CH_DROP_END";

					battery		= <&ab8500_battery>;

					vddadc-supply	= <&ab8500_ldo_tvout_reg>;

					io-channels = <&gpadc 0x03>,

						      <&gpadc 0x0a>,

						      <&gpadc 0x09>,

						      <&gpadc 0x0b>;

					io-channel-name = "main_charger_v",

					io-channel-names = "main_charger_v",

							"main_charger_c",

							"vbus_v",

							"usb_charger_c";

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

+59 −8
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ iio-hwmon { 
			      <&gpadc 0x08>, /* Main battery voltage */

			      <&gpadc 0x09>, /* VBUS */

			      <&gpadc 0x0b>, /* Charger current */

			      <&gpadc 0x0c>; /* Backup battery voltage */

			      <&gpadc 0x0c>, /* Backup battery voltage */

			      <&gpadc 0x0d>; /* Die temperature */

	};



	soc {
@@ -45,9 +46,8 @@ ab8500-rtc { 


				gpadc: ab8500-gpadc {

					compatible = "stericsson,ab8500-gpadc";

					interrupts = <32 IRQ_TYPE_LEVEL_HIGH

						      39 IRQ_TYPE_LEVEL_HIGH>;

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

					interrupts = <39 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "SW_CONV_END";

					vddadc-supply = <&ab8500_ldo_adc_reg>;

					#address-cells = <1>;

					#size-cells = <0>;
@@ -84,42 +84,93 @@ charger_c: channel@0b { 
					bk_bat_v: channel@0c {

						reg = <0x0c>;

					};

					die_temp: channel@0d {

						reg = <0x0d>;

					};

					usb_id: channel@0e {

						reg = <0x0e>;

					};

				};



				ab8500_battery: ab8500_battery {

					status = "disabled";

					stericsson,battery-type = "LIPO";

					thermistor-on-batctrl;

				};



				ab8500_fg {

					status = "disabled";

					compatible = "stericsson,ab8500-fg";

					interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,

						     <8 IRQ_TYPE_LEVEL_HIGH>,

						     <28 IRQ_TYPE_LEVEL_HIGH>,

						     <27 IRQ_TYPE_LEVEL_HIGH>,

						     <26 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "NCONV_ACCU",

							  "BATT_OVV",

							  "LOW_BAT_F",

							  "CC_INT_CALIB",

							  "CCEOC";

					battery = <&ab8500_battery>;

					io-channels = <&gpadc 0x08>;

					io-channel-name = "main_bat_v";

					io-channel-names = "main_bat_v";

				};



				ab8500_btemp {

					status = "disabled";

					compatible = "stericsson,ab8500-btemp";

					interrupts = <20 IRQ_TYPE_LEVEL_HIGH>,

						     <80 IRQ_TYPE_LEVEL_HIGH>,

						     <83 IRQ_TYPE_LEVEL_HIGH>,

						     <81 IRQ_TYPE_LEVEL_HIGH>,

						     <82 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "BAT_CTRL_INDB",

							  "BTEMP_LOW",

							  "BTEMP_HIGH",

							  "BTEMP_LOW_MEDIUM",

							  "BTEMP_MEDIUM_HIGH";

					battery = <&ab8500_battery>;

					io-channels = <&gpadc 0x02>,

						      <&gpadc 0x01>;

					io-channel-name = "btemp_ball",

					io-channel-names = "btemp_ball",

							  "bat_ctrl";

				};



				ab8500_charger {

					status = "disabled";

					compatible = "stericsson,ab8500-charger";

					interrupts = <10 IRQ_TYPE_LEVEL_HIGH>,

						     <11 IRQ_TYPE_LEVEL_HIGH>,

						     <0 IRQ_TYPE_LEVEL_HIGH>,

						     <107 IRQ_TYPE_LEVEL_HIGH>,

						     <106 IRQ_TYPE_LEVEL_HIGH>,

						     <14 IRQ_TYPE_LEVEL_HIGH>,

						     <15 IRQ_TYPE_LEVEL_HIGH>,

						     <79 IRQ_TYPE_LEVEL_HIGH>,

						     <105 IRQ_TYPE_LEVEL_HIGH>,

						     <104 IRQ_TYPE_LEVEL_HIGH>,

						     <89 IRQ_TYPE_LEVEL_HIGH>,

						     <22 IRQ_TYPE_LEVEL_HIGH>,

						     <21 IRQ_TYPE_LEVEL_HIGH>,

						     <16 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "MAIN_CH_UNPLUG_DET",

							  "MAIN_CHARGE_PLUG_DET",

							  "MAIN_EXT_CH_NOT_OK",

							  "MAIN_CH_TH_PROT_R",

							  "MAIN_CH_TH_PROT_F",

							  "VBUS_DET_F",

							  "VBUS_DET_R",

							  "USB_LINK_STATUS",

							  "USB_CH_TH_PROT_R",

							  "USB_CH_TH_PROT_F",

							  "USB_CHARGER_NOT_OKR",

							  "VBUS_OVV",

							  "CH_WD_EXP",

							  "VBUS_CH_DROP_END";

					battery = <&ab8500_battery>;

					vddadc-supply = <&ab8500_ldo_adc_reg>;

					io-channels = <&gpadc 0x09>,

						      <&gpadc 0x0b>;

					io-channel-name = "vbus_v",

					io-channel-names = "vbus_v",

							  "usb_charger_c";

				};

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

+6 −6
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ serial2: uart@80007000 { 
			status = "disabled";

		};



		sdi0_per1@80126000 {

		mmc@80126000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80126000 0x1000>;

			interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
@@ -899,7 +899,7 @@ sdi0_per1@80126000 { 
			status = "disabled";

		};



		sdi1_per2@80118000 {

		mmc@80118000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80118000 0x1000>;

			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
@@ -915,7 +915,7 @@ sdi1_per2@80118000 { 
			status = "disabled";

		};



		sdi2_per3@80005000 {

		mmc@80005000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80005000 0x1000>;

			interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
@@ -931,7 +931,7 @@ sdi2_per3@80005000 { 
			status = "disabled";

		};



		sdi3_per2@80119000 {

		mmc@80119000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80119000 0x1000>;

			interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
@@ -947,7 +947,7 @@ sdi3_per2@80119000 { 
			status = "disabled";

		};



		sdi4_per2@80114000 {

		mmc@80114000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80114000 0x1000>;

			interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
@@ -963,7 +963,7 @@ sdi4_per2@80114000 { 
			status = "disabled";

		};



		sdi5_per3@80008000 {

		mmc@80008000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80008000 0x1000>;

			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

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

+4 −19
Original line number Diff line number Diff line
@@ -113,23 +113,8 @@ i2c@80110000 { 
			status = "okay";

		};



		/* ST6G3244ME level translator for 1.8/2.9 V */

		vmmci: regulator-gpio {

			compatible = "regulator-gpio";



			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2900000>;

			regulator-name = "mmci-reg";

			regulator-type = "voltage";



			startup-delay-us = <100>;



			states = <1800000 0x1

				  2900000 0x0>;

		};



		// External Micro SD slot

		sdi0_per1@80126000 {

		mmc@80126000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <100000000>;

			bus-width = <4>;
@@ -152,7 +137,7 @@ sdi0_per1@80126000 { 
		};



		// WLAN SDIO channel

		sdi1_per2@80118000 {

		mmc@80118000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <100000000>;

			bus-width = <4>;
@@ -165,7 +150,7 @@ sdi1_per2@80118000 { 
		};



		// PoP:ed eMMC

		sdi2_per3@80005000 {

		mmc@80005000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <100000000>;

			bus-width = <8>;
@@ -180,7 +165,7 @@ sdi2_per3@80005000 { 
		};



		// On-board eMMC

		sdi4_per2@80114000 {

		mmc@80114000 {

			arm,primecell-periphid = <0x10480180>;

		        max-frequency = <100000000>;

			bus-width = <8>;