Commit 5163ac76 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
 "The fixes for this week include one small patch that was years in the
  making and that finally fixes using all eight CPUs on exynos542x.

  The rest are lots of minor changes for sunxi, imx, exynos and shmobile

   - fixing the minimum voltage for Allwinner A20
   - thermal boot issue on SMDK5250.
   - invalid clock used for FIMD IOMMU.
   - audio on Renesas r8a7790/r8a7791
   - invalid clock used for FIMD IOMMU
   - LEDs on exynos5422-odroidxu3-common
   - usb pin control for imx-rex
   - imx53: fix PMIC interrupt level
   - a Makefile typo"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: Fix wrong clock binding for sysmmu_fimd1_1 on exynos5420
  ARM: dts: Fix bootup thermal issue on smdk5250
  ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound
  ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
  arm-cci500: Don't enable PMU driver by default
  ARM: dts: fix usb pin control for imx-rex dts
  ARM: imx53: qsrb: fix PMIC interrupt level
  ARM: imx53: include IRQ dt-bindings header
  ARM: dts: add suspend opp to exynos4412
  ARM: dts: Fix LEDs on exynos5422-odroidxu3
  ARM: EXYNOS: reset Little cores when cpu is up
  ARM: dts: Fix Makefile target for sun4i-a10-itead-iteaduino-plus
  ARM: dts: sunxi: Raise minimum CPU voltage for sun7i-a20 to meet SoC specifications
