Skip to content

Commit 30c7b56

Browse files
torvaldstorvalds
committed
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: "Things are calming down nicely here w.r.t. fixes. This batch includes two week's worth since I missed to send before -rc4. Nothing particularly scary to point out, smaller fixes here and there. Shortlog describes it pretty well" * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: dts: keystone: fix dt bindings to use post div register for mainpll ARM: nomadik: disable UART0 on Nomadik boards ARM: dts: i.MX35: Fix can support. ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc ARM: dts: add CPU OPP and regulator supply property for exynos4210 ARM: dts: Update video-phy node with syscon phandle for exynos3250 ARM: DRA7: hwmod: fix gpmc hwmod
2 parents 0118360 + c1bfa98 commit 30c7b56

14 files changed

+59
-25
lines changed

‎arch/arm/boot/dts/exynos3250.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@
138138

139139
mipi_phy: video-phy@10020710 {
140140
compatible = "samsung,s5pv210-mipi-video-phy";
141-
reg = <0x10020710 8>;
142141
#phy-cells = <1>;
142+
syscon = <&pmu_system_controller>;
143143
};
144144

145145
pd_cam: cam-power-domain@10023C00 {

‎arch/arm/boot/dts/exynos4210-origen.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@
127127
};
128128
};
129129

130+
&cpu0 {
131+
cpu0-supply = <&buck1_reg>;
132+
};
133+
130134
&fimd {
131135
pinctrl-0 = <&lcd_en &lcd_clk &lcd_data24 &pwm0_out>;
132136
pinctrl-names = "default";

‎arch/arm/boot/dts/exynos4210-trats.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@
188188
};
189189
};
190190

191+
&cpu0 {
192+
cpu0-supply = <&varm_breg>;
193+
};
194+
191195
&dsi_0 {
192196
vddcore-supply = <&vusb_reg>;
193197
vddio-supply = <&vmipi_reg>;

‎arch/arm/boot/dts/exynos4210-universal_c210.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,10 @@
548548
};
549549
};
550550

