ARM: rockchip: rk3288 workaround temporarily

diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index 2ea51edb8d1fa37d378bf8874a21c4027cd4e366..b3de20aa3c115124d4a8f73ca1f9e77f1d5ec165 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -51,7 +51,7 @@
                compatible = "pwm-backlight";
                pwms = <&pwm0 0 25000>;
                brightness-levels = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 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>;
+               default-brightness-level = <20>;
                enable-gpios = <&gpio7 GPIO_A2 GPIO_ACTIVE_HIGH>;
        };
 
@@ -163,7 +163,7 @@
 
        
         vmmc-supply = <&rk808_ldo5_reg>;
-       status = "okay";
+       status = "disabled";
 };
                
 &sdio {
@@ -199,7 +199,7 @@
        bq24296: bq24296@6b {
                compatible = "ti,bq24296";
                reg = <0x6b>;
-               gpios = <&gpio0 GPIO_A7 GPIO_ACTIVE_HIGH>;
+//             gpios = <&gpio0 GPIO_A7 GPIO_ACTIVE_HIGH>;
                bq24296,chg_current = <1000 500 2000>;
                status = "okay";
        };
@@ -300,6 +300,7 @@
 
 &i2c4 {
        status = "okay";
+/*
        ts@55 {
                compatible = "goodix,gt8xx";
                reg = <0x55>;
@@ -320,6 +321,7 @@
                max-y = <800>;
                orientation=<1 0 0 1>;
        };
+*/
 };
 
 &i2c5 {

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index bc3a240a3c97c2406543840ebbc5ab1e73324c88..76ddbfd5a99339ab5dbc3a7fda75d44055653e43 100755 (executable)
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -31,7 +31,10 @@ CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
+# CONFIG_MSDOS_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
 CONFIG_ARCH_ROCKCHIP=y
+# CONFIG_RK_VCODEC is not set
 # CONFIG_SWP_EMULATE is not set
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_PL310_ERRATA_753970=y
@@ -305,7 +308,6 @@ CONFIG_I2C_ROCKCHIP_COMPAT=y
 CONFIG_SPI=y
 CONFIG_SPI_ROCKCHIP_CORE=y
 CONFIG_SPI_ROCKCHIP=y
-CONFIG_SPI_ROCKCHIP_DMA=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_BATTERY_BQ24296=y
@@ -351,10 +353,6 @@ CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_SND_RK_SOC=y
 CONFIG_SND_RK_SOC_HDMI_I2S=y
-CONFIG_SND_RK_SOC_ES8323=y
-CONFIG_SND_RK_SOC_RT5631=y
-CONFIG_SND_RK_SOC_RT3224=y
-CONFIG_SND_RK_SOC_RT5616=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=y

diff --git a/drivers/power/bq24296_charger.c b/drivers/power/bq24296_charger.c
index b29ca06468051051e1245900f7c944c32948ee57..0d110fd502717e7d3e16502964c6c491250af157 100755 (executable)
--- a/drivers/power/bq24296_charger.c
+++ b/drivers/power/bq24296_charger.c
@@ -538,6 +538,7 @@ static int bq24296_battery_probe(struct i2c_client *client,const struct i2c_devi
        schedule_delayed_work(&di->usb_detect_work, 0);
        bq24296_init_registers();
 
+/*
        if (gpio_is_valid(pdev->chg_irq_pin)){
                irq = gpio_to_irq(pdev->chg_irq_pin);
                ret = request_threaded_irq(irq, NULL,chg_irq_func, IRQF_TRIGGER_FALLING| IRQF_ONESHOT, "bq24296_chg_irq", di);
@@ -547,6 +548,7 @@ static int bq24296_battery_probe(struct i2c_client *client,const struct i2c_devi
                        goto err_chgirq_failed;
                }
        }
+*/
 
        bq24296_int =1;