A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Samsung DTS ARM64 changes for v4.18

Browse source 
1. Fix DTC warnings.
 2. Add mem-2-mem Scaler devices.
 -----BEGIN PGP SIGNATURE-----
 
 iQItBAABCAAXBQJa+FrYEBxrcnprQGtlcm5lbC5vcmcACgkQwTdm5oaLg9cksA/+
 Oidi1qDmcDy4Arhz9nCHrigu/cr/5slJKaD+Ucnx/I6eqGxJdSMs0v0I2swS756J
 7naI3eVjn9qpWF4rkyouccAmM08c8mZk2vifqMS1pjceOiWQf1rRq5LhAJSqTmny
 16QEl3x1u/gFwL7MIW/9QU2SuN/MptjS+Y6Bz8A3vT4F/NvJOCp+AWL8XzPhwTpU
 atEUZHgJizMpU21RnmOrooJGhdJ5PJzoJ7MjsIYgs+NtmvxnkkxiaDqtQ7UX5YIJ
 o/xTw08pQEQcpKQkoXREWpH0X2hmgYkm1AuvIKee2YgCKH45AafpZkE35tRvScgL
 cuxJoWkVXQlPH+wi/b9Txs5JEccXaOMwsG8SCdz2VVH+dBy47mIjmxJFEsqzDkW6
 Mk4BbJXED54juh7TqI5W/LBwaikaWEx+IorzEdAJBJZm0uOnmWRnml1RyBalqZ/a
 qc7oFEF+L/CkS7KTEcWUwu08+KDuFf/uAh30Cmu8Fx/Ior2WY2OplcjyxilJ2jWk
 aWgbZij3H/hM+f1m6fC1mB+vNaypfi0Hi4DmJLgw9kF8xI5jv2vqgRVoAaAqGkvK
 aOaTPDPdvby0jd+T9yCeioNoopA8CKeISq7JkU5RVlsVGcQwfRpeXynjtRPCsAHQ
 qd9yPNe4viEeNFOGQWmSDqMZM0sVYAWnRqCMUKjyBSY=
 =4MOV
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt64-4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Samsung DTS ARM64 changes for v4.18

1. Fix DTC warnings.
2. Add mem-2-mem Scaler devices.

* tag 'samsung-dt64-4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: Add mem-2-mem Scaler devices
  arm64: dts: exynos: Remove unneeded address space mapping for soc node
  arm64: dts: exynos: Move syscon poweroff and restart nodes under the PMU

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-05-14 13:51:36 -07:00
commit 3112013b29
2 changed files with 65 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

66
arch/arm64/boot/dts/exynos/exynos5433.dtsi
View file

@ -18,8 +18,8 @@
/ {
compatible = "samsung,exynos5433";
#address-cells = <2>;
#size-cells = <2>;
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&gic>;
@ -231,18 +231,11 @@
cpu_on = <0xC4000003>;
};
reboot: syscon-reboot {
compatible = "syscon-reboot";
regmap = <&pmu_system_controller>;
offset = <0x400>; /* SWRESET */
mask = <0x1>;
};
soc: soc {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x0 0x0 0x18000000>;
ranges;
arm_a53_pmu {
compatible = "arm,cortex-a53-pmu", "arm,armv8-pmuv3";
@ -799,6 +792,13 @@
#clock-cells = <1>;
clock-names = "clkout16";
clocks = <&xxti>;
reboot: syscon-reboot {
compatible = "syscon-reboot";
regmap = <&pmu_system_controller>;
offset = <0x400>; /* SWRESET */
mask = <0x1>;
};
};
gic: interrupt-controller@11001000 {
@ -1034,6 +1034,30 @@
power-domains = <&pd_gscl>;
};
scaler_0: scaler@15000000 {
compatible = "samsung,exynos5433-scaler";
reg = <0x15000000 0x1294>;
interrupts = <0 402 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "pclk", "aclk", "aclk_xiu";
clocks = <&cmu_mscl CLK_PCLK_M2MSCALER0>,
<&cmu_mscl CLK_ACLK_M2MSCALER0>,
<&cmu_mscl CLK_ACLK_XIU_MSCLX>;
iommus = <&sysmmu_scaler_0>;
power-domains = <&pd_mscl>;
};
scaler_1: scaler@15010000 {
compatible = "samsung,exynos5433-scaler";
reg = <0x15010000 0x1294>;
interrupts = <0 403 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "pclk", "aclk", "aclk_xiu";
clocks = <&cmu_mscl CLK_PCLK_M2MSCALER1>,
<&cmu_mscl CLK_ACLK_M2MSCALER1>,
<&cmu_mscl CLK_ACLK_XIU_MSCLX>;
iommus = <&sysmmu_scaler_1>;
power-domains = <&pd_mscl>;
};
jpeg: codec@15020000 {
compatible = "samsung,exynos5433-jpeg";
reg = <0x15020000 0x10000>;
@ -1137,6 +1161,28 @@
power-domains = <&pd_gscl>;
};
sysmmu_scaler_0: sysmmu@0x15040000 {
compatible = "samsung,exynos-sysmmu";
reg = <0x15040000 0x1000>;
interrupts = <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "pclk", "aclk";
clocks = <&cmu_mscl CLK_PCLK_SMMU_M2MSCALER0>,
<&cmu_mscl CLK_ACLK_SMMU_M2MSCALER0>;
#iommu-cells = <0>;
power-domains = <&pd_mscl>;
};
sysmmu_scaler_1: sysmmu@0x15050000 {
compatible = "samsung,exynos-sysmmu";
reg = <0x15050000 0x1000>;
interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "pclk", "aclk";
clocks = <&cmu_mscl CLK_PCLK_SMMU_M2MSCALER1>,
<&cmu_mscl CLK_ACLK_SMMU_M2MSCALER1>;
#iommu-cells = <0>;
power-domains = <&pd_mscl>;
};
sysmmu_jpeg: sysmmu@15060000 {
compatible = "samsung,exynos-sysmmu";
reg = <0x15060000 0x1000>;

18
arch/arm64/boot/dts/exynos/exynos7.dtsi
View file

@ -12,8 +12,8 @@
/ {
compatible = "samsung,exynos7";
interrupt-parent = <&gic>;
#address-cells = <2>;
#size-cells = <2>;
#address-cells = <1>;
#size-cells = <1>;
aliases {
pinctrl0 = &pinctrl_alive;
@ -70,7 +70,7 @@
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0 0 0x18000000>;
ranges;
chipid@10000000 {
compatible = "samsung,exynos4210-chipid";
@ -494,13 +494,13 @@
pmu_system_controller: system-controller@105c0000 {
compatible = "samsung,exynos7-pmu", "syscon";
reg = <0x105c0000 0x5000>;
};
reboot: syscon-reboot {
compatible = "syscon-reboot";
regmap = <&pmu_system_controller>;
offset = <0x0400>;
mask = <0x1>;
reboot: syscon-reboot {
compatible = "syscon-reboot";
regmap = <&pmu_system_controller>;
offset = <0x0400>;
mask = <0x1>;
};
};
rtc: rtc@10590000 {