diff --git a/arch/arm64/boot/dts/sunxi/sun50i-h618-bananapi-m4berry.dts b/arch/arm64/boot/dts/sunxi/sun50i-h618-bananapi-m4berry.dts index 62e6442e7fc8..1b88844b747b 100644 --- a/arch/arm64/boot/dts/sunxi/sun50i-h618-bananapi-m4berry.dts +++ b/arch/arm64/boot/dts/sunxi/sun50i-h618-bananapi-m4berry.dts @@ -4,7 +4,7 @@ interrupt-parent = <0x1>; #address-cells = <0x2>; #size-cells = <0x2>; - model = "Banana Pi M4 Berry"; + model = "Banana Pi M4 Zero"; compatible = "allwinner,h616", "arm,sun50iw9p1"; aliases { @@ -23,14 +23,17 @@ pwm5 = "/soc@3000000/pwm5@300a015"; ir0 = "/soc@3000000/s_cir@7040000"; mmc0 = "/soc@3000000/sdmmc@4020000"; + mmc1 = "/soc@3000000/sdmmc@4021000"; mmc2 = "/soc@3000000/sdmmc@4022000"; tv0 = "/soc@3000000/tv0@6520000"; gmac0 = "/soc@3000000/eth@5020000"; gmac1 = "/soc@3000000/eth@5030000"; ac200 = "/soc@3000000/ac200"; + nand0 = "/soc@3000000/nand0@4011000"; ve0 = "/soc@3000000/ve@1c0e000"; ve1 = "/soc@3000000/ve1@1c0e000"; disp = "/uboot_disp@1000000"; + lcd0 = "/soc@3000000/lcd0@1c0c000"; pmu0 = "/soc@3000000/twi@7081400/pmu"; standby_param = "/soc@3000000/twi@7081400/pmu/standby_param"; hdmi = "/uboot_hdmi@6000000"; @@ -245,11 +248,11 @@ opp@1512000000 { opp-hz = <0x0 0x5a1f4a00>; - opp-microvolt-a0 = <0x10c8e0>; - opp-microvolt-a1 = <0x10c8e0>; - opp-microvolt-a2 = <0x10c8e0>; - opp-microvolt-a3 = <0x10c8e0>; - opp-microvolt-a4 = <0x10c8e0>; + opp-microvolt-a0 = <0x118c30>; + opp-microvolt-a1 = <0x118c30>; + opp-microvolt-a2 = <0x118c30>; + opp-microvolt-a3 = <0x118c30>; + opp-microvolt-a4 = <0x118c30>; clock-latency-ns = <0x3b9b0>; opp-supported-hw = <0x1f>; }; @@ -476,6 +479,47 @@ }; }; + lcd0@1c0c000 { + compatible = "allwinner,sunxi-lcd0"; + reg = <0x0 0x1c0c000 0x0 0x0>; + pinctrl-names = "active", "sleep"; + lcd_used = <0x0>; + lcd_driver_name = "default_lcd"; + lcd_backlight = <0x32>; + lcd_if = <0x0>; + lcd_x = <0x500>; + lcd_y = <0x2d0>; + lcd_width = <0x96>; + lcd_height = <0x5e>; + lcd_dclk_freq = <0x46>; + lcd_pwm_used = <0x0>; + lcd_pwm_ch = <0x0>; + lcd_pwm_freq = <0xc350>; + lcd_pwm_pol = <0x0>; + lcd_pwm_max_limit = <0xff>; + lcd_hbp = <0x14>; + lcd_ht = <0x58a>; + lcd_hspw = <0xa>; + lcd_vbp = <0xa>; + lcd_vt = <0x32e>; + lcd_vspw = <0x5>; + lcd_lvds_if = <0x0>; + lcd_lvds_colordepth = <0x0>; + lcd_lvds_mode = <0x0>; + lcd_frm = <0x0>; + lcd_hv_clk_phase = <0x0>; + lcd_hv_sync_polarity = <0x0>; + lcd_gamma_en = <0x0>; + lcd_bright_curve_en = <0x0>; + lcd_cmap_en = <0x0>; + deu_mode = <0x0>; + lcdgamma4iep = <0x16>; + smart_color = <0x5a>; + lcd_pin_power = "bldo1"; + lcd_power = "dc1sw"; + phandle = <0x81>; + }; + tv0@6520000 { compatible = "allwinner,sunxi-tv"; reg = <0x0 0x6520000 0x0 0x100 0x0 0x6524000 0x0 0x3fc>; @@ -676,8 +720,8 @@ reg = <0x0 0x0300a011 0x0 0x4>; reg_base = <0x0300a000>; pinctrl-names = "active", "sleep"; - pinctrl-0 = <&pwm1_pin_a>; - pinctrl-1 = <&pwm1_pin_b>; + pinctrl-0 = <&pwm1_ph_pin_a>; + pinctrl-1 = <&pwm1_ph_pin_b>; status = "disabled"; }; @@ -686,8 +730,8 @@ reg = <0x0 0x0300a012 0x0 0x4>; reg_base = <0x0300a000>; pinctrl-names = "active", "sleep"; - pinctrl-0 = <&pwm2_pin_a>; - pinctrl-1 = <&pwm2_pin_b>; + pinctrl-0 = <&pwm2_ph_pin_a>; + pinctrl-1 = <&pwm2_ph_pin_b>; status = "disabled"; }; @@ -696,8 +740,8 @@ reg = <0x0 0x0300a013 0x0 0x4>; reg_base = <0x0300a000>; pinctrl-names = "active", "sleep"; - pinctrl-0 = <&pwm3_pin_a>; - pinctrl-1 = <&pwm3_pin_b>; + pinctrl-0 = <&pwm3_ph_pin_a>; + pinctrl-1 = <&pwm3_ph_pin_b>; status = "disabled"; }; @@ -706,8 +750,8 @@ reg = <0x0 0x0300a014 0x0 0x4>; reg_base = <0x0300a000>; pinctrl-names = "active", "sleep"; - pinctrl-0 = <&pwm4_pin_a>; - pinctrl-1 = <&pwm4_pin_b>; + pinctrl-0 = <&pwm4_ph_pin_a>; + pinctrl-1 = <&pwm4_ph_pin_b>; status = "disabled"; }; @@ -723,9 +767,9 @@ ac200 { compatible = "allwinner,sunxi-ac200"; - status = "disabled"; - tv_used = <0x0>; - tv_twi_used = <0x0>; + status = "okay"; + tv_used = <0x1>; + tv_twi_used = <0x1>; tv_twi_id = <0x3>; tv_twi_addr = <0x10>; tv_pwm_ch = <0x5>; @@ -747,14 +791,14 @@ vcc-pg-supply = <0x17>; phandle = <0x23>; - uart0-ph-pins { + uart0_ph_pins_a: uart0-ph-pins { pins = "PH0", "PH1"; function = "uart0"; bias-pull-up; phandle = <0x29>; }; - uart0-ph-sleep { + uart0_ph_pins_b: uart0-ph-sleep { pins = "PH0", "PH1"; function = "gpio_in"; phandle = <0x2a>; @@ -872,61 +916,67 @@ phandle = <0x28>; }; - uart1-ph-pins { + uart1_ph_pins_a: uart1-ph-pins { pins = "PG6", "PG7", "PG8", "PG9"; function = "uart1"; phandle = <0x2b>; }; - uart1-ph-sleep { + uart1_ph_pins_b: uart1-ph-sleep { pins = "PG6", "PG7", "PG8", "PG9"; function = "gpio_in"; phandle = <0x2c>; }; - uart2-ph-pins { + uart2_ph_pins_a: uart2-ph-pins { pins = "PH5", "PH6"; function = "uart2"; phandle = <0x2d>; }; - uart2-ph-sleep { + uart2_pi_pins_a: uart2-pi-pins { + pins = "PI5", "PI6"; + function = "uart2"; + }; + + uart2_pi_pins_b: uart2-pi-sleep { + pins = "PI5", "PI6"; + function = "gpio_in"; + }; + + uart2_ph_pins_b: uart2-ph-sleep { pins = "PH5", "PH6"; function = "gpio_in"; phandle = <0x2e>; }; - uart3-ph-pins { + uart3_pi_pins_a: uart3-pi-pins { pins = "PI9", "PI10"; function = "uart3"; - phandle = <0x2f>; }; - uart3-ph-sleep { + uart3_pi_pins_b: uart3-pi-sleep { pins = "PI9", "PI10"; function = "gpio_in"; - phandle = <0x30>; }; - uart4-ph-pins { + uart4_pi_pins_a: uart4-pi-pins { pins = "PI13", "PI14"; function = "uart4"; - phandle = <0x31>; }; - uart4-ph-sleep { + uart4_pi_pins_b: uart4-pi-sleep { pins = "PI13", "PI14"; function = "gpio_in"; - phandle = <0x32>; }; - uart5-ph-pins { + uart5_ph_pins_a: uart5-ph-pins { pins = "PH2", "PH3"; function = "uart5"; phandle = <0x33>; }; - uart5-ph-sleep { + uart5_ph_pins_b: uart5-ph-sleep { pins = "PH2", "PH3"; function = "gpio_in"; phandle = <0x34>; @@ -946,35 +996,44 @@ phandle = <0x65>; }; - twi0@0 { + twi0_pi_pins_a: twi0-pi-pins-a@0 { pins = "PI5", "PI6"; function = "twi0"; drive-strength = <0xa>; bias-pull-up; - phandle = <0x36>; }; - twi0@1 { + twi0_pi_pins_b: twi0-pi-pins-b@1 { pins = "PI5", "PI6"; function = "gpio_in"; - phandle = <0x37>; }; - twi1@0 { + twi1_ph_pins_a: twi1-ph-pins-a@0 { pins = "PH0", "PH1"; function = "twi1"; drive-strength = <0xa>; bias-pull-up; - phandle = <0x38>; }; - twi1@1 { + twi1_ph_pins_b: twi1-ph-pins-b@0 { pins = "PH0", "PH1"; function = "gpio_in"; phandle = <0x39>; }; - twi2@0 { + twi1_pi_pins_a: twi1-pi-pins-a@0 { + pins = "PI7", "PI8"; + function = "twi1"; + drive-strength = <0xa>; + bias-pull-up; + }; + + twi1_pi_pins_b: twi1-pi-pins-b@0 { + pins = "PI7", "PI8"; + function = "gpio_in"; + }; + + twi2_ph_pins_a: twi2-ph-pins-a@0 { pins = "PH2", "PH3"; function = "twi2"; drive-strength = <0xa>; @@ -982,13 +1041,25 @@ phandle = <0x3a>; }; - twi2@1 { + twi2_ph_pins_b: twi2-ph-pins-b@0 { pins = "PH2", "PH3"; function = "gpio_in"; phandle = <0x3b>; }; - twi3@0 { + twi2_pi_pins_a: twi2-pi-pins-a@0 { + pins = "PI9", "PI10"; + function = "twi2"; + drive-strength = <0xa>; + bias-pull-up; + }; + + twi2_pi_pins_b: twi2-pi-pins-b@0 { + pins = "PI9", "PI10"; + function = "gpio_in"; + }; + + twi3_ph_pins_a: twi3-ph-pins-a@0 { pins = "PH4", "PH5"; function = "twi3"; drive-strength = <0xa>; @@ -996,13 +1067,13 @@ phandle = <0x3c>; }; - twi3@1 { + twi3_ph_pins_b: twi3-ph-pins-b@0 { pins = "PH4", "PH5"; function = "gpio_in"; phandle = <0x3d>; }; - twi4@0 { + twi4_ph_pins_a: twi4-ph-pins-a@0 { pins = "PH6", "PH7"; function = "twi4"; drive-strength = <0xa>; @@ -1010,7 +1081,7 @@ phandle = <0x3e>; }; - twi4@1 { + twi4_ph_pins_b: twi4-ph-pins-b@0 { pins = "PH6", "PH7"; function = "gpio_in"; phandle = <0x3f>; @@ -1038,26 +1109,30 @@ phandle = <0x44>; }; - spi1@0 { + spi1_pins_a: spi1-pins-a { pins = "PH6", "PH7", "PH8"; function = "spi1"; drive-strength = <0x14>; - phandle = <0x45>; }; - spi1@1 { + spi1_cs0_pin: spi1-cs0-pin { + pins = "PH5"; + function = "spi1"; + drive-strength = <0x14>; + bias-pull-up; + }; + + spi1_cs1_pin: spi1-cs1-pin { pins = "PH9"; function = "spi1"; drive-strength = <0x14>; bias-pull-up; - phandle = <0x46>; }; - spi1@2 { - pins = "PH6", "PH7", "PH8", "PH9"; + spi1_pins_b: spi1-pins-b { + pins = "PH6", "PH7", "PH8"; function = "gpio_in"; drive-strength = <0x14>; - phandle = <0x47>; }; gmac0@0 { @@ -1075,83 +1150,128 @@ }; gmac1@0 { - allwinner,pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9"; - allwinner,function = "gmac1"; - allwinner,muxsel = <0x2>; - allwinner,drive = <0x3>; - allwinner,pull = <0x0>; + pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9"; + function = "gmac1"; + drive-strength = <10>; + bias-pull-up; phandle = <0x60>; }; gmac1@1 { - allwinner,pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9"; - allwinner,function = "gpio_in"; - allwinner,muxsel = <0x0>; - allwinner,drive = <0x3>; - allwinner,pull = <0x0>; + pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9"; + function = "gpio_in"; + drive-strength = <10>; phandle = <0x61>; }; - pwm0_pin_a: pwm0@0 { + pwm0_pin_a: pwm0-pin-a@0 { pins = "PD28"; function = "pwm0"; drive-strength = <10>; bias-pull-up; }; - pwm0_pin_b: pwm0@1 { + pwm0_pin_b: pwm0-pin-b@0 { pins = "PD28"; function = "gpio_in"; }; - pwm1_pin_a: pwm1@0 { + pwm1_ph_pin_a: pwm1-ph-pin-a@0 { pins = "PH3"; function = "pwm1"; drive-strength = <10>; bias-pull-up; }; - pwm1_pin_b: pwm1@1 { + pwm1_ph_pin_b: pwm1-ph-pin-b@0 { pins = "PH3"; function = "gpio_in"; }; - pwm2_pin_a: pwm2@0 { + pwm2_ph_pin_a: pwm2-ph-pin-a@0 { pins = "PH2"; function = "pwm2"; drive-strength = <10>; bias-pull-up; }; - pwm2_pin_b: pwm2@1 { + pwm2_ph_pin_b: pwm2-ph-pin-b@0 { pins = "PH2"; function = "gpio_in"; }; - pwm3_pin_a: pwm3@0 { + pwm3_ph_pin_a: pwm3-ph-pin-a@0 { pins = "PH0"; function = "pwm3"; drive-strength = <10>; bias-pull-up; }; - pwm3_pin_b: pwm3@1 { + pwm3_ph_pin_b: pwm3-ph-pin-b@0 { pins = "PH0"; function = "gpio_in"; }; - pwm4_pin_a: pwm4@0 { + pwm4_ph_pin_a: pwm4-ph-pin-a@0 { pins = "PH1"; function = "pwm4"; drive-strength = <10>; bias-pull-up; }; - pwm4_pin_b: pwm4@1 { + pwm4_ph_pin_b: pwm4-ph-pin-b@0 { pins = "PH1"; function = "gpio_in"; }; + pwm1_pi_pin_a: pwm1-pi-pin-a@0 { + pins = "PI11"; + function = "pwm1"; + drive-strength = <10>; + bias-pull-up; + }; + + pwm1_pi_pin_b: pwm1-pi-pin-b@0 { + pins = "PI11"; + function = "gpio_in"; + }; + + pwm2_pi_pin_a: pwm2-pi-pin-a@0 { + pins = "PI12"; + function = "pwm2"; + drive-strength = <10>; + bias-pull-up; + }; + + pwm2_pi_pin_b: pwm2-pi-pin-b@0 { + pins = "PI12"; + function = "gpio_in"; + }; + + pwm3_pi_pin_a: pwm3-pi-pin-a@0 { + pins = "PI13"; + function = "pwm3"; + drive-strength = <10>; + bias-pull-up; + }; + + pwm3_pi_pin_b: pwm3-pi-pin-b@0 { + pins = "PI13"; + function = "gpio_in"; + }; + + pwm4_pi_pin_a: pwm4-pi-pin-a@0 { + pins = "PI14"; + function = "pwm4"; + drive-strength = <10>; + bias-pull-up; + }; + + pwm4_pi_pin_b: pwm4-pi-pin-b@0 { + pins = "PI14"; + function = "gpio_in"; + }; + pwm5_pin_a: pwm5@0 { pins = "PA12"; function = "pwm5"; @@ -1399,7 +1519,7 @@ sd-uhs-ddr50; sd-uhs-sdr104; vmmc-supply = <0x1c>; - cd-gpios = <0x23 0x5 0x6 0x0>; /* PF6 */ + cd-gpios = <0x23 0x5 0x6 0x0>; /* PF6 */ phandle = <0x96>; }; @@ -1424,7 +1544,7 @@ sunxi-dly-52M-ddr4 = <0x1 0x0 0x0 0x0 0x2>; sunxi-dly-104M = <0x1 0x0 0x0 0x0 0x1>; sunxi-dly-208M = <0x1 0x0 0x0 0x0 0x1>; - status = "disabled"; + status = "okay"; no-sd; sd-uhs-sdr12; sd-uhs-sdr25; @@ -1473,7 +1593,7 @@ phandle = <0x99>; }; - uart@5000000 { + uart0: uart@5000000 { compatible = "allwinner,sun50i-uart"; reg = <0x0 0x5000000 0x0 0x400>; interrupts = <0x0 0x0 0x4>; @@ -1488,7 +1608,7 @@ phandle = <0x9a>; }; - uart@5000400 { + uart1: uart@5000400 { compatible = "allwinner,sun50i-uart"; reg = <0x0 0x5000400 0x0 0x400>; interrupts = <0x0 0x1 0x4>; @@ -1505,7 +1625,7 @@ phandle = <0x9b>; }; - uart@5000800 { + uart2: uart@5000800 { compatible = "allwinner,sun50i-uart"; reg = <0x0 0x5000800 0x0 0x400>; interrupts = <0x0 0x2 0x4>; @@ -1521,7 +1641,7 @@ phandle = <0x9c>; }; - uart@5000c00 { + uart3: uart@5000c00 { compatible = "allwinner,sun50i-uart"; reg = <0x0 0x5000c00 0x0 0x400>; interrupts = <0x0 0x3 0x4>; @@ -1537,7 +1657,7 @@ phandle = <0x9d>; }; - uart@5001000 { + uart4: uart@5001000 { compatible = "allwinner,sun50i-uart"; reg = <0x0 0x5001000 0x0 0x400>; interrupts = <0x0 0x4 0x4>; @@ -1553,7 +1673,7 @@ phandle = <0x9e>; }; - uart@5001400 { + uart5: uart@5001400 { compatible = "allwinner,sun50i-uart"; reg = <0x0 0x5001400 0x0 0x400>; interrupts = <0x0 0x5 0x4>; @@ -1562,14 +1682,14 @@ uart5_port = <0x5>; uart5_type = <0x2>; sunxi,uart-fifosize = <0x100>; - status = "okay"; + status = "disabled"; pinctrl-names = "default", "sleep"; pinctrl-0 = <0x33>; pinctrl-1 = <0x34>; phandle = <0x9f>; }; - twi@5002000 { + twi0: twi@5002000 { #address-cells = <0x1>; #size-cells = <0x0>; compatible = "allwinner,sun50i-twi"; @@ -1596,7 +1716,7 @@ }; }; - twi@5002400 { + twi1: twi@5002400 { #address-cells = <0x1>; #size-cells = <0x0>; compatible = "allwinner,sun50i-twi"; @@ -1617,7 +1737,7 @@ phandle = <0xa1>; }; - twi@5002800 { + twi2: twi@5002800 { #address-cells = <0x1>; #size-cells = <0x0>; compatible = "allwinner,sun50i-twi"; @@ -1638,7 +1758,7 @@ phandle = <0xa2>; }; - twi@5002c00 { + twi3: twi@5002c00 { #address-cells = <0x1>; #size-cells = <0x0>; compatible = "allwinner,sun50i-twi"; @@ -1650,7 +1770,7 @@ resets = <0x2 0x1a>; dmas = <0x35 0x2e 0x35 0x2e>; dma-names = "tx", "rx"; - status = "okay"; + status = "disabled"; clock-frequency = <0x61a80>; pinctrl-0 = <0x3c>; pinctrl-1 = <0x3d>; @@ -1659,7 +1779,7 @@ phandle = <0xa3>; }; - twi@5003000 { + twi4: twi@5003000 { #address-cells = <0x1>; #size-cells = <0x0>; compatible = "allwinner,sun50i-twi"; @@ -1680,7 +1800,7 @@ phandle = <0xa4>; }; - twi@7081400 { + twi5: twi@7081400 { #address-cells = <0x1>; #size-cells = <0x0>; compatible = "allwinner,sun50i-twi"; @@ -1772,7 +1892,7 @@ }; }; - spi@5010000 { + spi0: spi@5010000 { #address-cells = <0x1>; #size-cells = <0x0>; compatible = "allwinner,sun50i-spi"; @@ -1796,9 +1916,26 @@ spi1_cs_bitmap = <0x1>; /*spi_dbi_enable = <0x0>;*/ phandle = <0xa9>; + + spi_board0 { + device_type = "spi_board0"; + compatible = "rohm,dh2228fv"; + spi-max-frequency = <0x10000000>; + reg = <0x0>; + status = "disabled"; + }; + + flash@0 { + status = "okay"; + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <0x10000000>; + }; }; - spi@5011000 { + spi1: spi@5011000 { #address-cells = <0x1>; #size-cells = <0x0>; compatible = "allwinner,sun50i-spi"; @@ -1813,7 +1950,7 @@ spi1_cs_bitmap = <0x2>; dmas = <0x35 0x17 0x35 0x17>; dma-names = "tx", "rx"; - status = "okay"; + status = "disabled"; spi_slave_mode = <0x0>; pinctrl-names = "default", "sleep"; pinctrl-0 = <0x45 0x46>; @@ -1821,13 +1958,13 @@ /*spi_dbi_enable = <0x0>;*/ phandle = <0xaa>; - spi_board1@1 { - device_type = "spi_board1"; - compatible = "rohm,dh2228fv"; - spi-max-frequency = <0x989680>; - reg = <0x1>; - status = "okay"; - }; + //spi_board1: spi_board1@1 { + // device_type = "spi_board1"; + // compatible = "rohm,dh2228fv"; + // spi-max-frequency = <0x989680>; + // reg = <0x1>; + // status = "disabled"; + //}; }; thermal-sensor@5070400 { @@ -2214,12 +2351,11 @@ }; }; - leds { + leds: leds { compatible = "gpio-leds"; status = "okay"; - - led-red { - label = "red_led"; + sys_led { + label="sys_led"; gpios = <0x23 0x2 0xc 0x0>; /* PC12 */ linux,default-trigger = "heartbeat"; }; @@ -2249,13 +2385,13 @@ gmac-power0; gmac-power1; gmac-power2; - status = "okay"; + status = "disabled"; use_ephy25m = <0x0>; pinctrl-0 = <0x5e>; pinctrl-1 = <0x5f>; pinctrl-names = "default", "sleep"; tx-delay = <0x7>; - rx-delay = <0x1f>; + rx-delay = <0x0>; phandle = <0xbb>; }; @@ -2273,12 +2409,12 @@ gmac-power0; gmac-power1; gmac-power2; - status = "disabled"; + status = "okay"; pinctrl-0 = <0x60>; pinctrl-1 = <0x61>; pinctrl-names = "default", "sleep"; tx-delay = <0x7>; - rx-delay = <0x1f>; + rx-delay = <0x0>; phandle = <0xbc>; }; @@ -2299,7 +2435,7 @@ usb_serial_number = "20080411"; rndis_wceis = <0x1>; wakeup-source; - status = "disabled"; + status = "okay"; phandle = <0xbd>; }; @@ -2495,9 +2631,9 @@ boot_init_gpio { device_type = "boot_init_gpio"; - status = "okay"; - gpio0 = <0x53 0x2 0xc 0x1 0xffffffff 0xffffffff 0x1>; - gpio1 = <0x53 0x2 0xd 0x1 0xffffffff 0xffffffff 0x0>; + status = "disabled"; + gpio0 = <0x53 0x2 0xc 0x1 0xffffffff 0xffffffff 0x1>; /* PC12*/ + gpio1 = <0x53 0x2 0xd 0x1 0xffffffff 0xffffffff 0x0>; /* PC13*/ }; s_cir@7040000 { @@ -2548,8 +2684,8 @@ compatible = "allwinner,sunxi-wlan"; wlan_busnum = <0x1>; wlan_power; - wlan_regon = <0x23 0x6 0x12 0x0>; /* PG18 */ - wlan_hostwake = <0x23 0x6 0xf 0x0>; /* PG15 */ + wlan_regon = <0x23 0x6 0x12 0x0>; /* PG18 */ + wlan_hostwake = <0x23 0x6 0xf 0x0>; /* PG15 */ wakeup-source; phandle = <0xce>; }; @@ -2557,7 +2693,7 @@ bt { compatible = "allwinner,sunxi-bt"; bt_power; - bt_rst_n = <0x23 0x6 0x13 0x1>; /* PG19 */ + bt_rst_n = <0x23 0x6 0x13 0x1>; /* PG19 */ phandle = <0xcf>; }; }; @@ -2860,13 +2996,13 @@ cryptoengine = "/soc@3000000/ce@1904000"; soc_timer0 = "/soc@3000000/timer@3009000"; wdt = "/soc@3000000/watchdog@30090a0"; - pwm = "/soc@3000000/pwm@300a000"; + /*pwm = "/soc@3000000/pwm@300a000"; pwm0 = "/soc@3000000/pwm0@300a010"; pwm1 = "/soc@3000000/pwm1@300a011"; pwm2 = "/soc@3000000/pwm2@300a012"; pwm3 = "/soc@3000000/pwm3@300a013"; pwm4 = "/soc@3000000/pwm4@300a014"; - pwm5 = "/soc@3000000/pwm5@300a015"; + pwm5 = "/soc@3000000/pwm5@300a015";*/ ac200 = "/soc@3000000/ac200"; pio = "/soc@3000000/pinctrl@300b000"; uart0_ph_pins = "/soc@3000000/pinctrl@300b000/uart0-ph-pins"; @@ -2888,10 +3024,6 @@ uart1_ph_sleep = "/soc@3000000/pinctrl@300b000/uart1-ph-sleep"; uart2_ph_pins = "/soc@3000000/pinctrl@300b000/uart2-ph-pins"; uart2_ph_sleep = "/soc@3000000/pinctrl@300b000/uart2-ph-sleep"; - uart3_ph_pins = "/soc@3000000/pinctrl@300b000/uart3-ph-pins"; - uart3_ph_sleep = "/soc@3000000/pinctrl@300b000/uart3-ph-sleep"; - uart4_ph_pins = "/soc@3000000/pinctrl@300b000/uart4-ph-pins"; - uart4_ph_sleep = "/soc@3000000/pinctrl@300b000/uart4-ph-sleep"; uart5_ph_pins = "/soc@3000000/pinctrl@300b000/uart5-ph-pins"; uart5_ph_sleep = "/soc@3000000/pinctrl@300b000/uart5-ph-sleep"; s_cir0_pins_a = "/soc@3000000/pinctrl@300b000/s_cir0@0"; @@ -2909,15 +3041,16 @@ spi0_pins_a = "/soc@3000000/pinctrl@300b000/spi0@0"; spi0_pins_b = "/soc@3000000/pinctrl@300b000/spi0@1"; spi0_pins_c = "/soc@3000000/pinctrl@300b000/spi0@2"; - spi1_pins_a = "/soc@3000000/pinctrl@300b000/spi1@0"; - spi1_pins_b = "/soc@3000000/pinctrl@300b000/spi1@1"; - spi1_pins_c = "/soc@3000000/pinctrl@300b000/spi1@2"; + spi1_pins_a = "/soc@3000000/pinctrl@300b000/spi1-pins-a"; + spi1_pins_b = "/soc@3000000/pinctrl@300b000/spi1-pins-b"; + spi1_cs0_pin = "/soc@3000000/pinctrl@300b000/spi1-cs0-pin"; + spi1_cs1_pin = "/soc@3000000/pinctrl@300b000/spi1-cs1-pin"; gmac0_pins_a = "/soc@3000000/pinctrl@300b000/gmac0@0"; gmac0_pins_b = "/soc@3000000/pinctrl@300b000/gmac0@1"; gmac1_pins_a = "/soc@3000000/pinctrl@300b000/gmac1@0"; gmac1_pins_b = "/soc@3000000/pinctrl@300b000/gmac1@1"; - pwm5_pin_a = "/soc@3000000/pinctrl@300b000/pwm5@0"; - pwm5_pin_b = "/soc@3000000/pinctrl@300b000/pwm5@1"; + //pwm5_pin_a = "/soc@3000000/pinctrl@300b000/pwm5@0"; + //pwm5_pin_b = "/soc@3000000/pinctrl@300b000/pwm5@1"; spdif_pins_a = "/soc@3000000/pinctrl@300b000/spdif@0"; spdif_pins_b = "/soc@3000000/pinctrl@300b000/spdif_sleep@0"; ahub_daudio0_pins_a = "/soc@3000000/pinctrl@300b000/ahub_daudio0@0"; @@ -2942,7 +3075,7 @@ sdc1 = "/soc@3000000/sdmmc@4021000"; nand0 = "/soc@3000000/nand0@4011000"; mbus0 = "/soc@3000000/mbus-controller@47fa000"; - uart0 = "/soc@3000000/uart@5000000"; + /*uart0 = "/soc@3000000/uart@5000000"; uart1 = "/soc@3000000/uart@5000400"; uart2 = "/soc@3000000/uart@5000800"; uart3 = "/soc@3000000/uart@5000c00"; @@ -2953,7 +3086,7 @@ twi2 = "/soc@3000000/twi@5002800"; twi3 = "/soc@3000000/twi@5002c00"; twi4 = "/soc@3000000/twi@5003000"; - twi5 = "/soc@3000000/twi@7081400"; + twi5 = "/soc@3000000/twi@7081400";*/ pmu0 = "/soc@3000000/twi@7081400/pmu"; standby_param = "/soc@3000000/twi@7081400/pmu/standby_param"; reg_dcdc1 = "/soc@3000000/twi@7081400/pmu/regulators/dcdc1"; @@ -2961,8 +3094,8 @@ reg_dcdc3 = "/soc@3000000/twi@7081400/pmu/regulators/dcdc3"; reg_aldo1 = "/soc@3000000/twi@7081400/pmu/regulators/ldo1"; reg_dldo1 = "/soc@3000000/twi@7081400/pmu/regulators/ldo2"; - spi0 = "/soc@3000000/spi@5010000"; - spi1 = "/soc@3000000/spi@5011000"; + /*spi0 = "/soc@3000000/spi@5010000"; + spi1 = "/soc@3000000/spi@5011000";*/ ths = "/soc@3000000/thermal-sensor@5070400"; gpadc = "/soc@3000000/gpadc@5070000"; keyboard = "/soc@3000000/keyboard@5070800";