History

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: "Most of the changes this time are for incorrect device nodes in various ways, on on imx, berlin, exynos, ux500, uniphier, omap and meson. Chen-Yu Tsai now co-maintains mach-sunxi (Allwinner). Other bug fixes include - a partial revert of a broken tegra gpio patch - irq affinity for arm ccn - suspend on one Armada 385 machine - enable ZONE_DMA to avoid an OMAP crash for over 2GB RAM - turning on a regulator on beagleboard-x15 for HDMI - making the omap gpmc debug code visible - setup of orion network switch - a rare build regression for pxa" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits) ARM: OMAP2+: Fix imprecise external abort caused by bogus SRAM init thermal: exynos: Fix register read in TMU ARM: OMAP2+: Fix oops with LPAE and more than 2GB of memory ARM: tegra: Comment out gpio-ranges properties ARM: dts: uniphier: fix IRQ number for devices on PH1-LD6b ref board drivers/perf: arm_pmu: avoid CPU device_node reference leak bus: arm-ccn: Fix irq affinity setting on CPU migration bus: arm-ccn: Handle correctly no-more-cpus case ARM: mvebu: correct a385-db-ap compatible string ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers MAINTAINERS: Update Allwinner entry and add new maintainer ARM: ux500: modify initial levelshifter status ARM: pxa: fix pxa3xx DFI lockup hack Documentation: ARM: List new omap MMC requirements memory: omap-gpmc: dump "before" state before first modification memory: omap-gpmc: Fix unselectable debug option for GPMC ARM: dts: am57xx-beagle-x15: set VDD_SD to always-on ARM: dts: Fix audio card detection on Peach boards ARM: EXYNOS: Fix double of_node_put() when parsing child power domains ARM: orion: Fix DSA platform device after mvmdio conversion ...

Linus Torvalds committed 11 years ago

Commit d0ddf982 parents 2c44f4f 55f412928 files · +103 −44Browse files

Unified · Split

28 files
  1. Documentation/arm/OMAP/README +7 −0
  2. MAINTAINERS +3 −2
  3. arch/arm/boot/dts/am57xx-beagle-x15.dts +2 −1
  4. arch/arm/boot/dts/armada-385-db-ap.dts +1 −1
  5. arch/arm/boot/dts/berlin2q.dtsi +3 −3
  6. arch/arm/boot/dts/exynos5420-peach-pit.dts +5 −0
  7. arch/arm/boot/dts/exynos5800-peach-pi.dts +5 −0
  8. arch/arm/boot/dts/imx7d.dtsi +2 −2
  9. arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts +1 −1
  10. arch/arm/boot/dts/meson.dtsi +12 −11
  11. arch/arm/boot/dts/omap3-evm-37xx.dts +1 −1
  12. arch/arm/boot/dts/ste-hrefv60plus.dtsi +1 −1
  13. arch/arm/boot/dts/tegra114.dtsi +2 −0
  14. arch/arm/boot/dts/tegra124.dtsi +2 −0
  15. arch/arm/boot/dts/tegra20.dtsi +2 −0
  16. arch/arm/boot/dts/tegra30.dtsi +2 −0
  17. arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts +1 −1
  18. arch/arm/mach-exynos/pm_domains.c +3 −5
  19. arch/arm/mach-omap2/Kconfig +2 −0
  20. arch/arm/mach-omap2/board-generic.c +10 −0
  21. arch/arm/mach-omap2/pdata-quirks.c +8 −1
  22. arch/arm/mach-pxa/pxa3xx.c +5 −4
  23. arch/arm/plat-orion/common.c +1 −1
  24. drivers/bus/arm-ccn.c +3 −2
  25. drivers/memory/Kconfig +9 −3
  26. drivers/memory/omap-gpmc.c +1 −1
  27. drivers/perf/arm_pmu.c +8 −2
  28. drivers/thermal/samsung/exynos_tmu.c +1 −1
