diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts index 348e9be..3896506 100644 --- a/arch/arm/boot/dts/rk3288-miniarm.dts +++ b/arch/arm/boot/dts/rk3288-miniarm.dts @@ -194,6 +194,16 @@ status = "ok"; }; +&mipi_dsi { + status = "okay"; + mipi_panel: mipi-panel { + compatible ="asus,tc358762"; + reg = <0>; + status = "okay"; + }; +}; + + &hdmi { ddc-i2c-bus = <&i2c5>; status = "okay"; @@ -400,9 +410,15 @@ &i2c2 { status = "okay"; + afc0:af-controller@0 { + status = "okay"; + compatible = "silicon touch,vm149C-v4l2-i2c-subdev"; + reg = < 0x0c >; + }; + eeprom:m24c08@50 { - compatible = "at,24c08"; - reg = <0x50>; + compatible = "at,24c08"; + reg = <0x50>; }; }; @@ -626,6 +642,7 @@ }; &usb_host0_ehci { + no-relinquish-port; status = "okay"; }; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 0591a6f..6cb09fe 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -264,44 +264,6 @@ #iommu-cells = <0>; }; - gpu: mali@ffa30000 { - compatible = "arm,malit764", - "arm,malit76x", - "arm,malit7xx", - "arm,mali-midgard"; - reg = <0xffa30000 0x10000>; - interrupts = , - , - ; - interrupt-names = "JOB", "MMU", "GPU"; - clocks = <&cru ACLK_GPU>; - clock-names = "clk_mali"; - operating-points = < - /* KHz uV */ - 100000 950000 - 200000 950000 - 300000 1000000 - 400000 1100000 - 500000 1200000 - 600000 1250000 - >; - #cooling-cells = <2>; /* min followed by max */ - power-domains = <&power RK3288_PD_GPU>; - status = "disabled"; - - - gpu_power_model: power_model { - compatible = "arm,mali-simple-power-model"; - voltage = <950>; - frequency = <500>; - static-power = <300>; - dynamic-power = <396>; - ts = <32000 4700 (-80) 2>; - thermal-zone = "gpu_thermal"; - }; - - }; - reserved-memory { #address-cells = <1>; #size-cells = <1>; @@ -360,8 +322,6 @@ clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; interrupts = ; - #address-cells = <1>; - #size-cells = <0>; reg = <0xff0c0000 0x4000>; resets = <&cru SRST_MMC0>; reset-names = "reset"; @@ -376,8 +336,6 @@ clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; interrupts = ; - #address-cells = <1>; - #size-cells = <0>; reg = <0xff0d0000 0x4000>; resets = <&cru SRST_SDIO0>; reset-names = "reset"; @@ -392,8 +350,6 @@ clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; interrupts = ; - #address-cells = <1>; - #size-cells = <0>; reg = <0xff0e0000 0x4000>; resets = <&cru SRST_SDIO1>; reset-names = "reset"; @@ -408,8 +364,6 @@ clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; interrupts = ; - #address-cells = <1>; - #size-cells = <0>; reg = <0xff0f0000 0x4000>; resets = <&cru SRST_EMMC>; reset-names = "reset"; @@ -1274,6 +1228,44 @@ }; }; + gpu: mali@ffa30000 { + compatible = "arm,malit764", + "arm,malit76x", + "arm,malit7xx", + "arm,mali-midgard"; + reg = <0xffa30000 0x10000>; + interrupts = , + , + ; + interrupt-names = "JOB", "MMU", "GPU"; + clocks = <&cru ACLK_GPU>; + clock-names = "clk_mali"; + operating-points = < + /* KHz uV */ + 100000 950000 + 200000 950000 + 300000 1000000 + 400000 1100000 + 500000 1200000 + 600000 1250000 + >; + #cooling-cells = <2>; /* min followed by max */ + power-domains = <&power RK3288_PD_GPU>; + status = "disabled"; + + + gpu_power_model: power_model { + compatible = "arm,mali-simple-power-model"; + voltage = <950>; + frequency = <500>; + static-power = <300>; + dynamic-power = <396>; + ts = <32000 4700 (-80) 2>; + thermal-zone = "gpu_thermal"; + }; + + }; + qos_gpu_r: qos@ffaa0000 { compatible = "syscon"; reg = <0xffaa0000 0x20>;