Skip to content
This repository has been archived by the owner on Oct 5, 2018. It is now read-only.

Commit

Permalink
Revert "Merge remote-tracking branch 'lt-hisi/hikey-tracking-dts' int…
Browse files Browse the repository at this point in the history 
…o 96b/releases/2016.03-2"

This reverts commit 30d7c92, reversing
changes made to 2b18bd0.
  • Loading branch information
@idlethread
idlethread committed Feb 29, 2016
1 parent 7516424 commit 1d93b97
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 2,443 deletions.
23 changes: 0 additions & 23 deletions Documentation/devicetree/bindings/gpio/gpio-hi6220.txt
View file

This file was deleted.

266 changes: 4 additions & 262 deletions arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
View file
Expand Up @@ -6,11 +6,11 @@
*/

/dts-v1/;
#include <dt-bindings/gpio/gpio.h>

/*Reserved 1MB memory for MCU*/
/memreserve/ 0x05e00000 0x00100000;

#include "hi6220.dtsi"
#include "hikey-gpio.dtsi"
#include "hikey-pinctrl.dtsi"

/ {
model = "HiKey Development Board";
Expand All @@ -21,272 +21,14 @@
serial1 = &uart1; /* BT UART */
serial2 = &uart2; /* LS Expansion UART0 */
serial3 = &uart3; /* LS Expansion UART1 */
spi0 = &spi_0;
};

chosen {
stdout-path = "serial3:115200n8";
};

/*
* Reserve below regions from memory node:
*
* - 0x05e0,0000 - 0x05ef,ffff: MCU firmware runtime using
* - 0x05f0,1000 - 0x05f0,1fff: Reboot reason
* - 0x06df,f000 - 0x06df,ffff: Mailbox message data
* - 0x0740,f000 - 0x0740,ffff: MCU firmware section
* - 0x3e00,0000 - 0x3fff,ffff: OP-TEE
*/
memory@0 {
device_type = "memory";
reg = <0x00000000 0x00000000 0x00000000 0x05e00000>,
<0x00000000 0x05f00000 0x00000000 0x00001000>,
<0x00000000 0x05f02000 0x00000000 0x00efd000>,
<0x00000000 0x06e00000 0x00000000 0x0060f000>,
<0x00000000 0x07410000 0x00000000 0x36bf0000>;
};

reboot_reason: reboot-reason@05f01000 {
compatible = "linux,reboot-reason-sram";
reg = <0x0 0x05F01000 0x0 0x4>;
reason,none = <0x77665501>;
reason,bootloader = <0x77665500>;
reason,recovery = <0x77665502>;
reason,oem = <0x6f656d00>;
};


soc {
i2c0: i2c@f7100000 {
status = "ok";
};

i2c1: i2c@f7101000 {
status = "ok";
};

i2c2: i2c@f7102000 {
status = "ok";

#address-cells = <0x1>;
#size-cells = <0x0>;
adv7533: adv7533@39 {
compatible = "adi,adv7533";
reg = <0x39>;
interrupt-parent = <&gpio1>;
interrupts = <1 2>;
pd-gpio = <&gpio0 4 0>;
adi,dsi-lanes = <4>;

port {
adv_in: endpoint {
remote-endpoint = <&dsi_out>;
};
};
};
};

dwmmc_2: dwmmc2@f723f000 {
ti,non-removable;
non-removable;
/* WL_EN */
vmmc-supply = <&wlan_en_reg>;

#address-cells = <0x1>;
#size-cells = <0x0>;
wlcore: wlcore@2 {
compatible = "ti,wl1835";
reg = <2>; /* sdio func num */
/* WL_IRQ, WL_HOST_WAKE_GPIO1_3 */
interrupt-parent = <&gpio1>;
interrupts = <3 IRQ_TYPE_EDGE_RISING>;
};
};

wlan_en_reg: fixedregulator@1 {
compatible = "regulator-fixed";
regulator-name = "wlan-en-regulator";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
/* WLAN_EN GPIO */
gpio = <&gpio0 5 0>;
/* WLAN card specific delay */
startup-delay-us = <70000>;
enable-active-high;
};

hisi-ion@0 {
compatible = "hisilicon,ion";

heap_sys_user@0 {
heap-name = "sys_user";
heap-range = <0x0 0x0>;
heap-type = "ion_system";
};

heap_sys_contig@0 {
heap-name = "sys_contig";
heap-range = <0x0 0x0>;
heap-type = "ion_system_contig";
};

heap_cma@0 {
heap-name = "cma";
heap-range = <0x0 0x0>;
heap-type = "ion_cma";
};
};

uart1: uart@f7111000 {
status = "ok";
};
};

