diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-01-22 11:33:02 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-01-29 09:50:06 -0200 |
commit | a5a5bbd1b1a87c20016fe6689e2c5763e56d8427 (patch) | |
tree | 9014c37c1e28389b36231a8d463f447012e1c284 | |
parent | a35b262ee47b725a6e1a39a9c639703b3ec89182 (diff) | |
download | meta-fsl-arm-1.4_M3.tar.gz |
linux-imx (3.0.35): Upgrade to 1.1.0 BSP release1.4_M3
This upgrades to the 1.1.0 release and refresh the iMX6 SabreLITE diff
against Boundary Devices' repository.
Change-Id: Icc7463181b6eb2bd9bb57205560b642ff65e5f09
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
3 files changed, 241 insertions, 87 deletions
diff --git a/recipes-kernel/linux/linux-imx-3.0.35/imx6qsabrelite/sync-boundary-changes.patch b/recipes-kernel/linux/linux-imx-3.0.35/imx6qsabrelite/sync-boundary-changes.patch index 48cf7a7..91f5b2a 100644 --- a/recipes-kernel/linux/linux-imx-3.0.35/imx6qsabrelite/sync-boundary-changes.patch +++ b/recipes-kernel/linux/linux-imx-3.0.35/imx6qsabrelite/sync-boundary-changes.patch | |||
@@ -3229,10 +3229,10 @@ diff --git a/arch/arm/mach-mx5/usb_h2.c b/arch/arm/mach-mx5/usb_h2.c | |||
3229 | old mode 100755 | 3229 | old mode 100755 |
3230 | new mode 100644 | 3230 | new mode 100644 |
3231 | diff --git a/arch/arm/mach-mx6/Kconfig b/arch/arm/mach-mx6/Kconfig | 3231 | diff --git a/arch/arm/mach-mx6/Kconfig b/arch/arm/mach-mx6/Kconfig |
3232 | index 45ae9ea..fad950e 100644 | 3232 | index 2ffd90d..481075b 100644 |
3233 | --- a/arch/arm/mach-mx6/Kconfig | 3233 | --- a/arch/arm/mach-mx6/Kconfig |
3234 | +++ b/arch/arm/mach-mx6/Kconfig | 3234 | +++ b/arch/arm/mach-mx6/Kconfig |
3235 | @@ -173,6 +173,10 @@ config MACH_MX6Q_SABRELITE | 3235 | @@ -175,6 +175,10 @@ config MACH_MX6Q_SABRELITE |
3236 | select IMX_HAVE_PLATFORM_IMX_ASRC | 3236 | select IMX_HAVE_PLATFORM_IMX_ASRC |
3237 | select IMX_HAVE_PLATFORM_FLEXCAN | 3237 | select IMX_HAVE_PLATFORM_FLEXCAN |
3238 | select IMX_HAVE_PLATFORM_IMX_CAAM | 3238 | select IMX_HAVE_PLATFORM_IMX_CAAM |
@@ -3244,7 +3244,7 @@ index 45ae9ea..fad950e 100644 | |||
3244 | Include support for i.MX 6Quad SABRE Lite platform. This includes specific | 3244 | Include support for i.MX 6Quad SABRE Lite platform. This includes specific |
3245 | configurations for the board and its peripherals. | 3245 | configurations for the board and its peripherals. |
3246 | diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c | 3246 | diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c |
3247 | index eff81ac..2c0cbe2 100644 | 3247 | index 736b423..b586426 100644 |
3248 | --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c | 3248 | --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c |
3249 | +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c | 3249 | +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c |
3250 | @@ -56,12 +56,15 @@ | 3250 | @@ -56,12 +56,15 @@ |
@@ -3337,9 +3337,9 @@ index eff81ac..2c0cbe2 100644 | |||
3337 | void __init early_console_setup(unsigned long base, struct clk *clk); | 3337 | void __init early_console_setup(unsigned long base, struct clk *clk); |
3338 | static struct clk *sata_clk; | 3338 | static struct clk *sata_clk; |
3339 | 3339 | ||
3340 | @@ -108,252 +135,49 @@ extern struct regulator *(*get_cpu_regulator)(void); | 3340 | @@ -108,252 +135,49 @@ static int caam_enabled; |
3341 | extern struct regulator *(*get_cpu_regulator)(void); | ||
3341 | extern void (*put_cpu_regulator)(void); | 3342 | extern void (*put_cpu_regulator)(void); |
3342 | extern void mx6_cpu_regulator_init(void); | ||
3343 | 3343 | ||
3344 | -static iomux_v3_cfg_t mx6q_sabrelite_pads[] = { | 3344 | -static iomux_v3_cfg_t mx6q_sabrelite_pads[] = { |
3345 | - /* AUDMUX */ | 3345 | - /* AUDMUX */ |
@@ -3972,7 +3972,7 @@ index eff81ac..2c0cbe2 100644 | |||
3972 | { | 3972 | { |
3973 | int ret = 0; | 3973 | int ret = 0; |
3974 | 3974 | ||
3975 | @@ -660,21 +526,21 @@ static void __init imx6q_sabrelite_init_usb(void) | 3975 | @@ -660,20 +526,20 @@ static void __init imx6q_sabrelite_init_usb(void) |
3976 | /* disable external charger detect, | 3976 | /* disable external charger detect, |
3977 | * or it will affect signal quality at dp . | 3977 | * or it will affect signal quality at dp . |
3978 | */ | 3978 | */ |
@@ -3990,7 +3990,6 @@ index eff81ac..2c0cbe2 100644 | |||
3990 | 3990 | ||
3991 | - mx6_set_otghost_vbus_func(imx6q_sabrelite_usbotg_vbus); | 3991 | - mx6_set_otghost_vbus_func(imx6q_sabrelite_usbotg_vbus); |
3992 | + mx6_set_otghost_vbus_func(imx6_sabrelite_usbotg_vbus); | 3992 | + mx6_set_otghost_vbus_func(imx6_sabrelite_usbotg_vbus); |
3993 | mx6_usb_dr_init(); | ||
3994 | } | 3993 | } |
3995 | 3994 | ||
3996 | /* HW Initialization, if return 0, initialization is successful. */ | 3995 | /* HW Initialization, if return 0, initialization is successful. */ |
@@ -3999,7 +3998,7 @@ index eff81ac..2c0cbe2 100644 | |||
3999 | { | 3998 | { |
4000 | u32 tmpdata; | 3999 | u32 tmpdata; |
4001 | int ret = 0; | 4000 | int ret = 0; |
4002 | @@ -734,39 +600,45 @@ put_sata_clk: | 4001 | @@ -733,39 +599,45 @@ put_sata_clk: |
4003 | return ret; | 4002 | return ret; |
4004 | } | 4003 | } |
4005 | 4004 | ||
@@ -4063,7 +4062,7 @@ index eff81ac..2c0cbe2 100644 | |||
4063 | .reserved_mem_size = SZ_128M, | 4062 | .reserved_mem_size = SZ_128M, |
4064 | }; | 4063 | }; |
4065 | 4064 | ||
4066 | @@ -834,14 +706,12 @@ static void hdmi_init(int ipu_id, int disp_id) | 4065 | @@ -833,14 +705,12 @@ static void hdmi_init(int ipu_id, int disp_id) |
4067 | 4066 | ||
4068 | static void hdmi_enable_ddc_pin(void) | 4067 | static void hdmi_enable_ddc_pin(void) |
4069 | { | 4068 | { |
@@ -4080,7 +4079,7 @@ index eff81ac..2c0cbe2 100644 | |||
4080 | } | 4079 | } |
4081 | 4080 | ||
4082 | static struct fsl_mxc_hdmi_platform_data hdmi_data = { | 4081 | static struct fsl_mxc_hdmi_platform_data hdmi_data = { |
4083 | @@ -852,7 +722,7 @@ static struct fsl_mxc_hdmi_platform_data hdmi_data = { | 4082 | @@ -851,7 +721,7 @@ static struct fsl_mxc_hdmi_platform_data hdmi_data = { |
4084 | 4083 | ||
4085 | static struct fsl_mxc_hdmi_core_platform_data hdmi_core_data = { | 4084 | static struct fsl_mxc_hdmi_core_platform_data hdmi_core_data = { |
4086 | .ipu_id = 0, | 4085 | .ipu_id = 0, |
@@ -4089,7 +4088,7 @@ index eff81ac..2c0cbe2 100644 | |||
4089 | }; | 4088 | }; |
4090 | 4089 | ||
4091 | static struct fsl_mxc_lcd_platform_data lcdif_data = { | 4090 | static struct fsl_mxc_lcd_platform_data lcdif_data = { |
4092 | @@ -904,13 +774,12 @@ static void sabrelite_suspend_exit(void) | 4091 | @@ -903,13 +773,12 @@ static void sabrelite_suspend_exit(void) |
4093 | { | 4092 | { |
4094 | /* resume restore */ | 4093 | /* resume restore */ |
4095 | } | 4094 | } |
@@ -4104,7 +4103,7 @@ index eff81ac..2c0cbe2 100644 | |||
4104 | #define GPIO_BUTTON(gpio_num, ev_code, act_low, descr, wake) \ | 4103 | #define GPIO_BUTTON(gpio_num, ev_code, act_low, descr, wake) \ |
4105 | { \ | 4104 | { \ |
4106 | .gpio = gpio_num, \ | 4105 | .gpio = gpio_num, \ |
4107 | @@ -922,14 +791,15 @@ static const struct pm_platform_data mx6q_sabrelite_pm_data __initconst = { | 4106 | @@ -921,14 +790,15 @@ static const struct pm_platform_data mx6q_sabrelite_pm_data __initconst = { |
4108 | } | 4107 | } |
4109 | 4108 | ||
4110 | static struct gpio_keys_button sabrelite_buttons[] = { | 4109 | static struct gpio_keys_button sabrelite_buttons[] = { |
@@ -4126,7 +4125,7 @@ index eff81ac..2c0cbe2 100644 | |||
4126 | static struct gpio_keys_platform_data sabrelite_button_data = { | 4125 | static struct gpio_keys_platform_data sabrelite_button_data = { |
4127 | .buttons = sabrelite_buttons, | 4126 | .buttons = sabrelite_buttons, |
4128 | .nbuttons = ARRAY_SIZE(sabrelite_buttons), | 4127 | .nbuttons = ARRAY_SIZE(sabrelite_buttons), |
4129 | @@ -949,7 +819,63 @@ static void __init sabrelite_add_device_buttons(void) | 4128 | @@ -948,7 +818,63 @@ static void __init sabrelite_add_device_buttons(void) |
4130 | platform_device_register(&sabrelite_button_device); | 4129 | platform_device_register(&sabrelite_button_device); |
4131 | } | 4130 | } |
4132 | #else | 4131 | #else |
@@ -4191,7 +4190,7 @@ index eff81ac..2c0cbe2 100644 | |||
4191 | #endif | 4190 | #endif |
4192 | 4191 | ||
4193 | static struct regulator_consumer_supply sabrelite_vmmc_consumers[] = { | 4192 | static struct regulator_consumer_supply sabrelite_vmmc_consumers[] = { |
4194 | @@ -1056,7 +982,7 @@ static struct platform_device sgtl5000_sabrelite_vddd_reg_devices = { | 4193 | @@ -1055,7 +981,7 @@ static struct platform_device sgtl5000_sabrelite_vddd_reg_devices = { |
4195 | 4194 | ||
4196 | #endif /* CONFIG_SND_SOC_SGTL5000 */ | 4195 | #endif /* CONFIG_SND_SOC_SGTL5000 */ |
4197 | 4196 | ||
@@ -4200,7 +4199,7 @@ index eff81ac..2c0cbe2 100644 | |||
4200 | { | 4199 | { |
4201 | mxc_register_device(&mx6_sabrelite_audio_device, | 4200 | mxc_register_device(&mx6_sabrelite_audio_device, |
4202 | &mx6_sabrelite_audio_data); | 4201 | &mx6_sabrelite_audio_data); |
4203 | @@ -1069,6 +995,15 @@ static int imx6q_init_audio(void) | 4202 | @@ -1068,6 +994,15 @@ static int imx6q_init_audio(void) |
4204 | return 0; | 4203 | return 0; |
4205 | } | 4204 | } |
4206 | 4205 | ||
@@ -4216,9 +4215,9 @@ index eff81ac..2c0cbe2 100644 | |||
4216 | static struct platform_pwm_backlight_data mx6_sabrelite_pwm_backlight_data = { | 4215 | static struct platform_pwm_backlight_data mx6_sabrelite_pwm_backlight_data = { |
4217 | .pwm_id = 3, | 4216 | .pwm_id = 3, |
4218 | .max_brightness = 255, | 4217 | .max_brightness = 255, |
4219 | @@ -1115,19 +1050,37 @@ static struct mipi_csi2_platform_data mipi_csi2_pdata = { | 4218 | @@ -1121,19 +1056,37 @@ static int __init caam_setup(char *__unused) |
4220 | .pixel_clk = "emi_clk", | 4219 | } |
4221 | }; | 4220 | early_param("caam", caam_setup); |
4222 | 4221 | ||
4223 | +static const struct imx_pcie_platform_data pcie_data __initconst = { | 4222 | +static const struct imx_pcie_platform_data pcie_data __initconst = { |
4224 | + .pcie_pwr_en = -EINVAL, | 4223 | + .pcie_pwr_en = -EINVAL, |
@@ -4257,7 +4256,7 @@ index eff81ac..2c0cbe2 100644 | |||
4257 | 4256 | ||
4258 | #ifdef CONFIG_FEC_1588 | 4257 | #ifdef CONFIG_FEC_1588 |
4259 | /* Set GPIO_16 input for IEEE-1588 ts_clk and RMII reference clock | 4258 | /* Set GPIO_16 input for IEEE-1588 ts_clk and RMII reference clock |
4260 | @@ -1141,13 +1094,26 @@ static void __init mx6_sabrelite_board_init(void) | 4259 | @@ -1147,13 +1100,26 @@ static void __init mx6_sabrelite_board_init(void) |
4261 | gp_reg_id = sabrelite_dvfscore_data.reg_id; | 4260 | gp_reg_id = sabrelite_dvfscore_data.reg_id; |
4262 | soc_reg_id = sabrelite_dvfscore_data.soc_id; | 4261 | soc_reg_id = sabrelite_dvfscore_data.soc_id; |
4263 | pu_reg_id = sabrelite_dvfscore_data.pu_id; | 4262 | pu_reg_id = sabrelite_dvfscore_data.pu_id; |
@@ -4288,9 +4287,9 @@ index eff81ac..2c0cbe2 100644 | |||
4288 | imx6q_add_ipuv3fb(i, &sabrelite_fb_data[i]); | 4287 | imx6q_add_ipuv3fb(i, &sabrelite_fb_data[i]); |
4289 | 4288 | ||
4290 | imx6q_add_vdoa(); | 4289 | imx6q_add_vdoa(); |
4291 | @@ -1161,9 +1127,9 @@ static void __init mx6_sabrelite_board_init(void) | 4290 | @@ -1168,9 +1134,9 @@ static void __init mx6_sabrelite_board_init(void) |
4292 | 4291 | if (1 == caam_enabled) | |
4293 | imx6q_add_imx_caam(); | 4292 | imx6q_add_imx_caam(); |
4294 | 4293 | ||
4295 | - imx6q_add_imx_i2c(0, &mx6q_sabrelite_i2c_data); | 4294 | - imx6q_add_imx_i2c(0, &mx6q_sabrelite_i2c_data); |
4296 | - imx6q_add_imx_i2c(1, &mx6q_sabrelite_i2c_data); | 4295 | - imx6q_add_imx_i2c(1, &mx6q_sabrelite_i2c_data); |
@@ -4301,7 +4300,7 @@ index eff81ac..2c0cbe2 100644 | |||
4301 | i2c_register_board_info(0, mxc_i2c0_board_info, | 4300 | i2c_register_board_info(0, mxc_i2c0_board_info, |
4302 | ARRAY_SIZE(mxc_i2c0_board_info)); | 4301 | ARRAY_SIZE(mxc_i2c0_board_info)); |
4303 | i2c_register_board_info(1, mxc_i2c1_board_info, | 4302 | i2c_register_board_info(1, mxc_i2c1_board_info, |
4304 | @@ -1172,33 +1138,35 @@ static void __init mx6_sabrelite_board_init(void) | 4303 | @@ -1179,33 +1145,35 @@ static void __init mx6_sabrelite_board_init(void) |
4305 | ARRAY_SIZE(mxc_i2c2_board_info)); | 4304 | ARRAY_SIZE(mxc_i2c2_board_info)); |
4306 | 4305 | ||
4307 | /* SPI */ | 4306 | /* SPI */ |
@@ -4347,7 +4346,7 @@ index eff81ac..2c0cbe2 100644 | |||
4347 | imx6q_add_mxc_pwm_backlight(3, &mx6_sabrelite_pwm_backlight_data); | 4346 | imx6q_add_mxc_pwm_backlight(3, &mx6_sabrelite_pwm_backlight_data); |
4348 | 4347 | ||
4349 | imx6q_add_otp(); | 4348 | imx6q_add_otp(); |
4350 | @@ -1214,12 +1182,23 @@ static void __init mx6_sabrelite_board_init(void) | 4349 | @@ -1220,12 +1188,23 @@ static void __init mx6_sabrelite_board_init(void) |
4351 | imx6q_add_hdmi_soc(); | 4350 | imx6q_add_hdmi_soc(); |
4352 | imx6q_add_hdmi_soc_dai(); | 4351 | imx6q_add_hdmi_soc_dai(); |
4353 | 4352 | ||
@@ -4376,7 +4375,7 @@ index eff81ac..2c0cbe2 100644 | |||
4376 | 4375 | ||
4377 | clko2 = clk_get(NULL, "clko2_clk"); | 4376 | clko2 = clk_get(NULL, "clko2_clk"); |
4378 | if (IS_ERR(clko2)) | 4377 | if (IS_ERR(clko2)) |
4379 | @@ -1235,6 +1214,28 @@ static void __init mx6_sabrelite_board_init(void) | 4378 | @@ -1241,6 +1220,28 @@ static void __init mx6_sabrelite_board_init(void) |
4380 | clk_enable(clko2); | 4379 | clk_enable(clko2); |
4381 | imx6q_add_busfreq(); | 4380 | imx6q_add_busfreq(); |
4382 | 4381 | ||
@@ -4405,7 +4404,7 @@ index eff81ac..2c0cbe2 100644 | |||
4405 | imx6q_add_perfmon(0); | 4404 | imx6q_add_perfmon(0); |
4406 | imx6q_add_perfmon(1); | 4405 | imx6q_add_perfmon(1); |
4407 | imx6q_add_perfmon(2); | 4406 | imx6q_add_perfmon(2); |
4408 | @@ -1258,16 +1259,16 @@ static struct sys_timer mx6_sabrelite_timer = { | 4407 | @@ -1264,16 +1265,16 @@ static struct sys_timer mx6_sabrelite_timer = { |
4409 | .init = mx6_sabrelite_timer_init, | 4408 | .init = mx6_sabrelite_timer_init, |
4410 | }; | 4409 | }; |
4411 | 4410 | ||
@@ -4427,13 +4426,171 @@ index eff81ac..2c0cbe2 100644 | |||
4427 | } | 4426 | } |
4428 | #endif | 4427 | #endif |
4429 | } | 4428 | } |
4430 | @@ -1283,5 +1284,5 @@ MACHINE_START(MX6Q_SABRELITE, "Freescale i.MX 6Quad Sabre-Lite Board") | 4429 | @@ -1289,5 +1290,5 @@ MACHINE_START(MX6Q_SABRELITE, "Freescale i.MX 6Quad Sabre-Lite Board") |
4431 | .init_irq = mx6_init_irq, | 4430 | .init_irq = mx6_init_irq, |
4432 | .init_machine = mx6_sabrelite_board_init, | 4431 | .init_machine = mx6_sabrelite_board_init, |
4433 | .timer = &mx6_sabrelite_timer, | 4432 | .timer = &mx6_sabrelite_timer, |
4434 | - .reserve = mx6q_sabrelite_reserve, | 4433 | - .reserve = mx6q_sabrelite_reserve, |
4435 | + .reserve = mx6_sabrelite_reserve, | 4434 | + .reserve = mx6_sabrelite_reserve, |
4436 | MACHINE_END | 4435 | MACHINE_END |
4436 | diff --git a/arch/arm/mach-mx6/cpu_op-mx6.c b/arch/arm/mach-mx6/cpu_op-mx6.c | ||
4437 | index 5124c5e..750e57d 100644 | ||
4438 | --- a/arch/arm/mach-mx6/cpu_op-mx6.c | ||
4439 | +++ b/arch/arm/mach-mx6/cpu_op-mx6.c | ||
4440 | @@ -95,7 +95,7 @@ static struct cpu_op mx6q_cpu_op_1G[] = { | ||
4441 | .soc_voltage = 1250000, | ||
4442 | #else | ||
4443 | .pu_voltage = 1175000, | ||
4444 | - .soc_voltage = 1175000, | ||
4445 | + .soc_voltage = 1250000, | ||
4446 | #endif | ||
4447 | .cpu_voltage = 1150000,}, | ||
4448 | #ifdef CONFIG_MX6_VPU_352M | ||
4449 | @@ -115,7 +115,7 @@ static struct cpu_op mx6q_cpu_op_1G[] = { | ||
4450 | .cpu_rate = 396000000, | ||
4451 | .cpu_podf = 0, | ||
4452 | .pu_voltage = 1175000, | ||
4453 | - .soc_voltage = 1175000, | ||
4454 | + .soc_voltage = 1250000, | ||
4455 | .cpu_voltage = 950000,}, | ||
4456 | #endif | ||
4457 | }; | ||
4458 | diff --git a/arch/arm/mach-mx6/cpu_regulator-mx6.c b/arch/arm/mach-mx6/cpu_regulator-mx6.c | ||
4459 | index d905132..2af5d38 100644 | ||
4460 | --- a/arch/arm/mach-mx6/cpu_regulator-mx6.c | ||
4461 | +++ b/arch/arm/mach-mx6/cpu_regulator-mx6.c | ||
4462 | @@ -21,6 +21,7 @@ | ||
4463 | #include <linux/cpufreq.h> | ||
4464 | #endif | ||
4465 | #include <linux/io.h> | ||
4466 | +#include <linux/delay.h> | ||
4467 | #include <asm/cpu.h> | ||
4468 | |||
4469 | #include <mach/clock.h> | ||
4470 | @@ -101,49 +102,16 @@ void mx6_cpu_regulator_init(void) | ||
4471 | regulator_set_voltage(cpu_regulator, | ||
4472 | cpu_op_tbl[0].cpu_voltage, | ||
4473 | cpu_op_tbl[0].cpu_voltage); | ||
4474 | - if (enable_ldo_mode == LDO_MODE_BYPASSED) { | ||
4475 | - /*digital bypass VDDPU/VDDSOC/VDDARM*/ | ||
4476 | - reg = __raw_readl(ANADIG_REG_CORE); | ||
4477 | - reg &= ~BM_ANADIG_REG_CORE_REG0_TRG; | ||
4478 | - reg |= BF_ANADIG_REG_CORE_REG0_TRG(0x1f); | ||
4479 | - reg &= ~BM_ANADIG_REG_CORE_REG1_TRG; | ||
4480 | - reg |= BF_ANADIG_REG_CORE_REG1_TRG(0x1f); | ||
4481 | - reg &= ~BM_ANADIG_REG_CORE_REG2_TRG; | ||
4482 | - reg |= BF_ANADIG_REG_CORE_REG2_TRG(0x1f); | ||
4483 | - __raw_writel(reg, ANADIG_REG_CORE); | ||
4484 | - /* Mask the ANATOP brown out interrupt in the GPC. */ | ||
4485 | - reg = __raw_readl(gpc_base + 0x14); | ||
4486 | - reg |= 0x80000000; | ||
4487 | - __raw_writel(reg, gpc_base + 0x14); | ||
4488 | - } | ||
4489 | - clk_set_rate(cpu_clk, cpu_op_tbl[0].cpu_rate); | ||
4490 | - | ||
4491 | - /*Fix loops-per-jiffy */ | ||
4492 | -#ifdef CONFIG_SMP | ||
4493 | - for_each_online_cpu(cpu) | ||
4494 | - per_cpu(cpu_data, cpu).loops_per_jiffy = | ||
4495 | - mx6_cpu_jiffies( | ||
4496 | - per_cpu(cpu_data, cpu).loops_per_jiffy, | ||
4497 | - curr_cpu / 1000, | ||
4498 | - clk_get_rate(cpu_clk) / 1000); | ||
4499 | -#else | ||
4500 | - old_loops_per_jiffy = loops_per_jiffy; | ||
4501 | - | ||
4502 | - loops_per_jiffy = | ||
4503 | - mx6_cpu_jiffies(old_loops_per_jiffy, | ||
4504 | - curr_cpu/1000, | ||
4505 | - clk_get_rate(cpu_clk) / 1000); | ||
4506 | -#endif | ||
4507 | -#if defined(CONFIG_CPU_FREQ) | ||
4508 | - /* Fix CPU frequency for CPUFREQ. */ | ||
4509 | - for (cpu = 0; cpu < num_online_cpus(); cpu++) | ||
4510 | - cpufreq_get(cpu); | ||
4511 | -#endif | ||
4512 | } | ||
4513 | } | ||
4514 | soc_regulator = regulator_get(NULL, soc_reg_id); | ||
4515 | if (IS_ERR(soc_regulator)) | ||
4516 | printk(KERN_ERR "%s: failed to get soc regulator\n", __func__); | ||
4517 | + else if (cpu_op_tbl) | ||
4518 | + regulator_set_voltage(soc_regulator, | ||
4519 | + cpu_op_tbl[0].soc_voltage, | ||
4520 | + cpu_op_tbl[0].soc_voltage); | ||
4521 | + | ||
4522 | pu_regulator = regulator_get(NULL, pu_reg_id); | ||
4523 | if (IS_ERR(pu_regulator)) | ||
4524 | printk(KERN_ERR "%s: failed to get pu regulator\n", __func__); | ||
4525 | @@ -161,7 +129,66 @@ void mx6_cpu_regulator_init(void) | ||
4526 | *VDDPU can be turned off by internal anatop anatop power gate. | ||
4527 | * | ||
4528 | */ | ||
4529 | - else if (!IS_ERR(pu_regulator) && strcmp(pu_reg_id, "cpu_vddgpu")) | ||
4530 | - external_pureg = 1; | ||
4531 | + else { | ||
4532 | + printk (KERN_ERR "%s: have pu_regulator\n", __func__ ); | ||
4533 | + if (strcmp(pu_reg_id, "cpu_vddgpu")) | ||
4534 | + external_pureg = 1; | ||
4535 | + | ||
4536 | + if (cpu_op_tbl) { | ||
4537 | + printk (KERN_ERR "%s: setting pu_regulator to %uuV\n", | ||
4538 | + __func__, | ||
4539 | + cpu_op_tbl[0].pu_voltage); | ||
4540 | + | ||
4541 | + regulator_set_voltage(pu_regulator, | ||
4542 | + cpu_op_tbl[0].pu_voltage, | ||
4543 | + cpu_op_tbl[0].pu_voltage); | ||
4544 | + } | ||
4545 | + } | ||
4546 | + | ||
4547 | + if (cpu_op_tbl | ||
4548 | + && !IS_ERR(cpu_regulator) | ||
4549 | + && !IS_ERR(soc_regulator) | ||
4550 | + && !IS_ERR(pu_regulator)) { | ||
4551 | + udelay(500); | ||
4552 | + | ||
4553 | + if (enable_ldo_mode == LDO_MODE_BYPASSED) { | ||
4554 | + /*digital bypass VDDPU/VDDSOC/VDDARM*/ | ||
4555 | + reg = __raw_readl(ANADIG_REG_CORE); | ||
4556 | + reg &= ~BM_ANADIG_REG_CORE_REG0_TRG; | ||
4557 | + reg |= BF_ANADIG_REG_CORE_REG0_TRG(0x1f); | ||
4558 | + reg &= ~BM_ANADIG_REG_CORE_REG1_TRG; | ||
4559 | + reg |= BF_ANADIG_REG_CORE_REG1_TRG(0x1f); | ||
4560 | + reg &= ~BM_ANADIG_REG_CORE_REG2_TRG; | ||
4561 | + reg |= BF_ANADIG_REG_CORE_REG2_TRG(0x1f); | ||
4562 | + __raw_writel(reg, ANADIG_REG_CORE); | ||
4563 | + /* Mask the ANATOP brown out interrupt in the GPC. */ | ||
4564 | + reg = __raw_readl(gpc_base + 0x14); | ||
4565 | + reg |= 0x80000000; | ||
4566 | + __raw_writel(reg, gpc_base + 0x14); | ||
4567 | + } | ||
4568 | + clk_set_rate(cpu_clk, cpu_op_tbl[0].cpu_rate); | ||
4569 | + | ||
4570 | + /*Fix loops-per-jiffy */ | ||
4571 | +#ifdef CONFIG_SMP | ||
4572 | + for_each_online_cpu(cpu) | ||
4573 | + per_cpu(cpu_data, cpu).loops_per_jiffy = | ||
4574 | + mx6_cpu_jiffies( | ||
4575 | + per_cpu(cpu_data, cpu).loops_per_jiffy, | ||
4576 | + curr_cpu / 1000, | ||
4577 | + clk_get_rate(cpu_clk) / 1000); | ||
4578 | +#else | ||
4579 | + old_loops_per_jiffy = loops_per_jiffy; | ||
4580 | + | ||
4581 | + loops_per_jiffy = | ||
4582 | + mx6_cpu_jiffies(old_loops_per_jiffy, | ||
4583 | + curr_cpu/1000, | ||
4584 | + clk_get_rate(cpu_clk) / 1000); | ||
4585 | +#endif | ||
4586 | +#if defined(CONFIG_CPU_FREQ) | ||
4587 | + /* Fix CPU frequency for CPUFREQ. */ | ||
4588 | + for (cpu = 0; cpu < num_online_cpus(); cpu++) | ||
4589 | + cpufreq_get(cpu); | ||
4590 | +#endif | ||
4591 | + } | ||
4592 | } | ||
4593 | |||
4437 | diff --git a/arch/arm/mach-mx6/pads-mx6_sabrelite.h b/arch/arm/mach-mx6/pads-mx6_sabrelite.h | 4594 | diff --git a/arch/arm/mach-mx6/pads-mx6_sabrelite.h b/arch/arm/mach-mx6/pads-mx6_sabrelite.h |
4438 | new file mode 100644 | 4595 | new file mode 100644 |
4439 | index 0000000..63a556f | 4596 | index 0000000..63a556f |
@@ -4803,6 +4960,18 @@ new mode 100644 | |||
4803 | diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c | 4960 | diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c |
4804 | old mode 100755 | 4961 | old mode 100755 |
4805 | new mode 100644 | 4962 | new mode 100644 |
4963 | index 4cdc837..95c7b54 | ||
4964 | --- a/arch/arm/plat-mxc/cpufreq.c | ||
4965 | +++ b/arch/arm/plat-mxc/cpufreq.c | ||
4966 | @@ -112,7 +112,7 @@ int set_cpu_freq(int freq) | ||
4967 | printk(KERN_ERR "COULD NOT SET GP VOLTAGE!!!!\n"); | ||
4968 | goto err3; | ||
4969 | } | ||
4970 | - udelay(50); | ||
4971 | + udelay(260); | ||
4972 | } | ||
4973 | ret = clk_set_rate(cpu_clk, freq); | ||
4974 | if (ret != 0) { | ||
4806 | diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig | 4975 | diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig |
4807 | old mode 100755 | 4976 | old mode 100755 |
4808 | new mode 100644 | 4977 | new mode 100644 |
@@ -4912,10 +5081,10 @@ diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/inc | |||
4912 | old mode 100755 | 5081 | old mode 100755 |
4913 | new mode 100644 | 5082 | new mode 100644 |
4914 | diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx6q.h b/arch/arm/plat-mxc/include/mach/iomux-mx6q.h | 5083 | diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx6q.h b/arch/arm/plat-mxc/include/mach/iomux-mx6q.h |
4915 | index 9226af1..83f2881 100644 | 5084 | index cdff320..4519d23 100644 |
4916 | --- a/arch/arm/plat-mxc/include/mach/iomux-mx6q.h | 5085 | --- a/arch/arm/plat-mxc/include/mach/iomux-mx6q.h |
4917 | +++ b/arch/arm/plat-mxc/include/mach/iomux-mx6q.h | 5086 | +++ b/arch/arm/plat-mxc/include/mach/iomux-mx6q.h |
4918 | @@ -2909,6 +2909,24 @@ | 5087 | @@ -2913,6 +2913,24 @@ |
4919 | #define _MX6Q_PAD_TEST_MODE__TCU_TEST_MODE \ | 5088 | #define _MX6Q_PAD_TEST_MODE__TCU_TEST_MODE \ |
4920 | IOMUX_PAD(NO_PAD_I, NO_MUX_I, 0, 0x0000, 0, 0) | 5089 | IOMUX_PAD(NO_PAD_I, NO_MUX_I, 0, 0x0000, 0, 0) |
4921 | 5090 | ||
@@ -4940,7 +5109,7 @@ index 9226af1..83f2881 100644 | |||
4940 | #define _MX6Q_PAD_SD3_DAT7__USDHC3_DAT7 \ | 5109 | #define _MX6Q_PAD_SD3_DAT7__USDHC3_DAT7 \ |
4941 | IOMUX_PAD(0x0690, 0x02A8, 0, 0x0000, 0, 0) | 5110 | IOMUX_PAD(0x0690, 0x02A8, 0, 0x0000, 0, 0) |
4942 | #define _MX6Q_PAD_SD3_DAT7__UART1_TXD \ | 5111 | #define _MX6Q_PAD_SD3_DAT7__UART1_TXD \ |
4943 | @@ -6517,6 +6535,48 @@ | 5112 | @@ -6521,6 +6539,48 @@ |
4944 | #define MX6Q_PAD_TEST_MODE__TCU_TEST_MODE \ | 5113 | #define MX6Q_PAD_TEST_MODE__TCU_TEST_MODE \ |
4945 | (_MX6Q_PAD_TEST_MODE__TCU_TEST_MODE | MUX_PAD_CTRL(NO_PAD_CTRL)) | 5114 | (_MX6Q_PAD_TEST_MODE__TCU_TEST_MODE | MUX_PAD_CTRL(NO_PAD_CTRL)) |
4946 | 5115 | ||
@@ -5082,10 +5251,10 @@ new mode 100644 | |||
5082 | diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig | 5251 | diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig |
5083 | old mode 100755 | 5252 | old mode 100755 |
5084 | new mode 100644 | 5253 | new mode 100644 |
5085 | index 7cf975a..a2589e4 | 5254 | index 3420cdb..311bd4d |
5086 | --- a/drivers/input/touchscreen/Kconfig | 5255 | --- a/drivers/input/touchscreen/Kconfig |
5087 | +++ b/drivers/input/touchscreen/Kconfig | 5256 | +++ b/drivers/input/touchscreen/Kconfig |
5088 | @@ -282,6 +292,22 @@ config TOUCHSCREEN_MAX11801 | 5257 | @@ -292,6 +292,22 @@ config TOUCHSCREEN_MAX11801 |
5089 | To compile this driver as a module, choose M here: the | 5258 | To compile this driver as a module, choose M here: the |
5090 | module will be called max11801_ts. | 5259 | module will be called max11801_ts. |
5091 | 5260 | ||
@@ -5108,7 +5277,7 @@ index 7cf975a..a2589e4 | |||
5108 | config TOUCHSCREEN_MCS5000 | 5277 | config TOUCHSCREEN_MCS5000 |
5109 | tristate "MELFAS MCS-5000 touchscreen" | 5278 | tristate "MELFAS MCS-5000 touchscreen" |
5110 | depends on I2C | 5279 | depends on I2C |
5111 | @@ -695,6 +721,17 @@ config TOUCHSCREEN_TSC2007 | 5280 | @@ -718,6 +734,17 @@ config TOUCHSCREEN_TSC2007 |
5112 | To compile this driver as a module, choose M here: the | 5281 | To compile this driver as a module, choose M here: the |
5113 | module will be called tsc2007. | 5282 | module will be called tsc2007. |
5114 | 5283 | ||
@@ -5129,7 +5298,7 @@ index 7cf975a..a2589e4 | |||
5129 | diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile | 5298 | diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile |
5130 | old mode 100755 | 5299 | old mode 100755 |
5131 | new mode 100644 | 5300 | new mode 100644 |
5132 | index e614512..eac3453 | 5301 | index 94a71c1..e8104ce |
5133 | --- a/drivers/input/touchscreen/Makefile | 5302 | --- a/drivers/input/touchscreen/Makefile |
5134 | +++ b/drivers/input/touchscreen/Makefile | 5303 | +++ b/drivers/input/touchscreen/Makefile |
5135 | @@ -49,6 +49,7 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o | 5304 | @@ -49,6 +49,7 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o |
@@ -5140,9 +5309,9 @@ index e614512..eac3453 | |||
5140 | obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o | 5309 | obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o |
5141 | obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o | 5310 | obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o |
5142 | obj-$(CONFIG_TOUCHSCREEN_WM831X) += wm831x-ts.o | 5311 | obj-$(CONFIG_TOUCHSCREEN_WM831X) += wm831x-ts.o |
5143 | @@ -64,4 +65,5 @@ obj-$(CONFIG_TOUCHSCREEN_P1003) += p1003_ts.o | 5312 | @@ -65,4 +66,5 @@ obj-$(CONFIG_TOUCHSCREEN_TPS6507X) += tps6507x-ts.o |
5144 | obj-$(CONFIG_TOUCHSCREEN_TPS6507X) += tps6507x-ts.o | ||
5145 | obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o | 5313 | obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o |
5314 | obj-$(CONFIG_TOUCHSCREEN_NOVATEK) += novatek_ts.o | ||
5146 | obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o | 5315 | obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o |
5147 | +obj-$(CONFIG_TOUCHSCREEN_FT5X06) += ft5x06_ts.o | 5316 | +obj-$(CONFIG_TOUCHSCREEN_FT5X06) += ft5x06_ts.o |
5148 | obj-$(CONFIG_TOUCHSCREEN_ELAN) += elan_ts.o | 5317 | obj-$(CONFIG_TOUCHSCREEN_ELAN) += elan_ts.o |
@@ -6373,11 +6542,11 @@ index 541bdb8..3b0ca83 100644 | |||
6373 | 6542 | ||
6374 | ptr += tpl_link; | 6543 | ptr += tpl_link; |
6375 | diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c | 6544 | diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c |
6376 | index e173686..2e3330c 100644 | 6545 | index 35fd825..7b08196 100644 |
6377 | --- a/drivers/mmc/host/sdhci-esdhc-imx.c | 6546 | --- a/drivers/mmc/host/sdhci-esdhc-imx.c |
6378 | +++ b/drivers/mmc/host/sdhci-esdhc-imx.c | 6547 | +++ b/drivers/mmc/host/sdhci-esdhc-imx.c |
6379 | @@ -849,6 +849,7 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd | 6548 | @@ -855,6 +855,7 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd |
6380 | host->ocr_avail_sd |= MMC_VDD_165_195; | 6549 | |
6381 | if (boarddata->support_8bit) | 6550 | if (boarddata->support_8bit) |
6382 | host->mmc->caps |= MMC_CAP_8_BIT_DATA; | 6551 | host->mmc->caps |= MMC_CAP_8_BIT_DATA; |
6383 | + host->mmc->caps |= boarddata->caps; | 6552 | + host->mmc->caps |= boarddata->caps; |
@@ -6573,7 +6742,7 @@ index 0982a7b..cb52033 100644 | |||
6573 | diff --git a/drivers/net/fec.c b/drivers/net/fec.c | 6742 | diff --git a/drivers/net/fec.c b/drivers/net/fec.c |
6574 | old mode 100755 | 6743 | old mode 100755 |
6575 | new mode 100644 | 6744 | new mode 100644 |
6576 | index 5af378f..b74b1d9 | 6745 | index 4b5818e..9717fc6 |
6577 | --- a/drivers/net/fec.c | 6746 | --- a/drivers/net/fec.c |
6578 | +++ b/drivers/net/fec.c | 6747 | +++ b/drivers/net/fec.c |
6579 | @@ -159,7 +159,9 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); | 6748 | @@ -159,7 +159,9 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); |
@@ -6586,7 +6755,7 @@ index 5af378f..b74b1d9 | |||
6586 | #define FEC_ENET_RAEM_V 0x8 | 6755 | #define FEC_ENET_RAEM_V 0x8 |
6587 | #define FEC_ENET_RAFL_V 0x8 | 6756 | #define FEC_ENET_RAFL_V 0x8 |
6588 | #define FEC_ENET_OPD_V 0xFFF0 | 6757 | #define FEC_ENET_OPD_V 0xFFF0 |
6589 | @@ -557,28 +559,33 @@ static int fec_rx_poll(struct napi_struct *napi, int budget) | 6758 | @@ -562,28 +564,33 @@ static int fec_rx_poll(struct napi_struct *napi, int budget) |
6590 | goto rx_processing_done; | 6759 | goto rx_processing_done; |
6591 | 6760 | ||
6592 | /* Check for errors. */ | 6761 | /* Check for errors. */ |
@@ -6639,7 +6808,7 @@ index 5af378f..b74b1d9 | |||
6639 | goto rx_processing_done; | 6808 | goto rx_processing_done; |
6640 | } | 6809 | } |
6641 | 6810 | ||
6642 | @@ -1035,9 +1042,10 @@ static int fec_enet_mii_probe(struct net_device *ndev) | 6811 | @@ -1040,9 +1047,10 @@ static int fec_enet_mii_probe(struct net_device *ndev) |
6643 | } | 6812 | } |
6644 | 6813 | ||
6645 | /* mask with MAC supported features */ | 6814 | /* mask with MAC supported features */ |
@@ -6652,8 +6821,8 @@ index 5af378f..b74b1d9 | |||
6652 | + } else | 6821 | + } else |
6653 | phy_dev->supported &= PHY_BASIC_FEATURES; | 6822 | phy_dev->supported &= PHY_BASIC_FEATURES; |
6654 | 6823 | ||
6655 | phy_dev->advertising = phy_dev->supported; | 6824 | /* enable phy pause frame for any platform */ |
6656 | @@ -1054,7 +1062,7 @@ static int fec_enet_mii_probe(struct net_device *ndev) | 6825 | @@ -1062,7 +1070,7 @@ static int fec_enet_mii_probe(struct net_device *ndev) |
6657 | return 0; | 6826 | return 0; |
6658 | } | 6827 | } |
6659 | 6828 | ||
@@ -6662,7 +6831,7 @@ index 5af378f..b74b1d9 | |||
6662 | { | 6831 | { |
6663 | static struct mii_bus *fec0_mii_bus; | 6832 | static struct mii_bus *fec0_mii_bus; |
6664 | struct net_device *ndev = platform_get_drvdata(pdev); | 6833 | struct net_device *ndev = platform_get_drvdata(pdev); |
6665 | @@ -1120,7 +1128,7 @@ static int fec_enet_mii_init(struct platform_device *pdev) | 6834 | @@ -1128,7 +1136,7 @@ static int fec_enet_mii_init(struct platform_device *pdev) |
6666 | } | 6835 | } |
6667 | 6836 | ||
6668 | for (i = 0; i < PHY_MAX_ADDR; i++) | 6837 | for (i = 0; i < PHY_MAX_ADDR; i++) |
@@ -6671,7 +6840,7 @@ index 5af378f..b74b1d9 | |||
6671 | 6840 | ||
6672 | if (mdiobus_register(fep->mii_bus)) | 6841 | if (mdiobus_register(fep->mii_bus)) |
6673 | goto err_out_free_mdio_irq; | 6842 | goto err_out_free_mdio_irq; |
6674 | @@ -1611,6 +1619,9 @@ fec_restart(struct net_device *dev, int duplex) | 6843 | @@ -1627,6 +1635,9 @@ fec_restart(struct net_device *dev, int duplex) |
6675 | writel(OPT_FRAME_SIZE | 0x06, fep->hwp + FEC_R_CNTRL); | 6844 | writel(OPT_FRAME_SIZE | 0x06, fep->hwp + FEC_R_CNTRL); |
6676 | writel(0x0, fep->hwp + FEC_X_CNTRL); | 6845 | writel(0x0, fep->hwp + FEC_X_CNTRL); |
6677 | } | 6846 | } |
@@ -6681,7 +6850,7 @@ index 5af378f..b74b1d9 | |||
6681 | fep->full_duplex = duplex; | 6850 | fep->full_duplex = duplex; |
6682 | 6851 | ||
6683 | /* Set MII speed */ | 6852 | /* Set MII speed */ |
6684 | @@ -1641,12 +1652,9 @@ fec_restart(struct net_device *dev, int duplex) | 6853 | @@ -1657,12 +1668,9 @@ fec_restart(struct net_device *dev, int duplex) |
6685 | * ENET pause frame has two issues as ticket TKT116501 | 6854 | * ENET pause frame has two issues as ticket TKT116501 |
6686 | * The issues have been fixed on Rigel TO1.1 and Arik TO1.2 | 6855 | * The issues have been fixed on Rigel TO1.1 and Arik TO1.2 |
6687 | */ | 6856 | */ |
@@ -6696,7 +6865,7 @@ index 5af378f..b74b1d9 | |||
6696 | writel(val, fep->hwp + FEC_R_CNTRL); | 6865 | writel(val, fep->hwp + FEC_R_CNTRL); |
6697 | } | 6866 | } |
6698 | 6867 | ||
6699 | @@ -1700,24 +1708,31 @@ fec_restart(struct net_device *dev, int duplex) | 6868 | @@ -1716,24 +1724,31 @@ fec_restart(struct net_device *dev, int duplex) |
6700 | fep->phy_dev->speed == SPEED_1000) | 6869 | fep->phy_dev->speed == SPEED_1000) |
6701 | val |= (0x1 << 5); | 6870 | val |= (0x1 << 5); |
6702 | 6871 | ||
@@ -6740,7 +6909,7 @@ index 5af378f..b74b1d9 | |||
6740 | /* enable endian swap */ | 6909 | /* enable endian swap */ |
6741 | val |= (0x1 << 8); | 6910 | val |= (0x1 << 8); |
6742 | /* enable ENET store and forward mode */ | 6911 | /* enable ENET store and forward mode */ |
6743 | @@ -1772,6 +1787,7 @@ fec_probe(struct platform_device *pdev) | 6912 | @@ -1791,6 +1806,7 @@ fec_probe(struct platform_device *pdev) |
6744 | struct net_device *ndev; | 6913 | struct net_device *ndev; |
6745 | int i, irq, ret = 0; | 6914 | int i, irq, ret = 0; |
6746 | struct resource *r; | 6915 | struct resource *r; |
@@ -6748,7 +6917,7 @@ index 5af378f..b74b1d9 | |||
6748 | 6917 | ||
6749 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 6918 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
6750 | if (!r) | 6919 | if (!r) |
6751 | @@ -1804,8 +1820,11 @@ fec_probe(struct platform_device *pdev) | 6920 | @@ -1823,8 +1839,11 @@ fec_probe(struct platform_device *pdev) |
6752 | platform_set_drvdata(pdev, ndev); | 6921 | platform_set_drvdata(pdev, ndev); |
6753 | 6922 | ||
6754 | pdata = pdev->dev.platform_data; | 6923 | pdata = pdev->dev.platform_data; |
@@ -6761,7 +6930,7 @@ index 5af378f..b74b1d9 | |||
6761 | 6930 | ||
6762 | /* This device has up to three irqs on some platforms */ | 6931 | /* This device has up to three irqs on some platforms */ |
6763 | for (i = 0; i < 3; i++) { | 6932 | for (i = 0; i < 3; i++) { |
6764 | @@ -1833,7 +1852,7 @@ fec_probe(struct platform_device *pdev) | 6933 | @@ -1852,7 +1871,7 @@ fec_probe(struct platform_device *pdev) |
6765 | if (ret) | 6934 | if (ret) |
6766 | goto failed_init; | 6935 | goto failed_init; |
6767 | 6936 | ||
@@ -6983,10 +7152,10 @@ diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c | |||
6983 | old mode 100755 | 7152 | old mode 100755 |
6984 | new mode 100644 | 7153 | new mode 100644 |
6985 | diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c | 7154 | diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c |
6986 | index 8a66f3e..96df580 100644 | 7155 | index a512a76..00d3675 100644 |
6987 | --- a/drivers/tty/serial/imx.c | 7156 | --- a/drivers/tty/serial/imx.c |
6988 | +++ b/drivers/tty/serial/imx.c | 7157 | +++ b/drivers/tty/serial/imx.c |
6989 | @@ -1212,9 +1212,12 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, | 7158 | @@ -1215,9 +1215,12 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, |
6990 | { | 7159 | { |
6991 | struct imx_port *sport = (struct imx_port *)port; | 7160 | struct imx_port *sport = (struct imx_port *)port; |
6992 | unsigned long flags; | 7161 | unsigned long flags; |
@@ -7001,7 +7170,7 @@ index 8a66f3e..96df580 100644 | |||
7001 | unsigned long num, denom; | 7170 | unsigned long num, denom; |
7002 | uint64_t tdiv64; | 7171 | uint64_t tdiv64; |
7003 | 7172 | ||
7004 | @@ -1237,26 +1240,25 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, | 7173 | @@ -1240,26 +1243,25 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, |
7005 | old_csize = CS8; | 7174 | old_csize = CS8; |
7006 | } | 7175 | } |
7007 | 7176 | ||
@@ -7035,7 +7204,7 @@ index 8a66f3e..96df580 100644 | |||
7035 | } | 7204 | } |
7036 | 7205 | ||
7037 | /* | 7206 | /* |
7038 | @@ -1269,7 +1271,7 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, | 7207 | @@ -1272,7 +1274,7 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, |
7039 | 7208 | ||
7040 | spin_lock_irqsave(&sport->port.lock, flags); | 7209 | spin_lock_irqsave(&sport->port.lock, flags); |
7041 | 7210 | ||
@@ -7044,7 +7213,7 @@ index 8a66f3e..96df580 100644 | |||
7044 | if (termios->c_iflag & INPCK) | 7213 | if (termios->c_iflag & INPCK) |
7045 | sport->port.read_status_mask |= (URXD_FRMERR | URXD_PRERR); | 7214 | sport->port.read_status_mask |= (URXD_FRMERR | URXD_PRERR); |
7046 | if (termios->c_iflag & (BRKINT | PARMRK)) | 7215 | if (termios->c_iflag & (BRKINT | PARMRK)) |
7047 | @@ -1296,22 +1298,6 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, | 7216 | @@ -1299,22 +1301,6 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, |
7048 | */ | 7217 | */ |
7049 | uart_update_timeout(port, termios->c_cflag, baud); | 7218 | uart_update_timeout(port, termios->c_cflag, baud); |
7050 | 7219 | ||
@@ -7067,7 +7236,7 @@ index 8a66f3e..96df580 100644 | |||
7067 | if (USE_IRDA(sport)) { | 7236 | if (USE_IRDA(sport)) { |
7068 | /* | 7237 | /* |
7069 | * use maximum available submodule frequency to | 7238 | * use maximum available submodule frequency to |
7070 | @@ -1338,31 +1324,47 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, | 7239 | @@ -1341,31 +1327,47 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, |
7071 | num -= 1; | 7240 | num -= 1; |
7072 | denom -= 1; | 7241 | denom -= 1; |
7073 | 7242 | ||
@@ -7191,10 +7360,10 @@ diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile | |||
7191 | old mode 100755 | 7360 | old mode 100755 |
7192 | new mode 100644 | 7361 | new mode 100644 |
7193 | diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c | 7362 | diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c |
7194 | index 745c485..d8df225 100644 | 7363 | index 8038f3d..66ea47d 100644 |
7195 | --- a/drivers/video/mxc/mxc_ipuv3_fb.c | 7364 | --- a/drivers/video/mxc/mxc_ipuv3_fb.c |
7196 | +++ b/drivers/video/mxc/mxc_ipuv3_fb.c | 7365 | +++ b/drivers/video/mxc/mxc_ipuv3_fb.c |
7197 | @@ -830,6 +830,8 @@ static int mxcfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) | 7366 | @@ -869,6 +869,8 @@ static int mxcfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) |
7198 | vtotal = var->yres + var->lower_margin + var->vsync_len + | 7367 | vtotal = var->yres + var->lower_margin + var->vsync_len + |
7199 | var->upper_margin; | 7368 | var->upper_margin; |
7200 | var->pixclock = (vtotal * htotal * 6UL) / 100UL; | 7369 | var->pixclock = (vtotal * htotal * 6UL) / 100UL; |
@@ -7203,7 +7372,7 @@ index 745c485..d8df225 100644 | |||
7203 | var->pixclock = KHZ2PICOS(var->pixclock); | 7372 | var->pixclock = KHZ2PICOS(var->pixclock); |
7204 | dev_dbg(info->device, | 7373 | dev_dbg(info->device, |
7205 | "pixclock set for 60Hz refresh = %u ps\n", | 7374 | "pixclock set for 60Hz refresh = %u ps\n", |
7206 | @@ -2229,7 +2231,7 @@ static int mxcfb_probe(struct platform_device *pdev) | 7375 | @@ -2310,7 +2312,7 @@ static int mxcfb_probe(struct platform_device *pdev) |
7207 | mxcfbi->ipu_ch_nf_irq = IPU_IRQ_DC_SYNC_NFACK; | 7376 | mxcfbi->ipu_ch_nf_irq = IPU_IRQ_DC_SYNC_NFACK; |
7208 | mxcfbi->ipu_alp_ch_irq = -1; | 7377 | mxcfbi->ipu_alp_ch_irq = -1; |
7209 | mxcfbi->ipu_ch = MEM_DC_SYNC; | 7378 | mxcfbi->ipu_ch = MEM_DC_SYNC; |
@@ -7239,7 +7408,7 @@ index 3dbad0d..4f15ba4 100644 | |||
7239 | if (plat) { | 7408 | if (plat) { |
7240 | if (plat->reset) | 7409 | if (plat->reset) |
7241 | diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c | 7410 | diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c |
7242 | index a45c347..3d96dfa 100644 | 7411 | index 92822f8..91fc773 100644 |
7243 | --- a/drivers/video/mxc_hdmi.c | 7412 | --- a/drivers/video/mxc_hdmi.c |
7244 | +++ b/drivers/video/mxc_hdmi.c | 7413 | +++ b/drivers/video/mxc_hdmi.c |
7245 | @@ -1538,10 +1538,10 @@ static void mxc_hdmi_edid_rebuild_modelist(struct mxc_hdmi *hdmi) | 7414 | @@ -1538,10 +1538,10 @@ static void mxc_hdmi_edid_rebuild_modelist(struct mxc_hdmi *hdmi) |
@@ -7280,13 +7449,6 @@ new mode 100644 | |||
7280 | diff --git a/include/linux/mfd/da9052/tsi_filter.h b/include/linux/mfd/da9052/tsi_filter.h | 7449 | diff --git a/include/linux/mfd/da9052/tsi_filter.h b/include/linux/mfd/da9052/tsi_filter.h |
7281 | old mode 100755 | 7450 | old mode 100755 |
7282 | new mode 100644 | 7451 | new mode 100644 |
7283 | diff --git a/localversion b/localversion | ||
7284 | new file mode 100644 | ||
7285 | index 0000000..e02409d | ||
7286 | --- /dev/null | ||
7287 | +++ b/localversion | ||
7288 | @@ -0,0 +1 @@ | ||
7289 | +-2026-geaaf30e | ||
7290 | diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c | 7452 | diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c |
7291 | index fd05514..45191d1 100644 | 7453 | index fd05514..45191d1 100644 |
7292 | --- a/sound/soc/codecs/sgtl5000.c | 7454 | --- a/sound/soc/codecs/sgtl5000.c |
@@ -7309,17 +7471,3 @@ index fd05514..45191d1 100644 | |||
7309 | 7471 | ||
7310 | snd_soc_write(codec, SGTL5000_CHIP_DAC_VOL, 0x6060); | 7472 | snd_soc_write(codec, SGTL5000_CHIP_DAC_VOL, 0x6060); |
7311 | snd_soc_write(codec, SGTL5000_CHIP_ANA_ADC_CTRL, | 7473 | snd_soc_write(codec, SGTL5000_CHIP_ANA_ADC_CTRL, |
7312 | diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h | ||
7313 | index 547628e..791f9dd 100644 | ||
7314 | --- a/tools/perf/util/include/linux/compiler.h | ||
7315 | +++ b/tools/perf/util/include/linux/compiler.h | ||
7316 | @@ -5,9 +5,7 @@ | ||
7317 | #define __always_inline inline | ||
7318 | #endif | ||
7319 | #define __user | ||
7320 | -#ifndef __attribute_const__ | ||
7321 | #define __attribute_const__ | ||
7322 | -#endif | ||
7323 | |||
7324 | #define __used __attribute__((__unused__)) | ||
7325 | |||
diff --git a/recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig b/recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig index 0b59757..7193921 100644 --- a/recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig +++ b/recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig | |||
@@ -20,6 +20,7 @@ CONFIG_MACH_MX6Q_SABRELITE=y | |||
20 | CONFIG_MACH_MX6Q_SABRESD=y | 20 | CONFIG_MACH_MX6Q_SABRESD=y |
21 | CONFIG_MACH_MX6Q_SABREAUTO=y | 21 | CONFIG_MACH_MX6Q_SABREAUTO=y |
22 | CONFIG_USB_EHCI_ARC_H1=y | 22 | CONFIG_USB_EHCI_ARC_H1=y |
23 | CONFIG_USB_FSL_ARC_OTG=y | ||
23 | CONFIG_MXC_PWM=y | 24 | CONFIG_MXC_PWM=y |
24 | CONFIG_MXC_REBOOT_MFGMODE=y | 25 | CONFIG_MXC_REBOOT_MFGMODE=y |
25 | CONFIG_CLK_DEBUG=y | 26 | CONFIG_CLK_DEBUG=y |
@@ -94,11 +95,14 @@ CONFIG_DEVTMPFS=y | |||
94 | CONFIG_DEVTMPFS_MOUNT=y | 95 | CONFIG_DEVTMPFS_MOUNT=y |
95 | CONFIG_CONNECTOR=y | 96 | CONFIG_CONNECTOR=y |
96 | CONFIG_MTD=y | 97 | CONFIG_MTD=y |
97 | CONFIG_MTD_CMDLINE_PARTS=y | ||
98 | CONFIG_MTD_CHAR=y | 98 | CONFIG_MTD_CHAR=y |
99 | CONFIG_MTD_BLOCK=y | 99 | CONFIG_MTD_BLOCK=y |
100 | CONFIG_MTD_CFI=y | ||
101 | CONFIG_MTD_CFI_AMDSTD=y | ||
102 | CONFIG_MTD_PHYSMAP=y | ||
100 | CONFIG_MTD_M25P80=y | 103 | CONFIG_MTD_M25P80=y |
101 | CONFIG_MTD_NAND=y | 104 | CONFIG_MTD_NAND=y |
105 | CONFIG_MTD_NAND_GPMI_NAND=y | ||
102 | CONFIG_MTD_UBI=y | 106 | CONFIG_MTD_UBI=y |
103 | CONFIG_BLK_DEV_LOOP=y | 107 | CONFIG_BLK_DEV_LOOP=y |
104 | CONFIG_MISC_DEVICES=y | 108 | CONFIG_MISC_DEVICES=y |
@@ -193,7 +197,6 @@ CONFIG_SND_USB_AUDIO=y | |||
193 | CONFIG_SND_SOC=y | 197 | CONFIG_SND_SOC=y |
194 | CONFIG_SND_IMX_SOC=y | 198 | CONFIG_SND_IMX_SOC=y |
195 | CONFIG_SND_SOC_IMX_SGTL5000=y | 199 | CONFIG_SND_SOC_IMX_SGTL5000=y |
196 | CONFIG_SND_SOC_IMX_WM8958=y | ||
197 | CONFIG_SND_SOC_IMX_WM8962=y | 200 | CONFIG_SND_SOC_IMX_WM8962=y |
198 | CONFIG_SND_SOC_IMX_CS42888=y | 201 | CONFIG_SND_SOC_IMX_CS42888=y |
199 | CONFIG_SND_SOC_IMX_SPDIF=y | 202 | CONFIG_SND_SOC_IMX_SPDIF=y |
@@ -289,4 +292,7 @@ CONFIG_CRYPTO_XTS=y | |||
289 | CONFIG_CRYPTO_DES=y | 292 | CONFIG_CRYPTO_DES=y |
290 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 293 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
291 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | 294 | CONFIG_CRYPTO_DEV_FSL_CAAM=y |
295 | CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y | ||
296 | CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y | ||
297 | CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y | ||
292 | CONFIG_CRC_CCITT=m | 298 | CONFIG_CRC_CCITT=m |
diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb index b0870a2..1093e28 100644 --- a/recipes-kernel/linux/linux-imx_3.0.35.bb +++ b/recipes-kernel/linux/linux-imx_3.0.35.bb | |||
@@ -7,9 +7,9 @@ PR = "${INC_PR}.10" | |||
7 | 7 | ||
8 | COMPATIBLE_MACHINE = "(mx6)" | 8 | COMPATIBLE_MACHINE = "(mx6)" |
9 | 9 | ||
10 | # Revision of 12.09.01 tag | 10 | # Revision of 1.1.0 tag |
11 | SRCREV = "059685632ebd37a89e60cbb1e6dd535b3b08c3be" | 11 | SRCREV = "c27cb3851bb6f822f8a92e4a1e10fba19284bdd4" |
12 | LOCALVERSION = "-12.09.01+yocto" | 12 | LOCALVERSION = "-1.1.0+yocto" |
13 | 13 | ||
14 | SRC_URI += "file://fix_getrusage_for_perf.patch \ | 14 | SRC_URI += "file://fix_getrusage_for_perf.patch \ |
15 | file://egalax_ts-Add-support-for-single-touch-in-Kconfig.patch \ | 15 | file://egalax_ts-Add-support-for-single-touch-in-Kconfig.patch \ |