From: huang zhibao Date: Tue, 13 Jan 2015 06:38:51 +0000 (+0800) Subject: rk3036: add 3036 new board dts and modify 3036 256M defconfig X-Git-Tag: firefly_0821_release~4308 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c16bff6d87e6ba57d3eaa04465ba240067d4028c;p=firefly-linux-kernel-4.4.55.git rk3036: add 3036 new board dts and modify 3036 256M defconfig --- diff --git a/arch/arm/boot/dts/rk3036-new.dts b/arch/arm/boot/dts/rk3036-new.dts new file mode 100755 index 000000000000..8ff6addfcfe6 --- /dev/null +++ b/arch/arm/boot/dts/rk3036-new.dts @@ -0,0 +1,369 @@ +/dts-v1/; +#include +#include "rk3036.dtsi" +#include "rk3036-pinctrl.dtsi" +#include "lcd-box.dtsi" +#include + +/ { + + fiq-debugger { + status = "okay"; + }; + + pwm_regulator { + compatible = "rockchip_pwm_regulator"; + pwms = <&pwm2 0 25000>; + rockchip,pwm_id= <2>; + rockchip,pwm_voltage_map= <950000 975000 1000000 1025000 1050000 1075000 1100000 1125000 1150000 1175000 1200000 1225000 1250000 1275000 1300000 1325000 1350000 1375000 1400000 1425000 1450000>; + rockchip,pwm_voltage= <1300000>; + rockchip,pwm_min_voltage= <950000>; + rockchip,pwm_max_voltage= <1450000>; + rockchip,pwm_suspend_voltage= <1000000>; + rockchip,pwm_coefficient= <500>; + status = "disabled"; + regulators { + #address-cells = <1>; + #size-cells = <0>; + pwm_reg0: regulator@0 { + regulator-compatible = "pwm_dcdc1"; + regulator-name= "vdd_arm"; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1450000>; + regulator-always-on; + regulator-boot-on; + }; + }; + }; + + gpio_poweroff { + compatible = "gpio-poweroff"; + gpios = <&gpio1 GPIO_A2 GPIO_ACTIVE_LOW>; + }; + + power-led { + compatible = "gpio-leds"; + power { + label = "standby"; + gpios = <&gpio1 GPIO_A3 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + }; + + wireless-wlan { + compatible = "wlan-platdata"; + + /* wifi_chip_type - wifi chip define + * bcmwifi ==> like ap6xxx, rk90x; + * rtkwifi ==> like rtl8188xx, rtl8723xx,rtl8812auv; + * esp8089 ==> esp8089; + * other ==> for other wifi; + */ + //wifi_chip_type = "esp8089"; + wifi_chip_type = "rtkwifi"; + sdio_vref = <0>; //1800mv or 3300mv + + //power_ctrl_by_pmu; + //keep_wifi_power_on; + //power_pmu_regulator = "act_ldo3"; + //power_pmu_enable_level = <1>; //1->HIGH, 0->LOW + + //vref_ctrl_enable; + //vref_ctrl_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>; + //vref_pmu_regulator = "act_ldo3"; + //vref_pmu_enable_level = <1>; //1->HIGH, 0->LOW + + WIFI,poweren_gpio = <&gpio2 GPIO_D6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake_irq = <&gpio1 GPIO_A4 GPIO_ACTIVE_HIGH>; + //WIFI,reset_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>; + + status = "okay"; + }; + + /* wireless-bluetooth { + compatible = "bluetooth-platdata"; + //wifi-bt-power-toggle; + + uart_rts_gpios = <&gpio4 GPIO_C3 GPIO_ACTIVE_LOW>; + pinctrl-names = "default","rts_gpio"; + pinctrl-0 = <&uart0_rts>; + pinctrl-1 = <&uart0_rts_gpio>; + + //BT,power_gpio = <&gpio4 GPIO_D3 GPIO_ACTIVE_HIGH>; + BT,reset_gpio = <&gpio4 GPIO_D5 GPIO_ACTIVE_HIGH>; + BT,wake_gpio = <&gpio4 GPIO_D2 GPIO_ACTIVE_HIGH>; + BT,wake_host_irq = <&gpio4 GPIO_D7 GPIO_ACTIVE_LOW>; + + status = "okay"; + + };*/ + + usb_control { + compatible = "rockchip,rk3036-usb-control"; + host_drv_gpio = <&gpio2 GPIO_C7 GPIO_ACTIVE_LOW>; + otg_drv_gpio = <&gpio0 GPIO_D2 GPIO_ACTIVE_LOW>; + + rockchip,remote_wakeup; + rockchip,usb_irq_wakeup; + }; + + usb0: usb@10180000 { + /*0 - Normal, 1 - Force Host, 2 - Force Device*/ + rockchip,usb-mode = <1>; + }; + + key { + compatible = "rockchip,key"; + }; + + codec_hdmi_spdif: codec-hdmi-spdif { + compatible = "hdmi-spdif"; + status = "disabled"; + }; + + rockchip-hdmi-spdif { + status = "okay"; + compatible = "rockchip-hdmi-spdif"; + dais { + dai0 { + audio-codec = <&codec_hdmi_spdif>; + i2s-controller = <&spdif>; + }; + }; + }; + + rockchip-spdif-card { + status = "disabled"; + compatible = "rockchip-spdif-card"; + dais { + dai0 { + audio-codec = <&codec_hdmi_spdif>; + i2s-controller = <&spdif>; + }; + }; + }; + + rockchip-audio { + compatible = "rk3036-audio"; + dais { + dai0 { + audio-codec = <&codec>; + i2s-controller = <&i2s>; + format = "i2s"; + //continuous-clock; + //bitclock-inversion; + //frame-inversion; + //bitclock-master; + //frame-master; + }; + }; + }; +}; + +&uart0{ + status = "okay"; + dma-names = "!tx", "!rx"; + pinctrl-0 = <&uart0_xfer &uart0_cts>; +}; + +&pinctrl { + //used for init some gpio + + init-gpios = <&gpio1 GPIO_A3 GPIO_ACTIVE_LOW>; +}; + +&nandc { + status = "okay"; // used nand set "okay" ,used emmc set "disabled" +}; + +&nandc0reg { + status = "disabled"; // used nand set "disabled" ,used emmc set "okay" +}; + +&emmc { + clock-frequency = <37500000>; + clock-freq-min-max = <400000 37500000>; + + supports-highspeed; + supports-emmc; + bootpart-no-access; + + supports-DDR_MODE; + + ignore-pm-notify; + keep-power-in-suspend; + + //poll-hw-reset + status = "disabled"; +}; + +&sdmmc { + clock-frequency = <37500000>; + clock-freq-min-max = <400000 37500000>; + supports-highspeed; + supports-sd; + broken-cd; + card-detect-delay = <200>; + + ignore-pm-notify; + keep-power-in-suspend; + + //vmmc-supply = <&rk808_ldo5_reg>; + status = "disabled"; +}; + +&sdio { + clock-frequency = <37500000>; + clock-freq-min-max = <400000 37500000>; + supports-highspeed; + supports-sdio; + ignore-pm-notify; + keep-power-in-suspend; + cap-sdio-irq; + status = "okay"; +}; + + +&i2c1 { + status = "disabled"; + rtc@51 { + compatible = "rtc,hym8563"; + reg = <0x51>; + //irq_gpio = <&gpio0 GPIO_A4 IRQ_TYPE_EDGE_FALLING>; + }; +}; + + +&rk_screen { + display-timings = <&disp_timings>; +}; + +&fb { + rockchip,disp-mode = ; + rockchip,uboot-logo-on = <1>; +}; + +&lcdc { + status = "okay"; +}; + +&tve { + status = "disabled"; +}; + +&hdmi { + status = "okay"; + //rockchips,hdmi_audio_source = <0>; +}; + +&vmac { +// pmu_regulator = "act_ldo5"; +// pmu_enable_level = <1>; //1->HIGH, 0->LOW +// power-gpio = <&gpio0 GPIO_A6 GPIO_ACTIVE_HIGH>; + reset-gpio = <&gpio2 GPIO_C6 GPIO_ACTIVE_LOW>; + status="disabled"; +}; + +&dwc_control_usb { + usb_uart { + status = "disabled"; + }; +}; + +&pwm2 { + status = "okay"; +}; + +&remotectl { + handle_cpu_id = <1>; + ir_key1{ + rockchip,usercode = <0x4040>; + rockchip,key_table = + <0xf2 KEY_REPLY>, + <0xba KEY_BACK>, + <0xf4 KEY_UP>, + <0xf1 KEY_DOWN>, + <0xef KEY_LEFT>, + <0xee KEY_RIGHT>, + <0xbd KEY_HOME>, + <0xea KEY_VOLUMEUP>, + <0xe3 KEY_VOLUMEDOWN>, + <0xe2 KEY_SEARCH>, + <0xb2 KEY_POWER>, + <0xbc KEY_MUTE>, + <0xec KEY_MENU>, + <0xbf 0x190>, + <0xe0 0x191>, + <0xe1 0x192>, + <0xe9 183>, + <0xe6 248>, + <0xe8 185>, + <0xe7 186>, + <0xf0 388>, + <0xbe 0x175>; + }; + ir_key2{ + rockchip,usercode = <0xff00>; + rockchip,key_table = + <0xf9 KEY_HOME>, + <0xbf KEY_BACK>, + <0xfb KEY_MENU>, + <0xaa KEY_REPLY>, + <0xb9 KEY_UP>, + <0xe9 KEY_DOWN>, + <0xb8 KEY_LEFT>, + <0xea KEY_RIGHT>, + <0xeb KEY_VOLUMEDOWN>, + <0xef KEY_VOLUMEUP>, + <0xf7 KEY_MUTE>, + <0xe7 KEY_POWER>, + <0xfc KEY_POWER>, + <0xa9 KEY_VOLUMEDOWN>, + <0xa8 KEY_VOLUMEDOWN>, + <0xe0 KEY_VOLUMEDOWN>, + <0xa5 KEY_VOLUMEDOWN>, + <0xab 183>, + <0xb7 388>, + <0xf8 184>, + <0xaf 185>, + <0xed KEY_VOLUMEDOWN>, + <0xee 186>, + <0xb3 KEY_VOLUMEDOWN>, + <0xf1 KEY_VOLUMEDOWN>, + <0xf2 KEY_VOLUMEDOWN>, + <0xf3 KEY_SEARCH>, + <0xb4 KEY_VOLUMEDOWN>, + <0xbe KEY_SEARCH>; + }; + ir_key3{ + rockchip,usercode = <0x1dcc>; + rockchip,key_table = + <0xee KEY_REPLY>, + <0xf0 KEY_BACK>, + <0xf8 KEY_UP>, + <0xbb KEY_DOWN>, + <0xef KEY_LEFT>, + <0xed KEY_RIGHT>, + <0xfc KEY_HOME>, + <0xf1 KEY_VOLUMEUP>, + <0xfd KEY_VOLUMEDOWN>, + <0xb7 KEY_SEARCH>, + <0xff KEY_POWER>, + <0xf3 KEY_MUTE>, + <0xbf KEY_MENU>, + <0xf9 0x191>, + <0xf5 0x192>, + <0xb3 388>, + <0xbe KEY_1>, + <0xba KEY_2>, + <0xb2 KEY_3>, + <0xbd KEY_4>, + <0xf9 KEY_5>, + <0xb1 KEY_6>, + <0xfc KEY_7>, + <0xf8 KEY_8>, + <0xb0 KEY_9>, + <0xb6 KEY_0>, + <0xb5 KEY_BACKSPACE>; + }; +}; diff --git a/arch/arm/configs/rk3036_defconfig b/arch/arm/configs/rk3036_defconfig old mode 100644 new mode 100755 index 3962bf6d5e7d..ac3d29e32217 --- a/arch/arm/configs/rk3036_defconfig +++ b/arch/arm/configs/rk3036_defconfig @@ -21,6 +21,7 @@ CONFIG_NAMESPACES=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_PANIC_TIMEOUT=5 # CONFIG_UID16 is not set CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y @@ -187,7 +188,7 @@ CONFIG_TUN=y # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_WIZNET is not set CONFIG_RK_VMAC_ETH=y -CONFIG_RTL8188EU=y +CONFIG_RTL8189ES=y CONFIG_ESP8089=y CONFIG_RKWIFI=y CONFIG_AP6210=y @@ -303,7 +304,6 @@ CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y CONFIG_COMMON_CLK_DEBUG=y CONFIG_ROCKCHIP_IOMMU=y CONFIG_ROCKCHIP_IOVMM=y -CONFIG_ROCKCHIP_IOMMU_DEBUG=y CONFIG_IIO=y CONFIG_PWM=y CONFIG_PWM_ROCKCHIP=y