mirror of https://gitee.com/openkylin/linux.git
Renesas ARM-based SoC DT updates for v3.11
* Armadillo800eva reference DT - bring up armadillo800eva baord using DT as much as possible * Remove unused GIC dtsi entries for r8a7790 and r8a73a4 * Add AS3711 and CPUFreq DT bindings for kzm9g-reference * Add irqpin DT support for marzen-reference -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRrr1MAAoJENfPZGlqN0++IO8P/0KwAef6d4UNK26RlK8/rFLH VJteLNoocz0Le/qgkJNYZ79p4azW6ou9U6Muk/tKgZSdHyBo/y4mDdNTkJyefqTI fx6r/3SZPh2/hhfBhaaoZy6FiUWzoZk/OFLsE/LJkDTmQ/9wUcZlz7fl/sPc8tt2 yV9oKJLx2s1lsAsWTQx7NvKZQQu3OX7e0SlYVTIDWtFvxy6gyM/95uj1tIyPrr1d af4wyLS+Tk7wa08i5+ROqtBc+CIR/UAwo9xejkAK+CXiamIvdVt31WkqSmaBmvh0 BYPm8TlNk5TkaRbb+a3v3eYSE5B7de9b771GJfvqZNy+M4o66P6jP0keYhj8kfu/ KpzZPPIJmRmrWnJgkJ7MuTZ5TpPkif/ivYWcY22jftaRsWuEtKI9a2vIKv3lp088 ojOb7nJHyiPbEBT8ebvP7Wb0NkxsvMzv+jzaPlJUK1to8waKUzPoBukJs39J/Hj7 Y+i7ZOBXJcDDby4ad5VVKuMtGKBeZWF/mixo/Cs+9UHrrMJBom97EANR+xpHteKA Emrd9zvOXb9+G870KtAhq5i7G+C0LBOZhvpDjcYTS3SopRjZ3Gl55RphjexF25Gs EHJ7cHmauEZAw6IJ7n8outRTiAWDAotTwBcXxuoCwK3uIbyMHWn4hI2oHyIcJ7uV ZT9Xjgp5LZuXyJU/5kIP =6tQE -----END PGP SIGNATURE----- Merge tag 'renesas-dt-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt From Simon Horman: Renesas ARM-based SoC DT updates for v3.11 * Armadillo800eva reference DT - bring up armadillo800eva baord using DT as much as possible * Remove unused GIC dtsi entries for r8a7790 and r8a73a4 * Add AS3711 and CPUFreq DT bindings for kzm9g-reference * Add irqpin DT support for marzen-reference * tag 'renesas-dt-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: marzen-reference: add irqpin support in DT ARM: shmobile: kzm9g-reference: add AS3711 and CPUFreq DT bindings ARM: shmobile: armadillo800eva: Reference DT implementation ARM: shmobile: Remove unused r8a7790 GIC CPU interface DT bits ARM: shmobile: Remove unused r8a73a4 GIC CPU interface DT bits ARM: shmobile: r8a7740: Prepare for reference DT setup ARM: shmobile: r8a7740: Add OF support to initialze the GIC Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
commit
6cd26ecedf
|
|
@ -166,6 +166,7 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
|
|||
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
|
||||
r8a7740-armadillo800eva.dtb \
|
||||
r8a7778-bockw.dtb \
|
||||
r8a7740-armadillo800eva-reference.dtb \
|
||||
r8a7779-marzen-reference.dtb \
|
||||
r8a7790-lager.dtb \
|
||||
sh73a0-kzm9g.dtb \
|
||||
|
|
|
|||
|
|
@ -37,12 +37,6 @@ gic: interrupt-controller@f1001000 {
|
|||
<0 0xf1004000 0 0x2000>,
|
||||
<0 0xf1006000 0 0x2000>;
|
||||
interrupts = <1 9 0xf04>;
|
||||
|
||||
gic-cpuif@4 {
|
||||
compatible = "arm,gic-cpuif";
|
||||
cpuif-id = <4>;
|
||||
cpu = <&cpu0>;
|
||||
};
|
||||
};
|
||||
|
||||
timer {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
/*
|
||||
* Reference Device Tree Source for the armadillo 800 eva board
|
||||
*
|
||||
* Copyright (C) 2012 Renesas Solutions Corp.
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public License
|
||||
* version 2. This program is licensed "as is" without any warranty of any
|
||||
* kind, whether express or implied.
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
/include/ "r8a7740.dtsi"
|
||||
|
||||
/ {
|
||||
model = "armadillo 800 eva reference";
|
||||
compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740";
|
||||
|
||||
chosen {
|
||||
bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw";
|
||||
};
|
||||
|
||||
memory {
|
||||
device_type = "memory";
|
||||
reg = <0x40000000 0x20000000>;
|
||||
};
|
||||
|
||||
reg_3p3v: regulator@0 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "fixed-3.3V";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
touchscreen: st1232@55 {
|
||||
compatible = "sitronix,st1232";
|
||||
reg = <0x55>;
|
||||
interrupt-parent = <&irqpin1>;
|
||||
interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */
|
||||
};
|
||||
};
|
||||
|
|
@ -22,4 +22,121 @@ cpu@0 {
|
|||
reg = <0x0>;
|
||||
};
|
||||
};
|
||||
|
||||
gic: interrupt-controller@c2800000 {
|
||||
compatible = "arm,cortex-a9-gic";
|
||||
#interrupt-cells = <3>;
|
||||
#address-cells = <1>;
|
||||
interrupt-controller;
|
||||
reg = <0xc2800000 0x1000>,
|
||||
<0xc2000000 0x1000>;
|
||||
};
|
||||
|
||||
/* irqpin0: IRQ0 - IRQ7 */
|
||||
irqpin0: irqpin@e6900000 {
|
||||
compatible = "renesas,intc-irqpin";
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0xe6900000 4>,
|
||||
<0xe6900010 4>,
|
||||
<0xe6900020 1>,
|
||||
<0xe6900040 1>,
|
||||
<0xe6900060 1>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4>;
|
||||
};
|
||||
|
||||
/* irqpin1: IRQ8 - IRQ15 */
|
||||
irqpin1: irqpin@e6900004 {
|
||||
compatible = "renesas,intc-irqpin";
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0xe6900004 4>,
|
||||
<0xe6900014 4>,
|
||||
<0xe6900024 1>,
|
||||
<0xe6900044 1>,
|
||||
<0xe6900064 1>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4>;
|
||||
};
|
||||
|
||||
/* irqpin2: IRQ16 - IRQ23 */
|
||||
irqpin2: irqpin@e6900008 {
|
||||
compatible = "renesas,intc-irqpin";
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0xe6900008 4>,
|
||||
<0xe6900018 4>,
|
||||
<0xe6900028 1>,
|
||||
<0xe6900048 1>,
|
||||
<0xe6900068 1>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4>;
|
||||
};
|
||||
|
||||
/* irqpin3: IRQ24 - IRQ31 */
|
||||
irqpin3: irqpin@e690000c {
|
||||
compatible = "renesas,intc-irqpin";
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0xe690000c 4>,
|
||||
<0xe690001c 4>,
|
||||
<0xe690002c 1>,
|
||||
<0xe690004c 1>,
|
||||
<0xe690006c 1>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4>;
|
||||
};
|
||||
|
||||
i2c0: i2c@fff20000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
compatible = "renesas,rmobile-iic";
|
||||
reg = <0xfff20000 0x425>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 201 0x4
|
||||
0 202 0x4
|
||||
0 203 0x4
|
||||
0 204 0x4>;
|
||||
};
|
||||
|
||||
i2c1: i2c@e6c20000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
compatible = "renesas,rmobile-iic";
|
||||
reg = <0xe6c20000 0x425>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 70 0x4
|
||||
0 71 0x4
|
||||
0 72 0x4
|
||||
0 73 0x4>;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -48,6 +48,23 @@ gic: interrupt-controller@f0001000 {
|
|||
<0xf0000100 0x100>;
|
||||
};
|
||||
|
||||
irqpin0: irqpin@fe780010 {
|
||||
compatible = "renesas,intc-irqpin";
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0xfe78001c 4>,
|
||||
<0xfe780010 4>,
|
||||
<0xfe780024 4>,
|
||||
<0xfe780044 4>,
|
||||
<0xfe780064 4>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 27 0x4
|
||||
0 28 0x4
|
||||
0 29 0x4
|
||||
0 30 0x4>;
|
||||
sense-bitfield-width = <2>;
|
||||
};
|
||||
|
||||
i2c0: i2c@0xffc70000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
|
|
|||
|
|
@ -36,12 +36,6 @@ gic: interrupt-controller@f1001000 {
|
|||
<0 0xf1004000 0 0x2000>,
|
||||
<0 0xf1006000 0 0x2000>;
|
||||
interrupts = <1 9 0xf04>;
|
||||
|
||||
gic-cpuif@4 {
|
||||
compatible = "arm,gic-cpuif";
|
||||
cpuif-id = <4>;
|
||||
cpu = <&cpu0>;
|
||||
};
|
||||
};
|
||||
|
||||
timer {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,19 @@ / {
|
|||
model = "KZM-A9-GT";
|
||||
compatible = "renesas,kzm9g-reference", "renesas,sh73a0";
|
||||
|
||||
cpus {
|
||||
cpu@0 {
|
||||
cpu0-supply = <&vdd_dvfs>;
|
||||
operating-points = <
|
||||
/* kHz uV */
|
||||
1196000 1315000
|
||||
598000 1175000
|
||||
398667 1065000
|
||||
>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
};
|
||||
};
|
||||
|
||||
chosen {
|
||||
bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200";
|
||||
};
|
||||
|
|
@ -59,6 +72,79 @@ lan9220@10000000 {
|
|||
};
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
as3711@40 {
|
||||
compatible = "ams,as3711";
|
||||
reg = <0x40>;
|
||||
|
||||
regulators {
|
||||
vdd_dvfs: sd1 {
|
||||
regulator-name = "1.315V CPU";
|
||||
regulator-min-microvolt = <1050000>;
|
||||
regulator-max-microvolt = <1350000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
sd2 {
|
||||
regulator-name = "1.8V";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
sd4 {
|
||||
regulator-name = "1.215V";
|
||||
regulator-min-microvolt = <1215000>;
|
||||
regulator-max-microvolt = <1235000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
ldo2 {
|
||||
regulator-name = "2.8V CPU";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
ldo3 {
|
||||
regulator-name = "3.0V CPU";
|
||||
regulator-min-microvolt = <3000000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
ldo4 {
|
||||
regulator-name = "2.8V";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
ldo5 {
|
||||
regulator-name = "2.8V #2";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
ldo7 {
|
||||
regulator-name = "1.15V CPU";
|
||||
regulator-min-microvolt = <1150000>;
|
||||
regulator-max-microvolt = <1150000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
ldo8 {
|
||||
regulator-name = "1.15V CPU #2";
|
||||
regulator-min-microvolt = <1150000>;
|
||||
regulator-max-microvolt = <1150000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&mmcif {
|
||||
bus-width = <8>;
|
||||
vmmc-supply = <®_1p8v>;
|
||||
|
|
|
|||
|
|
@ -129,6 +129,20 @@ config MACH_ARMADILLO800EVA
|
|||
select SND_SOC_WM8978 if SND_SIMPLE_CARD
|
||||
select USE_OF
|
||||
|
||||
config MACH_ARMADILLO800EVA_REFERENCE
|
||||
bool "Armadillo-800 EVA board - Reference Device Tree Implementation"
|
||||
depends on ARCH_R8A7740
|
||||
select ARCH_REQUIRE_GPIOLIB
|
||||
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
||||
select SND_SOC_WM8978 if SND_SIMPLE_CARD
|
||||
select USE_OF
|
||||
---help---
|
||||
Use reference implementation of Aramdillo800 EVA board support
|
||||
which makes a greater use of device tree at the expense
|
||||
of not supporting a number of devices.
|
||||
|
||||
This is intended to aid developers
|
||||
|
||||
config MACH_BOCKW
|
||||
bool "BOCK-W platform"
|
||||
depends on ARCH_R8A7778
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
|
|||
obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o
|
||||
obj-$(CONFIG_MACH_LAGER) += board-lager.o
|
||||
obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o
|
||||
obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o
|
||||
obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o
|
||||
obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o
|
||||
obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o
|
||||
|
|
|
|||
|
|
@ -0,0 +1,213 @@
|
|||
/*
|
||||
* armadillo 800 eva board support
|
||||
*
|
||||
* Copyright (C) 2012 Renesas Solutions Corp.
|
||||
* Copyright (C) 2012 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/pinctrl/machine.h>
|
||||
#include <mach/common.h>
|
||||
#include <mach/r8a7740.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/hardware/cache-l2x0.h>
|
||||
|
||||
/*
|
||||
* CON1 Camera Module
|
||||
* CON2 Extension Bus
|
||||
* CON3 HDMI Output
|
||||
* CON4 Composite Video Output
|
||||
* CON5 H-UDI JTAG
|
||||
* CON6 ARM JTAG
|
||||
* CON7 SD1
|
||||
* CON8 SD2
|
||||
* CON9 RTC BackUp
|
||||
* CON10 Monaural Mic Input
|
||||
* CON11 Stereo Headphone Output
|
||||
* CON12 Audio Line Output(L)
|
||||
* CON13 Audio Line Output(R)
|
||||
* CON14 AWL13 Module
|
||||
* CON15 Extension
|
||||
* CON16 LCD1
|
||||
* CON17 LCD2
|
||||
* CON19 Power Input
|
||||
* CON20 USB1
|
||||
* CON21 USB2
|
||||
* CON22 Serial
|
||||
* CON23 LAN
|
||||
* CON24 USB3
|
||||
* LED1 Camera LED(Yellow)
|
||||
* LED2 Power LED (Green)
|
||||
* ED3-LED6 User LED(Yellow)
|
||||
* LED7 LAN link LED(Green)
|
||||
* LED8 LAN activity LED(Yellow)
|
||||
*/
|
||||
|
||||
/*
|
||||
* DipSwitch
|
||||
*
|
||||
* SW1
|
||||
*
|
||||
* -12345678-+---------------+----------------------------
|
||||
* 1 | boot | hermit
|
||||
* 0 | boot | OS auto boot
|
||||
* -12345678-+---------------+----------------------------
|
||||
* 00 | boot device | eMMC
|
||||
* 10 | boot device | SDHI0 (CON7)
|
||||
* 01 | boot device | -
|
||||
* 11 | boot device | Extension Buss (CS0)
|
||||
* -12345678-+---------------+----------------------------
|
||||
* 0 | Extension Bus | D8-D15 disable, eMMC enable
|
||||
* 1 | Extension Bus | D8-D15 enable, eMMC disable
|
||||
* -12345678-+---------------+----------------------------
|
||||
* 0 | SDHI1 | COM8 disable, COM14 enable
|
||||
* 1 | SDHI1 | COM8 enable, COM14 disable
|
||||
* -12345678-+---------------+----------------------------
|
||||
* 0 | USB0 | COM20 enable, COM24 disable
|
||||
* 1 | USB0 | COM20 disable, COM24 enable
|
||||
* -12345678-+---------------+----------------------------
|
||||
* 00 | JTAG | SH-X2
|
||||
* 10 | JTAG | ARM
|
||||
* 01 | JTAG | -
|
||||
* 11 | JTAG | Boundary Scan
|
||||
*-----------+---------------+----------------------------
|
||||
*/
|
||||
|
||||
/*
|
||||
* FSI-WM8978
|
||||
*
|
||||
* this command is required when playback.
|
||||
*
|
||||
* # amixer set "Headphone" 50
|
||||
*
|
||||
* this command is required when capture.
|
||||
*
|
||||
* # amixer set "Input PGA" 15
|
||||
* # amixer set "Left Input Mixer MicP" on
|
||||
* # amixer set "Left Input Mixer MicN" on
|
||||
* # amixer set "Right Input Mixer MicN" on
|
||||
* # amixer set "Right Input Mixer MicP" on
|
||||
*/
|
||||
|
||||
/*
|
||||
* USB function
|
||||
*
|
||||
* When you use USB Function,
|
||||
* set SW1.6 ON, and connect cable to CN24.
|
||||
*
|
||||
* USBF needs workaround on R8A7740 chip.
|
||||
* These are a little bit complex.
|
||||
* see
|
||||
* usbhsf_power_ctrl()
|
||||
*/
|
||||
|
||||
static const struct pinctrl_map eva_pinctrl_map[] = {
|
||||
/* SCIFA1 */
|
||||
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740",
|
||||
"scifa1_data", "scifa1"),
|
||||
};
|
||||
|
||||
static void __init eva_clock_init(void)
|
||||
{
|
||||
struct clk *system = clk_get(NULL, "system_clk");
|
||||
struct clk *xtal1 = clk_get(NULL, "extal1");
|
||||
struct clk *usb24s = clk_get(NULL, "usb24s");
|
||||
struct clk *fsibck = clk_get(NULL, "fsibck");
|
||||
|
||||
if (IS_ERR(system) ||
|
||||
IS_ERR(xtal1) ||
|
||||
IS_ERR(usb24s) ||
|
||||
IS_ERR(fsibck)) {
|
||||
pr_err("armadillo800eva board clock init failed\n");
|
||||
goto clock_error;
|
||||
}
|
||||
|
||||
/* armadillo 800 eva extal1 is 24MHz */
|
||||
clk_set_rate(xtal1, 24000000);
|
||||
|
||||
/* usb24s use extal1 (= system) clock (= 24MHz) */
|
||||
clk_set_parent(usb24s, system);
|
||||
|
||||
/* FSIBCK is 12.288MHz, and it is parent of FSI-B */
|
||||
clk_set_rate(fsibck, 12288000);
|
||||
|
||||
clock_error:
|
||||
if (!IS_ERR(system))
|
||||
clk_put(system);
|
||||
if (!IS_ERR(xtal1))
|
||||
clk_put(xtal1);
|
||||
if (!IS_ERR(usb24s))
|
||||
clk_put(usb24s);
|
||||
if (!IS_ERR(fsibck))
|
||||
clk_put(fsibck);
|
||||
}
|
||||
|
||||
/*
|
||||
* board init
|
||||
*/
|
||||
static void __init eva_init(void)
|
||||
{
|
||||
|
||||
r8a7740_clock_init(MD_CK0 | MD_CK2);
|
||||
eva_clock_init();
|
||||
|
||||
pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
|
||||
r8a7740_pinmux_init();
|
||||
|
||||
r8a7740_meram_workaround();
|
||||
|
||||
/*
|
||||
* Touchscreen
|
||||
* TODO: Move reset GPIO over to .dts when we can reference it
|
||||
*/
|
||||
gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
|
||||
|
||||
#ifdef CONFIG_CACHE_L2X0
|
||||
/* Early BRESP enable, Shared attribute override enable, 32K*8way */
|
||||
l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
|
||||
#endif
|
||||
|
||||
r8a7740_add_standard_devices_dt();
|
||||
r8a7740_pm_init();
|
||||
}
|
||||
|
||||
#define RESCNT2 IOMEM(0xe6188020)
|
||||
static void eva_restart(char mode, const char *cmd)
|
||||
{
|
||||
/* Do soft power on reset */
|
||||
writel((1 << 31), RESCNT2);
|
||||
}
|
||||
|
||||
static const char *eva_boards_compat_dt[] __initdata = {
|
||||
"renesas,armadillo800eva-reference",
|
||||
NULL,
|
||||
};
|
||||
|
||||
DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva-reference")
|
||||
.map_io = r8a7740_map_io,
|
||||
.init_early = r8a7740_init_delay,
|
||||
.init_irq = r8a7740_init_irq_of,
|
||||
.init_machine = eva_init,
|
||||
.init_time = shmobile_timer_init,
|
||||
.init_late = shmobile_init_late,
|
||||
.dt_compat = eva_boards_compat_dt,
|
||||
.restart = eva_restart,
|
||||
MACHINE_END
|
||||
|
|
@ -533,10 +533,13 @@ enum {
|
|||
};
|
||||
|
||||
extern void r8a7740_meram_workaround(void);
|
||||
extern void r8a7740_init_delay(void);
|
||||
extern void r8a7740_init_irq(void);
|
||||
extern void r8a7740_init_irq_of(void);
|
||||
extern void r8a7740_map_io(void);
|
||||
extern void r8a7740_add_early_devices(void);
|
||||
extern void r8a7740_add_standard_devices(void);
|
||||
extern void r8a7740_add_standard_devices_dt(void);
|
||||
extern void r8a7740_clock_init(u8 md_ck);
|
||||
extern void r8a7740_pinmux_init(void);
|
||||
extern void r8a7740_pm_init(void);
|
||||
|
|
|
|||
|
|
@ -20,19 +20,15 @@
|
|||
|
||||
#include <linux/init.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/irqchip.h>
|
||||
#include <linux/irqchip/arm-gic.h>
|
||||
|
||||
void __init r8a7740_init_irq(void)
|
||||
static void __init r8a7740_init_irq_common(void)
|
||||
{
|
||||
void __iomem *gic_dist_base = ioremap_nocache(0xc2800000, 0x1000);
|
||||
void __iomem *gic_cpu_base = ioremap_nocache(0xc2000000, 0x1000);
|
||||
void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);
|
||||
void __iomem *intc_msk_base = ioremap_nocache(0xe6900040, 0x10);
|
||||
void __iomem *pfc_inta_ctrl = ioremap_nocache(0xe605807c, 0x4);
|
||||
|
||||
/* initialize the Generic Interrupt Controller PL390 r0p0 */
|
||||
gic_init(0, 29, gic_dist_base, gic_cpu_base);
|
||||
|
||||
/* route signals to GIC */
|
||||
iowrite32(0x0, pfc_inta_ctrl);
|
||||
|
||||
|
|
@ -54,3 +50,19 @@ void __init r8a7740_init_irq(void)
|
|||
iounmap(intc_msk_base);
|
||||
iounmap(pfc_inta_ctrl);
|
||||
}
|
||||
|
||||
void __init r8a7740_init_irq_of(void)
|
||||
{
|
||||
irqchip_init();
|
||||
r8a7740_init_irq_common();
|
||||
}
|
||||
|
||||
void __init r8a7740_init_irq(void)
|
||||
{
|
||||
void __iomem *gic_dist_base = ioremap_nocache(0xc2800000, 0x1000);
|
||||
void __iomem *gic_cpu_base = ioremap_nocache(0xc2000000, 0x1000);
|
||||
|
||||
/* initialize the Generic Interrupt Controller PL390 r0p0 */
|
||||
gic_init(0, 29, gic_dist_base, gic_cpu_base);
|
||||
r8a7740_init_irq_common();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -531,11 +531,7 @@ static struct platform_device ipmmu_device = {
|
|||
.num_resources = ARRAY_SIZE(ipmmu_resources),
|
||||
};
|
||||
|
||||
static struct platform_device *r8a7740_early_devices[] __initdata = {
|
||||
&irqpin0_device,
|
||||
&irqpin1_device,
|
||||
&irqpin2_device,
|
||||
&irqpin3_device,
|
||||
static struct platform_device *r8a7740_devices_dt[] __initdata = {
|
||||
&scif0_device,
|
||||
&scif1_device,
|
||||
&scif2_device,
|
||||
|
|
@ -546,6 +542,13 @@ static struct platform_device *r8a7740_early_devices[] __initdata = {
|
|||
&scif7_device,
|
||||
&scifb_device,
|
||||
&cmt10_device,
|
||||
};
|
||||
|
||||
static struct platform_device *r8a7740_early_devices[] __initdata = {
|
||||
&irqpin0_device,
|
||||
&irqpin1_device,
|
||||
&irqpin2_device,
|
||||
&irqpin3_device,
|
||||
&tmu00_device,
|
||||
&tmu01_device,
|
||||
&tmu02_device,
|
||||
|
|
@ -965,6 +968,8 @@ void __init r8a7740_add_standard_devices(void)
|
|||
/* add devices */
|
||||
platform_add_devices(r8a7740_early_devices,
|
||||
ARRAY_SIZE(r8a7740_early_devices));
|
||||
platform_add_devices(r8a7740_devices_dt,
|
||||
ARRAY_SIZE(r8a7740_devices_dt));
|
||||
platform_add_devices(r8a7740_late_devices,
|
||||
ARRAY_SIZE(r8a7740_late_devices));
|
||||
|
||||
|
|
@ -986,6 +991,8 @@ void __init r8a7740_add_early_devices(void)
|
|||
{
|
||||
early_platform_add_devices(r8a7740_early_devices,
|
||||
ARRAY_SIZE(r8a7740_early_devices));
|
||||
early_platform_add_devices(r8a7740_devices_dt,
|
||||
ARRAY_SIZE(r8a7740_devices_dt));
|
||||
|
||||
/* setup early console here as well */
|
||||
shmobile_setup_console();
|
||||
|
|
@ -993,33 +1000,29 @@ void __init r8a7740_add_early_devices(void)
|
|||
|
||||
#ifdef CONFIG_USE_OF
|
||||
|
||||
void __init r8a7740_add_early_devices_dt(void)
|
||||
{
|
||||
shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
|
||||
|
||||
early_platform_add_devices(r8a7740_early_devices,
|
||||
ARRAY_SIZE(r8a7740_early_devices));
|
||||
|
||||
/* setup early console here as well */
|
||||
shmobile_setup_console();
|
||||
}
|
||||
|
||||
static const struct of_dev_auxdata r8a7740_auxdata_lookup[] __initconst = {
|
||||
{ }
|
||||
};
|
||||
|
||||
void __init r8a7740_add_standard_devices_dt(void)
|
||||
{
|
||||
/* clocks are setup late during boot in the case of DT */
|
||||
r8a7740_clock_init(0);
|
||||
|
||||
platform_add_devices(r8a7740_early_devices,
|
||||
ARRAY_SIZE(r8a7740_early_devices));
|
||||
|
||||
platform_add_devices(r8a7740_devices_dt,
|
||||
ARRAY_SIZE(r8a7740_devices_dt));
|
||||
of_platform_populate(NULL, of_default_bus_match_table,
|
||||
r8a7740_auxdata_lookup, NULL);
|
||||
}
|
||||
|
||||
void __init r8a7740_init_delay(void)
|
||||
{
|
||||
shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
|
||||
};
|
||||
|
||||
static void __init r8a7740_generic_init(void)
|
||||
{
|
||||
r8a7740_clock_init(0);
|
||||
r8a7740_add_standard_devices_dt();
|
||||
}
|
||||
|
||||
static const char *r8a7740_boards_compat_dt[] __initdata = {
|
||||
"renesas,r8a7740",
|
||||
NULL,
|
||||
|
|
@ -1027,9 +1030,10 @@ static const char *r8a7740_boards_compat_dt[] __initdata = {
|
|||
|
||||
DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
|
||||
.map_io = r8a7740_map_io,
|
||||
.init_early = r8a7740_add_early_devices_dt,
|
||||
.init_irq = r8a7740_init_irq,
|
||||
.init_machine = r8a7740_add_standard_devices_dt,
|
||||
.init_early = r8a7740_init_delay,
|
||||
.init_irq = r8a7740_init_irq_of,
|
||||
.init_machine = r8a7740_generic_init,
|
||||
.init_time = shmobile_timer_init,
|
||||
.dt_compat = r8a7740_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue