Commit 1564dd1d authored by Olof Johansson's avatar Olof Johansson

Merge tag 'samsung-soc-4.11-2' of...

Merge tag 'samsung-soc-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung mach/soc update for v4.11, second round:
1. Remove mach code for Exynos4415 as a continuation of removal
   of this SoC.
2. Remove obsolete property from the bindings documentation.

* tag 'samsung-soc-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  dt-bindings: video: exynos7-decon: Remove obsolete samsung,power-domain property
  ARM: EXYNOS: Remove Exynos4415 arch code (SoC not supported anymore)
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a329b0ca 95ed41df
...@@ -33,7 +33,7 @@ Required properties: ...@@ -33,7 +33,7 @@ Required properties:
- i80-if-timings: timing configuration for lcd i80 interface support. - i80-if-timings: timing configuration for lcd i80 interface support.
Optional Properties: Optional Properties:
- samsung,power-domain: a phandle to DECON power domain node. - power-domains: a phandle to DECON power domain node.
- display-timings: timing settings for DECON, as described in document [1]. - display-timings: timing settings for DECON, as described in document [1].
Can be used in case timings cannot be provided otherwise Can be used in case timings cannot be provided otherwise
or to override timings provided by the panel. or to override timings provided by the panel.
......
...@@ -95,11 +95,6 @@ config SOC_EXYNOS4412 ...@@ -95,11 +95,6 @@ config SOC_EXYNOS4412
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
config SOC_EXYNOS4415
bool "SAMSUNG EXYNOS4415"
default y
depends on ARCH_EXYNOS4
config SOC_EXYNOS5250 config SOC_EXYNOS5250
bool "SAMSUNG EXYNOS5250" bool "SAMSUNG EXYNOS5250"
default y default y
......
...@@ -210,7 +210,6 @@ static char const *const exynos_dt_compat[] __initconst = { ...@@ -210,7 +210,6 @@ static char const *const exynos_dt_compat[] __initconst = {
"samsung,exynos4210", "samsung,exynos4210",
"samsung,exynos4212", "samsung,exynos4212",
"samsung,exynos4412", "samsung,exynos4412",
"samsung,exynos4415",
"samsung,exynos5", "samsung,exynos5",
"samsung,exynos5250", "samsung,exynos5250",
"samsung,exynos5260", "samsung,exynos5260",
......
...@@ -270,7 +270,6 @@ EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu"); ...@@ -270,7 +270,6 @@ EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu");
EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu"); EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu");
EXYNOS_PMU_IRQ(exynos4212_pmu_irq, "samsung,exynos4212-pmu"); EXYNOS_PMU_IRQ(exynos4212_pmu_irq, "samsung,exynos4212-pmu");
EXYNOS_PMU_IRQ(exynos4412_pmu_irq, "samsung,exynos4412-pmu"); EXYNOS_PMU_IRQ(exynos4412_pmu_irq, "samsung,exynos4412-pmu");
EXYNOS_PMU_IRQ(exynos4415_pmu_irq, "samsung,exynos4415-pmu");
EXYNOS_PMU_IRQ(exynos5250_pmu_irq, "samsung,exynos5250-pmu"); EXYNOS_PMU_IRQ(exynos5250_pmu_irq, "samsung,exynos5250-pmu");
EXYNOS_PMU_IRQ(exynos5420_pmu_irq, "samsung,exynos5420-pmu"); EXYNOS_PMU_IRQ(exynos5420_pmu_irq, "samsung,exynos5420-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