From 0478f80ad533e812456c7ff2e88a03788c0025f1 Mon Sep 17 00:00:00 2001 From: Stricted Date: Fri, 2 Jul 2021 04:59:07 +0000 Subject: [PATCH] arm64: dts: sm1_s905y3_odroidc4: Apply changes for odroidc4 Change-Id: I2ee6b8645002d98631496587055dcaece9d9ca8d --- .../boot/dts/amlogic/sm1_s905y3_odroidc4.dts | 202 +++++++++--------- 1 file changed, 106 insertions(+), 96 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts b/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts index f243707e3e81..d017c942a970 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts @@ -35,18 +35,20 @@ serial2 = &uart_B; serial3 = &uart_C; serial4 = &uart_AO_B; + i2c0 = &i2c2; + i2c1 = &i2c3; + i2c2 = &i2c0; + i2c3 = &i2c1; + i2c4 = &i2c_AO; tsensor0 = &p_tsensor; tsensor1 = &d_tsensor; - i2c0 = &i2c0; - i2c1 = &i2c1; - i2c2 = &i2c2; - i2c3 = &i2c3; - i2c4 = &i2c_AO; + spi0 = &spicc0; + spi1 = &spicc1; }; memory@00000000 { device_type = "memory"; - linux,usable-memory = <0x0 0x000000 0x0 0x80000000>; + linux,usable-memory = <0x0 0x000000 0x0 0xf0000000>; }; reserved-memory { @@ -248,7 +250,7 @@ bt-dev{ compatible = "amlogic, bt-dev"; dev_name = "bt-dev"; - status = "okay"; + status = "disabled"; gpio_reset = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; gpio_hostwake = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; }; @@ -256,7 +258,7 @@ wifi{ compatible = "amlogic, aml_wifi"; dev_name = "aml_wifi"; - status = "okay"; + status = "disabled"; interrupt_pin = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>; irq_trigger_type = "GPIO_IRQ_LOW"; power_on_pin = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>; @@ -643,30 +645,12 @@ };//End unifykey efusekey:efusekey{ - keynum = <4>; + keynum = <1>; key0 = <&key_0>; - key1 = <&key_1>; - key2 = <&key_2>; - key3 = <&key_3>; key_0:key_0{ - keyname = "mac"; + keyname = "uuid"; offset = <0>; - size = <6>; - }; - key_1:key_1{ - keyname = "mac_bt"; - offset = <6>; - size = <6>; - }; - key_2:key_2{ - keyname = "mac_wifi"; - offset = <12>; - size = <6>; - }; - key_3:key_3{ - keyname = "usid"; - offset = <18>; - size = <16>; + size = <32>; }; };//End efusekey @@ -975,6 +959,77 @@ }; /* end of / */ +&custom_maps{ + mapnum = <1>; + map0 = <&map_0>; + map_0: map_0{ + mapname = "amlogic-remote-1"; + customcode = <0xf708>; + release_delay = <80>; + size = <60>; /*keymap size*/ + keymap = ; + }; +}; + &vddcpu0 { pwms = <&pwm_AO_cd MESON_PWM_1 1250 0>; regulator-min-microvolt = <720000>; @@ -1027,62 +1082,12 @@ status = "okay"; }; -&i2c0 { - status = "okay"; - pinctrl-names="default"; - pinctrl-0=<&i2c0_master_pins2>; - clock-frequency = <400000>; - - gt9xx@5d { - compatible = "goodix,gt9xx"; - status = "disabled"; - reg = <0x5d>; - reset-gpio = <&gpio GPIOZ_9 0x00>; - irq-gpio = <&gpio GPIOZ_3 0x00>; - }; - - ftxx@38 { - compatible = "focaltech,fts"; - status = "disabled"; - reg = <0x38>; - reset-gpio = <&gpio GPIOZ_9 0x00>; - irq-gpio = <&gpio GPIOZ_3 0x00>; - x_max = <600>; - y_max = <1024>; - max-touch-number = <10>; - }; +&i2c2 { + status = "disabled"; }; -/*&i2c2 { - * status = "okay"; - * pinctrl-names="default"; - * pinctrl-0=<&i2c2_master_pins2>; - * clock-frequency = <300000>; - *}; - */ - &i2c3 { - status = "ok"; - pinctrl-names="default"; - pinctrl-0=<&i2c3_master_pins2>; - clock-frequency = <300000>; /* default 100k */ - - /* for ref board */ - ad82584f_62: ad82584f_62@62 { - compatible = "ESMT, ad82584f"; - #sound-dai-cells = <0>; - reg = <0x31>; - status = "disabled"; - reset_pin = <&gpio GPIOA_5 0>; - no_mclk; - }; - - bl_extern_i2c { - compatible = "bl_extern, i2c"; - dev_name = "lp8556"; - reg = <0x2c>; - status = "disabled"; - }; + status = "disabled"; }; &audiobus { @@ -1530,12 +1535,12 @@ }; pdmin: pdmin { - mux { /* GPIOZ_2, GPIOZ_3, GPIOZ_4, GPIOZ_5, GPIOZ_6 */ - groups = "pdm_din0_z", - "pdm_din1_z", - "pdm_din2_z", - "pdm_din3_z", - "pdm_dclk_z"; + mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/ + groups = "pdm_din0_a", + "pdm_din1_a", + "pdm_din2_a", + "pdm_din3_a", + "pdm_dclk_a"; function = "pdm"; }; }; @@ -1614,25 +1619,30 @@ &usb3_phy_v2 { status = "okay"; portnum = <1>; - otg = <0>; + otg = <1>; + gpio-vbus-power = "GPIOAO_2"; + gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; }; &dwc2_a { status = "okay"; /** 0: normal, 1: otg+dwc3 host only, 2: otg+dwc3 device only*/ - controller-type = <1>; + controller-type = <3>; }; ðmac { status = "okay"; - pinctrl-names = "internal_eth_pins"; - pinctrl-0 = <&internal_eth_pins>; - mc_val = <0x4be04>; + pinctrl-names = "external_eth_pins"; + pinctrl-0 = <&external_eth_pins>; + mc_val = <0x1621>; + + internal_phy=<0>; - internal_phy=<1>; + /* reset */ + rst_pin-gpios = <&gpio GPIOZ_15 GPIO_ACTIVE_LOW>; }; &uart_A { - status = "okay"; + status = "disabled"; }; /*if you want to use vdin just modify status to "ok"*/ @@ -1806,7 +1816,7 @@ }; &irblaster { - status = "okay"; + status = "disabled"; }; &dummy_venc { -- 2.20.1