Commit 8916e0b0 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull ARM SoC fixes from Olof Johansson:
 "A smallish batch of fixes, a little more than expected this late, but
  all fixes are contained to their platforms and seem reasonably low
  risk:

   - a somewhat large SMP fix for ux500 that still seemed warranted to
     include here
   - OMAP DT fixes for pbias regulator specification that broke due to
     some DT reshuffling
   - PCIe IRQ routing bugfix for i.MX
   - networking fixes for keystone
   - runtime PM for OMAP GPMC
   - a couple of error path bug fixes for exynos"

* tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: keystone: Fix the mdio bindings by moving it to soc specific file
  ARM: dts: keystone: fix the clock node for mdio
  memory: omap-gpmc: Don't try to save uninitialized GPMC context
  ARM: imx6: correct i.MX6 PCIe interrupt routing
  ARM: ux500: add an SMP enablement type and move cpu nodes
  ARM: dts: dra7: Fix broken pbias device creation
  ARM: dts: OMAP5: Fix broken pbias device creation
  ARM: dts: OMAP4: Fix broken pbias device creation
  ARM: dts: omap243x: Fix broken pbias device creation
  ARM: EXYNOS: fix double of_node_put() on error path
  ARM: EXYNOS: Fix potentian kfree() of ro memory
