Fixes for omaps for v5.1-rc cycle Few small fixes for omap variants: - Fix ams-delta gpio IDs - Add missing of_node_put for omapdss platform init code - Fix unconfigured audio regulators for two am335x boards - Fix use of wrong offset for am335x d_can clocks * tag 'omap-for-v5.1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Fix dcan clkctrl clock for am3 ARM: dts: am335x-evmsk: Correct the regulators for the audio codec ARM: dts: am335x-evm: Correct the regulators for the audio codec ARM: OMAP2+: add missing of_node_put after of_device_is_available ARM: OMAP1: ams-delta: Fix broken GPIO ID allocation
Unified · Split
| @@ -57,6 +57,24 @@ · 56 unmodified lines | |||
| 57 | enable-active-high; | 57 | enable-active-high; |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | /* TPS79501 */ | ||
| 61 | v1_8d_reg: fixedregulator-v1_8d { | ||
| 62 | compatible = "regulator-fixed"; | ||
| 63 | regulator-name = "v1_8d"; | ||
| 64 | vin-supply = <&vbat>; | ||
| 65 | regulator-min-microvolt = <1800000>; | ||
| 66 | regulator-max-microvolt = <1800000>; | ||
| 67 | }; | ||
| 68 | |||
| 69 | /* TPS79501 */ | ||
| 70 | v3_3d_reg: fixedregulator-v3_3d { | ||
| 71 | compatible = "regulator-fixed"; | ||
| 72 | regulator-name = "v3_3d"; | ||
| 73 | vin-supply = <&vbat>; | ||
| 74 | regulator-min-microvolt = <3300000>; | ||
| 75 | regulator-max-microvolt = <3300000>; | ||
| 76 | }; | ||
| 77 | |||
| 60 | matrix_keypad: matrix_keypad0 { | 78 | matrix_keypad: matrix_keypad0 { |
| 61 | compatible = "gpio-matrix-keypad"; | 79 | compatible = "gpio-matrix-keypad"; |
| 62 | debounce-delay-ms = <5>; | 80 | debounce-delay-ms = <5>; |
| @@ -499,10 +517,10 @@ · 436 unmodified lines | |||
| 499 | status = "okay"; | 517 | status = "okay"; |
| 500 | 518 | ||
| 501 | /* Regulators */ | 519 | /* Regulators */ |
| 502 | AVDD-supply = <&vaux2_reg>; | 520 | AVDD-supply = <&v3_3d_reg>; |
| 503 | IOVDD-supply = <&vaux2_reg>; | 521 | IOVDD-supply = <&v3_3d_reg>; |
| 504 | DRVDD-supply = <&vaux2_reg>; | 522 | DRVDD-supply = <&v3_3d_reg>; |
| 505 | DVDD-supply = <&vbat>; | 523 | DVDD-supply = <&v1_8d_reg>; |
| 506 | }; | 524 | }; |
| 507 | }; | 525 | }; |
| 508 | 526 | ||
| @@ -73,6 +73,24 @@ · 72 unmodified lines | |||
| 73 | enable-active-high; | 73 | enable-active-high; |
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| 76 | /* TPS79518 */ | ||
| 77 | v1_8d_reg: fixedregulator-v1_8d { | ||
| 78 | compatible = "regulator-fixed"; | ||
| 79 | regulator-name = "v1_8d"; | ||
| 80 | vin-supply = <&vbat>; | ||
| 81 | regulator-min-microvolt = <1800000>; | ||
| 82 | regulator-max-microvolt = <1800000>; | ||
| 83 | }; | ||
| 84 | |||
| 85 | /* TPS78633 */ | ||
| 86 | v3_3d_reg: fixedregulator-v3_3d { | ||
| 87 | compatible = "regulator-fixed"; | ||
| 88 | regulator-name = "v3_3d"; | ||
| 89 | vin-supply = <&vbat>; | ||
| 90 | regulator-min-microvolt = <3300000>; | ||
| 91 | regulator-max-microvolt = <3300000>; | ||
| 92 | }; | ||
| 93 | |||
| 76 | leds { | 94 | leds { |
| 77 | pinctrl-names = "default"; | 95 | pinctrl-names = "default"; |
| 78 | pinctrl-0 = <&user_leds_s0>; | 96 | pinctrl-0 = <&user_leds_s0>; |
| @@ -501,10 +519,10 @@ · 422 unmodified lines | |||
| 501 | status = "okay"; | 519 | status = "okay"; |
| 502 | 520 | ||
| 503 | /* Regulators */ | 521 | /* Regulators */ |
| 504 | AVDD-supply = <&vaux2_reg>; | 522 | AVDD-supply = <&v3_3d_reg>; |
| 505 | IOVDD-supply = <&vaux2_reg>; | 523 | IOVDD-supply = <&v3_3d_reg>; |
| 506 | DRVDD-supply = <&vaux2_reg>; | 524 | DRVDD-supply = <&v3_3d_reg>; |
| 507 | DVDD-supply = <&vbat>; | 525 | DVDD-supply = <&v1_8d_reg>; |
| 508 | }; | 526 | }; |
| 509 | }; | 527 | }; |
| 510 | 528 | ||
| @@ -1762,7 +1762,7 @@ · 1761 unmodified lines | |||
| 1762 | reg = <0xcc000 0x4>; | 1762 | reg = <0xcc000 0x4>; |
| 1763 | reg-names = "rev"; | 1763 | reg-names = "rev"; |
| 1764 | /* Domains (P, C): per_pwrdm, l4ls_clkdm */ | 1764 | /* Domains (P, C): per_pwrdm, l4ls_clkdm */ |
| 1765 | clocks = <&l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0>; | 1765 | clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>; |
| 1766 | clock-names = "fck"; | 1766 | clock-names = "fck"; |
| 1767 | #address-cells = <1>; | 1767 | #address-cells = <1>; |
| 1768 | #size-cells = <1>; | 1768 | #size-cells = <1>; |
| @@ -1785,7 +1785,7 @@ · 16 unmodified lines | |||
| 1785 | reg = <0xd0000 0x4>; | 1785 | reg = <0xd0000 0x4>; |
| 1786 | reg-names = "rev"; | 1786 | reg-names = "rev"; |
| 1787 | /* Domains (P, C): per_pwrdm, l4ls_clkdm */ | 1787 | /* Domains (P, C): per_pwrdm, l4ls_clkdm */ |
| 1788 | clocks = <&l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0>; | 1788 | clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>; |
| 1789 | clock-names = "fck"; | 1789 | clock-names = "fck"; |
| 1790 | #address-cells = <1>; | 1790 | #address-cells = <1>; |
| 1791 | #size-cells = <1>; | 1791 | #size-cells = <1>; |
| @@ -182,6 +182,7 @@ static struct resource latch1_resources[] = { · 181 unmodified lines | |||
| 182 | 182 | ||
| 183 | static struct bgpio_pdata latch1_pdata = { | 183 | static struct bgpio_pdata latch1_pdata = { |
| 184 | .label = LATCH1_LABEL, | 184 | .label = LATCH1_LABEL, |
| 185 | .base = -1, | ||
| 185 | .ngpio = LATCH1_NGPIO, | 186 | .ngpio = LATCH1_NGPIO, |
| 186 | }; | 187 | }; |
| 187 | 188 | ||
| @@ -219,6 +220,7 @@ static struct resource latch2_resources[] = { · 31 unmodified lines | |||
| 219 | 220 | ||
| 220 | static struct bgpio_pdata latch2_pdata = { | 221 | static struct bgpio_pdata latch2_pdata = { |
| 221 | .label = LATCH2_LABEL, | 222 | .label = LATCH2_LABEL, |
| 223 | .base = -1, | ||
| 222 | .ngpio = LATCH2_NGPIO, | 224 | .ngpio = LATCH2_NGPIO, |
| 223 | }; | 225 | }; |
| 224 | 226 | ||
| @@ -250,8 +250,10 @@ static int __init omapdss_init_of(void) · 249 unmodified lines | |||
| 250 | if (!node) | 250 | if (!node) |
| 251 | return 0; | 251 | return 0; |
| 252 | 252 | ||
| 253 | if (!of_device_is_available(node)) | 253 | if (!of_device_is_available(node)) { |
| 254 | of_node_put(node); | ||
| 254 | return 0; | 255 | return 0; |
| 256 | } | ||
| 255 | 257 | ||
| 256 | pdev = of_find_device_by_node(node); | 258 | pdev = of_find_device_by_node(node); |
| 257 | 259 | ||