kim {
compatible = "kim";
pinctrl-names = "default";
pinctrl-0 = <>; /* FIXME: add BT PCM pinctrl here */
/*
* FIXME: The following is complete CRAP since
* the vendor driver doesn't follow the gpio
* binding. Passing in a magic Linux gpio number
* here until we fix the vendor driver.
*/
/* BT_EN: BT_REG_ON_GPIO1_7 */
nshutdown_gpio = <503>;
dev_name = "/dev/ttyAMA1";
flow_cntrl = <1>;
baud_rate = <3000000>;
};

btwilink {
compatible = "btwilink";
};

leds {
compatible = "gpio-leds";
user_led1 {
label = "user_led4";
gpios = <&gpio4 0 0>; /* <&gpio_user_led_1>; */
linux,default-trigger = "heartbeat";
};

user_led2 {
label = "user_led3";
gpios = <&gpio4 1 0>; /* <&gpio_user_led_2>; */
linux,default-trigger = "mmc0";
};

user_led3 {
label = "user_led2";
gpios = <&gpio4 2 0>; /* <&gpio_user_led_3>; */
linux,default-trigger = "mmc1";
};

user_led4 {
label = "user_led1";
gpios = <&gpio4 3 0>; /* <&gpio_user_led_4>; */
linux,default-trigger = "cpu0";
};

wlan_active_led {
label = "wifi_active";
gpios = <&gpio3 5 0>; /* <&gpio_wlan_active_led>; */
linux,default-trigger = "phy0tx";
default-state = "off";
};

bt_active_led {
label = "bt_active";
gpios = <&gpio4 7 0>; /* <&gpio_bt_active_led>; */
linux,default-trigger = "hci0rx";
default-state = "off";
};
};

pmic: pmic@f8000000 {
compatible = "hisilicon,hi655x-pmic";
reg = <0x0 0xf8000000 0x0 0x1000>;
interrupt-controller;
#interrupt-cells = <2>;
pmic-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
status = "okay";

regulators {
ldo2: LDO2@a21 {
regulator-name = "LDO2_2V8";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <3200000>;
regulator-enable-ramp-delay = <120>;
};

ldo7: LDO7@a26 {
regulator-name = "LDO7_SDIO";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-enable-ramp-delay = <120>;
};

ldo10: LDO10@a29 {
regulator-name = "LDO10_2V85";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>;
regulator-enable-ramp-delay = <360>;
};

ldo13: LDO13@a32 {
regulator-name = "LDO13_1V8";
regulator-min-microvolt = <1600000>;
regulator-max-microvolt = <1950000>;
regulator-enable-ramp-delay = <120>;
};

ldo14: LDO14@a33 {
regulator-name = "LDO14_2V8";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <3200000>;
regulator-enable-ramp-delay = <120>;
};

ldo15: LDO15@a34 {
regulator-name = "LDO15_1V8";
regulator-min-microvolt = <1600000>;
regulator-max-microvolt = <1950000>;
regulator-boot-on;
regulator-always-on;
regulator-enable-ramp-delay = <120>;
};

ldo17: LDO17@a36 {
regulator-name = "LDO17_2V5";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <3200000>;
regulator-enable-ramp-delay = <120>;
};

ldo19: LDO19@a38 {
regulator-name = "LDO19_3V0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>;
regulator-enable-ramp-delay = <360>;
};

ldo21: LDO21@a40 {
regulator-name = "LDO21_1V8";
regulator-min-microvolt = <1650000>;
regulator-max-microvolt = <2000000>;
regulator-always-on;
regulator-enable-ramp-delay = <120>;
};

ldo22: LDO22@a41 {
regulator-name = "LDO22_1V2";
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1200000>;
regulator-boot-on;
regulator-always-on;
regulator-enable-ramp-delay = <120>;
};
};
reg = <0x0 0x0 0x0 0x40000000>;
};
};

0 comments on commit 1d93b97

Please sign in to comment.