On 16/09/14 09:58, Naveen Krishna Chatradhi wrote:
> Instead of using the ADC_PHY register base address, use sysreg phandle
> in ADC node to control ADC_PHY configuration register.
>
> This patch adds syscon node for Exynos3250, Exynos4x12, Exynos5250,
> and Exynos5420, Exynos5800.
>
> Signed-off-by: Naveen Krishna Chatradhi
> To: linux-samsung-soc@vger.kernel.org
Applied to the togreg branch of iio.git - initially pushed out as testing.
As this is very closely tied with the driver changes I've applied it through
the IIO tree. If it turns up in the samsung tree as well, we can let git
work it's magic to drop one of the copies!
Jonathan
> ---
> arch/arm/boot/dts/exynos3250.dtsi |3 ++-
> arch/arm/boot/dts/exynos4x12.dtsi |3 ++-
> arch/arm/boot/dts/exynos5250.dtsi |3 ++-
> arch/arm/boot/dts/exynos5420.dtsi |3 ++-
> 4 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos3250.dtsi
> b/arch/arm/boot/dts/exynos3250.dtsi
> index 1d52de6..b997a4c 100644
> --- a/arch/arm/boot/dts/exynos3250.dtsi
> +++ b/arch/arm/boot/dts/exynos3250.dtsi
> @@ -272,12 +272,13 @@
> adc: adc@126C {
> compatible = "samsung,exynos3250-adc",
>"samsung,exynos-adc-v2";
> - reg = <0x126C 0x100>, <0x10020718 0x4>;
> + reg = <0x126C 0x100>;
> interrupts = <0 137 0>;
> clock-names = "adc", "sclk";
> clocks = <&cmu CLK_TSADC>, <&cmu CLK_SCLK_TSADC>;
> #io-channel-cells = <1>;
> io-channel-ranges;
> + samsung,syscon-phandle = <&pmu_system_controller>;
> status = "disabled";
> };
>
> diff --git a/arch/arm/boot/dts/exynos4x12.dtsi
> b/arch/arm/boot/dts/exynos4x12.dtsi
> index 861bb91..9ee77d3 100644
> --- a/arch/arm/boot/dts/exynos4x12.dtsi
> +++ b/arch/arm/boot/dts/exynos4x12.dtsi
> @@ -108,13 +108,14 @@
>
> adc: adc@126C {
> compatible = "samsung,exynos-adc-v1";
> - reg = <0x126C 0x100>, <0x10020718 0x4>;
> + reg = <0x126C 0x100>;
> interrupt-parent = <&combiner>;
> interrupts = <10 3>;
> clocks = <&clock CLK_TSADC>;
> clock-names = "adc";
> #io-channel-cells = <1>;
> io-channel-ranges;
> + samsung,syscon-phandle = <&pmu_system_controller>;
> status = "disabled";
> };
>
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi
> b/arch/arm/boot/dts/exynos5250.dtsi
> index 492e1ef..108adc5 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -765,12 +765,13 @@
>
> adc: adc@12D1 {
> compatible = "samsung,exynos-adc-v1";
> - reg = <0x12D1 0x100>, <0x10040718 0x4>;
> + reg = <0x12D1 0x100>;
> interrupts = <0 106 0>;
> clocks = <&clock CLK_ADC>;
> clock-names = "adc";
> #io-channel-cells = <1>;
> io-channel-ranges;
> + samsung,syscon-phandle = <&pmu_system_controller>;
> status = "disabled";
> };
>
> diff --git a/arch/arm/boot/dts/exynos5420.dtsi
> b/arch/arm/boot/dts/exynos5420.dtsi
> index bfe056d..5fd587a 100644
> --- a/arch/arm/boot/dts/exynos5420.dtsi
> +++ b/arch/arm/boot/dts/exynos5420.dtsi
> @@ -541,12 +541,13 @@
>
> adc: adc@12D1 {
> compatible = "samsung,exynos-adc-v2";
> - reg = <0x12D1 0x100>, <0x10040720 0x4>;
> + reg = <0x12D1 0x100>;
> interrupts = <0 106 0>;
> clocks = <&clock CLK_TSADC>;
> clock-names = "adc";
> #io-channel-cells = <1>;
> io-channel-ranges;
> + samsung,syscon-phandle = <&pmu_system_controller>;
> status = "disabled";
> };
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
