Skip to content

Commit 4431374

Browse files
hormshorms
committed
Merge branches 'tpu-pwm', 'backlight' and 'soc' into cleanup2-base
3 parents ae3e4c2 + 0fb19cd + 81b9d53 commit 4431374

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1516
-639
lines changed

‎arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
183183
ccu9540.dtb
184184
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
185185
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
186+
emev2-kzm9d-reference.dtb \
186187
r8a7740-armadillo800eva.dtb \
187188
r8a7778-bockw.dtb \
188189
r8a7740-armadillo800eva-reference.dtb \

‎arch/arm/boot/dts/emev2-kzm9d-reference.dts

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
* Device Tree Source for the KZM9D board
3+
*
4+
* Copyright (C) 2013 Renesas Solutions Corp.
5+
*
6+
* This file is licensed under the terms of the GNU General Public License
7+
* version 2. This program is licensed "as is" without any warranty of any
8+
* kind, whether express or implied.
9+
*/
10+
/dts-v1/;
11+
12+
/include/ "emev2.dtsi"
13+
14+
/ {
15+
model = "EMEV2 KZM9D Board";
16+
compatible = "renesas,kzm9d-reference", "renesas,emev2";
17+
18+
memory {
19+
device_type = "memory";
20+
reg = <0x40000000 0x8000000>;
21+
};
22+
23+
chosen {
24+
bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096";
25+
};
26+
27+
reg_1p8v: regulator@0 {
28+
compatible = "regulator-fixed";
29+
regulator-name = "fixed-1.8V";
30+
regulator-min-microvolt = <1800000>;
31+
regulator-max-microvolt = <1800000>;
32+
regulator-always-on;
33+
regulator-boot-on;
34+
};
35+
36+
reg_3p3v: regulator@1 {
37+
compatible = "regulator-fixed";
38+
regulator-name = "fixed-3.3V";
39+
regulator-min-microvolt = <3300000>;
40+
regulator-max-microvolt = <3300000>;
41+
regulator-always-on;
42+
regulator-boot-on;
43+
};
44+
45+
lan9220@20000000 {
46+
compatible = "smsc,lan9220", "smsc,lan9115";
47+
reg = <0x20000000 0x10000>;
48+
phy-mode = "mii";
49+
interrupt-parent = <&gpio0>;
50+
interrupts = <1 1>; /* active high */
51+
reg-io-width = <4>;
52+
smsc,irq-active-high;
53+
smsc,irq-push-pull;
54+
vddvario-supply = <&reg_1p8v>;
55+
vdd33a-supply = <&reg_3p3v>;
56+
};
57+
};

‎arch/arm/boot/dts/emev2-kzm9d.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
};
2222

2323
chosen {
24-
bootargs = "console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096";
24+
bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096";
2525
};
2626
};

‎arch/arm/boot/dts/emev2.dtsi

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
compatible = "renesas,emev2";
1515
interrupt-parent = <&gic>;
1616

17+
aliases {
18+
gpio0 = &gpio0;
19+
gpio1 = &gpio1;
20+
gpio2 = &gpio2;
21+
gpio3 = &gpio3;
22+
gpio4 = &gpio4;
23+
};
24+
1725
cpus {
1826
#address-cells = <1>;
1927
#size-cells = <0>;
@@ -67,4 +75,55 @@
6775
reg = <0xe1050000 0x38>;
6876
interrupts = <0 11 0>;
6977
};
78+
79+
gpio0: gpio@e0050000 {
80+
compatible = "renesas,em-gio";
81+
reg = <0xe0050000 0x2c>, <0xe0050040 0x20>;
82+
interrupts = <0 67 0>, <0 68 0>;
83+
gpio-controller;
84+
#gpio-cells = <2>;
85+
ngpios = <32>;
86+
interrupt-controller;
87+
#interrupt-cells = <2>;
88+
};
89+
gpio1: gpio@e0050080 {
90+
compatible = "renesas,em-gio";
91+
reg = <0xe0050080 0x2c>, <0xe00500c0 0x20>;
92+
interrupts = <0 69 0>, <0 70 0>;
93+
gpio-controller;
94+
#gpio-cells = <2>;
95+
ngpios = <32>;
96+
interrupt-controller;
97+
#interrupt-cells = <2>;
98+
};
99+
gpio2: gpio@e0050100 {
100+
compatible = "renesas,em-gio";
101+
reg = <0xe0050100 0x2c>, <0xe0050140 0x20>;
102+
interrupts = <0 71 0>, <0 72 0>;
103+
gpio-controller;
104+
#gpio-cells = <2>;
105+
ngpios = <32>;
106+
interrupt-controller;
107+
#interrupt-cells = <2>;
108+
};
109+
gpio3: gpio@e0050180 {
110+
compatible = "renesas,em-gio";
111+
reg = <0xe0050180 0x2c>, <0xe00501c0 0x20>;
112+
interrupts = <0 73 0>, <0 74 0>;
113+
gpio-controller;
114+
#gpio-cells = <2>;
115+
ngpios = <32>;
116+
interrupt-controller;
117+
#interrupt-cells = <2>;
118+
};
119+
gpio4: gpio@e0050200 {
120+
compatible = "renesas,em-gio";
121+
reg = <0xe0050200 0x2c>, <0xe0050240 0x20>;
122+
interrupts = <0 75 0>, <0 76 0>;
123+
gpio-controller;
124+
#gpio-cells = <2>;
125+
ngpios = <31>;
126+
interrupt-controller;
127+
#interrupt-cells = <2>;
128+
};
70129
};