Documentation/arm/OMAP/README+7−0
@@ -0,0 +1,7 @@
1+This file contains documentation for running mainline
2+kernel on omaps.
3+
4+KERNEL NEW DEPENDENCIES
5+v4.3+ Update is needed for custom .config files to make sure
6+ CONFIG_REGULATOR_PBIAS is enabled for MMC1 to work
7+ properly.
MAINTAINERS+3−2
@@ -894,11 +894,12 @@ M: Lennert Buytenhek <kernel@wantstofly.org> · 893 unmodified lines
894894 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
895895 S: Maintained
896896
897−ARM/Allwinner A1X SoC support
897+ARM/Allwinner sunXi SoC support
898898 M: Maxime Ripard <maxime.ripard@free-electrons.com>
899+M: Chen-Yu Tsai <wens@csie.org>
899900 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
900901 S: Maintained
901−N: sun[x4567]i
902+N: sun[x456789]i
902903
903904 ARM/Allwinner SoC Clock Support
904905 M: Emilio López <emilio@elopez.com.ar>
arch/arm/boot/dts/am57xx-beagle-x15.dts+2−1
@@ -402,11 +402,12 @@ · 401 unmodified lines
402402 /* SMPS9 unused */
403403
404404 ldo1_reg: ldo1 {
405− /* VDD_SD */
405+ /* VDD_SD / VDDSHV8 */
406406 regulator-name = "ldo1";
407407 regulator-min-microvolt = <1800000>;
408408 regulator-max-microvolt = <3300000>;
409409 regulator-boot-on;
410+ regulator-always-on;
410411 };
411412
412413 ldo2_reg: ldo2 {
arch/arm/boot/dts/armada-385-db-ap.dts+1−1
@@ -46,7 +46,7 @@ · 45 unmodified lines
4646
4747 / {
4848 model = "Marvell Armada 385 Access Point Development Board";
49− compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38x";
49+ compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada380";
5050
5151 chosen {
5252 stdout-path = "serial1:115200n8";
arch/arm/boot/dts/berlin2q.dtsi+3−3
@@ -152,7 +152,7 @@ · 151 unmodified lines
152152 };
153153
154154 usb_phy2: phy@a2f400 {
155− compatible = "marvell,berlin2-usb-phy";
155+ compatible = "marvell,berlin2cd-usb-phy";
156156 reg = <0xa2f400 0x128>;
157157 #phy-cells = <0>;
158158 resets = <&chip_rst 0x104 14>;
@@ -170,7 +170,7 @@ · 11 unmodified lines
170170 };
171171
172172 usb_phy0: phy@b74000 {
173− compatible = "marvell,berlin2-usb-phy";
173+ compatible = "marvell,berlin2cd-usb-phy";
174174 reg = <0xb74000 0x128>;
175175 #phy-cells = <0>;
176176 resets = <&chip_rst 0x104 12>;
@@ -178,7 +178,7 @@ · 1 unmodified line
178178 };
179179
180180 usb_phy1: phy@b78000 {
181− compatible = "marvell,berlin2-usb-phy";
181+ compatible = "marvell,berlin2cd-usb-phy";
182182 reg = <0xb78000 0x128>;
183183 #phy-cells = <0>;
184184 resets = <&chip_rst 0x104 13>;
arch/arm/boot/dts/exynos5420-peach-pit.dts+5−0
@@ -915,6 +915,11 @@ · 914 unmodified lines
915915 };
916916 };
917917
918+&pmu_system_controller {
919+ assigned-clocks = <&pmu_system_controller 0>;
920+ assigned-clock-parents = <&clock CLK_FIN_PLL>;
921+};
922+
918923 &rtc {
919924 status = "okay";
920925 clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;
arch/arm/boot/dts/exynos5800-peach-pi.dts+5−0
@@ -878,6 +878,11 @@ · 877 unmodified lines
878878 };
879879 };
880880
881+&pmu_system_controller {
882+ assigned-clocks = <&pmu_system_controller 0>;
883+ assigned-clock-parents = <&clock CLK_FIN_PLL>;
884+};
885+
881886 &rtc {
882887 status = "okay";
883888 clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;
arch/arm/boot/dts/imx7d.dtsi+2−2
@@ -588,10 +588,10 @@ · 587 unmodified lines
588588 status = "disabled";
589589 };
590590
591− uart2: serial@30870000 {
591+ uart2: serial@30890000 {
592592 compatible = "fsl,imx7d-uart",
593593 "fsl,imx6q-uart";
594− reg = <0x30870000 0x10000>;
594+ reg = <0x30890000 0x10000>;
595595 interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
596596 clocks = <&clks IMX7D_UART2_ROOT_CLK>,
597597 <&clks IMX7D_UART2_ROOT_CLK>;
arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212
1313 / {
1414 model = "LogicPD Zoom DM3730 Torpedo Development Kit";
15− compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap36xx";
15+ compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3";
1616
1717 gpio_keys {
1818 compatible = "gpio-keys";
arch/arm/boot/dts/meson.dtsi+12−11
@@ -67,7 +67,7 @@ · 66 unmodified lines
6767
6868 timer@c1109940 {
6969 compatible = "amlogic,meson6-timer";
70− reg = <0xc1109940 0x14>;
70+ reg = <0xc1109940 0x18>;
7171 interrupts = <0 10 1>;
7272 };
7373
@@ -80,36 +80,37 @@ · 6 unmodified lines
8080 wdt: watchdog@c1109900 {
8181 compatible = "amlogic,meson6-wdt";
8282 reg = <0xc1109900 0x8>;
83+ interrupts = <0 0 1>;
8384 };
8485
8586 uart_AO: serial@c81004c0 {
8687 compatible = "amlogic,meson-uart";
87− reg = <0xc81004c0 0x14>;
88+ reg = <0xc81004c0 0x18>;
8889 interrupts = <0 90 1>;
8990 clocks = <&clk81>;
9091 status = "disabled";
9192 };
9293
93− uart_A: serial@c81084c0 {
94+ uart_A: serial@c11084c0 {
9495 compatible = "amlogic,meson-uart";
95− reg = <0xc81084c0 0x14>;
96− interrupts = <0 90 1>;
96+ reg = <0xc11084c0 0x18>;
97+ interrupts = <0 26 1>;
9798 clocks = <&clk81>;
9899 status = "disabled";
99100 };
100101
101− uart_B: serial@c81084dc {
102+ uart_B: serial@c11084dc {
102103 compatible = "amlogic,meson-uart";
103− reg = <0xc81084dc 0x14>;
104− interrupts = <0 90 1>;
104+ reg = <0xc11084dc 0x18>;
105+ interrupts = <0 75 1>;
105106 clocks = <&clk81>;
106107 status = "disabled";
107108 };
108109
109− uart_C: serial@c8108700 {
110+ uart_C: serial@c1108700 {
110111 compatible = "amlogic,meson-uart";
111− reg = <0xc8108700 0x14>;
112− interrupts = <0 90 1>;
112+ reg = <0xc1108700 0x18>;
113+ interrupts = <0 93 1>;
113114 clocks = <&clk81>;
114115 status = "disabled";
115116 };
arch/arm/boot/dts/omap3-evm-37xx.dts+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313
1414 / {
1515 model = "TI OMAP37XX EVM (TMDSEVM3730)";
16− compatible = "ti,omap3-evm-37xx", "ti,omap36xx";
16+ compatible = "ti,omap3-evm-37xx", "ti,omap3630", "ti,omap3";
1717
1818 memory {
1919 device_type = "memory";
arch/arm/boot/dts/ste-hrefv60plus.dtsi+1−1
@@ -56,7 +56,7 @@ · 55 unmodified lines
5656 /* VMMCI level-shifter enable */
5757 default_hrefv60_cfg2 {
5858 pins = "GPIO169_D22";
59− ste,config = <&gpio_out_lo>;
59+ ste,config = <&gpio_out_hi>;
6060 };
6161 /* VMMCI level-shifter voltage select */
6262 default_hrefv60_cfg3 {
arch/arm/boot/dts/tegra114.dtsi+2−0
@@ -234,7 +234,9 @@ · 233 unmodified lines
234234 gpio-controller;
235235 #interrupt-cells = <2>;
236236 interrupt-controller;
237+ /*
237238 gpio-ranges = <&pinmux 0 0 246>;
239+ */
238240 };
239241
240242 apbmisc@70000800 {
arch/arm/boot/dts/tegra124.dtsi+2−0
@@ -258,7 +258,9 @@ · 257 unmodified lines
258258 gpio-controller;
259259 #interrupt-cells = <2>;
260260 interrupt-controller;
261+ /*
261262 gpio-ranges = <&pinmux 0 0 251>;
263+ */
262264 };
263265
264266 apbdma: dma@0,60020000 {
arch/arm/boot/dts/tegra20.dtsi+2−0
@@ -244,7 +244,9 @@ · 243 unmodified lines
244244 gpio-controller;
245245 #interrupt-cells = <2>;
246246 interrupt-controller;
247+ /*
247248 gpio-ranges = <&pinmux 0 0 224>;
249+ */
248250 };
249251
250252 apbmisc@70000800 {
arch/arm/boot/dts/tegra30.dtsi+2−0
@@ -349,7 +349,9 @@ · 348 unmodified lines
349349 gpio-controller;
350350 #interrupt-cells = <2>;
351351 interrupt-controller;
352+ /*
352353 gpio-ranges = <&pinmux 0 0 248>;
354+ */
353355 };
354356
355357 apbmisc@70000800 {
arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts+1−1
@@ -85,7 +85,7 @@ · 84 unmodified lines
8585 };
8686
8787 &ethsc {
88− interrupts = <0 50 4>;
88+ interrupts = <0 52 4>;
8989 };
9090
9191 &serial0 {
arch/arm/mach-exynos/pm_domains.c+3−5
@@ -200,15 +200,15 @@ no_clk: · 199 unmodified lines
200200 args.args_count = 0;
201201 child_domain = of_genpd_get_from_provider(&args);
202202 if (IS_ERR(child_domain))
203− goto next_pd;
203+ continue;
204204
205205 if (of_parse_phandle_with_args(np, "power-domains",
206206 "#power-domain-cells", 0, &args) != 0)
207− goto next_pd;
207+ continue;
208208
209209 parent_domain = of_genpd_get_from_provider(&args);
210210 if (IS_ERR(parent_domain))
211− goto next_pd;
211+ continue;
212212
213213 if (pm_genpd_add_subdomain(parent_domain, child_domain))
214214 pr_warn("%s failed to add subdomain: %s\n",
@@ -216,8 +216,6 @@ no_clk: · 1 unmodified line
216216 else
217217 pr_info("%s has as child subdomain: %s.\n",
218218 parent_domain->name, child_domain->name);
219−next_pd:
220− of_node_put(np);
221219 }
222220
223221 return 0;
arch/arm/mach-omap2/Kconfig+2−0
@@ -49,6 +49,7 @@ config SOC_OMAP5 · 48 unmodified lines
4949 select OMAP_INTERCONNECT
5050 select OMAP_INTERCONNECT_BARRIER
5151 select PM_OPP if PM
52+ select ZONE_DMA if ARM_LPAE
5253
5354 config SOC_AM33XX
5455 bool "TI AM33XX"
@@ -78,6 +79,7 @@ config SOC_DRA7XX · 23 unmodified lines
7879 select OMAP_INTERCONNECT
7980 select OMAP_INTERCONNECT_BARRIER
8081 select PM_OPP if PM
82+ select ZONE_DMA if ARM_LPAE
8183
8284 config ARCH_OMAP2PLUS
8385 bool
arch/arm/mach-omap2/board-generic.c+10−0
@@ -106,6 +106,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") · 105 unmodified lines
106106 MACHINE_END
107107
108108 static const char *const omap36xx_boards_compat[] __initconst = {
109+ "ti,omap3630",
109110 "ti,omap36xx",
110111 NULL,
111112 };
@@ -243,6 +244,9 @@ static const char *const omap5_boards_compat[] __initconst = { · 131 unmodified lines
243244 };
244245
245246 DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)")
247+#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
248+ .dma_zone_size = SZ_2G,
249+#endif
246250 .reserve = omap_reserve,
247251 .smp = smp_ops(omap4_smp_ops),
248252 .map_io = omap5_map_io,
@@ -288,6 +292,9 @@ static const char *const dra74x_boards_compat[] __initconst = { · 39 unmodified lines
288292 };
289293
290294 DT_MACHINE_START(DRA74X_DT, "Generic DRA74X (Flattened Device Tree)")
295+#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
296+ .dma_zone_size = SZ_2G,
297+#endif
291298 .reserve = omap_reserve,
292299 .smp = smp_ops(omap4_smp_ops),
293300 .map_io = dra7xx_map_io,
@@ -308,6 +315,9 @@ static const char *const dra72x_boards_compat[] __initconst = { · 14 unmodified lines
308315 };
309316
310317 DT_MACHINE_START(DRA72X_DT, "Generic DRA72X (Flattened Device Tree)")
318+#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
319+ .dma_zone_size = SZ_2G,
320+#endif
311321 .reserve = omap_reserve,
312322 .map_io = dra7xx_map_io,
313323 .init_early = dra7xx_init_early,
arch/arm/mach-omap2/pdata-quirks.c+8−1
@@ -559,7 +559,14 @@ static void pdata_quirks_check(struct pdata_init *quirks) · 558 unmodified lines
559559
560560 void __init pdata_quirks_init(const struct of_device_id *omap_dt_match_table)
561561 {
562− omap_sdrc_init(NULL, NULL);
562+ /*
563+ * We still need this for omap2420 and omap3 PM to work, others are
564+ * using drivers/misc/sram.c already.
565+ */
566+ if (of_machine_is_compatible("ti,omap2420") ||
567+ of_machine_is_compatible("ti,omap3"))
568+ omap_sdrc_init(NULL, NULL);
569+
563570 pdata_quirks_check(auxdata_quirks);
564571 of_platform_populate(NULL, omap_dt_match_table,
565572 omap_auxdata_lookup, NULL);
arch/arm/mach-pxa/pxa3xx.c+5−4
@@ -42,10 +42,6 @@ · 41 unmodified lines
4242 #define PECR_IS(n) ((1 << ((n) * 2)) << 29)
4343
4444 extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int));
45−#ifdef CONFIG_PM
46−
47−#define ISRAM_START 0x5c000000
48−#define ISRAM_SIZE SZ_256K
4945
5046 /*
5147 * NAND NFC: DFI bus arbitration subset
@@ -54,6 +50,11 @@ extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)); · 2 unmodified lines
5450 #define NDCR_ND_ARB_EN (1 << 12)
5551 #define NDCR_ND_ARB_CNTL (1 << 19)
5652
53+#ifdef CONFIG_PM
54+
55+#define ISRAM_START 0x5c000000
56+#define ISRAM_SIZE SZ_256K
57+
5758 static void __iomem *sram;
5859 static unsigned long wakeup_src;
5960
arch/arm/plat-orion/common.c+1−1
@@ -495,7 +495,7 @@ void __init orion_ge00_switch_init(struct dsa_platform_data *d, int irq) · 494 unmodified lines
495495
496496 d->netdev = &orion_ge00.dev;
497497 for (i = 0; i < d->nr_chips; i++)
498− d->chip[i].host_dev = &orion_ge00_shared.dev;
498+ d->chip[i].host_dev = &orion_ge_mvmdio.dev;
499499 orion_switch_device.dev.platform_data = d;
500500
501501 platform_device_register(&orion_switch_device);
drivers/bus/arm-ccn.c+3−2
@@ -1184,11 +1184,12 @@ static int arm_ccn_pmu_cpu_notifier(struct notifier_block *nb, · 1183 unmodified lines
11841184 if (!cpumask_test_and_clear_cpu(cpu, &dt->cpu))
11851185 break;
11861186 target = cpumask_any_but(cpu_online_mask, cpu);
1187− if (target < 0)
1187+ if (target >= nr_cpu_ids)
11881188 break;
11891189 perf_pmu_migrate_context(&dt->pmu, cpu, target);
11901190 cpumask_set_cpu(target, &dt->cpu);
1191− WARN_ON(irq_set_affinity(ccn->irq, &dt->cpu) != 0);
1191+ if (ccn->irq)
1192+ WARN_ON(irq_set_affinity(ccn->irq, &dt->cpu) != 0);
11921193 default:
11931194 break;
11941195 }
drivers/memory/Kconfig+9−3
@@ -58,12 +58,18 @@ config OMAP_GPMC · 57 unmodified lines
5858 memory drives like NOR, NAND, OneNAND, SRAM.
5959
6060 config OMAP_GPMC_DEBUG
61− bool
61+ bool "Enable GPMC debug output and skip reset of GPMC during init"
6262 depends on OMAP_GPMC
6363 help
6464 Enables verbose debugging mostly to decode the bootloader provided
65− timings. Enable this during development to configure devices
66− connected to the GPMC bus.
65+ timings. To preserve the bootloader provided timings, the reset
66+ of GPMC is skipped during init. Enable this during development to
67+ configure devices connected to the GPMC bus.
68+
69+ NOTE: In addition to matching the register setup with the bootloader
70+ you also need to match the GPMC FCLK frequency used by the
71+ bootloader or else the GPMC timings won't be identical with the
72+ bootloader timings.
6773
6874 config MVEBU_DEVBUS
6975 bool "Marvell EBU Device Bus Controller"
drivers/memory/omap-gpmc.c+1−1
@@ -696,7 +696,6 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t, · 695 unmodified lines
696696 int div;
697697 u32 l;
698698
699− gpmc_cs_show_timings(cs, "before gpmc_cs_set_timings");
700699 div = gpmc_calc_divider(t->sync_clk);
701700 if (div < 0)
702701 return div;
@@ -1988,6 +1987,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, · 1285 unmodified lines
19881987 if (ret < 0)
19891988 goto err;
19901989
1990+ gpmc_cs_show_timings(cs, "before gpmc_cs_program_settings");
19911991 ret = gpmc_cs_program_settings(cs, &gpmc_s);
19921992 if (ret < 0)
19931993 goto err;
drivers/perf/arm_pmu.c+8−2
@@ -823,9 +823,15 @@ static int of_pmu_irq_cfg(struct arm_pmu *pmu) · 822 unmodified lines
823823 }
824824
825825 /* Now look up the logical CPU number */
826− for_each_possible_cpu(cpu)
827− if (dn == of_cpu_device_node_get(cpu))
826+ for_each_possible_cpu(cpu) {
827+ struct device_node *cpu_dn;
828+
829+ cpu_dn = of_cpu_device_node_get(cpu);
830+ of_node_put(cpu_dn);
831+
832+ if (dn == cpu_dn)
828833 break;
834+ }
829835
830836 if (cpu >= nr_cpu_ids) {
831837 pr_warn("Failed to find logical CPU for %s\n",
drivers/thermal/samsung/exynos_tmu.c+1−1
@@ -932,7 +932,7 @@ static void exynos4412_tmu_set_emulation(struct exynos_tmu_data *data, · 931 unmodified lines
932932
933933 if (data->soc == SOC_ARCH_EXYNOS5260)
934934 emul_con = EXYNOS5260_EMUL_CON;
935− if (data->soc == SOC_ARCH_EXYNOS5433)
935+ else if (data->soc == SOC_ARCH_EXYNOS5433)
936936 emul_con = EXYNOS5433_TMU_EMUL_CON;
937937 else if (data->soc == SOC_ARCH_EXYNOS7)
938938 emul_con = EXYNOS7_TMU_REG_EMUL_CON;