Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17e2aa01 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt64' of... 

Merge tag 'samsung-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/arm64

Samsung arm64 DT update for v4.4

- add BUS1 instance pinctrl support on exynos7 SoC

* tag 'samsung-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  arm64: dts: Add BUS1 instance pinctrl support for exynos7

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents dd5cf711 c60ce7fe

arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi

+103 −0
Original line number Diff line number Diff line
@@ -586,3 +586,106 @@ 
		samsung,pin-drv = <2>;

	};

};



&pinctrl_bus1 {

	gpf0: gpf0 {

		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpf1: gpf1 {

		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpf2: gpf2 {

		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpf3: gpf3 {

		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpf4: gpf4 {

		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpf5: gpf5 {

		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpg1: gpg1 {

		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpg2: gpg2 {

		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gph1: gph1 {

		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpv6: gpv6 {

		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;

	};



	spi5_bus: spi5-bus {

		samsung,pins = "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

	};



	ufs_refclk_out: ufs-refclk-out {

		samsung,pins = "gpg2-4";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <2>;

	};



	ufs_rst_n: ufs-rst-n {

		samsung,pins = "gph1-5";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

	};

};

arch/arm64/boot/dts/exynos/exynos7.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
		pinctrl5 = &pinctrl_ese;

		pinctrl6 = &pinctrl_fsys0;

		pinctrl7 = &pinctrl_fsys1;

		pinctrl8 = &pinctrl_bus1;

	};



	cpus {
@@ -278,6 +279,12 @@ 
			interrupts = <0 203 0>;

		};



		pinctrl_bus1: pinctrl@14870000 {

			compatible = "samsung,exynos7-pinctrl";

			reg = <0x14870000 0x1000>;

			interrupts = <0 384 0>;

		};



		hsi2c_0: hsi2c@13640000 {

			compatible = "samsung,exynos7-hsi2c";

			reg = <0x13640000 0x1000>;