‎arch/arm/boot/dts/r8a73a4-ape6evm.dts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,25 @@
5050
};
5151
};
5252
};
53+
54+
&i2c5 {
55+
vdd_dvfs: max8973@1b {
56+
compatible = "maxim,max8973";
57+
reg = <0x1b>;
58+
59+
regulator-min-microvolt = <935000>;
60+
regulator-max-microvolt = <1200000>;
61+
regulator-boot-on;
62+
regulator-always-on;
63+
};
64+
};
65+
66+
&cpu0 {
67+
cpu0-supply = <&vdd_dvfs>;
68+
operating-points = <
69+
/* kHz uV */
70+
1950000 1115000
71+
1462500 995000
72+
>;
73+
voltage-tolerance = <1>; /* 1% */
74+
};

‎arch/arm/boot/dts/r8a73a4.dtsi

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,130 @@
8585
interrupt-parent = <&gic>;
8686
interrupts = <0 69 4>;
8787
};
88+
89+
i2c0: i2c@e6500000 {
90+
#address-cells = <1>;
91+
#size-cells = <0>;
92+
compatible = "renesas,rmobile-iic";
93+
reg = <0 0xe6500000 0 0x428>;
94+
interrupt-parent = <&gic>;
95+
interrupts = <0 174 0x4>;
96+
};
97+
98+
i2c1: i2c@e6510000 {
99+
#address-cells = <1>;
100+
#size-cells = <0>;
101+
compatible = "renesas,rmobile-iic";
102+
reg = <0 0xe6510000 0 0x428>;
103+
interrupt-parent = <&gic>;
104+
interrupts = <0 175 0x4>;
105+
};
106+
107+
i2c2: i2c@e6520000 {
108+
#address-cells = <1>;
109+
#size-cells = <0>;
110+
compatible = "renesas,rmobile-iic";
111+
reg = <0 0xe6520000 0 0x428>;
112+
interrupt-parent = <&gic>;
113+
interrupts = <0 176 0x4>;
114+
};
115+
116+
i2c3: i2c@e6530000 {
117+
#address-cells = <1>;
118+
#size-cells = <0>;
119+
compatible = "renesas,rmobile-iic";
120+
reg = <0 0xe6530000 0 0x428>;
121+
interrupt-parent = <&gic>;
122+
interrupts = <0 177 0x4>;
123+
};
124+
125+
i2c4: i2c@e6540000 {
126+
#address-cells = <1>;
127+
#size-cells = <0>;
128+
compatible = "renesas,rmobile-iic";
129+
reg = <0 0xe6540000 0 0x428>;
130+
interrupt-parent = <&gic>;
131+
interrupts = <0 178 0x4>;
132+
};
133+
134+
i2c5: i2c@e60b0000 {
135+
#address-cells = <1>;
136+
#size-cells = <0>;
137+
compatible = "renesas,rmobile-iic";
138+
reg = <0 0xe60b0000 0 0x428>;
139+
interrupt-parent = <&gic>;
140+
interrupts = <0 179 0x4>;
141+
};
142+
143+
i2c6: i2c@e6550000 {
144+
#address-cells = <1>;
145+
#size-cells = <0>;
146+
compatible = "renesas,rmobile-iic";
147+
reg = <0 0xe6550000 0 0x428>;
148+
interrupt-parent = <&gic>;
149+
interrupts = <0 184 0x4>;
150+
};
151+
152+
i2c7: i2c@e6560000 {
153+
#address-cells = <1>;
154+
#size-cells = <0>;
155+
compatible = "renesas,rmobile-iic";
156+
reg = <0 0xe6560000 0 0x428>;
157+
interrupt-parent = <&gic>;
158+
interrupts = <0 185 0x4>;
159+
};
160+
161+
i2c8: i2c@e6570000 {
162+
#address-cells = <1>;
163+
#size-cells = <0>;
164+
compatible = "renesas,rmobile-iic";
165+
reg = <0 0xe6570000 0 0x428>;
166+
interrupt-parent = <&gic>;
167+
interrupts = <0 173 0x4>;
168+
};
169+
170+
mmcif0: mmcif@ee200000 {
171+
compatible = "renesas,sh-mmcif";
172+
reg = <0 0xee200000 0 0x80>;
173+
interrupt-parent = <&gic>;
174+
interrupts = <0 169 0x4>;
175+
reg-io-width = <4>;
176+
status = "disabled";
177+
};
178+
179+
mmcif1: mmcif@ee220000 {
180+
compatible = "renesas,sh-mmcif";
181+
reg = <0 0xee220000 0 0x80>;
182+
interrupt-parent = <&gic>;
183+
interrupts = <0 170 0x4>;
184+
reg-io-width = <4>;
185+
status = "disabled";
186+
};
187+
188+
sdhi0: sdhi@ee100000 {
189+
compatible = "renesas,r8a73a4-sdhi";
190+
reg = <0 0xee100000 0 0x100>;
191+
interrupt-parent = <&gic>;
192+
interrupts = <0 165 4>;
193+
cap-sd-highspeed;
194+
status = "disabled";
195+
};
196+
197+
sdhi1: sdhi@ee120000 {
198+
compatible = "renesas,r8a73a4-sdhi";
199+
reg = <0 0xee120000 0 0x100>;
200+
interrupt-parent = <&gic>;
201+
interrupts = <0 166 4>;
202+
cap-sd-highspeed;
203+
status = "disabled";
204+
};
205+
206+
sdhi2: sdhi@ee140000 {
207+
compatible = "renesas,r8a73a4-sdhi";
208+
reg = <0 0xee140000 0 0x100>;
209+
interrupt-parent = <&gic>;
210+
interrupts = <0 167 4>;
211+
cap-sd-highspeed;
212+
status = "disabled";
213+
};
88214
};