parents c6fa8e6d 5a37b153
...@@ -578,7 +578,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \ ...@@ -578,7 +578,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
sun4i-a10-hackberry.dtb \ sun4i-a10-hackberry.dtb \
sun4i-a10-hyundai-a7hd.dtb \ sun4i-a10-hyundai-a7hd.dtb \
sun4i-a10-inet97fv2.dtb \ sun4i-a10-inet97fv2.dtb \
sun4i-a10-itead-iteaduino-plus.dts \ sun4i-a10-itead-iteaduino-plus.dtb \
sun4i-a10-jesurun-q5.dtb \ sun4i-a10-jesurun-q5.dtb \
sun4i-a10-marsboard.dtb \ sun4i-a10-marsboard.dtb \
sun4i-a10-mini-xplus.dtb \ sun4i-a10-mini-xplus.dtb \
......
...@@ -98,6 +98,7 @@ opp06 { ...@@ -98,6 +98,7 @@ opp06 {
opp-hz = /bits/ 64 <800000000>; opp-hz = /bits/ 64 <800000000>;
opp-microvolt = <1000000>; opp-microvolt = <1000000>;
clock-latency-ns = <200000>; clock-latency-ns = <200000>;
opp-suspend;
}; };
opp07 { opp07 {
opp-hz = /bits/ 64 <900000000>; opp-hz = /bits/ 64 <900000000>;
......
...@@ -197,6 +197,7 @@ ldo10_reg: LDO10 { ...@@ -197,6 +197,7 @@ ldo10_reg: LDO10 {
regulator-name = "P1.8V_LDO_OUT10"; regulator-name = "P1.8V_LDO_OUT10";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-always-on;
}; };
ldo11_reg: LDO11 { ldo11_reg: LDO11 {
......
...@@ -1117,7 +1117,7 @@ sysmmu_fimd1_1: sysmmu@0x14680000 { ...@@ -1117,7 +1117,7 @@ sysmmu_fimd1_1: sysmmu@0x14680000 {
interrupt-parent = <&combiner>; interrupt-parent = <&combiner>;
interrupts = <3 0>; interrupts = <3 0>;
clock-names = "sysmmu", "master"; clock-names = "sysmmu", "master";
clocks = <&clock CLK_SMMU_FIMD1M0>, <&clock CLK_FIMD1>; clocks = <&clock CLK_SMMU_FIMD1M1>, <&clock CLK_FIMD1>;
power-domains = <&disp_pd>; power-domains = <&disp_pd>;
#iommu-cells = <0>; #iommu-cells = <0>;
}; };
......
...@@ -472,7 +472,6 @@ &pwm { ...@@ -472,7 +472,6 @@ &pwm {
*/ */
pinctrl-0 = <&pwm0_out &pwm1_out &pwm2_out &pwm3_out>; pinctrl-0 = <&pwm0_out &pwm1_out &pwm2_out &pwm3_out>;
pinctrl-names = "default"; pinctrl-names = "default";
samsung,pwm-outputs = <0>;
status = "okay"; status = "okay";
}; };
......
...@@ -36,7 +36,7 @@ pmic: mc34708@8 { ...@@ -36,7 +36,7 @@ pmic: mc34708@8 {
pinctrl-0 = <&pinctrl_pmic>; pinctrl-0 = <&pinctrl_pmic>;
reg = <0x08>; reg = <0x08>;
interrupt-parent = <&gpio5>; interrupt-parent = <&gpio5>;
interrupts = <23 0x8>; interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;
regulators { regulators {
sw1_reg: sw1a { sw1_reg: sw1a {
regulator-name = "SW1"; regulator-name = "SW1";
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <dt-bindings/clock/imx5-clock.h> #include <dt-bindings/clock/imx5-clock.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
/ { / {
aliases { aliases {
......
...@@ -35,7 +35,6 @@ reg_usbh1_vbus: regulator@1 { ...@@ -35,7 +35,6 @@ reg_usbh1_vbus: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; reg = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbh1>;
regulator-name = "usbh1_vbus"; regulator-name = "usbh1_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -47,7 +46,6 @@ reg_usb_otg_vbus: regulator@2 { ...@@ -47,7 +46,6 @@ reg_usb_otg_vbus: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; reg = <2>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbotg>;
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
...@@ -1627,6 +1627,7 @@ rcar_sound: sound@ec500000 { ...@@ -1627,6 +1627,7 @@ rcar_sound: sound@ec500000 {
"mix.0", "mix.1", "mix.0", "mix.1",
"dvc.0", "dvc.1", "dvc.0", "dvc.1",
"clk_a", "clk_b", "clk_c", "clk_i"; "clk_a", "clk_b", "clk_c", "clk_i";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
......
...@@ -1677,6 +1677,7 @@ rcar_sound: sound@ec500000 { ...@@ -1677,6 +1677,7 @@ rcar_sound: sound@ec500000 {
"mix.0", "mix.1", "mix.0", "mix.1",
"dvc.0", "dvc.1", "dvc.0", "dvc.1",
"clk_a", "clk_b", "clk_c", "clk_i"; "clk_a", "clk_b", "clk_c", "clk_i";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
......
...@@ -107,7 +107,7 @@ cpu0: cpu@0 { ...@@ -107,7 +107,7 @@ cpu0: cpu@0 {
720000 1200000 720000 1200000
528000 1100000 528000 1100000
312000 1000000 312000 1000000
144000 900000 144000 1000000
>; >;
#cooling-cells = <2>; #cooling-cells = <2>;
cooling-min-level = <0>; cooling-min-level = <0>;
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <asm/cputype.h> #include <asm/cputype.h>
#include <asm/cp15.h> #include <asm/cp15.h>
#include <asm/mcpm.h> #include <asm/mcpm.h>
#include <asm/smp_plat.h>
#include "regs-pmu.h" #include "regs-pmu.h"
#include "common.h" #include "common.h"
...@@ -70,7 +71,31 @@ static int exynos_cpu_powerup(unsigned int cpu, unsigned int cluster) ...@@ -70,7 +71,31 @@ static int exynos_cpu_powerup(unsigned int cpu, unsigned int cluster)
cluster >= EXYNOS5420_NR_CLUSTERS) cluster >= EXYNOS5420_NR_CLUSTERS)
return -EINVAL; return -EINVAL;
exynos_cpu_power_up(cpunr); if (!exynos_cpu_power_state(cpunr)) {
exynos_cpu_power_up(cpunr);
/*
* This assumes the cluster number of the big cores(Cortex A15)
* is 0 and the Little cores(Cortex A7) is 1.
* When the system was booted from the Little core,
* they should be reset during power up cpu.
*/
if (cluster &&
cluster == MPIDR_AFFINITY_LEVEL(cpu_logical_map(0), 1)) {
/*
* Before we reset the Little cores, we should wait
* the SPARE2 register is set to 1 because the init
* codes of the iROM will set the register after
* initialization.
*/
while (!pmu_raw_readl(S5P_PMU_SPARE2))
udelay(10);
pmu_raw_writel(EXYNOS5420_KFC_CORE_RESET(cpu),
EXYNOS_SWRESET);
}
}
return 0; return 0;
} }
......
...@@ -513,6 +513,12 @@ static inline unsigned int exynos_pmu_cpunr(unsigned int mpidr) ...@@ -513,6 +513,12 @@ static inline unsigned int exynos_pmu_cpunr(unsigned int mpidr)
#define SPREAD_ENABLE 0xF #define SPREAD_ENABLE 0xF
#define SPREAD_USE_STANDWFI 0xF #define SPREAD_USE_STANDWFI 0xF
#define EXYNOS5420_KFC_CORE_RESET0 BIT(8)
#define EXYNOS5420_KFC_ETM_RESET0 BIT(20)
#define EXYNOS5420_KFC_CORE_RESET(_nr) \
((EXYNOS5420_KFC_CORE_RESET0 | EXYNOS5420_KFC_ETM_RESET0) << (_nr))
#define EXYNOS5420_BB_CON1 0x0784 #define EXYNOS5420_BB_CON1 0x0784
#define EXYNOS5420_BB_SEL_EN BIT(31) #define EXYNOS5420_BB_SEL_EN BIT(31)
#define EXYNOS5420_BB_PMOS_EN BIT(7) #define EXYNOS5420_BB_PMOS_EN BIT(7)
......
...@@ -36,7 +36,6 @@ config ARM_CCI400_PORT_CTRL ...@@ -36,7 +36,6 @@ config ARM_CCI400_PORT_CTRL
config ARM_CCI500_PMU config ARM_CCI500_PMU
bool "ARM CCI500 PMU support" bool "ARM CCI500 PMU support"
default y
depends on (ARM && CPU_V7) || ARM64 depends on (ARM && CPU_V7) || ARM64
depends on PERF_EVENTS depends on PERF_EVENTS
select ARM_CCI_PMU select ARM_CCI_PMU
......
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