parents 0f405bf7 02149517
...@@ -199,6 +199,7 @@ nodes to be present and contain the properties described below. ...@@ -199,6 +199,7 @@ nodes to be present and contain the properties described below.
"qcom,kpss-acc-v1" "qcom,kpss-acc-v1"
"qcom,kpss-acc-v2" "qcom,kpss-acc-v2"
"rockchip,rk3066-smp" "rockchip,rk3066-smp"
"ste,dbx500-smp"
- cpu-release-addr - cpu-release-addr
Usage: required for systems that have an "enable-method" Usage: required for systems that have an "enable-method"
......
...@@ -116,7 +116,7 @@ scm: scm@2000 { ...@@ -116,7 +116,7 @@ scm: scm@2000 {
ranges = <0 0x2000 0x2000>; ranges = <0 0x2000 0x2000>;
scm_conf: scm_conf@0 { scm_conf: scm_conf@0 {
compatible = "syscon"; compatible = "syscon", "simple-bus";
reg = <0x0 0x1400>; reg = <0x0 0x1400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -181,10 +181,10 @@ pcie: pcie@0x01000000 { ...@@ -181,10 +181,10 @@ pcie: pcie@0x01000000 {
interrupt-names = "msi"; interrupt-names = "msi";
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0x7>; interrupt-map-mask = <0 0 0 0x7>;
interrupt-map = <0 0 0 1 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, interrupt-map = <0 0 0 1 &gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
<0 0 0 2 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, <0 0 0 2 &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
<0 0 0 3 &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, <0 0 0 3 &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
<0 0 0 4 &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; <0 0 0 4 &gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6QDL_CLK_PCIE_AXI>, clocks = <&clks IMX6QDL_CLK_PCIE_AXI>,
<&clks IMX6QDL_CLK_LVDS1_GATE>, <&clks IMX6QDL_CLK_LVDS1_GATE>,
<&clks IMX6QDL_CLK_PCIE_REF_125M>; <&clks IMX6QDL_CLK_PCIE_REF_125M>;
......
...@@ -131,10 +131,17 @@ pcie_intc1: legacy-interrupt-controller { ...@@ -131,10 +131,17 @@ pcie_intc1: legacy-interrupt-controller {
<GIC_SPI 376 IRQ_TYPE_EDGE_RISING>; <GIC_SPI 376 IRQ_TYPE_EDGE_RISING>;
}; };
}; };
mdio: mdio@24200f00 {
compatible = "ti,keystone_mdio", "ti,davinci_mdio";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x24200f00 0x100>;
status = "disabled";
clocks = <&clkcpgmac>;
clock-names = "fck";
bus_freq = <2500000>;
};
/include/ "k2e-netcp.dtsi" /include/ "k2e-netcp.dtsi"
}; };
}; };
&mdio {
reg = <0x24200f00 0x100>;
};
...@@ -98,6 +98,17 @@ dspgpio7: keystone_dsp_gpio@262025c { ...@@ -98,6 +98,17 @@ dspgpio7: keystone_dsp_gpio@262025c {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x25c>; gpio,syscon-dev = <&devctrl 0x25c>;
}; };
mdio: mdio@02090300 {
compatible = "ti,keystone_mdio", "ti,davinci_mdio";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x02090300 0x100>;
status = "disabled";
clocks = <&clkcpgmac>;
clock-names = "fck";
bus_freq = <2500000>;
};
/include/ "k2hk-netcp.dtsi" /include/ "k2hk-netcp.dtsi"
}; };
}; };
...@@ -29,7 +29,6 @@ cpu@1 { ...@@ -29,7 +29,6 @@ cpu@1 {
}; };
soc { soc {
/include/ "k2l-clocks.dtsi" /include/ "k2l-clocks.dtsi"
uart2: serial@02348400 { uart2: serial@02348400 {
...@@ -79,6 +78,17 @@ dspgpio3: keystone_dsp_gpio@262024c { ...@@ -79,6 +78,17 @@ dspgpio3: keystone_dsp_gpio@262024c {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x24c>; gpio,syscon-dev = <&devctrl 0x24c>;
}; };
mdio: mdio@26200f00 {
compatible = "ti,keystone_mdio", "ti,davinci_mdio";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x26200f00 0x100>;
status = "disabled";
clocks = <&clkcpgmac>;
clock-names = "fck";
bus_freq = <2500000>;
};
/include/ "k2l-netcp.dtsi" /include/ "k2l-netcp.dtsi"
}; };
}; };
...@@ -96,7 +106,3 @@ &spi2 { ...@@ -96,7 +106,3 @@ &spi2 {
/* Pin muxed. Enabled and configured by Bootloader */ /* Pin muxed. Enabled and configured by Bootloader */
status = "disabled"; status = "disabled";
}; };
&mdio {
reg = <0x26200f00 0x100>;
};
...@@ -267,17 +267,6 @@ aemif: aemif@21000A00 { ...@@ -267,17 +267,6 @@ aemif: aemif@21000A00 {
1 0 0x21000A00 0x00000100>; 1 0 0x21000A00 0x00000100>;
}; };
mdio: mdio@02090300 {
compatible = "ti,keystone_mdio", "ti,davinci_mdio";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x02090300 0x100>;
status = "disabled";
clocks = <&clkpa>;
clock-names = "fck";
bus_freq = <2500000>;
};
kirq0: keystone_irq@26202a0 { kirq0: keystone_irq@26202a0 {
compatible = "ti,keystone-irq"; compatible = "ti,keystone-irq";
interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
......
...@@ -51,7 +51,8 @@ omap2430_pmx: pinmux@30 { ...@@ -51,7 +51,8 @@ omap2430_pmx: pinmux@30 {
}; };
scm_conf: scm_conf@270 { scm_conf: scm_conf@270 {
compatible = "syscon"; compatible = "syscon",
"simple-bus";
reg = <0x270 0x240>; reg = <0x270 0x240>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -191,7 +191,8 @@ omap4_pmx_core: pinmux@40 { ...@@ -191,7 +191,8 @@ omap4_pmx_core: pinmux@40 {
}; };
omap4_padconf_global: omap4_padconf_global@5a0 { omap4_padconf_global: omap4_padconf_global@5a0 {
compatible = "syscon"; compatible = "syscon",
"simple-bus";
reg = <0x5a0 0x170>; reg = <0x5a0 0x170>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -180,7 +180,8 @@ omap5_pmx_core: pinmux@40 { ...@@ -180,7 +180,8 @@ omap5_pmx_core: pinmux@40 {
}; };
omap5_padconf_global: omap5_padconf_global@5a0 { omap5_padconf_global: omap5_padconf_global@5a0 {
compatible = "syscon"; compatible = "syscon",
"simple-bus";
reg = <0x5a0 0xec>; reg = <0x5a0 0xec>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -15,6 +15,33 @@ ...@@ -15,6 +15,33 @@
#include "skeleton.dtsi" #include "skeleton.dtsi"
/ { / {
cpus {
#address-cells = <1>;
#size-cells = <0>;
enable-method = "ste,dbx500-smp";
cpu-map {
cluster0 {
core0 {
cpu = <&CPU0>;
};
core1 {
cpu = <&CPU1>;
};
};
};
CPU0: cpu@300 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <0x300>;
};
CPU1: cpu@301 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <0x301>;
};
};
soc { soc {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -22,32 +49,6 @@ soc { ...@@ -22,32 +49,6 @@ soc {
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
ranges; ranges;
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpu-map {
cluster0 {
core0 {
cpu = <&CPU0>;
};
core1 {
cpu = <&CPU1>;
};
};
};
CPU0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <0>;
};
CPU1: cpu@1 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <1>;
};
};
ptm@801ae000 { ptm@801ae000 {
compatible = "arm,coresight-etm3x", "arm,primecell"; compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0x801ae000 0x1000>; reg = <0x801ae000 0x1000>;
......
...@@ -146,9 +146,8 @@ static __init int exynos4_pm_init_power_domain(void) ...@@ -146,9 +146,8 @@ static __init int exynos4_pm_init_power_domain(void)
pd->base = of_iomap(np, 0); pd->base = of_iomap(np, 0);
if (!pd->base) { if (!pd->base) {
pr_warn("%s: failed to map memory\n", __func__); pr_warn("%s: failed to map memory\n", __func__);
kfree(pd->pd.name); kfree_const(pd->pd.name);
kfree(pd); kfree(pd);
of_node_put(np);
continue; continue;
} }
......
...@@ -2245,6 +2245,9 @@ void omap3_gpmc_save_context(void) ...@@ -2245,6 +2245,9 @@ void omap3_gpmc_save_context(void)
{ {
int i; int i;
if (!gpmc_base)
return;
gpmc_context.sysconfig = gpmc_read_reg(GPMC_SYSCONFIG); gpmc_context.sysconfig = gpmc_read_reg(GPMC_SYSCONFIG);
gpmc_context.irqenable = gpmc_read_reg(GPMC_IRQENABLE); gpmc_context.irqenable = gpmc_read_reg(GPMC_IRQENABLE);
gpmc_context.timeout_ctrl = gpmc_read_reg(GPMC_TIMEOUT_CONTROL); gpmc_context.timeout_ctrl = gpmc_read_reg(GPMC_TIMEOUT_CONTROL);
...@@ -2277,6 +2280,9 @@ void omap3_gpmc_restore_context(void) ...@@ -2277,6 +2280,9 @@ void omap3_gpmc_restore_context(void)
{ {
int i; int i;
if (!gpmc_base)
return;
gpmc_write_reg(GPMC_SYSCONFIG, gpmc_context.sysconfig); gpmc_write_reg(GPMC_SYSCONFIG, gpmc_context.sysconfig);
gpmc_write_reg(GPMC_IRQENABLE, gpmc_context.irqenable); gpmc_write_reg(GPMC_IRQENABLE, gpmc_context.irqenable);
gpmc_write_reg(GPMC_TIMEOUT_CONTROL, gpmc_context.timeout_ctrl); gpmc_write_reg(GPMC_TIMEOUT_CONTROL, gpmc_context.timeout_ctrl);
......
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