Rahul Sharma wrote:
>
> Hdmi Subsystem nodes shares many properties across exynos5 SoCs
> (exynos5250 and exyno5420). Common code is moved to exynos5.dtsi
> which is included in exyno5250 and exynos5420 SoC files.
>
> It also renames the hdmi and mixer nodes as per dt naming
> convention in the format name@phy_add.
>
> Signed-off-by: Rahul Sharma <rahul.sharma@xxxxxxxxxxx>
> ---
> arch/arm/boot/dts/cros5250-common.dtsi | 2 +-
> arch/arm/boot/dts/exynos5.dtsi | 12 ++++++++++++
> arch/arm/boot/dts/exynos5250-arndale.dts | 7 ++++++-
> arch/arm/boot/dts/exynos5250-smdk5250.dts | 7 ++++++-
> arch/arm/boot/dts/exynos5250-snow.dts | 8 ++++++++
> arch/arm/boot/dts/exynos5250.dtsi | 8 ++------
> 6 files changed, 35 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi
> b/arch/arm/boot/dts/cros5250-common.dtsi
> index dc259e8b..bef56fa 100644
> --- a/arch/arm/boot/dts/cros5250-common.dtsi
> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
> @@ -299,7 +299,7 @@
> status = "disabled";
> };
>
> - hdmi {
> + hdmi@14530000 {
> hpd-gpio = <&gpx3 7 0>;
> };
>
> diff --git a/arch/arm/boot/dts/exynos5.dtsi
> b/arch/arm/boot/dts/exynos5.dtsi
> index 1ae179e..dcb4943 100644
> --- a/arch/arm/boot/dts/exynos5.dtsi
> +++ b/arch/arm/boot/dts/exynos5.dtsi
> @@ -144,4 +144,16 @@
> #size-cells = <0>;
> status = "disabled";
> };
> +
> + hdmi@14530000 {
> + reg = <0x14530000 0x70000>;
> + interrupts = <0 95 0>;
> + status = "disabled";
> + };
> +
> + mixer@14450000 {
> + reg = <0x14450000 0x10000>;
> + interrupts = <0 94 0>;
> + status = "disabled";
> + };
> };
> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts
> b/arch/arm/boot/dts/exynos5250-arndale.dts
> index 83ab780..955ecfc 100644
> --- a/arch/arm/boot/dts/exynos5250-arndale.dts
> +++ b/arch/arm/boot/dts/exynos5250-arndale.dts
> @@ -471,13 +471,18 @@
> };
> };
>
> - hdmi {
> + hdmi@14530000 {
> + status = "okay";
> hpd-gpio = <&gpx3 7 2>;
> vdd_osc-supply = <&ldo10_reg>;
> vdd_pll-supply = <&ldo8_reg>;
> vdd-supply = <&ldo8_reg>;
> };
>
> + mixer@14450000 {
> + status = "okay";
> + };
> +
> regulators {
> compatible = "simple-bus";
> #address-cells = <1>;
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> index 945e6cc..1cce2e8 100644
> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> @@ -221,10 +221,15 @@
> status = "disabled";
> };
>
> - hdmi {
> + hdmi@14530000 {
> + status = "okay";
> hpd-gpio = <&gpx3 7 0>;
> };
>
> + mixer@14450000 {
> + status = "okay";
> + };
> +
> codec@11000000 {
> samsung,mfc-r = <0x43000000 0x800000>;
> samsung,mfc-l = <0x51000000 0x800000>;
> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts
> b/arch/arm/boot/dts/exynos5250-snow.dts
> index e79331d..b1378af 100644
> --- a/arch/arm/boot/dts/exynos5250-snow.dts
> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
> @@ -196,4 +196,12 @@
> clock-frequency = <24000000>;
> };
> };
> +
> + hdmi@14530000 {
> + status = "okay";
> + };
> +
> + mixer@14450000 {
> + status = "okay";
> + };
> };
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi
> b/arch/arm/boot/dts/exynos5250.dtsi
> index de54b38..f587cd7 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -578,20 +578,16 @@
> clock-names = "gscl";
> };
>
> - hdmi {
> + hdmi@14530000 {
> compatible = "samsung,exynos4212-hdmi";
> - reg = <0x14530000 0x70000>;
> - interrupts = <0 95 0>;
> clocks = <&clock 344>, <&clock 136>, <&clock 137>,
> <&clock 159>, <&clock 1024>;
> clock-names = "hdmi", "sclk_hdmi", "sclk_pixel",
> "sclk_hdmiphy", "mout_hdmi";
> };
>
> - mixer {
> + mixer@14450000 {
> compatible = "samsung,exynos5250-mixer";
> - reg = <0x14450000 0x10000>;
> - interrupts = <0 94 0>;
> clocks = <&clock 343>, <&clock 136>;
> clock-names = "mixer", "sclk_hdmi";
> };
> --
> 1.7.10.4
NAK, again because of same reason with previous my comments. Note, different
addresses and IRQ# on upcoming exynos5 SoC.
- Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
