UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Devicetree fixes for omaps for v6.2 

Two devicetree fixes for omaps. These fixes are not urgent and
 can wait for the merge window:
 
 - Fix up the node names and missing #pwm-cells property for
   ti,omap-dmtimer-pwm to avoid warnings when the the related
   yaml binding gets merged
 
 - Fix TDA998x port addressing
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAmOAd3gRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXPV7A/+LaevsMSHk5ajbicNWxa0FAVmZo/BYpt7
 NuPnNfomLKXK0Ls5anj/AQDekLNLrI+dGfFUdMtIevnwLIDbodwBJzh4A01SmE6x
 eH2FWPBwV+qEWAJd255CCxpWk6+DJdoCbdWfRx2+5aTh46saDITxzf7AZVUHqkPK
 D6egp5fgxlwAHInnqO67D0KWA5sKNVmLaC4c0soex1D6R9CY1SbxPedTSviD/uEx
 sBKZeXxwSq8kenexTVbC6FJ76V8nLaC2OfF3MSEuv9VRHwt8Z2B6Muf5BKEv/rlr
 nceHvB8iXRXHYdtjh/lfa/3PP2Gh70gGcQEkXmuPDzCnATjdesDyLf/t/M8dASmF
 Ukb3OlLWYTt0ckxK/KuX+w4aG9c6yWc7fruSZv2woKQV09MFvct9d9RQcRm5awjD
 voXyQaerceGV8e8EVOQ0i/aZvpYOtYwFQJz2w5wYvqbHMh4VEEHc/oUs02Aw4Iqd
 xAy5tYmvSpmLbpC3eeHYzjIBE9sfLwFRnsKlZfS+ylYxtx1pXeuUKCBz4z0SyRLU
 kTy3fRbxdUQahxli4EtfDwweMwumc1CAZTqbjcP04BhvI2ZQSn5inMQF2XhHt+99
 G9vyrnyopxabVoU0hpHVyoaNHFxQLos2eAz8IsiTNOwz94Yh1dg777DL3YLJz8P+
 iTeA3YnWy9M=
 =Q2be
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmOHYqQACgkQmmx57+YA
 GNn3mQ/8CSpnS5kVqJpI4FiKDdT/J20DJOH4+VeMcEW+U06vu4N3rEQceyPUA2P3
 jIEWxO0F/UtMHH+ygBTYKSrT/xnjGfcX7iiaov19/Q1x7ZApvUXplO7roaFAjlC9
 VWaDhcXECsz6/IfsJjiV+4fnJHxrLHLRYtUAM0Ix2QL/3cfQxdnLJ1Nb0jL1V9UD
 JaFut5uXeff++qcOrkluj8lxO0LJquLbJWO3aF5pDhgw9h7h5o/gvjIwCvh7C5gi
 mg5+x7WP3Qra13MEFccqUROsAotl+9mPp6KNz9SINlim9m8slOvCU0FZQrLSJnQC
 ePIvI0A58nqUlfSKirJazxFQgoqnvzIYn1fL1SRRpgLm7OIG76R67AuXKDZwsuaZ
 3j/RCWHB3kN1F24t7AkFccFXNq0fHflU9WbyJtczvHWcXBLH9yZM+HOi97sv/SQd
 Cp/h0zJE1TJTjhr9/vEVCmUSAAFoE8HFZV/dl8CteCw6o2GEWZRJ+qQS8SgBq+XP
 nxbeMP83kJvLM0/vxaH0i3hUdwJGOvsoDvRv4jkoVn/MhjbXPwje19JO0nFglVHP
 a1Ha10RbHbOFHj35HFR8EawmP5jRnAz5RhXjfknv/jSvCDtpJbncxL0x8QDBYjb4
 Pp9d17o3nJd9jFzUzjkGqaWzHWzg17JpveyIMynQ9twfveLpQ8U=
 =5YCR
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v6.2/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/dt

Devicetree fixes for omaps for v6.2

Two devicetree fixes for omaps. These fixes are not urgent and
can wait for the merge window:

- Fix up the node names and missing #pwm-cells property for
  ti,omap-dmtimer-pwm to avoid warnings when the the related
  yaml binding gets merged

