diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts index 2fbec41..1c01e12 100644 --- a/arch/arm/boot/dts/rk3288-miniarm.dts +++ b/arch/arm/boot/dts/rk3288-miniarm.dts @@ -66,7 +66,7 @@ wireless-wlan { compatible = "wlan-platdata"; rockchip,grf = <&grf>; - wifi_chip_type = "ap6212"; + wifi_chip_type = "8723bs"; sdio_vref = <1800>; WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>; status = "okay"; @@ -130,7 +130,7 @@ led1-led { gpios=<&gpio1 25 GPIO_ACTIVE_HIGH>; - linux,default-trigger="default-off"; + linux,default-trigger="heartbeat"; }; }; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 0af92bd..39747ff 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -103,6 +103,8 @@ #cooling-cells = <2>; /* min followed by max */ dynamic-power-coefficient = <322>; clocks = <&cru ARMCLK>; + nvmem-cells = <&package_info>; + nvmem-cell-names = "package_info"; }; cpu1: cpu@501 { device_type = "cpu"; @@ -238,6 +240,22 @@ opp-microvolt-L2 = <1250000>; clock-latency-ns = <40000>; }; + opp-1704000000 { + opp-hz = /bits/ 64 <1704000000>; + opp-microvolt = <1350000>; + opp-microvolt-L0 = <1350000>; + opp-microvolt-L1 = <1300000>; + opp-microvolt-L2 = <1250000>; + clock-latency-ns = <40000>; + }; + opp-1800000000 { + opp-hz = /bits/ 64 <1800000000>; + opp-microvolt = <1350000>; + opp-microvolt-L0 = <1400000>; + opp-microvolt-L1 = <1350000>; + opp-microvolt-L2 = <1300000>; + clock-latency-ns = <40000>; +}; }; amba { @@ -576,7 +594,7 @@ type = "passive"; }; target: trip-point@1 { - temperature = <85000>; /* millicelsius */ + temperature = <80000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */ type = "passive"; }; @@ -1748,6 +1766,9 @@ cpu_leakage: cpu_leakage@17 { reg = <0x17 0x1>; }; + package_info: package_info { + reg = <0x05 0x1>; + }; }; gic: interrupt-controller@ffc01000 {