microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

AT91 DT for 5.11 #2: 

- switch to new TCB PWM bindings
  - rework ADC bindings
  - fix sama5d2 securam and can1
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEycoQi/giopmpPgB12wIijOdRNOUFAl/MNUMACgkQ2wIijOdR
 NOV5Kw/9GqV12iNTx1com+sz1NcnWC3owpk9KNBL8WmvxWtCE2N0qyHg16gsFSMy
 b0lrmnO/xH8BlQNVICOLsPhY1RJpSSqqSCdO/HvlWb1kYJytU7Hc2ruVPbfH5K2K
 qJ8BvyNUvE9bN/TZtuiTwYOid0TnuS1D4bH/Zvoy7OPw9yyUZA0CMgAu/f/dw3Yl
 smmrC5ws2ZM/AxfqnMIQVrRzYrUaOr15sCb1uqqMDJ1mSXmWDUHsNLp75ZMpTVnd
 Dsi4wgmpkE1HDeAEorcHKwuRbpmCVxFHPd5TdsRUq94KItr/SfjkEBLFvZnF5mw9
 A9RzbqqBYqBJQmeKfUzC1c3K1fQ0Akueb9pNcdDjkkse2+TFKKLrKbL/chp8gAvJ
 Y3uAhsh1rYTrFRPEaP0+ObXCvjtfWX7bvL/1eil1a3rtW76BEWZuqxIbvmOR4mqq
 YQnyWp3Sr7YhaGR6D2BxjYyg3Ky1nHCWgUMU3iSNe0YedqEGOU2epdwPLsEToILn
 1srKfWE3i/Dw5YoQrnScPE8Er2U9iUApoDORGcGONW4KS5lWyOFFwPhz+JX7VWgo
 aj9KiPLLVz3b78NDOqb/UUIfqNqTukFAeMZ6gG//9DRu1R9e9t5dnaDegMSDFKv5
 u4A7jMi7JDG8EOWIrFSmUYaWUVYe4EH9MkZOrORxrjW0kxBWfL4=
 =Dw4H
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-12-09 00:01:58 +01:00
Родитель 49d47bf9f5 85b8350ae9
Коммит f8ff2f057e
9 изменённых файлов: 35 добавлений и 174 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

45
arch/arm/boot/dts/at91-kizbox.dts
Просмотреть файл

