Commit 218b2f88 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: dts: ux500: Update AB850[05] nodes 



The new YAML device tree bindings gives new and proper names
to several of the AB850[05] nodes and redefines the way we
use numbering on PWMs to use reg.

Update all the DTS nodes accordingly.

Add the missing thermal node to the AB8505.

Drop the debugfs nodes because these are not real devices.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1afc8a28

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

+20 −19
Original line number Diff line number Diff line
@@ -28,26 +28,28 @@ ab8500 { 
				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-controller;

				#interrupt-cells = <2>;

				#address-cells = <1>;

				#size-cells = <0>;



				ab8500_clock: clock-controller {

					compatible = "stericsson,ab8500-clk";

					#clock-cells = <1>;

				};



				ab8500_gpio: ab8500-gpiocontroller {

				ab8500_gpio: gpio {

					compatible = "stericsson,ab8500-gpio";

					gpio-controller;

					#gpio-cells = <2>;

				};



				ab8500-rtc {

				rtc {

					compatible = "stericsson,ab8500-rtc";

					interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,

						     <18 IRQ_TYPE_LEVEL_HIGH>;

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

				};



				gpadc: ab8500-gpadc {

				gpadc: adc {

					compatible = "stericsson,ab8500-gpadc";

					interrupts = <32 IRQ_TYPE_LEVEL_HIGH>,

						     <39 IRQ_TYPE_LEVEL_HIGH>;
@@ -120,13 +122,10 @@ bat_temp_and_ibat: channel@1f { 
					};

				};



				ab8500_temp {

				thermal {

					compatible = "stericsson,abx500-temp";

					interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "ABX500_TEMP_WARM";

					io-channels = <&gpadc 0x06>,

						      <&gpadc 0x07>;

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

				};



				ab8500_fg {
@@ -212,7 +211,7 @@ ab8500_chargalg { 
					monitored-battery	= <&battery>;

				};



				ab8500_usb: ab8500_usb {

				ab8500_usb: phy {

					compatible = "stericsson,ab8500-usb";

					interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,

						     <96 IRQ_TYPE_LEVEL_HIGH>,
@@ -236,7 +235,7 @@ ab8500_usb: ab8500_usb { 
					#phy-cells = <0>;

				};



				ab8500-ponkey {

				key {

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

					interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,

						     <7 IRQ_TYPE_LEVEL_HIGH>;
@@ -247,29 +246,31 @@ ab8500-sysctrl { 
					compatible = "stericsson,ab8500-sysctrl";

				};



				ab8500-pwm-1 {

				pwm@1 {

					compatible = "stericsson,ab8500-pwm";

					reg = <1>;

					clocks = <&ab8500_clock AB8500_SYSCLK_INT>;

					clock-names = "intclk";

					#pwm-cells = <1>;

				};



				ab8500-pwm-2 {

				pwm@2 {

					compatible = "stericsson,ab8500-pwm";

					reg = <2>;

					clocks = <&ab8500_clock AB8500_SYSCLK_INT>;

					clock-names = "intclk";

					#pwm-cells = <1>;

				};



				ab8500-pwm-3 {

				pwm@3 {

					compatible = "stericsson,ab8500-pwm";

					reg = <3>;

					clocks = <&ab8500_clock AB8500_SYSCLK_INT>;

					clock-names = "intclk";

					#pwm-cells = <1>;

				};



				ab8500-debugfs {

					compatible = "stericsson,ab8500-debug";

				};



				codec: ab8500-codec {

				codec: codec {

					compatible = "stericsson,ab8500-codec";



					V-AUD-supply = <&ab8500_ldo_audio_reg>;
@@ -283,7 +284,7 @@ codec: ab8500-codec { 
					stericsson,earpeice-cmv = <950>; /* Units in mV. */

				};



				ext_regulators: ab8500-ext-regulators {

				ext_regulators: regulator-external {

					compatible = "stericsson,ab8500-ext-regulator";



					ab8500_ext1_reg: ab8500_ext1 {
@@ -307,7 +308,7 @@ ab8500_ext3_reg: ab8500_ext3 { 
					};

				};



				ab8500-regulators {

				regulator {

					compatible = "stericsson,ab8500-regulator";

					vin-supply = <&ab8500_ext3_reg>;

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

+18 −12
Original line number Diff line number Diff line
@@ -25,26 +25,28 @@ ab8505 { 
				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-controller;

				#interrupt-cells = <2>;

				#address-cells = <1>;

				#size-cells = <0>;



				ab8500_clock: clock-controller {

					compatible = "stericsson,ab8500-clk";

					#clock-cells = <1>;

				};



				ab8505_gpio: ab8505-gpiocontroller {

				ab8505_gpio: gpio {

					compatible = "stericsson,ab8505-gpio";

					gpio-controller;

					#gpio-cells = <2>;

				};



				ab8500-rtc {

				rtc {

					compatible = "stericsson,ab8500-rtc";

					interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,

						     <18 IRQ_TYPE_LEVEL_HIGH>;

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

				};



				gpadc: ab8500-gpadc {

				gpadc: adc {

					compatible = "stericsson,ab8500-gpadc";

					interrupts = <39 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "SW_CONV_END";
@@ -92,6 +94,12 @@ usb_id: channel@e { 
					};

				};



				thermal {

					compatible = "stericsson,abx500-temp";

					interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "ABX500_TEMP_WARM";

				};



				ab8500_fg {

					compatible = "stericsson,ab8500-fg";

					interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
@@ -171,7 +179,7 @@ ab8500_chargalg { 
					monitored-battery = <&battery>;

				};



				ab8500_usb: ab8500_usb {

				ab8500_usb: phy {

					compatible = "stericsson,ab8500-usb";

					interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,

						     <96 IRQ_TYPE_LEVEL_HIGH>,
@@ -195,7 +203,7 @@ ab8500_usb: ab8500_usb { 
					#phy-cells = <0>;

				};



				ab8500-ponkey {

				key {

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

					interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,

						     <7 IRQ_TYPE_LEVEL_HIGH>;
@@ -206,17 +214,15 @@ ab8500-sysctrl { 
					compatible = "stericsson,ab8500-sysctrl";

				};



				ab8500-pwm {

				pwm@1 {

					compatible = "stericsson,ab8500-pwm";

					reg = <1>;

					clocks = <&ab8500_clock AB8500_SYSCLK_INT>;

					clock-names = "intclk";

					#pwm-cells = <1>;

				};



				ab8500-debugfs {

					compatible = "stericsson,ab8500-debug";

				};



				codec: ab8500-codec {

				codec: codec {

					compatible = "stericsson,ab8500-codec";



					V-AUD-supply = <&ab8500_ldo_audio_reg>;
@@ -229,7 +235,7 @@ codec: ab8500-codec { 
					stericsson,earpeice-cmv = <950>; /* Units in mV. */

				};



				ab8505-regulators {

				regulator {

					compatible = "stericsson,ab8505-regulator";



					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

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-gpiocontroller {

				gpio {

					/* Hog a few default settings */

					pinctrl-names = "default";

					pinctrl-0 = <&gpio2_default_mode>,

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

+3 −3
Original line number Diff line number Diff line
@@ -236,16 +236,16 @@ msp3: msp@80125000 { 


		prcmu@80157000 {

			ab8500 {

				ab8500-gpiocontroller {

				gpio {

				};



				ab8500_usb {

				phy {

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

					pinctrl-0 = <&usb_a_1_default>;

					pinctrl-1 = <&usb_a_1_sleep>;

				};



				ab8500-regulators {

				regulator {

					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

						regulator-name = "V-DISPLAY";

					};

arch/arm/boot/dts/ste-snowball.dts

+4 −4
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ spi@80002000 { 


		prcmu@80157000 {

			ab8500 {

				ab8500-gpiocontroller {

				gpio {

					/*

					 * AB8500 GPIOs are numbered starting from 1, so the first

					 * index 0 is what in the datasheet is called "GPIO1", and
@@ -423,13 +423,13 @@ ab8500-gpiocontroller { 
						     "PM_GPIO42"; /* AB8500 GPIO42 */

				};



				ab8500_usb {

				phy {

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

					pinctrl-0 = <&usb_a_1_default>;

					pinctrl-1 = <&usb_a_1_sleep>;

				};



				ext_regulators: ab8500-ext-regulators {

				ext_regulators: regulator-external {

					ab8500_ext1_reg: ab8500_ext1 {

						regulator-name = "ab8500-ext-supply1";

					};
@@ -443,7 +443,7 @@ ab8500_ext3_reg_reg: ab8500_ext3 { 
					};

				};



				ab8500-regulators {

				regulator {

					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

						regulator-name = "V-DISPLAY";

					};