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-gru.dtsi;h=b7cadfee5d1143880088c02e2f7fa8234a5eea5b;hp=3fb0c1e97ce0fa6fc56c71ebbfdc696b8c47b647;hb=51e978001434c0b64a54fc2ffbdf2fd508c50652;hpb=7229de675c18d6d71e6791af670fdff0a07b494d diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index 3fb0c1e97ce0..b7cadfee5d11 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include #include #include "rk3399.dtsi" @@ -129,7 +130,7 @@ pinctrl-0 = <&pp3000_en>; enable-active-high; - gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>; + gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; regulator-always-on; regulator-boot-on; @@ -350,7 +351,7 @@ regulator-boot-on; enable-active-high; - gpio = <&gpio0 1 GPIO_ACTIVE_HIGH>; + gpio = <&gpio0 2 GPIO_ACTIVE_HIGH>; vin-supply = <&pp1800>; }; @@ -364,7 +365,7 @@ regulator-always-on; // TODO: for bringup??? regulator-boot-on; // TODO: for bringup??? enable-active-high; - gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; + gpio = <&gpio0 4 GPIO_ACTIVE_HIGH>; vin-supply = <&pp1800>; }; @@ -463,23 +464,6 @@ /* END REGULATORS */ - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&pp1800_ap_io>; /* APIO2_VDD; 2a 2b */ - audio-supply = <&pp1800_audio>; /* APIO5_VDD; 3d 4a */ - sdmmc-supply = <&ppvar_sd_card_io>; /* SDMMC0_VDD; 4b */ - gpio1830-supply = <&pp3000_ap>; /* APIO4_VDD; 4c 4d */ - }; - - pmu-io-domains { - compatible = "rockchip,rk3399-pmu-io-voltage-domain"; - rockchip,grf = <&pmugrf>; - - pmu1830-supply = <&pp1800_pmu>; /* PMUIO2_VDD */ - }; - sound { compatible = "rockchip,rockchip-audio-da7219"; rockchip,model = "audio-da7219"; @@ -575,6 +559,8 @@ ap_i2c_ts: &i2c3 { }; ap_i2c_tp: &i2c5 { + status = "okay"; + /* * Note strange pullup enable. Apparently this avoids leakage but * still allows us to get nice 4.7K pullups for high speed i2c @@ -583,13 +569,11 @@ ap_i2c_tp: &i2c5 { */ pinctrl-0 = <&i2c5_xfer &ap_i2c_tp_pu_en>; - status = "okay"; + clock-frequency = <400000>; - // TODO: bus speed - // ...with no speed, it should just use 100kHz - // TODO: rise / fall times? - - // TODO: Add the proper touchpanel reference... + /* These are relatively safe rise/fall times; TODO: measure */ + i2c-scl-falling-time-ns = <50>; + i2c-scl-rising-time-ns = <300>; }; ap_i2c_audio: &i2c8 { @@ -646,6 +630,15 @@ ap_i2c_audio: &i2c8 { status = "okay"; }; +&io_domains { + status = "okay"; + + bt656-supply = <&pp1800_ap_io>; /* APIO2_VDD; 2a 2b */ + audio-supply = <&pp1800_audio>; /* APIO5_VDD; 3d 4a */ + sdmmc-supply = <&ppvar_sd_card_io>; /* SDMMC0_VDD; 4b */ + gpio1830-supply = <&pp3000_ap>; /* APIO4_VDD; 4c 4d */ +}; + &pwm0 { status = "okay"; }; @@ -662,25 +655,16 @@ ap_i2c_audio: &i2c8 { status = "okay"; }; -&sdhci { +&emmc_phy { status = "okay"; +}; - // HACK: supports-emmc is not mainline. - supports-emmc; - - // HACK: limit to 50MHz to avoid tuning during bringup. - max-frequency = <50000000>; - - // TODO: add caps? - //cap-mmc-highspeed; - //mmc-hs200-1_8v; - //mmc-hs400-1_8v; - +&sdhci { bus-width = <8>; + mmc-hs400-1_8v; + supports-emmc; non-removable; - - vmmc-supply = <&pp3000>; - vqmmc-supply = <&pp1800_emmc>; + status = "okay"; }; &sdmmc { @@ -707,7 +691,7 @@ ap_i2c_audio: &i2c8 { clock-freq-min-max = <400000 37500000>; bus-width = <4>; - cd-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>; + cd-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>; disable-wp; cap-mmc-highspeed; @@ -789,7 +773,7 @@ ap_i2c_audio: &i2c8 { google,cros-ec-spi-pre-delay = <30>; // TODO: check interrupt-parent = <&gpio0>; - interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + interrupts = <1 IRQ_TYPE_LEVEL_LOW>; spi-max-frequency = <3000000>; // TODO: check; TODO: rx-sample-delay-ns? i2c_tunnel: i2c-tunnel { @@ -815,7 +799,7 @@ ap_i2c_audio: &i2c8 { status = "okay"; }; -&usb_host0_echi { +&usb_host0_ehci { status = "okay"; }; @@ -823,7 +807,7 @@ ap_i2c_audio: &i2c8 { status = "okay"; }; -&usb_host1_echi { +&usb_host1_ehci { status = "okay"; }; @@ -944,6 +928,19 @@ ap_i2c_audio: &i2c8 { status = "disabled"; }; +&pvtm { + status = "okay"; +}; + +&pmu_pvtm { + status = "okay"; +}; + +&pmu_io_domains { + status = "okay"; + pmu1830-supply = <&pp1800_pmu>; /* PMUIO2_VDD */ +}; + /* PINCTRL: always below everything else */ &pinctrl { @@ -953,19 +950,19 @@ ap_i2c_audio: &i2c8 { cros-ec { ec_ap_int_l: ec-ap-int-l { - rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = ; }; }; discrete-regulators { pp1500_en: pp1500-en { - rockchip,pins = ; }; pp1800_audio_en: pp1800-audio-en { - rockchip,pins = ; + rockchip,pins = ; }; pp3300_disp_en: pp3300-disp-en { @@ -974,7 +971,7 @@ ap_i2c_audio: &i2c8 { }; pp3000_en: pp3000-en { - rockchip,pins = ; }; @@ -994,8 +991,8 @@ ap_i2c_audio: &i2c8 { }; wlan_module_pd_l: wlan-module-pd-l { - rockchip,pins = ; + rockchip,pins = ; }; }; @@ -1053,14 +1050,18 @@ ap_i2c_audio: &i2c8 { /* This is where we actually hook up CD; has external pull */ sdmmc_cd_gpio: sdmmc-cd-gpio { - rockchip,pins = <4 26 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <4 24 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - touchpanel { + trackpad { ap_i2c_tp_pu_en: ap-i2c-tp-pu-en { rockchip,pins = <3 12 RK_FUNC_GPIO &pcfg_output_high>; }; + + trackpad_int_l: trackpad-int-l { + rockchip,pins = <1 4 RK_FUNC_GPIO &pcfg_pull_up>; + }; }; backlight-enable {