Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

ARM: dts: OMAP updates for v6.20

* tag 'omap-for-v6.20/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
ARM: dts: omap: dra7: Remove bogus #syscon-cells property
ARM: dts: ti/omap: omap*: fix watchdog node names
ARM: dts: ti: Drop unused .dtsi
ARM: dts: Drop am335x-base0033 devicetree
ARM: dts: tps65910: Add gpio & interrupt properties
ARM: dts: omap: enable panic-indicator option
ARM: dts: ti/omap: omap4-epson-embt2ws: add powerbutton

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+15 -360
-1
arch/arm/boot/dts/ti/omap/Makefile
··· 86 86 am335x-baltos-ir2110.dtb \ 87 87 am335x-baltos-ir3220.dtb \ 88 88 am335x-baltos-ir5221.dtb \ 89 - am335x-base0033.dtb \ 90 89 am335x-bone.dtb \ 91 90 am335x-boneblack.dtb \ 92 91 am335x-boneblack-wireless.dtb \
+1
arch/arm/boot/dts/ti/omap/am335x-baltos-leds.dtsi
··· 22 22 linux,default-trigger = "default-on"; 23 23 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; 24 24 default-state = "on"; 25 + panic-indicator; 25 26 }; 26 27 led_wlan: led-wlan { 27 28 label = "onrisc:blue:wlan";
-92
arch/arm/boot/dts/ti/omap/am335x-base0033.dts
··· 1 - // SPDX-License-Identifier: GPL-2.0-only 2 - /* 3 - * am335x-base0033.dts - Device Tree file for IGEP AQUILA EXPANSION 4 - * 5 - * Copyright (C) 2013 ISEE 2007 SL - https://www.isee.biz 6 - */ 7 - 8 - #include "am335x-igep0033.dtsi" 9 - 10 - / { 11 - model = "IGEP COM AM335x on AQUILA Expansion"; 12 - compatible = "isee,am335x-base0033", "isee,am335x-igep0033", "ti,am33xx"; 13 - 14 - hdmi { 15 - compatible = "ti,tilcdc,slave"; 16 - i2c = <&i2c0>; 17 - pinctrl-names = "default", "off"; 18 - pinctrl-0 = <&nxp_hdmi_pins>; 19 - pinctrl-1 = <&nxp_hdmi_off_pins>; 20 - status = "okay"; 21 - }; 22 - 23 - leds_base { 24 - pinctrl-names = "default"; 25 - pinctrl-0 = <&leds_base_pins>; 26 - 27 - compatible = "gpio-leds"; 28 - 29 - led0 { 30 - label = "base:red:user"; 31 - gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; /* gpio1_21 */ 32 - default-state = "off"; 33 - }; 34 - 35 - led1 { 36 - label = "base:green:user"; 37 - gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; /* gpio2_0 */ 38 - default-state = "off"; 39 - }; 40 - }; 41 - }; 42 - 43 - &am33xx_pinmux { 44 - nxp_hdmi_pins: nxp-hdmi-pins { 45 - pinctrl-single,pins = < 46 - AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT, MUX_MODE3) /* xdma_event_intr0.clkout1 */ 47 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0) 48 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0) 49 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA2, PIN_OUTPUT, MUX_MODE0) 50 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA3, PIN_OUTPUT, MUX_MODE0) 51 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA4, PIN_OUTPUT, MUX_MODE0) 52 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA5, PIN_OUTPUT, MUX_MODE0) 53 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA6, PIN_OUTPUT, MUX_MODE0) 54 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA7, PIN_OUTPUT, MUX_MODE0) 55 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA8, PIN_OUTPUT, MUX_MODE0) 56 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA9, PIN_OUTPUT, MUX_MODE0) 57 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_OUTPUT, MUX_MODE0) 58 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE0) 59 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_OUTPUT, MUX_MODE0) 60 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE0) 61 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA14, PIN_OUTPUT, MUX_MODE0) 62 - AM33XX_PADCONF(AM335X_PIN_LCD_DATA15, PIN_OUTPUT, MUX_MODE0) 63 - AM33XX_PADCONF(AM335X_PIN_LCD_VSYNC, PIN_OUTPUT, MUX_MODE0) 64 - AM33XX_PADCONF(AM335X_PIN_LCD_HSYNC, PIN_OUTPUT, MUX_MODE0) 65 - AM33XX_PADCONF(AM335X_PIN_LCD_PCLK, PIN_OUTPUT, MUX_MODE0) 66 - AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_OUTPUT, MUX_MODE0) 67 - >; 68 - }; 69 - nxp_hdmi_off_pins: nxp-hdmi-off-pins { 70 - pinctrl-single,pins = < 71 - AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT, MUX_MODE3) /* xdma_event_intr0.clkout1 */ 72 - >; 73 - }; 74 - 75 - leds_base_pins: leds-base-pins { 76 - pinctrl-single,pins = < 77 - AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_a5.gpio1_21 */ 78 - AM33XX_PADCONF(AM335X_PIN_GPMC_CSN3, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_csn3.gpio2_0 */ 79 - >; 80 - }; 81 - }; 82 - 83 - &lcdc { 84 - status = "okay"; 85 - }; 86 - 87 - &i2c0 { 88 - eeprom: eeprom@50 { 89 - compatible = "atmel,24c256"; 90 - reg = <0x50>; 91 - }; 92 - };
-14
arch/arm/boot/dts/ti/omap/am3703.dtsi
··· 1 - // SPDX-License-Identifier: GPL-2.0-only 2 - /* 3 - * Copyright (C) 2020 André Hentschel <nerv@dawncrow.de> 4 - */ 5 - 6 - #include "omap36xx.dtsi" 7 - 8 - &iva { 9 - status = "disabled"; 10 - }; 11 - 12 - &sgx_module { 13 - status = "disabled"; 14 - };
-10
arch/arm/boot/dts/ti/omap/am3715.dtsi
··· 1 - // SPDX-License-Identifier: GPL-2.0-only 2 - /* 3 - * Copyright (C) 2020 André Hentschel <nerv@dawncrow.de> 4 - */ 5 - 6 - #include "omap36xx.dtsi" 7 - 8 - &iva { 9 - status = "disabled"; 10 - };
-1
arch/arm/boot/dts/ti/omap/dra7-l4.dtsi
··· 109 109 scm_conf1: scm_conf@1c04 { 110 110 compatible = "syscon"; 111 111 reg = <0x1c04 0x0020>; 112 - #syscon-cells = <2>; 113 112 }; 114 113 115 114 scm_conf_pcie: scm_conf@1c24 {
+1 -1
arch/arm/boot/dts/ti/omap/omap2430.dtsi
··· 332 332 interrupts = <93>; 333 333 }; 334 334 335 - wd_timer2: wdt@49016000 { 335 + wd_timer2: watchdog@49016000 { 336 336 compatible = "ti,omap2-wdt"; 337 337 ti,hwmods = "wd_timer2"; 338 338 reg = <0x49016000 0x80>;
+1 -1
arch/arm/boot/dts/ti/omap/omap3.dtsi
··· 553 553 status = "disabled"; 554 554 }; 555 555 556 - wdt2: wdt@48314000 { 556 + wdt2: watchdog@48314000 { 557 557 compatible = "ti,omap3-wdt"; 558 558 reg = <0x48314000 0x80>; 559 559 ti,hwmods = "wd_timer2";
-237
arch/arm/boot/dts/ti/omap/omap3430es1-clocks.dtsi
··· 1 - // SPDX-License-Identifier: GPL-2.0-only 2 - /* 3 - * Device Tree Source for OMAP3430 ES1 clock data 4 - * 5 - * Copyright (C) 2013 Texas Instruments, Inc. 6 - */ 7 - &cm_clocks { 8 - gfx_l3_ck: gfx_l3_ck@b10 { 9 - #clock-cells = <0>; 10 - compatible = "ti,wait-gate-clock"; 11 - clocks = <&l3_ick>; 12 - reg = <0x0b10>; 13 - ti,bit-shift = <0>; 14 - }; 15 - 16 - gfx_l3_fck: gfx_l3_fck@b40 { 17 - #clock-cells = <0>; 18 - compatible = "ti,divider-clock"; 19 - clocks = <&l3_ick>; 20 - ti,max-div = <7>; 21 - reg = <0x0b40>; 22 - ti,index-starts-at-one; 23 - }; 24 - 25 - gfx_l3_ick: gfx_l3_ick { 26 - #clock-cells = <0>; 27 - compatible = "fixed-factor-clock"; 28 - clocks = <&gfx_l3_ck>; 29 - clock-mult = <1>; 30 - clock-div = <1>; 31 - }; 32 - 33 - gfx_cg1_ck: gfx_cg1_ck@b00 { 34 - #clock-cells = <0>; 35 - compatible = "ti,wait-gate-clock"; 36 - clocks = <&gfx_l3_fck>; 37 - reg = <0x0b00>; 38 - ti,bit-shift = <1>; 39 - }; 40 - 41 - gfx_cg2_ck: gfx_cg2_ck@b00 { 42 - #clock-cells = <0>; 43 - compatible = "ti,wait-gate-clock"; 44 - clocks = <&gfx_l3_fck>; 45 - reg = <0x0b00>; 46 - ti,bit-shift = <2>; 47 - }; 48 - 49 - clock@a00 { 50 - compatible = "ti,clksel"; 51 - reg = <0xa00>; 52 - #clock-cells = <2>; 53 - #address-cells = <1>; 54 - #size-cells = <0>; 55 - 56 - d2d_26m_fck: clock-d2d-26m-fck@3 { 57 - reg = <3>; 58 - #clock-cells = <0>; 59 - compatible = "ti,wait-gate-clock"; 60 - clock-output-names = "d2d_26m_fck"; 61 - clocks = <&sys_ck>; 62 - }; 63 - 64 - fshostusb_fck: clock-fshostusb-fck@5 { 65 - reg = <5>; 66 - #clock-cells = <0>; 67 - compatible = "ti,wait-gate-clock"; 68 - clock-output-names = "fshostusb_fck"; 69 - clocks = <&core_48m_fck>; 70 - }; 71 - 72 - ssi_ssr_gate_fck_3430es1: clock-ssi-ssr-gate-fck-3430es1@0 { 73 - reg = <0>; 74 - #clock-cells = <0>; 75 - compatible = "ti,composite-no-wait-gate-clock"; 76 - clock-output-names = "ssi_ssr_gate_fck_3430es1"; 77 - clocks = <&corex2_fck>; 78 - }; 79 - }; 80 - 81 - clock@a40 { 82 - compatible = "ti,clksel"; 83 - reg = <0xa40>; 84 - #clock-cells = <2>; 85 - #address-cells = <1>; 86 - #size-cells = <0>; 87 - 88 - ssi_ssr_div_fck_3430es1: clock-ssi-ssr-div-fck-3430es1@8 { 89 - reg = <8>; 90 - #clock-cells = <0>; 91 - compatible = "ti,composite-divider-clock"; 92 - clock-output-names = "ssi_ssr_div_fck_3430es1"; 93 - clocks = <&corex2_fck>; 94 - ti,dividers = <0>, <1>, <2>, <3>, <4>, <0>, <6>, <0>, <8>; 95 - }; 96 - 97 - usb_l4_div_ick: clock-usb-l4-div-ick@4 { 98 - reg = <4>; 99 - #clock-cells = <0>; 100 - compatible = "ti,composite-divider-clock"; 101 - clock-output-names = "usb_l4_div_ick"; 102 - clocks = <&l4_ick>; 103 - ti,max-div = <1>; 104 - ti,index-starts-at-one; 105 - }; 106 - }; 107 - 108 - ssi_ssr_fck: ssi_ssr_fck_3430es1 { 109 - #clock-cells = <0>; 110 - compatible = "ti,composite-clock"; 111 - clocks = <&ssi_ssr_gate_fck_3430es1>, <&ssi_ssr_div_fck_3430es1>; 112 - }; 113 - 114 - ssi_sst_fck: ssi_sst_fck_3430es1 { 115 - #clock-cells = <0>; 116 - compatible = "fixed-factor-clock"; 117 - clocks = <&ssi_ssr_fck>; 118 - clock-mult = <1>; 119 - clock-div = <2>; 120 - }; 121 - 122 - clock@a10 { 123 - compatible = "ti,clksel"; 124 - reg = <0xa10>; 125 - #clock-cells = <2>; 126 - #address-cells = <1>; 127 - #size-cells = <0>; 128 - 129 - hsotgusb_ick_3430es1: clock-hsotgusb-ick-3430es1@4 { 130 - reg = <4>; 131 - #clock-cells = <0>; 132 - compatible = "ti,omap3-no-wait-interface-clock"; 133 - clock-output-names = "hsotgusb_ick_3430es1"; 134 - clocks = <&core_l3_ick>; 135 - }; 136 - 137 - fac_ick: clock-fac-ick@8 { 138 - reg = <8>; 139 - #clock-cells = <0>; 140 - compatible = "ti,omap3-interface-clock"; 141 - clock-output-names = "fac_ick"; 142 - clocks = <&core_l4_ick>; 143 - }; 144 - 145 - ssi_ick: clock-ssi-ick-3430es1@0 { 146 - reg = <0>; 147 - #clock-cells = <0>; 148 - compatible = "ti,omap3-no-wait-interface-clock"; 149 - clock-output-names = "ssi_ick_3430es1"; 150 - clocks = <&ssi_l4_ick>; 151 - }; 152 - 153 - usb_l4_gate_ick: clock-usb-l4-gate-ick@5 { 154 - reg = <5>; 155 - #clock-cells = <0>; 156 - compatible = "ti,composite-interface-clock"; 157 - clock-output-names = "usb_l4_gate_ick"; 158 - clocks = <&l4_ick>; 159 - }; 160 - }; 161 - 162 - ssi_l4_ick: ssi_l4_ick { 163 - #clock-cells = <0>; 164 - compatible = "fixed-factor-clock"; 165 - clocks = <&l4_ick>; 166 - clock-mult = <1>; 167 - clock-div = <1>; 168 - }; 169 - 170 - usb_l4_ick: usb_l4_ick { 171 - #clock-cells = <0>; 172 - compatible = "ti,composite-clock"; 173 - clocks = <&usb_l4_gate_ick>, <&usb_l4_div_ick>; 174 - }; 175 - 176 - clock@e00 { 177 - compatible = "ti,clksel"; 178 - reg = <0xe00>; 179 - #clock-cells = <2>; 180 - #address-cells = <1>; 181 - #size-cells = <0>; 182 - 183 - dss1_alwon_fck: clock-dss1-alwon-fck-3430es1@0 { 184 - reg = <0>; 185 - #clock-cells = <0>; 186 - compatible = "ti,gate-clock"; 187 - clock-output-names = "dss1_alwon_fck_3430es1"; 188 - clocks = <&dpll4_m4x2_ck>; 189 - ti,set-rate-parent; 190 - }; 191 - }; 192 - 193 - dss_ick: dss_ick_3430es1@e10 { 194 - #clock-cells = <0>; 195 - compatible = "ti,omap3-no-wait-interface-clock"; 196 - clocks = <&l4_ick>; 197 - reg = <0x0e10>; 198 - ti,bit-shift = <0>; 199 - }; 200 - }; 201 - 202 - &cm_clockdomains { 203 - core_l3_clkdm: core_l3_clkdm { 204 - compatible = "ti,clockdomain"; 205 - clocks = <&sdrc_ick>, <&hsotgusb_ick_3430es1>; 206 - }; 207 - 208 - gfx_3430es1_clkdm: gfx_3430es1_clkdm { 209 - compatible = "ti,clockdomain"; 210 - clocks = <&gfx_l3_ck>, <&gfx_cg1_ck>, <&gfx_cg2_ck>; 211 - }; 212 - 213 - dss_clkdm: dss_clkdm { 214 - compatible = "ti,clockdomain"; 215 - clocks = <&dss_tv_fck>, <&dss_96m_fck>, <&dss2_alwon_fck>, 216 - <&dss1_alwon_fck>, <&dss_ick>; 217 - }; 218 - 219 - d2d_clkdm: d2d_clkdm { 220 - compatible = "ti,clockdomain"; 221 - clocks = <&d2d_26m_fck>; 222 - }; 223 - 224 - core_l4_clkdm: core_l4_clkdm { 225 - compatible = "ti,clockdomain"; 226 - clocks = <&mmchs2_fck>, <&mmchs1_fck>, <&i2c3_fck>, <&i2c2_fck>, 227 - <&i2c1_fck>, <&mcspi4_fck>, <&mcspi3_fck>, 228 - <&mcspi2_fck>, <&mcspi1_fck>, <&uart2_fck>, 229 - <&uart1_fck>, <&hdq_fck>, <&mmchs2_ick>, <&mmchs1_ick>, 230 - <&hdq_ick>, <&mcspi4_ick>, <&mcspi3_ick>, 231 - <&mcspi2_ick>, <&mcspi1_ick>, <&i2c3_ick>, <&i2c2_ick>, 232 - <&i2c1_ick>, <&uart2_ick>, <&uart1_ick>, <&gpt11_ick>, 233 - <&gpt10_ick>, <&mcbsp5_ick>, <&mcbsp1_ick>, 234 - <&omapctrl_ick>, <&aes2_ick>, <&sha12_ick>, 235 - <&fshostusb_fck>, <&fac_ick>, <&ssi_ick>; 236 - }; 237 - };
+5
arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts
··· 229 229 interrupts = <11>; 230 230 }; 231 231 232 + pwrbutton { 233 + compatible = "ti,twl6030-pwrbutton"; 234 + interrupts = <0>; 235 + }; 236 + 232 237 ldo2: regulator-ldo2 { 233 238 compatible = "ti,twl6032-ldo2"; 234 239 regulator-min-microvolt = <1000000>;
+1 -1
arch/arm/boot/dts/ti/omap/omap4-l4-abe.dtsi
··· 279 279 ranges = <0x0 0x30000 0x1000>, 280 280 <0x49030000 0x49030000 0x1000>; 281 281 282 - wdt3: wdt@0 { 282 + wdt3: watchdog@0 { 283 283 compatible = "ti,omap4-wdt", "ti,omap3-wdt"; 284 284 reg = <0x0 0x80>; 285 285 interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+1 -1
arch/arm/boot/dts/ti/omap/omap4-l4.dtsi
··· 1133 1133 #size-cells = <1>; 1134 1134 ranges = <0x0 0x4000 0x1000>; 1135 1135 1136 - wdt2: wdt@0 { 1136 + wdt2: watchdog@0 { 1137 1137 compatible = "ti,omap4-wdt", "ti,omap3-wdt"; 1138 1138 reg = <0x0 0x80>; 1139 1139 interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+1 -1
arch/arm/boot/dts/ti/omap/omap5-l4.dtsi
··· 2393 2393 #size-cells = <1>; 2394 2394 ranges = <0x0 0x4000 0x1000>; 2395 2395 2396 - wdt2: wdt@0 { 2396 + wdt2: watchdog@0 { 2397 2397 compatible = "ti,omap5-wdt", "ti,omap3-wdt"; 2398 2398 reg = <0x0 0x80>; 2399 2399 interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+4
arch/arm/boot/dts/tps65910.dtsi
··· 10 10 11 11 &tps { 12 12 compatible = "ti,tps65910"; 13 + interrupt-controller; 14 + #interrupt-cells = <2>; 15 + gpio-controller; 16 + #gpio-cells = <2>; 13 17 14 18 regulators { 15 19 #address-cells = <1>;