@ -53,43 +53,32 @@
led-1 { led-1 {
label = "pwm:green:network"; label = "pwm:green:network";
pwms = <&tcb_pwm 2 10000000 PWM_POLARITY_INVERTED>; pwms = <&tcb1_pwm1 0 10000000 PWM_POLARITY_INVERTED>;
max-brightness = <255>; max-brightness = <255>;
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
}; };
led-2 { led-2 {
label = "pwm:red:network"; label = "pwm:red:network";
pwms = <&tcb_pwm 4 10000000 PWM_POLARITY_INVERTED>; pwms = <&tcb1_pwm2 0 10000000 PWM_POLARITY_INVERTED>;
max-brightness = <255>; max-brightness = <255>;
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
}; };
led-3 { led-3 {
label = "pwm:green:user"; label = "pwm:green:user";
pwms = <&tcb_pwm 0 10000000 PWM_POLARITY_INVERTED>; pwms = <&tcb1_pwm0 0 10000000 PWM_POLARITY_INVERTED>;
max-brightness = <255>; max-brightness = <255>;
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
}; };
led-4 { led-4 {
label = "pwm:red:user"; label = "pwm:red:user";
pwms = <&tcb_pwm 1 10000000 PWM_POLARITY_INVERTED>; pwms = <&tcb1_pwm0 1 10000000 PWM_POLARITY_INVERTED>;
max-brightness = <255>; max-brightness = <255>;
linux,default-trigger = "default-on"; 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 { &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 { &ebi {
status = "okay"; status = "okay";
}; };

4
arch/arm/boot/dts/at91-sam9x60ek.dts
Просмотреть файл

@ -578,10 +578,6 @@
}; };
}; /* pinctrl */ }; /* pinctrl */
&pmc {
atmel,osc-bypass;
};
&pwm0 { &pwm0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_0 &pinctrl_pwm0_1 &pinctrl_pwm0_2 &pinctrl_pwm0_3>; pinctrl-0 = <&pinctrl_pwm0_0 &pinctrl_pwm0_1 &pinctrl_pwm0_2 &pinctrl_pwm0_3>;

25
arch/arm/boot/dts/at91sam9260.dtsi
Просмотреть файл

@ -697,8 +697,6 @@
}; };
adc0: adc@fffe0000 { adc0: adc@fffe0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,at91sam9260-adc"; compatible = "atmel,at91sam9260-adc";
reg = <0xfffe0000 0x100>; reg = <0xfffe0000 0x100>;
interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>; interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>;
@ -708,29 +706,6 @@
atmel,adc-channels-used = <0xf>; atmel,adc-channels-used = <0xf>;
atmel,adc-vref = <3300>; atmel,adc-vref = <3300>;
atmel,adc-startup-time = <15>; 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 { rtc@fffffd20 {

27
arch/arm/boot/dts/at91sam9g45.dtsi
Просмотреть файл

@ -812,8 +812,6 @@
}; };
adc0: adc@fffb0000 { adc0: adc@fffb0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,at91sam9g45-adc"; compatible = "atmel,at91sam9g45-adc";
reg = <0xfffb0000 0x100>; reg = <0xfffb0000 0x100>;
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@ -822,31 +820,6 @@
atmel,adc-channels-used = <0xff>; atmel,adc-channels-used = <0xff>;
atmel,adc-vref = <3300>; atmel,adc-vref = <3300>;
atmel,adc-startup-time = <40>; 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 { isi@fffb4000 {

25
arch/arm/boot/dts/at91sam9rl.dtsi
Просмотреть файл

@ -266,8 +266,6 @@
}; };
adc0: adc@fffd0000 { adc0: adc@fffd0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,at91sam9rl-adc"; compatible = "atmel,at91sam9rl-adc";
reg = <0xfffd0000 0x100>; reg = <0xfffd0000 0x100>;
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@ -277,29 +275,6 @@
atmel,adc-channels-used = <0x3f>; atmel,adc-channels-used = <0x3f>;
atmel,adc-vref = <3300>; atmel,adc-vref = <3300>;
atmel,adc-startup-time = <40>; 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 { usb0: gadget@fffd4000 {

28
arch/arm/boot/dts/at91sam9x5.dtsi
Просмотреть файл

@ -795,8 +795,6 @@
}; };
adc0: adc@f804c000 { adc0: adc@f804c000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,at91sam9x5-adc"; compatible = "atmel,at91sam9x5-adc";
reg = <0xf804c000 0x100>; reg = <0xf804c000 0x100>;
interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>; interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
@ -808,32 +806,6 @@
atmel,adc-vref = <3300>; atmel,adc-vref = <3300>;
atmel,adc-startup-time = <40>; atmel,adc-startup-time = <40>;
atmel,adc-sample-hold-time = <11>; atmel,adc-sample-hold-time = <11>;
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>;
};
}; };
spi0: spi@f0000000 { spi0: spi@f0000000 {

7
arch/arm/boot/dts/sama5d2.dtsi
Просмотреть файл

@ -656,6 +656,7 @@
clocks = <&pmc PMC_TYPE_PERIPHERAL 51>; clocks = <&pmc PMC_TYPE_PERIPHERAL 51>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
no-memory-wc;
ranges = <0 0xf8044000 0x1420>; ranges = <0 0xf8044000 0x1420>;
}; };
@ -724,7 +725,7 @@
can0: can@f8054000 { can0: can@f8054000 {
compatible = "bosch,m_can"; compatible = "bosch,m_can";
reg = <0xf8054000 0x4000>, <0x210000 0x4000>; reg = <0xf8054000 0x4000>, <0x210000 0x1c00>;
reg-names = "m_can", "message_ram"; reg-names = "m_can", "message_ram";
interrupts = <56 IRQ_TYPE_LEVEL_HIGH 7>, interrupts = <56 IRQ_TYPE_LEVEL_HIGH 7>,
<64 IRQ_TYPE_LEVEL_HIGH 7>; <64 IRQ_TYPE_LEVEL_HIGH 7>;
@ -1130,7 +1131,7 @@
can1: can@fc050000 { can1: can@fc050000 {
compatible = "bosch,m_can"; compatible = "bosch,m_can";
reg = <0xfc050000 0x4000>, <0x210000 0x4000>; reg = <0xfc050000 0x4000>, <0x210000 0x3800>;
reg-names = "m_can", "message_ram"; reg-names = "m_can", "message_ram";
interrupts = <57 IRQ_TYPE_LEVEL_HIGH 7>, interrupts = <57 IRQ_TYPE_LEVEL_HIGH 7>,
<65 IRQ_TYPE_LEVEL_HIGH 7>; <65 IRQ_TYPE_LEVEL_HIGH 7>;
@ -1140,7 +1141,7 @@
assigned-clocks = <&pmc PMC_TYPE_GCK 57>; assigned-clocks = <&pmc PMC_TYPE_GCK 57>;
assigned-clock-parents = <&pmc PMC_TYPE_CORE PMC_UTMI>; assigned-clock-parents = <&pmc PMC_TYPE_CORE PMC_UTMI>;
assigned-clock-rates = <40000000>; assigned-clock-rates = <40000000>;
bosch,mram-cfg = <0x1100 0 0 64 0 0 32 32>; bosch,mram-cfg = <0x1c00 0 0 64 0 0 32 32>;
status = "disabled"; status = "disabled";
}; };

26
arch/arm/boot/dts/sama5d3.dtsi
Просмотреть файл

@ -305,9 +305,7 @@
}; };
adc0: adc@f8018000 { adc0: adc@f8018000 {
#address-cells = <1>; compatible = "atmel,sama5d3-adc";
#size-cells = <0>;
compatible = "atmel,at91sam9x5-adc";
reg = <0xf8018000 0x100>; reg = <0xf8018000 0x100>;
interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>; interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
pinctrl-names = "default"; pinctrl-names = "default";
@ -333,30 +331,8 @@
atmel,adc-startup-time = <40>; atmel,adc-startup-time = <40>;
atmel,adc-use-external-triggers; atmel,adc-use-external-triggers;
atmel,adc-vref = <3000>; atmel,adc-vref = <3000>;
atmel,adc-res = <10 12>;
atmel,adc-sample-hold-time = <11>; atmel,adc-sample-hold-time = <11>;
atmel,adc-res-names = "lowres", "highres";
status = "disabled"; status = "disabled";
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>;
};
}; };
i2c2: i2c@f801c000 { i2c2: i2c@f801c000 {

22
arch/arm/boot/dts/sama5d4.dtsi
Просмотреть файл

@ -661,31 +661,9 @@
atmel,adc-startup-time = <40>; atmel,adc-startup-time = <40>;
atmel,adc-use-external-triggers; atmel,adc-use-external-triggers;
atmel,adc-vref = <3000>; atmel,adc-vref = <3000>;
atmel,adc-res = <8 10>;
atmel,adc-sample-hold-time = <11>; atmel,adc-sample-hold-time = <11>;
atmel,adc-res-names = "lowres", "highres";
atmel,adc-ts-pressure-threshold = <10000>; atmel,adc-ts-pressure-threshold = <10000>;
status = "disabled"; status = "disabled";
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>;
};
}; };
aes@fc044000 { aes@fc044000 {