551+
&cpu0 {
552+
cpu0-supply = <&vdd_arm_reg>;
553+
};
554+
551555
&pinctrl_1 {
552556
hdmi_hpd: hdmi-hpd {
553557
samsung,pins = "gpx3-7";

‎arch/arm/boot/dts/exynos4210.dtsi

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@
4040
device_type = "cpu";
4141
compatible = "arm,cortex-a9";
4242
reg = <0x900>;
43+
clocks = <&clock CLK_ARM_CLK>;
44+
clock-names = "cpu";
45+
clock-latency = <160000>;
46+
47+
operating-points = <
48+
1200000 1250000
49+
1000000 1150000
50+
800000 1075000
51+
500000 975000
52+
400000 975000
53+
200000 950000
54+
>;
4355
cooling-min-level = <4>;
4456
cooling-max-level = <2>;
4557
#cooling-cells = <2>; /* min followed by max */

‎arch/arm/boot/dts/imx35.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,17 +286,17 @@
286286
can1: can@53fe4000 {
287287
compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
288288
reg = <0x53fe4000 0x1000>;
289-
clocks = <&clks 33>;
290-
clock-names = "ipg";
289+
clocks = <&clks 33>, <&clks 33>;
290+
clock-names = "ipg", "per";
291291
interrupts = <43>;
292292
status = "disabled";
293293
};
294294

295295
can2: can@53fe8000 {
296296
compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
297297
reg = <0x53fe8000 0x1000>;
298-
clocks = <&clks 34>;
299-
clock-names = "ipg";
298+
clocks = <&clks 34>, <&clks 34>;
299+
clock-names = "ipg", "per";
300300
interrupts = <44>;
301301
status = "disabled";
302302
};

‎arch/arm/boot/dts/k2e-clocks.dtsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ clocks {
1313
#clock-cells = <0>;
1414
compatible = "ti,keystone,main-pll-clock";
1515
clocks = <&refclksys>;
16-
reg = <0x02620350 4>, <0x02310110 4>;
17-
reg-names = "control", "multiplier";
18-
fixed-postdiv = <2>;
16+
reg = <0x02620350 4>, <0x02310110 4>, <0x02310108 4>;
17+
reg-names = "control", "multiplier", "post-divider";
1918
};
2019

2120
papllclk: papllclk@2620358 {

‎arch/arm/boot/dts/k2hk-clocks.dtsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ clocks {
2222
#clock-cells = <0>;
2323
compatible = "ti,keystone,main-pll-clock";
2424
clocks = <&refclksys>;
25-
reg = <0x02620350 4>, <0x02310110 4>;
26-
reg-names = "control", "multiplier";
27-
fixed-postdiv = <2>;
25+
reg = <0x02620350 4>, <0x02310110 4>, <0x02310108 4>;
26+
reg-names = "control", "multiplier", "post-divider";
2827
};
2928

3029
papllclk: papllclk@2620358 {

‎arch/arm/boot/dts/k2l-clocks.dtsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ clocks {
2222
#clock-cells = <0>;
2323
compatible = "ti,keystone,main-pll-clock";
2424
clocks = <&refclksys>;
25-
reg = <0x02620350 4>, <0x02310110 4>;
26-
reg-names = "control", "multiplier";
27-
fixed-postdiv = <2>;
25+
reg = <0x02620350 4>, <0x02310110 4>, <0x02310108 4>;
26+
reg-names = "control", "multiplier", "post-divider";
2827
};
2928

3029
papllclk: papllclk@2620358 {

‎arch/arm/boot/dts/ste-nomadik-nhk15.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
};
1818

1919
aliases {
20+
serial1 = &uart1;
2021
stmpe-i2c0 = &stmpe0;
2122
stmpe-i2c1 = &stmpe1;
2223
};

‎arch/arm/boot/dts/ste-nomadik-s8815.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";
1616
};
1717

18+
aliases {
19+
serial1 = &uart1;
20+
};
21+
1822
src@101e0000 {
1923
/* These chrystal drivers are not used on this board */
2024
disable-sxtalo;

‎arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,7 @@
757757
clock-names = "uartclk", "apb_pclk";
758758
pinctrl-names = "default";
759759
pinctrl-0 = <&uart0_default_mux>;
760+
status = "disabled";
760761
};
761762

762763
uart1: uart@101fb000 {

‎arch/arm/mach-omap2/omap_hwmod.c

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2373,6 +2373,9 @@ static int of_dev_hwmod_lookup(struct device_node *np,
23732373
* registers. This address is needed early so the OCP registers that
23742374
* are part of the device's address space can be ioremapped properly.
23752375
*
2376+
* If SYSC access is not needed, the registers will not be remapped
2377+
* and non-availability of MPU access is not treated as an error.
2378+
*
23762379
* Returns 0 on success, -EINVAL if an invalid hwmod is passed, and
23772380
* -ENXIO on absent or invalid register target address space.
23782381
*/
@@ -2387,6 +2390,11 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data,
23872390

23882391
_save_mpu_port_index(oh);
23892392

2393+
/* if we don't need sysc access we don't need to ioremap */
2394+
if (!oh->class->sysc)
2395+
return 0;
2396+
2397+
/* we can't continue without MPU PORT if we need sysc access */
23902398
if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
23912399
return -ENXIO;
23922400

@@ -2396,8 +2404,10 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data,
23962404
oh->name);
23972405

23982406
/* Extract the IO space from device tree blob */
2399-
if (!np)
2407+
if (!np) {
2408+
pr_err("omap_hwmod: %s: no dt node\n", oh->name);
24002409
return -ENXIO;
2410+
}
24012411

24022412
va_start = of_iomap(np, index + oh->mpu_rt_idx);
24032413
} else {
@@ -2456,13 +2466,11 @@ static int __init _init(struct omap_hwmod *oh, void *data)
24562466
oh->name, np->name);
24572467
}
24582468

2459-
if (oh->class->sysc) {
2460-
r = _init_mpu_rt_base(oh, NULL, index, np);
2461-
if (r < 0) {
2462-
WARN(1, "omap_hwmod: %s: doesn't have mpu register target base\n",
2463-
oh->name);
2464-
return 0;
2465-
}
2469+
r = _init_mpu_rt_base(oh, NULL, index, np);
2470+
if (r < 0) {
2471+
WARN(1, "omap_hwmod: %s: doesn't have mpu register target base\n",
2472+
oh->name);
2473+
return 0;
24662474
}
24672475

24682476
r = _init_clocks(oh, NULL);

‎arch/arm/mach-omap2/omap_hwmod_7xx_data.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -827,8 +827,7 @@ static struct omap_hwmod_class_sysconfig dra7xx_gpmc_sysc = {
827827
.syss_offs = 0x0014,
828828
.sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE |
829829
SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
830-
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
831-
SIDLE_SMART_WKUP),
830+
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
832831
.sysc_fields = &omap_hwmod_sysc_type1,
833832
};
834833

@@ -844,7 +843,7 @@ static struct omap_hwmod dra7xx_gpmc_hwmod = {
844843
.class = &dra7xx_gpmc_hwmod_class,
845844
.clkdm_name = "l3main1_clkdm",
846845
/* Skip reset for CONFIG_OMAP_GPMC_DEBUG for bootloader timings */
847-
.flags = HWMOD_SWSUP_SIDLE | DEBUG_OMAP_GPMC_HWMOD_FLAGS,
846+
.flags = DEBUG_OMAP_GPMC_HWMOD_FLAGS,
848847
.main_clk = "l3_iclk_div",
849848
.prcm = {
850849
.omap4 = {

0 commit comments

Comments
 (0)