tjh.dev / kernel
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 'amlogic-arm64-dt-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt

Amlogic ARM64 DT changes for v5.19:
- DTS makefile alpsa sort
- align SPI NOR node name with dtschema
- add support for S4 power domain, gpio_intc, pinctrl
- updates and fixes for JetHub D1/H1 boards

* tag 'amlogic-arm64-dt-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
arm64: dts: meson: alpa sort the board Makefile
arm64: dts: meson: align SPI NOR node name with dtschema
arm64: dts: add support for S4 power domain controller
arm64: dts: meson-s4: add gpio_intc node
arm64: dts: meson-s4: add pinctrl node
arm64: meson: update WiFi SDIO in dts for JetHub D1
arm64: meson: update SDIO voltage in dts for JetHub D1
arm64: meson: dts: update serial alias in dts for JetHub D1
arm64: meson: add dts bluetooth node for JetHub H1

Link: https://lore.kernel.org/r/1e5179ab-2d92-0d64-c57b-e002ec2f0806@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 8b86fc33 97736c2e

+77 -30
+20 -20
arch/arm64/boot/dts/amlogic/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb 2 + dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb 3 3 dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j100.dtb 4 + dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb 4 5 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-radxa-zero.dtb 5 6 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb 6 7 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb 7 8 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb 8 - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb 9 - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb 10 - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb 11 9 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb 12 - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb 13 - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb 10 + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb 11 + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb 12 + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb 14 13 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb 14 + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb 15 + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb 15 16 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb 16 17 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb 17 18 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb ··· 20 19 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb 21 20 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p200.dtb 22 21 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p201.dtb 23 - dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-pro.dtb 24 22 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb 23 + dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-pro.dtb 25 24 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb 26 25 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb 27 26 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb 28 27 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-libretech-ac.dtb 29 - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-hwacom-amazetv.dtb 30 - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb 31 - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb 32 - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb 33 - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb 34 - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb 28 + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb 29 + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb 35 30 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-kii-pro.dtb 36 31 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb 37 32 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb 38 33 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb 39 34 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-sml5442tw.dtb 40 35 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb 41 - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb 36 + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-jethome-jethub-j80.dtb 42 37 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb 43 38 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb 44 - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb 45 - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-jethome-jethub-j80.dtb 39 + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-hwacom-amazetv.dtb 40 + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb 41 + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb 42 + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb 43 + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb 44 + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb 46 45 dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb 47 46 dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb 48 47 dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb ··· 53 52 dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb 54 53 dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb 55 54 dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb 56 - dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air.dtb 55 + dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb 57 56 dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-gbit.dtb 57 + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air.dtb 58 58 dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb 59 59 dtb-$(CONFIG_ARCH_MESON) += meson-sm1-h96-max.dtb 60 60 dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb 61 61 dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb 62 62 dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb 63 63 dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb 64 - dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air.dtb 65 64 dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-gbit.dtb 66 - dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb 67 - dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb 65 + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air.dtb
+12 -4
arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
··· 18 18 model = "JetHome JetHub J100"; 19 19 aliases { 20 20 serial0 = &uart_AO; /* Console */ 21 - serial1 = &uart_AO_B; /* External UART (Wireless Module) */ 21 + serial2 = &uart_AO_B; /* External UART (Wireless Module) */ 22 22 ethernet0 = &ethmac; 23 23 }; 24 24 ··· 81 81 vddio_boot: regulator-vddio_boot { 82 82 compatible = "regulator-fixed"; 83 83 regulator-name = "VDDIO_BOOT"; 84 + regulator-min-microvolt = <3300000>; 85 + regulator-max-microvolt = <3300000>; 86 + vin-supply = <&vddao_3v3>; 87 + regulator-always-on; 88 + }; 89 + 90 + vccq_1v8: regulator-vccq_1v8 { 91 + compatible = "regulator-fixed"; 92 + regulator-name = "VCCQ_1V8"; 84 93 regulator-min-microvolt = <1800000>; 85 94 regulator-max-microvolt = <1800000>; 86 95 vin-supply = <&vddao_3v3>; ··· 257 248 258 249 bus-width = <4>; 259 250 cap-sd-highspeed; 260 - sd-uhs-sdr104; 261 - max-frequency = <200000000>; 251 + max-frequency = <50000000>; 262 252 non-removable; 263 253 disable-wp; 264 254 ··· 290 282 mmc-pwrseq = <&emmc_pwrseq>; 291 283 292 284 vmmc-supply = <&vcc_3v3>; 293 - vqmmc-supply = <&vddio_boot>; 285 + vqmmc-supply = <&vccq_1v8>; 294 286 }; 295 287 296 288 /* UART Bluetooth */
+1 -1
arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
··· 416 416 pinctrl-names = "default"; 417 417 status = "okay"; 418 418 419 - gd25lq128: spi-flash@0 { 419 + gd25lq128: flash@0 { 420 420 compatible = "jedec,spi-nor"; 421 421 #address-cells = <1>; 422 422 #size-cells = <1>;
+1 -1
arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
··· 298 298 pinctrl-0 = <&nor_pins>; 299 299 pinctrl-names = "default"; 300 300 301 - w25q32: spi-flash@0 { 301 + w25q32: flash@0 { 302 302 #address-cells = <1>; 303 303 #size-cells = <1>; 304 304 compatible = "jedec,spi-nor";
+6
arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
··· 213 213 pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; 214 214 pinctrl-names = "default"; 215 215 uart-has-rtscts; 216 + 217 + bluetooth { 218 + compatible = "realtek,rtl8822cs-bt"; 219 + enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; 220 + host-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; 221 + }; 216 222 }; 217 223 218 224 &uart_C {
+1 -1
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
··· 284 284 pinctrl-0 = <&nor_pins>; 285 285 pinctrl-names = "default"; 286 286 287 - nor_4u1: spi-flash@0 { 287 + nor_4u1: flash@0 { 288 288 #address-cells = <1>; 289 289 #size-cells = <1>; 290 290 compatible = "jedec,spi-nor";
+1 -1
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
··· 374 374 pinctrl-0 = <&nor_pins>; 375 375 pinctrl-names = "default"; 376 376 377 - w25q32: spi-flash@0 { 377 + w25q32: flash@0 { 378 378 #address-cells = <1>; 379 379 #size-cells = <1>; 380 380 compatible = "winbond,w25q16", "jedec,spi-nor";
+1 -1
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
··· 458 458 pinctrl-0 = <&nor_pins>; 459 459 pinctrl-names = "default"; 460 460 461 - w25q128: spi-flash@0 { 461 + w25q128: flash@0 { 462 462 #address-cells = <1>; 463 463 #size-cells = <1>; 464 464 compatible = "winbond,w25q128fw", "jedec,spi-nor";
+33
arch/arm64/boot/dts/amlogic/meson-s4.dtsi
··· 5 5 6 6 #include <dt-bindings/interrupt-controller/irq.h> 7 7 #include <dt-bindings/interrupt-controller/arm-gic.h> 8 + #include <dt-bindings/gpio/gpio.h> 8 9 9 10 / { 10 11 cpus { ··· 61 60 #clock-cells = <0>; 62 61 }; 63 62 63 + pwrc: power-controller { 64 + compatible = "amlogic,meson-s4-pwrc"; 65 + #power-domain-cells = <1>; 66 + status = "okay"; 67 + }; 68 + 64 69 soc { 65 70 compatible = "simple-bus"; 66 71 #address-cells = <2>; ··· 91 84 #address-cells = <2>; 92 85 #size-cells = <2>; 93 86 ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>; 87 + 88 + periphs_pinctrl: pinctrl@4000 { 89 + compatible = "amlogic,meson-s4-periphs-pinctrl"; 90 + #address-cells = <2>; 91 + #size-cells = <2>; 92 + ranges; 93 + 94 + gpio: bank@4000 { 95 + reg = <0x0 0x4000 0x0 0x004c>, 96 + <0x0 0x40c0 0x0 0x0220>; 97 + reg-names = "mux", "gpio"; 98 + gpio-controller; 99 + #gpio-cells = <2>; 100 + gpio-ranges = <&periphs_pinctrl 0 0 82>; 101 + }; 102 + }; 103 + 104 + gpio_intc: interrupt-controller@4080 { 105 + compatible = "amlogic,meson-s4-gpio-intc", 106 + "amlogic,meson-gpio-intc"; 107 + reg = <0x0 0x4080 0x0 0x20>; 108 + interrupt-controller; 109 + #interrupt-cells = <2>; 110 + amlogic,channel-interrupts = 111 + <10 11 12 13 14 15 16 17 18 19 20 21>; 112 + }; 94 113 95 114 uart_B: serial@7a000 { 96 115 compatible = "amlogic,meson-s4-uart",
+1 -1
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
··· 121 121 pinctrl-0 = <&nor_pins>; 122 122 pinctrl-names = "default"; 123 123 124 - spi-flash@0 { 124 + flash@0 { 125 125 #address-cells = <1>; 126 126 #size-cells = <1>; 127 127 compatible = "jedec,spi-nor";