X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=blobdiff_plain;f=arch%2Farm64%2Fboot%2Fdts%2Frockchip%2Frk3399-evb.dtsi;h=6c3cae823d34d98f1d5006bf8eea82b1393ef0ae;hp=7e3f588cc0880181db1178297a48a4fee1a65a45;hb=a03cd4c58d1123fecbed835e3f24b59d32c3296d;hpb=234718be61d6b0dbf94ac977af23e61ea3e5bfb2 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi index 7e3f588cc088..6c3cae823d34 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi @@ -46,16 +46,6 @@ / { compatible = "rockchip,rk3399-evb", "rockchip,rk3399"; - vdd_center: vdd-center { - compatible = "pwm-regulator"; - pwms = <&pwm3 0 25000 0>; - regulator-name = "vdd_center"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1400000>; - regulator-always-on; - regulator-boot-on; - }; - vcc3v3_sys: vcc3v3-sys { compatible = "regulator-fixed"; regulator-name = "vcc3v3_sys"; @@ -65,6 +55,15 @@ regulator-max-microvolt = <3300000>; }; + vcc5v0_host: vcc5v0-host-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&host_vbus_drv>; + regulator-name = "vcc5v0_host"; + }; + backlight: backlight { compatible = "pwm-backlight"; pwms = <&pwm0 0 25000 0>; @@ -102,7 +101,6 @@ 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255>; default-brightness-level = <200>; - enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; }; clkin_gmac: external-gmac-clock { @@ -157,6 +155,26 @@ }; }; + hdmi_sound: hdmi-sound { + status = "disabled"; + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "rockchip,hdmi"; + simple-audio-card,cpu { + sound-dai = <&i2s2>; + }; + simple-audio-card,codec { + sound-dai = <&dw_hdmi_audio>; + }; + }; + + dw_hdmi_audio: dw-hdmi-audio { + status = "disabled"; + compatible = "rockchip,dw-hdmi-audio"; + #sound-dai-cells = <0>; + }; + spdif_sound: spdif-sound { status = "disabled"; compatible = "simple-audio-card"; @@ -213,6 +231,39 @@ BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ status = "okay"; }; + + test-power { + status = "okay"; + }; +}; + +&cpu_l0 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l1 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l2 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l3 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_b0 { + cpu-supply = <&vdd_cpu_b>; +}; + +&cpu_b1 { + cpu-supply = <&vdd_cpu_b>; +}; + +&gpu { + status = "okay"; + mali-supply = <&vdd_gpu>; }; &sdmmc { @@ -274,6 +325,10 @@ #sound-dai-cells = <0>; }; +&i2s2 { + #sound-dai-cells = <0>; +}; + &spdif { #sound-dai-cells = <0>; }; @@ -284,6 +339,22 @@ i2c-scl-falling-time-ns = <15>; }; +&i2c1 { + status = "okay"; + i2c-scl-rising-time-ns = <300>; + i2c-scl-falling-time-ns = <15>; + + es8316: es8316@10 { + #sound-dai-cells = <0>; + compatible = "everest,es8316"; + reg = <0x10>; + clocks = <&cru SCLK_I2S_8CH_OUT>; + clock-names = "mclk"; + spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; + hp-det-gpio = <&gpio4 28 GPIO_ACTIVE_LOW>; + }; +}; + &i2c4 { status = "okay"; i2c-scl-rising-time-ns = <600>; @@ -299,21 +370,14 @@ tp-size = <911>; tp-supply = <&vcc3v0_tp>; }; -}; - -&i2c1 { - status = "okay"; - i2c-scl-rising-time-ns = <300>; - i2c-scl-falling-time-ns = <15>; - es8316: es8316@10 { - #sound-dai-cells = <0>; - compatible = "everest,es8316"; - reg = <0x10>; - clocks = <&cru SCLK_I2S_8CH_OUT>; - clock-names = "mclk"; - spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; - hp-det-gpio = <&gpio4 28 GPIO_ACTIVE_LOW>; + gsl3673: gsl3673@40 { + compatible = "GSL,GSL3673"; + reg = <0x40>; + screen_max_x = <1536>; + screen_max_y = <2048>; + irq_gpio_number = <&gpio1 20 IRQ_TYPE_LEVEL_LOW>; + rst_gpio_number = <&gpio4 22 GPIO_ACTIVE_HIGH>; }; }; @@ -328,12 +392,50 @@ status = "okay"; }; +&tcphy0 { + extcon = <&fusb0>; + status = "okay"; +}; + +&tcphy1 { + extcon = <&fusb1>; + status = "okay"; +}; + &tsadc { rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */ rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */ status = "okay"; }; +&u2phy0 { + status = "okay"; + extcon = <&fusb0>; + + u2phy0_otg: otg-port { + status = "okay"; + }; + + u2phy0_host: host-port { + phy-supply = <&vcc5v0_host>; + status = "okay"; + }; +}; + +&u2phy1 { + status = "okay"; + extcon = <&fusb1>; + + u2phy1_otg: otg-port { + status = "okay"; + }; + + u2phy1_host: host-port { + phy-supply = <&vcc5v0_host>; + status = "okay"; + }; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_xfer &uart0_cts>; @@ -344,10 +446,6 @@ status = "okay"; }; -&usb2phy { - vbus_drv-gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; -}; - &usb_host0_ehci { status = "okay"; }; @@ -365,6 +463,7 @@ }; &usbdrd3_0 { + extcon = <&fusb0>; status = "okay"; }; @@ -373,6 +472,7 @@ }; &usbdrd3_1 { + extcon = <&fusb1>; status = "okay"; }; @@ -384,10 +484,6 @@ status = "okay"; }; -&pwm3 { - status = "okay"; -}; - &gmac { phy-supply = <&vcc_phy>; phy-mode = "rgmii"; @@ -432,4 +528,21 @@ <1 18 RK_FUNC_GPIO &pcfg_pull_down>; }; }; + + usb2 { + host_vbus_drv: host-vbus-drv { + rockchip,pins = + <4 25 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + fusb30x { + fusb0_int: fusb0-int { + rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + fusb1_int: fusb1-int { + rockchip,pins = <1 24 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; };