- U9540 boot regression fix due to new clock framework
- Configure out the yet instable battery management driver - Adjust cache initilization per SoC family -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABAgAGBQJRAW4TAAoJEEEQszewGV1zF/0QAIUzPjigasRFmqCdaGylkpT7 iaYRzrr0zEKajDwtK/vNLTGJhR5IGPuy+f5lCIGXKYGtUkEh8RHs1tQAqBw7UzDi Spijsg59n1bk7Gu/t1Wo3OGaPLM0/mR1zMbdw50gxcD6kHCrXI72aTKyu5D2uZlK +ZlAJfTjUXNKHfXQraJ7U7CbR21XktfeluAZbQIgmtG0bH6SnZqFeP6u/9M67+Am sQcrQ41TdcpE3i+cksEZgW8ji7JPEBdD7yHSlRBn3nufs85NQ43zZAsHan2Losns 5k1+mMqIC5H55dA6Ufuhos/+O2kEWfCm+28bRwKEm0ykyjbbw9Df33tpJM+Ftuvs 39JrHhznLD0YgYMEjvOoatQpFoKtZ4vz8ASK82zzw7JR+0lmpavEx8XeNsO5KsOH T4oa+jN3COksqZDNOjYRXjxk5CU8bVYHqypalYXNffvGYubycAhCmG3sQj2Nww3o vyi8eNX/pLIWwiOHtKiny3JMyDPk294Uv1Cs0SI3WnMYKKtKzzaNPfRQ8BiLJwBt edxWQ68Uqu8Iloq8Zvg908rcrNi1uJDLXjEUIEQY1NacWEXQJC4zmnDfeSRztOmK xOfr6NTtAkBtNcpGfUJI0RRxwQYheT1Fs25NEYqFOHru34lAzVs2UDeFzhw6Wylv qMBucplW4pjm4Q3E25YD =kja1 -----END PGP SIGNATURE----- Merge tag 'ux500-fixes-for-v3.8' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes From Linus Walleij: - U9540 boot regression fix due to new clock framework - Configure out the yet instable battery management driver - Adjust cache initilization per SoC family * tag 'ux500-fixes-for-v3.8' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: Fix u9540 booting issues ARM: ux500: add spin_unlock(&master_lock). ARM: ux500: Disable Power Supply and Battery Management by default Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
3c2b251e88
|
@ -66,9 +66,9 @@ CONFIG_SPI=y
|
||||||
CONFIG_SPI_PL022=y
|
CONFIG_SPI_PL022=y
|
||||||
CONFIG_GPIO_STMPE=y
|
CONFIG_GPIO_STMPE=y
|
||||||
CONFIG_GPIO_TC3589X=y
|
CONFIG_GPIO_TC3589X=y
|
||||||
CONFIG_POWER_SUPPLY=y
|
# CONFIG_POWER_SUPPLY is not set
|
||||||
CONFIG_AB8500_BM=y
|
# CONFIG_AB8500_BM is not set
|
||||||
CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y
|
# CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL is not set
|
||||||
CONFIG_THERMAL=y
|
CONFIG_THERMAL=y
|
||||||
CONFIG_CPU_THERMAL=y
|
CONFIG_CPU_THERMAL=y
|
||||||
CONFIG_MFD_STMPE=y
|
CONFIG_MFD_STMPE=y
|
||||||
|
|
|
@ -71,13 +71,11 @@ void __init ux500_init_irq(void)
|
||||||
* Init clocks here so that they are available for system timer
|
* Init clocks here so that they are available for system timer
|
||||||
* initialization.
|
* initialization.
|
||||||
*/
|
*/
|
||||||
if (cpu_is_u8500_family())
|
if (cpu_is_u8500_family() || cpu_is_u9540())
|
||||||
db8500_prcmu_early_init();
|
db8500_prcmu_early_init();
|
||||||
|
|
||||||
if (cpu_is_u8500_family())
|
if (cpu_is_u8500_family() || cpu_is_u9540())
|
||||||
u8500_clk_init();
|
u8500_clk_init();
|
||||||
else if (cpu_is_u9540())
|
|
||||||
u9540_clk_init();
|
|
||||||
else if (cpu_is_u8540())
|
else if (cpu_is_u8540())
|
||||||
u8540_clk_init();
|
u8540_clk_init();
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,8 +40,10 @@ static inline int ux500_enter_idle(struct cpuidle_device *dev,
|
||||||
goto wfi;
|
goto wfi;
|
||||||
|
|
||||||
/* decouple the gic from the A9 cores */
|
/* decouple the gic from the A9 cores */
|
||||||
if (prcmu_gic_decouple())
|
if (prcmu_gic_decouple()) {
|
||||||
|
spin_unlock(&master_lock);
|
||||||
goto out;
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
/* If an error occur, we will have to recouple the gic
|
/* If an error occur, we will have to recouple the gic
|
||||||
* manually */
|
* manually */
|
||||||
|
|
Loading…
Reference in a new issue