Commit f8ff2f05 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt 

AT91 DT for 5.11 #2:

 - switch to new TCB PWM bindings
 - rework ADC bindings
 - fix sama5d2 securam and can1

* tag 'at91-dt-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d2: fix CAN message ram offset and size
  ARM: dts: at91: sama5d2: map securam as device
  ARM: dts: at91: sam9x60ek: remove bypass property
  ARM: dts: at91: remove deprecated ADC properties
  ARM: dts: at91: at91sam9rl: fix ADC triggers
  ARM: dts: at91: sama5d3: use proper ADC compatible
  ARM: dts: at91: kizbox: switch to new pwm-atmel-tcb binding

Link: https://lore.kernel.org/r/20201206013840.GA627225@piout.net


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 49d47bf9 85b8350a

arch/arm/boot/dts/at91-kizbox.dts

+30 −15
Original line number Diff line number Diff line
@@ -53,43 +53,32 @@ 


		led-1 {

			label = "pwm:green:network";

			pwms = <&tcb_pwm 2 10000000 PWM_POLARITY_INVERTED>;

			pwms = <&tcb1_pwm1 0 10000000 PWM_POLARITY_INVERTED>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



		led-2 {

			label = "pwm:red:network";

			pwms = <&tcb_pwm 4 10000000 PWM_POLARITY_INVERTED>;

			pwms = <&tcb1_pwm2 0 10000000 PWM_POLARITY_INVERTED>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



		led-3 {

			label = "pwm:green:user";

			pwms = <&tcb_pwm 0 10000000 PWM_POLARITY_INVERTED>;

			pwms = <&tcb1_pwm0 0 10000000 PWM_POLARITY_INVERTED>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



		led-4 {

			label = "pwm:red:user";

			pwms = <&tcb_pwm 1 10000000 PWM_POLARITY_INVERTED>;

			pwms = <&tcb1_pwm0 1 10000000 PWM_POLARITY_INVERTED>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};

	};



	tcb_pwm: pwm {

		compatible = "atmel,tcb-pwm";

		#pwm-cells = <3>;

		tc-block = <1>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_tcb1_tioa0

			     &pinctrl_tcb1_tioa1

			     &pinctrl_tcb1_tioa2

			     &pinctrl_tcb1_tiob0>;

	};

};



&tcb0 {
@@ -104,6 +93,32 @@ 
	};

};



&tcb1 {

	tcb1_pwm0: pwm@0 {

		compatible = "atmel,tcb-pwm";

		reg = <0>;

		#pwm-cells = <3>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_tcb1_tioa0 &pinctrl_tcb1_tiob0>;

	};



	tcb1_pwm1: pwm@1 {

		compatible = "atmel,tcb-pwm";

		reg = <1>;

		#pwm-cells = <3>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_tcb1_tioa1>;

	};



	tcb1_pwm2: pwm@2 {

		compatible = "atmel,tcb-pwm";

		reg = <2>;

		#pwm-cells = <3>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_tcb1_tioa2>;

	};

};



&ebi {

	status = "okay";

};

arch/arm/boot/dts/at91-sam9x60ek.dts

+0 −4
Original line number Diff line number Diff line
@@ -578,10 +578,6 @@ 
	};

}; /* pinctrl */



&pmc {

	atmel,osc-bypass;

};



&pwm0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_pwm0_0 &pinctrl_pwm0_1 &pinctrl_pwm0_2 &pinctrl_pwm0_3>;

arch/arm/boot/dts/at91sam9260.dtsi

+0 −25
Original line number Diff line number Diff line
@@ -697,8 +697,6 @@ 
			};



			adc0: adc@fffe0000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91sam9260-adc";

				reg = <0xfffe0000 0x100>;

				interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -708,29 +706,6 @@ 
				atmel,adc-channels-used = <0xf>;

				atmel,adc-vref = <3300>;

				atmel,adc-startup-time = <15>;

				atmel,adc-res = <8 10>;

				atmel,adc-res-names = "lowres", "highres";

				atmel,adc-use-res = "highres";



				trigger0 {

					trigger-name = "timer-counter-0";

					trigger-value = <0x1>;

				};

				trigger1 {

					trigger-name = "timer-counter-1";

					trigger-value = <0x3>;

				};



				trigger2 {

					trigger-name = "timer-counter-2";

					trigger-value = <0x5>;

				};



				trigger3 {

					trigger-name = "external";

					trigger-value = <0xd>;

					trigger-external;

				};

			};



			rtc@fffffd20 {

arch/arm/boot/dts/at91sam9g45.dtsi

+0 −27
Original line number Diff line number Diff line
@@ -812,8 +812,6 @@ 
			};



			adc0: adc@fffb0000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91sam9g45-adc";

				reg = <0xfffb0000 0x100>;

				interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -822,31 +820,6 @@ 
				atmel,adc-channels-used = <0xff>;

				atmel,adc-vref = <3300>;

				atmel,adc-startup-time = <40>;

				atmel,adc-res = <8 10>;

				atmel,adc-res-names = "lowres", "highres";

				atmel,adc-use-res = "highres";



				trigger0 {

					trigger-name = "external-rising";

					trigger-value = <0x1>;

					trigger-external;

				};

				trigger1 {

					trigger-name = "external-falling";

					trigger-value = <0x2>;

					trigger-external;

				};



				trigger2 {

					trigger-name = "external-any";

					trigger-value = <0x3>;

					trigger-external;

				};



				trigger3 {

					trigger-name = "continuous";

					trigger-value = <0x6>;

				};

			};



			isi@fffb4000 {

arch/arm/boot/dts/at91sam9rl.dtsi

+0 −25
Original line number Diff line number Diff line
@@ -266,8 +266,6 @@ 
			};



			adc0: adc@fffd0000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91sam9rl-adc";

				reg = <0xfffd0000 0x100>;

				interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -277,29 +275,6 @@ 
				atmel,adc-channels-used = <0x3f>;

				atmel,adc-vref = <3300>;

				atmel,adc-startup-time = <40>;

				atmel,adc-res = <8 10>;

				atmel,adc-res-names = "lowres", "highres";

				atmel,adc-use-res = "highres";



				trigger0 {

					trigger-name = "timer-counter-0";

					trigger-value = <0x1>;

				};

				trigger1 {

					trigger-name = "timer-counter-1";

					trigger-value = <0x3>;

				};



				trigger2 {

					trigger-name = "timer-counter-2";

					trigger-value = <0x5>;

				};



				trigger3 {

					trigger-name = "external";

					trigger-value = <0x13>;

					trigger-external;

				};

			};



			usb0: gadget@fffd4000 {