Skip to content

GitLab

Commit 1f318833 authored by Mark Stevens's avatar Mark Stevens
Browse files

kernel reimport for 1018

parent cdf3487b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 645 deletions
Untitled Project.IAB 0 → 100755
View file @ 1f318833
File added
Untitled Project.IAD 0 → 100755
View file @ 1f318833
File added
Untitled Project.IMB 0 → 100755
View file @ 1f318833
File added
Untitled Project.IMD 0 → 100755
View file @ 1f318833
File added
Untitled Project.PFI 0 → 100755
View file @ 1f318833
File added
Untitled Project.PO 0 → 100755
View file @ 1f318833
File added
Untitled Project.PR 0 → 100755
View file @ 1f318833
File added
Untitled Project.PRI 0 → 100755
View file @ 1f318833
File added
Untitled Project.PS 0 → 100755
View file @ 1f318833
File added
Untitled Project.SearchResults 0 → 100755
View file @ 1f318833
---- reboot Matches (5 in 3 files) ----
Image (arch\arm\boot):pwr: dsoc=%d, rsoc=%d, vol=%d, halt: st=%d, cnt=%d, reboot=%d
Vexpress-v2m-rs1.dtsi (arch\arm\boot\dts): reboot@0 {
Vexpress-v2m-rs1.dtsi (arch\arm\boot\dts): compatible = "arm,vexpress-reboot";
Vexpress-v2m.dtsi (arch\arm\boot\dts): reboot@0 {
Vexpress-v2m.dtsi (arch\arm\boot\dts): compatible = "arm,vexpress-reboot";
Untitled Project.WK3 0 → 100755
View file @ 1f318833
File added
arch/arm/boot/dts/rk3128-86v.dts
View file @ 1f318833
......@@ -50,7 +50,7 @@
WIFI,host_wake_irq = <&gpio3 GPIO_C7 GPIO_ACTIVE_HIGH>;
/* WIFI_REG_ON = GPIO3_D3 */
WIFI,poweren_gpio = <&gpio3 GPIO_D3 GPIO_ACTIVE_HIGH>;
WIFI,chipen_gpio = <&gpio0 GPIO_B3 GPIO_ACTIVE_HIGH>;
status = "okay";
};
......
arch/arm/boot/dts/rk3128-86v_jiangpin.dts deleted 100755 → 0
View file @ cdf3487b
/dts-v1/;
#include "rk3128.dtsi"
#include "lcd-ld089wu1-mipi.dtsi"
#include "rk3128-cif-sensor.dtsi"
#include "rk312x-sdk.dtsi"
//#include "lcd-rk3128-86v-LVDS1024x600.dtsi"
/ {
compatible = "rockchip,rk3128";
backlight: backlight {
compatible = "pwm-backlight";
pwms = <&pwm0 0 25000>;
brightness-levels = <18 18 18 18 19 19 19 19 20 20 20 20 20 20 21 21 21 21 21 21 22 22 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255>;
default-brightness-level = <128>;
//enable-gpios = <&gpio3 GPIO_C1 GPIO_ACTIVE_HIGH>;
};
gpio_poweroff {
compatible = "gpio-poweroff";
//gpios = <&gpio1 GPIO_A2 GPIO_ACTIVE_LOW>;
};
usb_control {
compatible = "rockchip,rk3126-usb-control";
//host_drv_gpio = <&gpio3 GPIO_C4 GPIO_ACTIVE_LOW>;
//otg_drv_gpio = <&gpio3 GPIO_C1 GPIO_ACTIVE_LOW>;
rockchip,remote_wakeup;
rockchip,usb_irq_wakeup;
};
wireless-wlan {
compatible = "wlan-platdata";
/* wifi_chip_type - wifi chip define
* ap6210, ap6330, ap6335
* rtl8188eu, rtl8723bs, rtl8723bu
* esp8089
*/
wifi_chip_type = "rtl8723bs_vq0";
sdio_vref = <1800>; //1800mv or 3300mv
// power_ctrl_by_pmu;
// pmu_regulator = "act_ldo3";
// pmu_enable_level = <1>; //1->HIGH, 0->LOW
/* WIFI_HOST_WAKE = GPIO3_C7 */
WIFI,host_wake_irq = <&gpio3 GPIO_C7 GPIO_ACTIVE_HIGH>;
/* WIFI_REG_ON = GPIO3_D3 */
WIFI,poweren_gpio = <&gpio3 GPIO_D3 GPIO_ACTIVE_HIGH>;
status = "okay";
};
wireless-bluetooth {
compatible = "bluetooth-platdata";
//wifi-bt-power-toggle;
uart_rts_gpios = <&gpio0 GPIO_C1 GPIO_ACTIVE_LOW>;
pinctrl-names = "default","rts_gpio";
pinctrl-0 = <&uart0_rts>;
pinctrl-1 = <&uart0_rts_gpio>;
/* BT_HOST_WAKE = GPIO3_C6 */
/* BT_RST = GPIO3_C5 */
/* BT_WAKE = GPIO3_D2 */
//BT,power_gpio = <&gpio4 GPIO_D3 GPIO_ACTIVE_HIGH>;
// BT,reset_gpio = <&gpio3 GPIO_C5 GPIO_ACTIVE_LOW>;
BT,wake_gpio = <&gpio3 GPIO_D2 GPIO_ACTIVE_HIGH>;
// BT,wake_host_irq = <&gpio3 GPIO_C6 GPIO_ACTIVE_LOW>;
status = "okay";
};
rockchip_suspend: rockchip_suspend {
rockchip,ctrbits = <
(0
|RKPM_CTR_PWR_DMNS
|RKPM_CTR_GTCLKS
|RKPM_CTR_PLLS
|RKPM_CTR_ARMOFF_LPMD
|RKPM_CTR_IDLESRAM_MD
|RKPM_CTR_DDR
|RKPM_CTR_VOLTS
|RKPM_CTR_BUS_IDLE
|RKPM_CTR_VOL_PWM1
)
>;
rockchip,pmic-suspend_gpios = <GPIO3_C1>;//GPIO3_C1
};
chosen {
bootargs = "vmalloc=496M cma=8M rockchip_jtag";
};
};
&pwm_regulator1 {
status = "disabled";
};
&pwm1 {
status = "disabled";
};
&fb {
rockchip,disp-mode = <NO_DUAL>;
rockchip,uboot-logo-on = <1>;
};
&rk_screen {
display-timings = <&disp_timings>;
};
&lvds {
status = "okay";
pinctrl-names = "lcdc";
pinctrl-0 = <&lcdc0_lcdc_d>;
};
&lcdc {
status = "okay";
backlight = <&backlight>;
pinctrl-names = "default", "gpio";
pinctrl-0 = <&lcdc0_lcdc>;
pinctrl-1 = <&lcdc0_gpio>;
rockchip,fb-win-map = <FB_DEFAULT_ORDER>;
power_ctr: power_ctr {
rockchip,debug = <0>;
lcd_en: lcd_en {
rockchip,power_type = <GPIO>;
gpios = <&gpio1 GPIO_B4 GPIO_ACTIVE_LOW>;
rockchip,delay = <10>;
};
};
};
&hdmi {
status = "disabled";
};
&adc {
status = "okay";
key: key {
compatible = "rockchip,key";
io-channels = <&adc 1>;
vol-up-key {
linux,code = <115>;
label = "volume up";
rockchip,adc_value = <1>;
};
vol-down-key {
linux,code = <114>;
label = "volume down";
rockchip,adc_value = <512>;
};
/*power-key {
//gpios = <&gpio1 GPIO_A4 GPIO_ACTIVE_LOW>;
gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>;
linux,code = <116>;
label = "power";
gpio-key,wakeup;
};*/
};
adc-battery {
status = "disabled";
compatible = "rk30-adc-battery";
io-channels = <&adc 0>, <&adc 3>;
dc_det_gpio = <&gpio2 GPIO_B1 GPIO_ACTIVE_LOW>;
auto_calibration = <0>;
ref_voltage = <3300>;
//bat_low_gpio = <&gpio0 GPIO_A7 GPIO_ACTIVE_LOW>;
//chg_ok_gpio = <&gpio0 GPIO_B1 GPIO_ACTIVE_HIGH>;
bat_table = <0 0 0 0 100 100
3500 3619 3678 3734 3742 3783 3813 3884 3968 4110 4220
3750 3710 3770 3830 3850 3880 3910 3980 4060 4240 4300
>;
is_dc_charge = <1>;
is_usb_charge = <0>;
};
};
&i2c0 {
status = "okay";
/* ts@28 {
compatible = "NXP,pn544";
reg = <0x28>;
irq_gpio = <&gpio1 GPIO_B3 IRQ_TYPE_LEVEL_LOW>;
ven_gpio = <&gpio0 GPIO_B1 GPIO_ACTIVE_HIGH>;
firm_gpio = <&gpio0 GPIO_B0 GPIO_ACTIVE_HIGH>;
//pwr_req = <&gpio2 GPIO_A1 GPIO_ACTIVE_HIGH>;
//nfc_pwr = <&gpio2 GPIO_A2 GPIO_ACTIVE_HIGH>;
};*/
rk818: rk818@1c {
reg = <0x1c>;
status = "disabled";
};
rk816: rk816@1a {
reg = <0x1a>;
status = "okay";
compatible = "rockchip,rk816";
};
};
&i2c1 {
status = "disabled";
/*
sensor@4c {
compatible = "gs_mma7660";
reg = <0x4c>;
type = <SENSOR_TYPE_ACCEL>;
irq-gpio = <&gpio1 GPIO_A0 IRQ_TYPE_LEVEL_LOW>;
irq_enable = <0>;
poll_delay_ms = <30>;
layout = <7>;
};
rk816: rk816@1a {
reg = <0x1a>;
status = "okay";
compatible = "rockchip,rk816";
};
*/
rtc@51 {
compatible = "rtc,hym8563";
reg = <0x51>;
status = "disabled";
irq_gpio = <&gpio1 GPIO_A5 IRQ_TYPE_EDGE_FALLING>;
};
};
&i2c2 {
status = "okay";
ts@55 {
compatible = "goodix,gt8xx";
reg = <0x55>;
//touch-gpio = <&gpio1 GPIO_B0 IRQ_TYPE_LEVEL_LOW>;
reset-gpio = <&gpio2 GPIO_C1 GPIO_ACTIVE_LOW>;
//power-gpio = <&gpio0 GPIO_C5 GPIO_ACTIVE_LOW>;
max-x = <1280>;
max-y = <800>;
status = "disabled";
};
/* sensor@4c {
compatible = "gs_mma7660";
reg = <0x4c>;
type = <SENSOR_TYPE_ACCEL>;
irq-gpio = <&gpio1 GPIO_A0 IRQ_TYPE_LEVEL_LOW>;
irq_enable = <0>;
poll_delay_ms = <30>;
layout = <6>;
};
stk8ba5xx_acc {
compatible = "stk8ba5xx_acc";
reg = <0x18>;
type = <SENSOR_TYPE_ACCEL>;
//irq-gpio = <&xgold_pmx_gpio 0 IRQ_TYPE_LEVEL_LOW>;
irq_enable = <0>;
poll_delay_ms = <30>;
layout = <1>;
};*/
sensor@18 {
compatible = "gs_bma2xx";
reg = <0x18>;
type = <SENSOR_TYPE_ACCEL>;
irq-gpio = <&gpio0 GPIO_B6 IRQ_TYPE_LEVEL_LOW>;
irq_enable = <0>;
poll_delay_ms = <5>;
layout = <4>;
};
ts@40 {
compatible = "gslX680";
reg = <0x40>;
irp-gpio = <&gpio1 GPIO_B0 IRQ_TYPE_LEVEL_LOW>;
//touch-gpio = <&gpio1 GPIO_B0 IRQ_TYPE_LEVEL_LOW>; /* TP_INT == GPIO1_B0 */
reset-gpio = <&gpio0 GPIO_D1 GPIO_ACTIVE_LOW>; /* TP_RST == GPIO0_D1 */
//power-gpio = <&gpio0 GPIO_C5 GPIO_ACTIVE_LOW>;
//max-x = <800>;
//max-y = <480>;
status = "okay";
};
};
&sdmmc {
cd-gpios = <&gpio1 GPIO_C1 GPIO_ACTIVE_HIGH>;/*CD GPIO*/
status = "okay";
};
&sdio {
clock-frequency = <37500000>;
clock-freq-min-max = <200000 37500000>;
supports-highspeed;
supports-sdio;
ignore-pm-notify;
keep-power-in-suspend;
//cap-sdio-irq;
status = "okay";
};
&uart0 {
status = "okay";
clock-frequency = <24000000>;
dma-names = "!tx", "!rx";
pinctrl-0 = <&uart0_xfer &uart0_cts>;
};
&codec {
spk_ctl_io = <&gpio0 GPIO_D6 GPIO_ACTIVE_HIGH>;
host_drv_gpio = <&gpio0 GPIO_D0 GPIO_ACTIVE_HIGH>;
spk-mute-delay = <200>;
hp-mute-delay = <100>;
rk312x_for_mid = <1>;
is_rk3128 = <0>;
spk_volume = <26>;
hp_volume = <25>;
capture_volume = <30>;//26
gpio_debug = <0>;
codec_hp_det = <0>;
};
&dwc_control_usb {
usb_uart {
status = "disabled";
};
};
&rk3128_cif_sensor{
status = "okay";
/*
gc2035 {
rockchip,powerdown = <&gpio1 GPIO_B2 GPIO_ACTIVE_HIGH>;
};
gc0308 {
rockchip,powerdown = <&gpio1 GPIO_B1 GPIO_ACTIVE_HIGH>;
};
*/
};
&gmac {
status = "disabled";
};
&rk818 {
test-power {
status = "disabled";
};
};
&uart2 {
status = "disabled";
};
&clk_core_dvfs_table {
operating-points = <
/* KHz uV */
216000 925000
408000 925000
600000 950000
696000 975000
816000 1050000
1008000 1175000
1200000 1300000
// 1296000 1350000
// 1320000 1375000
>;
virt-temp-limit-1-cpu-busy = <
/* target-temp limit-freq */
75 1008000
85 1200000
95 1200000
100 1200000
>;
virt-temp-limit-2-cpu-busy = <
/* target-temp limit-freq */
75 912000
85 1008000
95 1104000
100 1200000
>;
virt-temp-limit-3-cpu-busy = <
/* target-temp limit-freq */
75 816000
85 912000
95 100800
100 110400
>;
virt-temp-limit-4-cpu-busy = <
/* target-temp limit-freq */
75 816000
85 912000
95 100800
100 110400
>;
temp-limit-enable = <1>;
target-temp = <85>;
status="okay";
};
&clk_gpu_dvfs_table {
operating-points = <
/* KHz uV */
200000 1000000
300000 1025000
400000 1125000
//480000 1175000
>;
status="okay";
};
&clk_ddr_dvfs_table {
operating-points = <
/* KHz uV */
200000 1000000
300000 1000000
400000 1075000
533000 1250000
>;
freq-table = <
/*status freq(KHz)*/
SYS_STATUS_NORMAL 400000
SYS_STATUS_SUSPEND 200000
SYS_STATUS_VIDEO_1080P 240000
SYS_STATUS_VIDEO_4K 400000
SYS_STATUS_PERFORMANCE 528000
SYS_STATUS_DUALVIEW 400000
SYS_STATUS_BOOST 324000
SYS_STATUS_ISP 533000
>;
auto-freq-table = <
240000
324000
396000
528000
>;
auto-freq=<0>;
status="okay";
};
/*
&pinctrl {
init-gpios = <&gpio1 GPIO_C1 GPIO_ACTIVE_HIGH>;
};
*/
/include/ "rk816.dtsi"
&rk816 {
gpios =<&gpio1 GPIO_B1 GPIO_ACTIVE_HIGH>,<&gpio3 GPIO_C1 GPIO_ACTIVE_LOW>;
rk816,system-power-controller;
rk816,support_dc_chg = <0>;/*1: dc chg; 0:usb chg*/
io-channels = <&adc 0>;
gpio-controller;
#gpio-cells = <2>;
regulators {
rk816_dcdc1_reg: regulator@0{
regulator-name= "vdd_arm";
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1500000>;
regulator-initial-mode = <0x2>;
regulator-initial-state = <3>;
regulator-always-on;
regulator-state-mem {
regulator-state-mode = <0x2>;
regulator-state-disabled;
regulator-state-uv = <900000>;
};
};
rk816_dcdc2_reg: regulator@1 {
regulator-name= "vdd_logic";
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1500000>;
regulator-initial-mode = <0x2>;
regulator-initial-state = <3>;
regulator-always-on;
regulator-state-mem {
regulator-state-mode = <0x2>;
regulator-state-enabled;
regulator-state-uv = <950000>;
};
};
rk816_dcdc3_reg: regulator@2 {
regulator-name= "rk816_dcdc3";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <0x2>;
regulator-initial-state = <3>;
regulator-always-on;
regulator-state-mem {
regulator-state-mode = <0x2>;
regulator-state-enabled;
regulator-state-uv = <1200000>;
};
};
rk816_dcdc4_reg: regulator@3 {
regulator-name= "vccio";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-initial-mode = <0x1>;
regulator-initial-state = <3>;
regulator-always-on;
regulator-state-mem {
regulator-state-mode = <0x2>;
regulator-state-enabled;
regulator-state-uv = <3000000>;
};
};
rk816_ldo1_reg: regulator@4 {
regulator-name= "rk816_ldo1";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
regulator-initial-state = <3>;
regulator-always-on;
regulator-state-mem {
regulator-state-disabled;
regulator-state-uv = <2800000>;
};
};
rk816_ldo2_reg: regulator@5 {
regulator-name= "rk816_ldo2";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-state = <3>;
regulator-always-on;
regulator-state-mem {
regulator-state-disabled;
regulator-state-uv = <1800000>;
};
};
rk816_ldo3_reg: regulator@6 {
regulator-name= "rk816_ldo3";
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
regulator-initial-state = <3>;
regulator-always-on;
regulator-state-mem {
regulator-state-enabled;
regulator-state-uv = <1100000>;
};
};
rk816_ldo4_reg:regulator@7 {
regulator-name= "rk816_ldo4";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
//regulator-boot-on;
regulator-initial-state = <3>;
regulator-always-on;
regulator-state-mem {
regulator-state-disabled;
regulator-state-uv = <3300000>;
};
};
rk816_ldo5_reg: regulator@8 {
regulator-name= "rk816_ldo5";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-state = <3>;
//regulator-always-on;
regulator-state-mem {
regulator-state-disabled;
regulator-state-uv = <1800000>;
};
};
rk816_ldo6_reg: regulator@9 {
regulator-name= "rk816_ldo6";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-initial-state = <3>;
//regulator-always-on;
regulator-state-mem {
regulator-state-disabled;
regulator-state-uv = <3300000>;
};
};
};
battery {
compatible = "rk816-battery";
/* ocv_table = < 3400 3599 3671 3701 3728 3746 3762
3772 3781 3792 3816 3836 3866 3910
3942 3971 4002 4050 4088 4132 4183>;
ocv_table = < 3400 3649 3680 3706 3734 3753 3763
3770 3778 3790 3805 3828 3865 3897
3926 3958 3994 4034 4077 4124 4184>;
design_capacity = <4162>;
*/
ocv_table = < 3400 3649 3680 3706 3734 3753 3763
3770 3778 3790 3805 3828 3865 3897
3926 3958 3994 4034 4077 4124 4184>;
design_capacity = <4150>;
design_qmax = <4000>;
bat_res = <100>;
max_input_current = <1500>;
max_chrg_current = <1000>;
max_chrg_voltage = <4200>;
sleep_enter_current = <300>;
sleep_exit_current = <300>;
sleep_filter_current = <100>;
power_off_thresd = <3500>;
zero_algorithm_vol = <3800>;
monitor_sec = <5>;
virtual_power = <0>;
power_dc2otg = <1>;
dc_det_adc = <1>;
dc_adc_trigger = <200>;
};
gpio {
compatible = "rk816-gpio";
};
};
\ No newline at end of file
arch/arm/boot/dts/rk3128-86v_normal.dts 100644 → 100755
View file @ 1f318833
File mode changed from 100644 to 100755
drivers/input/touchscreen/gsl_point_id.o.bak deleted 100755 → 0
View file @ cdf3487b
File deleted
drivers/net/wireless/rockchip_wlan/rtl8723bs-vq0-0/Makefile → drivers/net/wireless/rockchip_wlan/rtl8723bs-vq0.bak/Makefile
View file @ 1f318833
......@@ -1107,6 +1107,7 @@ EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC
EXTRA_CFLAGS += -DRTW_SUPPORT_PLATFORM_SHUTDOWN
# default setting for Special function
EXTRA_CFLAGS += -DCONFIG_P2P_IPS
EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
ARCH := arm
CROSS_COMPILE := /home/android_sdk/Rockchip/Rk3188/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi-
KSRC := /home/android_sdk/Rockchip/Rk3188/kernel
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment