diff --git a/patch/kernel/rockchip-next/9001ARM-dts-rockchip-add-missing-grf-phandle-for-rk3288.patch b/patch/kernel/rockchip-next/9001ARM-dts-rockchip-add-missing-grf-phandle-for-rk3288.patch new file mode 100644 index 000000000..c9963bff3 --- /dev/null +++ b/patch/kernel/rockchip-next/9001ARM-dts-rockchip-add-missing-grf-phandle-for-rk3288.patch @@ -0,0 +1,44 @@ +diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi +index 26b8886..c1d3b1f 100644 +--- a/arch/arm/boot/dts/rk3288.dtsi ++++ b/arch/arm/boot/dts/rk3288.dtsi +@@ -546,6 +546,7 @@ + pinctrl-2 = <&otp_gpio>; + #thermal-sensor-cells = <1>; + rockchip,hw-tshut-temp = <95000>; ++ rockchip,grf = <&grf>; + status = "disabled"; + }; + +@@ -654,6 +655,7 @@ + pinctrl-0 = <&pwm0_pin>; + clocks = <&cru PCLK_PWM>; + clock-names = "pwm"; ++ rockchip,grf = <&grf>; + status = "disabled"; + }; + +@@ -665,6 +667,7 @@ + pinctrl-0 = <&pwm1_pin>; + clocks = <&cru PCLK_PWM>; + clock-names = "pwm"; ++ rockchip,grf = <&grf>; + status = "disabled"; + }; + +@@ -676,6 +679,7 @@ + pinctrl-0 = <&pwm2_pin>; + clocks = <&cru PCLK_PWM>; + clock-names = "pwm"; ++ rockchip,grf = <&grf>; + status = "disabled"; + }; + +@@ -687,6 +691,7 @@ + pinctrl-0 = <&pwm3_pin>; + clocks = <&cru PCLK_PWM>; + clock-names = "pwm"; ++ rockchip,grf = <&grf>; + status = "disabled"; + }; + diff --git a/patch/kernel/rockchip-next/9002_dts_rk3288_updates.patch b/patch/kernel/rockchip-next/9002_dts_rk3288_updates.patch new file mode 100644 index 000000000..f82157b35 --- /dev/null +++ b/patch/kernel/rockchip-next/9002_dts_rk3288_updates.patch @@ -0,0 +1,126 @@ +diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts +index f796568..6bc4b39 100644 +--- a/arch/arm/boot/dts/rk3288-miniarm.dts ++++ b/arch/arm/boot/dts/rk3288-miniarm.dts +@@ -197,7 +197,7 @@ + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <750000>; +- regulator-max-microvolt = <1350000>; ++ regulator-max-microvolt = <1450000>; + regulator-name = "vdd_arm"; + regulator-ramp-delay = <6000>; + regulator-state-mem { +@@ -333,7 +333,6 @@ + }; + + vcc33_sd: SWITCH_REG1 { +- regulator-always-on; + regulator-boot-on; + regulator-name = "vcc33_sd"; + regulator-state-mem { +@@ -353,14 +352,45 @@ + }; + }; + ++&i2c1 { ++ status = "okay"; ++}; ++ + &i2c2 { + status = "okay"; + }; + ++&i2c3 { ++ status = "okay"; ++}; ++ ++&i2c4 { ++ status = "okay"; ++}; ++ + &i2c5 { + status = "okay"; + }; + ++ &spi2 { ++ status = "okay"; ++ max-freq = <50000000>; ++ spidev@0 { ++ compatible = "rockchip,spi_tinker"; ++ reg = <0>; ++ spi-max-frequency = <50000000>; ++ spi-cpha = <1>; ++ //spi-cpol = <1>; ++ }; ++ spidev@1 { ++ compatible = "rockchip,spi_tinker"; ++ reg = <1>; ++ spi-max-frequency = <50000000>; ++ spi-cpha = <1>; ++ //spi-cpol = <1>; ++ }; ++ }; ++ + &i2s { + #sound-dai-cells = <0>; + status = "okay"; +diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi +index 7b3c737..d54bb79 100644 +--- a/arch/arm/boot/dts/rk3288.dtsi ++++ b/arch/arm/boot/dts/rk3288.dtsi +@@ -285,8 +285,21 @@ + 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 { +@@ -437,9 +450,9 @@ + dma-names = "tx", "rx"; + interrupts = ; + pinctrl-names = "default"; +- pinctrl-0 = <&spi2_clk &spi2_tx &spi2_rx &spi2_cs0>; ++ pinctrl-0 = <&spi2_clk &spi2_tx &spi2_rx &spi2_cs0 &spi2_cs1>; + reg = <0xff130000 0x1000>; +- #address-cells = <1>; ++ #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; +@@ -630,7 +643,7 @@ + map0 { + trip = <&gpu_alert0>; + cooling-device = +- <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; ++ <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; +diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c +index 9e2e099..3a0f0a7 100644 +--- a/drivers/spi/spidev.c ++++ b/drivers/spi/spidev.c +@@ -697,6 +697,7 @@ static const struct of_device_id spidev_dt_ids[] = { + { .compatible = "rohm,dh2228fv" }, + { .compatible = "lineartechnology,ltc2488" }, + { .compatible = "ge,achc" }, ++ { .compatible = "rockchip,spi_tinker" }, + {}, + }; + MODULE_DEVICE_TABLE(of, spidev_dt_ids);