Commit b994738b authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'samsung-dt-4.9-2' of...

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

Pull "Samsung DeviceTree update for v4.9, second round" from Krzysztof Kozłowski:

1. Enable HDMI on Arndale Octa board.
2. Update list of clocks for FIMC-IS block on Exynos4x12.
3. Remove skeleton.dtsi thus fixing DT compiler warning:
	"Node /memory has a reg or ranges property, but no unit name"
   This is a tree-wide effort by various people. Javier Martinez Canillas did
   it for Exynos and S5PV210.

* tag 'samsung-dt-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s5p: Add missing unit name to memory nodes for S5PV210 boards
  ARM: dts: s5p: Remove skeleton.dtsi inclusion for S5PV210
  ARM: dts: exynos: Add missing unit name to memory nodes in Exynos5 DTS
  ARM: dts: exynos: Add missing unit name to memory nodes in Exynos4 DTS
  ARM: dts: exynos: Add missing unit name to memory nodes in Exynos3 DTS
  ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos5
  ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos4
  ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos3
  ARM: dts: exynos: Add missing memory node for Exynos5440 boards
  ARM: dts: exynos: Add all required FIMC-IS clocks to exynos4x12
  ARM: dts: exynos: Enable HDMI for Arndale Octa board
parents 71e84db1 5271d002
......@@ -24,7 +24,8 @@ chosen {
stdout-path = &serial_2;
};
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x1ff00000>;
};
......
......@@ -27,7 +27,8 @@ aliases {
i2c7 = &i2c_max77836;
};
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x1ff00000>;
};
......
......@@ -27,7 +27,8 @@ aliases {
i2c7 = &i2c_max77836;
};
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x1ff00000>;
};
......
......@@ -17,7 +17,6 @@
* published by the Free Software Foundation.
*/
#include "skeleton.dtsi"
#include "exynos4-cpu-thermal.dtsi"
#include "exynos-syscon-restart.dtsi"
#include <dt-bindings/clock/exynos3250.h>
......@@ -25,6 +24,8 @@
/ {
compatible = "samsung,exynos3250";
interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
aliases {
pinctrl0 = &pinctrl_0;
......
......@@ -21,11 +21,12 @@
#include <dt-bindings/clock/exynos4.h>
#include <dt-bindings/clock/exynos-audss-clk.h>
#include "skeleton.dtsi"
#include "exynos-syscon-restart.dtsi"
/ {
interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
aliases {
spi0 = &spi_0;
......
......@@ -24,7 +24,8 @@ / {
model = "Insignal Origen evaluation board based on Exynos4210";
compatible = "insignal,origen", "samsung,exynos4210", "samsung,exynos4";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x10000000
0x50000000 0x10000000
0x60000000 0x10000000
......
......@@ -23,7 +23,8 @@ / {
model = "Samsung smdkv310 evaluation board based on Exynos4210";
compatible = "samsung,smdkv310", "samsung,exynos4210", "samsung,exynos4";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x80000000>;
};
......
......@@ -20,7 +20,8 @@ / {
model = "Samsung Trats based on Exynos4210";
compatible = "samsung,trats", "samsung,exynos4210", "samsung,exynos4";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x10000000
0x50000000 0x10000000
0x60000000 0x10000000
......
......@@ -20,7 +20,8 @@ / {
model = "Samsung Universal C210 based on Exynos4210 rev0";
compatible = "samsung,universal_c210", "samsung,exynos4210", "samsung,exynos4";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x10000000
0x50000000 0x10000000>;
};
......
......@@ -18,7 +18,8 @@ / {
model = "Hardkernel ODROID-U3 board based on Exynos4412";
compatible = "hardkernel,odroid-u3", "samsung,exynos4412", "samsung,exynos4";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x7FF00000>;
};
......
......@@ -18,7 +18,8 @@ / {
model = "Hardkernel ODROID-X board based on Exynos4412";
compatible = "hardkernel,odroid-x", "samsung,exynos4412", "samsung,exynos4";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x3FF00000>;
};
......
......@@ -17,7 +17,8 @@ / {
model = "Hardkernel ODROID-X2 board based on Exynos4412";
compatible = "hardkernel,odroid-x2", "samsung,exynos4412", "samsung,exynos4";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x7FF00000>;
};
};
......
......@@ -22,7 +22,8 @@ / {
model = "Insignal Origen evaluation board based on Exynos4412";
compatible = "insignal,origen4412", "samsung,exynos4412", "samsung,exynos4";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x40000000>;
};
......
......@@ -20,7 +20,8 @@ / {
model = "Samsung SMDK evaluation board based on Exynos4412";
compatible = "samsung,smdk4412", "samsung,exynos4412", "samsung,exynos4";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x40000000>;
};
......
......@@ -23,7 +23,8 @@ chosen {
stdout-path = &serial_0;
};
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x40000000>;
};
......
......@@ -30,7 +30,8 @@ aliases {
i2c12 = &i2c_max77693_fuel;
};
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x40000000>;
};
......
......@@ -16,13 +16,14 @@
* published by the Free Software Foundation.
*/
#include "skeleton.dtsi"
#include <dt-bindings/clock/exynos4415.h>
#include <dt-bindings/clock/exynos-audss-clk.h>
/ {
compatible = "samsung,exynos4415";
interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
aliases {
pinctrl0 = &pinctrl_0;
......
......@@ -157,7 +157,9 @@ fimc_is: fimc-is@12000000 {
<&clock CLK_MOUT_MPLL_USER_T>,
<&clock CLK_FIMC_ISP>, <&clock CLK_FIMC_DRC>,
<&clock CLK_FIMC_FD>, <&clock CLK_MCUISP>,
<&clock CLK_DIV_ISP0>,<&clock CLK_DIV_ISP1>,
<&clock CLK_GICISP>, <&clock CLK_MCUCTL_ISP>,
<&clock CLK_PWM_ISP>,
<&clock CLK_DIV_ISP0>, <&clock CLK_DIV_ISP1>,
<&clock CLK_DIV_MCUISP0>,
<&clock CLK_DIV_MCUISP1>,
<&clock CLK_UART_ISP_SCLK>,
......@@ -167,6 +169,7 @@ fimc_is: fimc-is@12000000 {
clock-names = "lite0", "lite1", "ppmuispx",
"ppmuispmx", "mpll", "isp",
"drc", "fd", "mcuisp",
"gicisp", "mcuctl_isp", "pwm_isp",
"ispdiv0", "ispdiv1", "mcuispdiv0",
"mcuispdiv1", "uart", "aclk200",
"div_aclk200", "aclk400mcuisp",
......
......@@ -13,11 +13,12 @@
* published by the Free Software Foundation.
*/
#include "skeleton.dtsi"
#include "exynos-syscon-restart.dtsi"
/ {
interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
aliases {
i2c0 = &i2c_0;
......
......@@ -20,7 +20,8 @@ / {
model = "Insignal Arndale evaluation board based on EXYNOS5250";
compatible = "insignal,arndale", "samsung,exynos5250", "samsung,exynos5";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x80000000>;
};
......
......@@ -22,7 +22,8 @@ / {
aliases {
};
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x80000000>;
};
......
......@@ -19,7 +19,8 @@ aliases {
i2c104 = &i2c_104;
};
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x80000000>;
};
......
......@@ -20,7 +20,8 @@ / {
model = "Google Spring";
compatible = "google,spring", "samsung,exynos5250", "samsung,exynos5";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x80000000>;
};
......
......@@ -16,7 +16,8 @@ / {
model = "SAMSUNG XYREF5260 board based on EXYNOS5260";
compatible = "samsung,xyref5260", "samsung,exynos5260", "samsung,exynos5";
memory {
memory@20000000 {
device_type = "memory";
reg = <0x20000000 0x80000000>;
};
......
......@@ -9,13 +9,13 @@
* published by the Free Software Foundation.
*/
#include "skeleton.dtsi"
#include <dt-bindings/clock/exynos5260-clk.h>
/ {
compatible = "samsung,exynos5260", "samsung,exynos5";
interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
aliases {
pinctrl0 = &pinctrl_0;
......
......@@ -21,7 +21,8 @@ / {
model = "Hardkernel Odroid XU";
compatible = "hardkernel,odroid-xu", "samsung,exynos5410", "samsung,exynos5";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x7ea00000>;
};
......
......@@ -16,7 +16,8 @@ / {
model = "Samsung SMDK5410 board based on EXYNOS5410";
compatible = "samsung,smdk5410", "samsung,exynos5410", "samsung,exynos5";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x80000000>;
};
......
......@@ -22,7 +22,8 @@ / {
model = "Insignal Arndale Octa evaluation board based on EXYNOS5420";
compatible = "insignal,arndale-octa", "samsung,exynos5420", "samsung,exynos5";
memory {
memory@20000000 {
device_type = "memory";
reg = <0x20000000 0x80000000>;
};
......@@ -70,6 +71,15 @@ &cci {
status = "disabled";
};
&hdmi {
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
vdd_osc-supply = <&ldo7_reg>;
vdd_pll-supply = <&ldo6_reg>;
vdd-supply = <&ldo6_reg>;
ddc = <&i2c_2>;
status = "okay";
};
&hsi2c_4 {
status = "okay";
......@@ -347,6 +357,10 @@ buck10_reg: BUCK10 {
};
};
&i2c_2 {
status = "okay";
};
&mmc_0 {
status = "okay";
broken-cd;
......
......@@ -79,7 +79,8 @@ lid-switch {
};
};
memory {
memory@20000000 {
device_type = "memory";
reg = <0x20000000 0x80000000>;
};
......
......@@ -19,7 +19,8 @@ / {
model = "Samsung SMDK5420 board based on EXYNOS5420";
compatible = "samsung,smdk5420", "samsung,exynos5420", "samsung,exynos5";
memory {
memory@20000000 {
device_type = "memory";
reg = <0x20000000 0x80000000>;
};
......
......@@ -21,7 +21,8 @@
#include "exynos-mfc-reserved-memory.dtsi"
/ {
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x7EA00000>;
};
......
......@@ -20,6 +20,12 @@ chosen {
bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200";
};
/* FIXME: set reg property with correct start address and size */
memory@0 {
device_type = "memory";
reg = <0 0>;
};
fixed-rate-clocks {
xtal {
compatible = "samsung,clock-xtal";
......
......@@ -21,6 +21,12 @@ chosen {
bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200";
};
/* FIXME: set reg property with correct start address and size */
memory@0 {
device_type = "memory";
reg = <0 0>;
};
fixed-rate-clocks {
xtal {
compatible = "samsung,clock-xtal";
......
......@@ -10,12 +10,13 @@
*/
#include <dt-bindings/clock/exynos5440.h>
#include "skeleton.dtsi"
/ {
compatible = "samsung,exynos5440", "samsung,exynos5";
interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
aliases {
serial0 = &serial_0;
......
......@@ -14,7 +14,6 @@
* published by the Free Software Foundation.
*/
#include "skeleton.dtsi"
#include "exynos5.dtsi"
/ {
......
......@@ -79,7 +79,8 @@ lid-switch {
};
memory {
memory@20000000 {
device_type = "memory";
reg = <0x20000000 0x80000000>;
};
......
......@@ -29,7 +29,7 @@ chosen {
bootargs = "console=ttySAC2,115200n8 root=/dev/mmcblk1p5 rw rootwait ignore_loglevel earlyprintk";
};
memory {
memory@30000000 {
device_type = "memory";
reg = <0x30000000 0x05000000
0x40000000 0x18000000>;
......
......@@ -29,7 +29,7 @@ chosen {
bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p5 rw rootwait ignore_loglevel earlyprintk";
};
memory {
memory@30000000 {
device_type = "memory";
reg = <0x30000000 0x05000000
0x40000000 0x10000000
......
......@@ -29,7 +29,7 @@ chosen {
bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p1 rw rootwait ignore_loglevel earlyprintk";
};
memory {
memory@20000000 {
device_type = "memory";
reg = <0x20000000 0x20000000>;
};
......
......@@ -29,7 +29,7 @@ chosen {
bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p1 rw rootwait ignore_loglevel earlyprintk";
};
memory {
memory@20000000 {
device_type = "memory";
reg = <0x20000000 0x40000000>;
};
......
......@@ -29,7 +29,7 @@ chosen {
bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p1 rw rootwait ignore_loglevel earlyprintk";
};
memory {
memory@20000000 {
device_type = "memory";
reg = <0x20000000 0x20000000>;
};
......
......@@ -19,11 +19,13 @@
* published by the Free Software Foundation.
*/
#include "skeleton.dtsi"
#include <dt-bindings/clock/s5pv210.h>
#include <dt-bindings/clock/s5pv210-audss.h>
/ {
#address-cells = <1>;
#size-cells = <1>;
aliases {
csis0 = &csis0;
fimc0 = &fimc0;
......
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