- Fix TDA998x port addressing

* tag 'omap-for-v6.2/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Unify pwm-omap-dmtimer node names
  ARM: dts: am335x: Fix TDA998x ports addressing
  ARM: dts: am335x-pcm-953: Define fixed regulators in root node

Link: https://lore.kernel.org/r/pull-1669363695-856423@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-11-30 15:03:08 +01:00
parent bcbc468528 4f15fc7c0f
commit 1e52d6c811
9 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi
View File

@ -85,8 +85,13 @@
audio-ports = < TDA998x_I2S 0x03>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
hdmi_0: endpoint@0 {
reg = <0>;
hdmi_0: endpoint {
remote-endpoint = <&lcdc_0>;
};
};

3
arch/arm/boot/dts/am335x-guardian.dts
View File

@ -103,8 +103,9 @@
};
guardian_beeper: dmtimer-pwm@7 {
guardian_beeper: pwm-7 {
compatible = "ti,omap-dmtimer-pwm";
#pwm-cells = <3>;
ti,timers = <&timer7>;
pinctrl-names = "default";
pinctrl-0 = <&guardian_beeper_pins>;

7
arch/arm/boot/dts/am335x-myirtech-myd.dts
View File

@ -161,8 +161,13 @@
#sound-dai-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
hdmi_0: endpoint@0 {
reg = <0>;
hdmi_0: endpoint {
remote-endpoint = <&lcdc_0>;
};
};

28
arch/arm/boot/dts/am335x-pcm-953.dtsi
View File

@ -12,22 +12,20 @@
compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx";
/* Power */
regulators {
vcc3v3: fixedregulator@1 {
compatible = "regulator-fixed";
regulator-name = "vcc3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
};
vcc3v3: fixedregulator1 {
compatible = "regulator-fixed";
regulator-name = "vcc3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
};
vcc1v8: fixedregulator@2 {
compatible = "regulator-fixed";
regulator-name = "vcc1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
};
vcc1v8: fixedregulator2 {
compatible = "regulator-fixed";
regulator-name = "vcc1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
};
/* User IO */

2
arch/arm/boot/dts/am3517-evm.dts
View File

@ -150,7 +150,7 @@
enable-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* gpio_182 */
};
pwm11: dmtimer-pwm@11 {
pwm11: pwm-11 {
compatible = "ti,omap-dmtimer-pwm";
pinctrl-names = "default";
pinctrl-0 = <&pwm_pins>;

2
arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi
View File

@ -59,7 +59,7 @@
};
};
pwm10: dmtimer-pwm {
pwm10: pwm-10 {
compatible = "ti,omap-dmtimer-pwm";
pinctrl-names = "default";
pinctrl-0 = <&pwm_pins>;

4
arch/arm/boot/dts/motorola-mapphone-common.dtsi
View File

@ -133,7 +133,7 @@
dais = <&mcbsp2_port>, <&mcbsp3_port>;
};
pwm8: dmtimer-pwm-8 {
pwm8: pwm-8 {
pinctrl-names = "default";
pinctrl-0 = <&vibrator_direction_pin>;
@ -143,7 +143,7 @@
ti,clock-source = <0x01>;
};
pwm9: dmtimer-pwm-9 {
pwm9: pwm-9 {
pinctrl-names = "default";
pinctrl-0 = <&vibrator_enable_pin>;

2
arch/arm/boot/dts/omap3-gta04.dtsi
View File

@ -147,7 +147,7 @@
pinctrl-0 = <&backlight_pins>;
};
pwm11: dmtimer-pwm {
pwm11: pwm-11 {
compatible = "ti,omap-dmtimer-pwm";
ti,timers = <&timer11>;
#pwm-cells = <3>;

2
arch/arm/boot/dts/omap3-n900.dts
View File

@ -156,7 +156,7 @@
io-channel-names = "temp", "bsi", "vbat";
};
pwm9: dmtimer-pwm {
pwm9: pwm-9 {
compatible = "ti,omap-dmtimer-pwm";
#pwm-cells = <3>;
ti,timers = <&timer9>;