‎arch/arm/boot/dts/r8a7790.dtsi

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,58 @@
5454
interrupt-parent = <&gic>;
5555
interrupts = <0 0 4>, <0 1 4>, <0 2 4>, <0 3 4>;
5656
};
57+
58+
mmcif0: mmcif@ee200000 {
59+
compatible = "renesas,sh-mmcif";
60+
reg = <0 0xee200000 0 0x80>;
61+
interrupt-parent = <&gic>;
62+
interrupts = <0 169 0x4>;
63+
reg-io-width = <4>;
64+
status = "disabled";
65+
};
66+
67+
mmcif1: mmcif@ee220000 {
68+
compatible = "renesas,sh-mmcif";
69+
reg = <0 0xee220000 0 0x80>;
70+
interrupt-parent = <&gic>;
71+
interrupts = <0 170 0x4>;
72+
reg-io-width = <4>;
73+
status = "disabled";
74+
};
75+
76+
sdhi0: sdhi@ee100000 {
77+
compatible = "renesas,r8a7790-sdhi";
78+
reg = <0 0xee100000 0 0x100>;
79+
interrupt-parent = <&gic>;
80+
interrupts = <0 165 4>;
81+
cap-sd-highspeed;
82+
status = "disabled";
83+
};
84+
85+
sdhi1: sdhi@ee120000 {
86+
compatible = "renesas,r8a7790-sdhi";
87+
reg = <0 0xee120000 0 0x100>;
88+
interrupt-parent = <&gic>;
89+
interrupts = <0 166 4>;
90+
cap-sd-highspeed;
91+
status = "disabled";
92+
};
93+
94+
sdhi2: sdhi@ee140000 {
95+
compatible = "renesas,r8a7790-sdhi";
96+
reg = <0 0xee140000 0 0x100>;
97+
interrupt-parent = <&gic>;
98+
interrupts = <0 167 4>;
99+
cap-sd-highspeed;
100+
status = "disabled";
101+
};
102+
103+
sdhi3: sdhi@ee160000 {
104+
compatible = "renesas,r8a7790-sdhi";
105+
reg = <0 0xee160000 0 0x100>;
106+
interrupt-parent = <&gic>;
107+
interrupts = <0 168 4>;
108+
cap-sd-highspeed;
109+
status = "disabled";
110+
};
57111
};

‎arch/arm/mach-shmobile/Kconfig

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ config ARCH_R8A73A4
2323
select ARCH_WANT_OPTIONAL_GPIOLIB
2424
select ARM_GIC
2525
select CPU_V7
26-
select HAVE_ARM_ARCH_TIMER
2726
select SH_CLK_CPG
2827
select RENESAS_IRQC
28+
select ARCH_HAS_CPUFREQ
29+
select ARCH_HAS_OPP
2930

3031
config ARCH_R8A7740
3132
bool "R-Mobile A1 (R8A77400)"
@@ -59,7 +60,6 @@ config ARCH_R8A7790
5960
select ARCH_WANT_OPTIONAL_GPIOLIB
6061
select ARM_GIC
6162
select CPU_V7
62-
select HAVE_ARM_ARCH_TIMER
6363
select SH_CLK_CPG
6464
select RENESAS_IRQC
6565

@@ -156,6 +156,18 @@ config MACH_KZM9D
156156
select REGULATOR_FIXED_VOLTAGE if REGULATOR
157157
select USE_OF
158158

159+
config MACH_KZM9D_REFERENCE
160+
bool "KZM9D board - Reference Device Tree Implementation"
161+
depends on ARCH_EMEV2
162+
select REGULATOR_FIXED_VOLTAGE if REGULATOR
163+
select USE_OF
164+
---help---
165+
Use reference implementation of KZM9D board support
166+
which makes a greater use of device tree at the expense
167+
of not supporting a number of devices.
168+
169+
This is intended to aid developers
170+
159171
config MACH_KZM9G
160172
bool "KZM-A9-GT board"
161173
depends on ARCH_SH73A0

0 commit comments

Comments
 (0)