mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 08:31:55 +00:00
fa91515cbf
Lots of cleanup and refactoring and some SMP additions for Renesas platforms. Due to some inter-dependencies with other arm-soc branches, this Renesas stuff was separated out for sending after the other branches were merged. Highlights: - remove unused board support and cleanup of unused headers - refactoring of init and device registration - simplify IRQ initialization Conflicts: Too many. Most of these are because Simon chose to send some board updates through the V4L tree that ends up colliding with the main platform changes. We'll work with him on sorting out his workflow: - arch/arm/boot/dts/r8a7740.dtsi: - Add/add conflict in a devicetree file (keep both) - arch/arm/mach-shmobile/Makefile: - Splitting out of clock files collides with intc move to DT. Keep HEAD version but remove intc-* files for R8A7740 and R8A7779. - arch/arm/mach-shmobile/board-bockw.c: - Keep HEAD but remove i2c, hspi and mmc device init calls - arch/arm/mach-shmobile/board-marzen.c - Remove mach/hardware.h include and r8a7779_add_usb_phy_device() call, everything else stays. - arch/arm/mach-shmobile/include/mach/r8a7778.h: - From HEAD, Keep camera-rcar.h include and r8a7778_add_vin_device() - From branch, keep everything - arch/arm/mach-shmobile/include/mach/r8a7779.h: - From HEAD, Keep only camera-rcar.h include and r8a7779_add_vin_device() - arch/arm/mach-shmobile/setup-r8a7778.c - Keep HEAD, but drop the MMC section (struct resource + add_mmc_device()) - take the new function name from our side (r8a7778_add_dt_devices()) - arch/arm/mach-shmobile/setup-r8a7779.c - Keep HEAD, but drop r8a7779_add_usb_phy_device() I've also pushed a test-merge2 branch where you can see how I resolved them. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSLkaWAAoJEFk3GJrT+8Zl5l8P/3oJ83VJHcjD2fMpAb8Dz5b6 pdRLxFLJrLxN+WTC1LylPom3EsSAJuuaG3Z8Cr9Xa6yoWuUYLy/A6MwsyLXBOGLC 3tVWa96xt1cHhd3p/NAOQwvRz/CFdMLM7MStd0mgSihj/pq3jtc2V697+dRtmJih J0mIc8+jnig+uwVl1DMCmBqdEmasccaDZeX30PcjaPL9ZDyZBeSXI8brdDx8A21e 5RiAsqn9HCxrLZjedL9TWA23BJ7NccsI3aVGpQVtCa9N/MHKp8gZft3v8FrWzFjk cOeaZY55Xq8hbbbmkF1LoezLrlQDF5aJcj6tl85lyuSJfR5d5BXmLswI7bglw8Qy ZU7/aF28pbhUT3oozNuRx5yl8oqpxmUoCwfP5hfnFf590OJ3noIELbOoIZQkJQUy LsCf3GMUQaWzrvs0IenM1lMJmw5zfDXbrUWUti95OAd5bbTdBE30z7EouejoKRVh 1/Wg4keBdtem4CpU+C4fUVtLL4XJhe/uadbjKteA7DRpTRMvrLYNutQgyOAuQjRM RiLvDPnsIZEGV+YMsj+IemN0hanae4kR3v8At+HwvVK1hROWEQWyL6cGxXH9n9jB VToxoYoyiAOk01X2BnPVMVTXEl5XMAVgZ1IgZNhnhaIUxi3HKrUfNG4oXE5Jx8Lw XruUAUKHknTUJ2Q/3y4D =Fagt -----END PGP SIGNATURE----- Merge tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM Renesas SoC cleanup, refactoring and more SMP support from Kevin Hilman: "Lots of cleanup and refactoring and some SMP additions for Renesas platforms. Due to some inter-dependencies with other arm-soc branches, this Renesas stuff was separated out for sending after the other branches were merged. Highlights: - remove unused board support and cleanup of unused headers - refactoring of init and device registration - simplify IRQ initialization" * tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (68 commits) ARM: shmobile: Per-CPU SMP boot / sleep code for SCU SoCs ARM: shmobile: Introduce per-CPU SMP boot / sleep code ARM: shmobile: Use shared SCU CPU Hotplug code on r8a7779 ARM: shmobile: Use shared SCU CPU Hotplug code on sh73a0 ARM: shmobile: Add shared SCU CPU Hotplug code ARM: shmobile: Use shared SCU SMP boot code on emev2 ARM: shmobile: Use shared SCU SMP boot code on r8a7779 ARM: shmobile: Use shared SCU SMP boot code on sh73a0 ARM: shmobile: Introduce shared SCU SMP boot code ARM: shmobile: sh73a0: Remove global GPIO_NR definition ARM: shmobile: kzm9d: remove nfsroot settings from bootargs ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs ARM: shmobile: r8a7779: move r8a7779_init_irq_xxx() to setup ARM: shmobile: r8a7740: move r8a7740_init_irq_of() to setup ARM: shmobile: bockw: add missing __initdata ARM: shmobile: r8a7790: add missing __initdata ARM: shmobile: r8a7779: add missing __initdata ARM: shmobile: Remove unused shmobile_init_time() ARM: shmobile: Use clocksource_of_init() on r8a7790 ARM: shmobile: Use default ->init_time() on KZM9G DT ref ...
252 lines
5.2 KiB
Plaintext
252 lines
5.2 KiB
Plaintext
/*
|
|
* Device Tree Source for the KZM-A9-GT board
|
|
*
|
|
* Copyright (C) 2012 Horms Solutions Ltd.
|
|
*
|
|
* Based on sh73a0-kzm9g.dts
|
|
* 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/ "sh73a0.dtsi"
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
|
|
/ {
|
|
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 rw";
|
|
};
|
|
|
|
memory {
|
|
device_type = "memory";
|
|
reg = <0x41000000 0x1e800000>;
|
|
};
|
|
|
|
reg_1p8v: regulator@0 {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "fixed-1.8V";
|
|
regulator-min-microvolt = <1800000>;
|
|
regulator-max-microvolt = <1800000>;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
};
|
|
|
|
reg_3p3v: regulator@1 {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "fixed-3.3V";
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
};
|
|
|
|
vmmc_sdhi0: regulator@2 {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "SDHI0 Vcc";
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
gpio = <&pfc 15 GPIO_ACTIVE_HIGH>;
|
|
enable-active-high;
|
|
};
|
|
|
|
vmmc_sdhi2: regulator@3 {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "SDHI2 Vcc";
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
gpio = <&pfc 14 GPIO_ACTIVE_HIGH>;
|
|
enable-active-high;
|
|
};
|
|
|
|
lan9220@10000000 {
|
|
compatible = "smsc,lan9220", "smsc,lan9115";
|
|
reg = <0x10000000 0x100>;
|
|
phy-mode = "mii";
|
|
interrupt-parent = <&irqpin0>;
|
|
interrupts = <3 0>; /* active low */
|
|
reg-io-width = <4>;
|
|
smsc,irq-push-pull;
|
|
smsc,save-mac-address;
|
|
vddvario-supply = <®_1p8v>;
|
|
vdd33a-supply = <®_3p3v>;
|
|
};
|
|
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
led1 {
|
|
gpios = <&pfc 20 GPIO_ACTIVE_LOW>;
|
|
};
|
|
led2 {
|
|
gpios = <&pfc 21 GPIO_ACTIVE_LOW>;
|
|
};
|
|
led3 {
|
|
gpios = <&pfc 22 GPIO_ACTIVE_LOW>;
|
|
};
|
|
led4 {
|
|
gpios = <&pfc 23 GPIO_ACTIVE_LOW>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&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;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
&i2c3 {
|
|
pinctrl-0 = <&i2c3_pins>;
|
|
pinctrl-names = "default";
|
|
};
|
|
|
|
&mmcif {
|
|
pinctrl-0 = <&mmcif_pins>;
|
|
pinctrl-names = "default";
|
|
|
|
bus-width = <8>;
|
|
vmmc-supply = <®_1p8v>;
|
|
status = "okay";
|
|
};
|
|
|
|
&pfc {
|
|
pinctrl-0 = <&scifa4_pins>;
|
|
pinctrl-names = "default";
|
|
|
|
i2c3_pins: i2c3 {
|
|
renesas,groups = "i2c3_1";
|
|
renesas,function = "i2c3";
|
|
};
|
|
|
|
mmcif_pins: mmcif {
|
|
mux {
|
|
renesas,groups = "mmc0_data8_0", "mmc0_ctrl_0";
|
|
renesas,function = "mmc0";
|
|
};
|
|
cfg {
|
|
renesas,groups = "mmc0_data8_0";
|
|
renesas,pins = "PORT279";
|
|
bias-pull-up;
|
|
};
|
|
};
|
|
|
|
scifa4_pins: scifa4 {
|
|
renesas,groups = "scifa4_data", "scifa4_ctrl";
|
|
renesas,function = "scifa4";
|
|
};
|
|
|
|
sdhi0_pins: sdhi0 {
|
|
renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd", "sdhi0_wp";
|
|
renesas,function = "sdhi0";
|
|
};
|
|
|
|
sdhi2_pins: sdhi2 {
|
|
renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
|
|
renesas,function = "sdhi2";
|
|
};
|
|
};
|
|
|
|
&sdhi0 {
|
|
pinctrl-0 = <&sdhi0_pins>;
|
|
pinctrl-names = "default";
|
|
|
|
vmmc-supply = <&vmmc_sdhi0>;
|
|
bus-width = <4>;
|
|
status = "okay";
|
|
};
|
|
|
|
&sdhi2 {
|
|
pinctrl-0 = <&sdhi2_pins>;
|
|
pinctrl-names = "default";
|
|
|
|
vmmc-supply = <&vmmc_sdhi2>;
|
|
bus-width = <4>;
|
|
broken-cd;
|
|
status = "okay";
|
|
};
|