diff --git a/config/orangepione.fex b/config/orangepione.fex index a8bfa1a42e..191c375f2d 100644 --- a/config/orangepione.fex +++ b/config/orangepione.fex @@ -218,6 +218,8 @@ mode = 0 [gpio_para] gpio_used = 1 gpio_num = 30 +; gpio_pin_1 = port:PL10<1><1> +; gpio_pin_2 = port:PA15<1><0> gpio_pin_3 = port:PA12<1><0> gpio_pin_4 = port:PA11<1><0> gpio_pin_5 = port:PA06<1><0> @@ -247,6 +249,10 @@ gpio_pin_28 = port:PA20<1><0> gpio_pin_29 = port:PG06<1><0> gpio_pin_30 = port:PG07<1><0> +;[led_assign] +;normal_led = "gpio_pin_2" +;standby_led = "gpio_pin_1" + [leds_para] leds_used = 1 green_led = port:PL10<1><0> @@ -347,6 +353,7 @@ tv_dac_src0 = 0 [pwm0_para] pwm_used = 0 pwm_positive = port:PA05<3><0> +; If set gamc_phy to use = 2 [gmac0] gmac_used = 2 @@ -700,6 +707,30 @@ ir_addr_code12 = 65344 ir_used = 1 ir_tx = port:PH07<2> +;---------------------------------------------------------------------------------- +; dvfs voltage-frequency table configuration +; +; pmuic_type:0:none, 1:gpio, 2:i2c +; pmu_gpio0: gpio config. +; pmu_levelx: 0~9999: voltage(mV), 10000~90000:gpio0 state. voltage form high to low. +; +; extremity_freq(Hz): cpu extremity frequency when run benckmark or demo apk +; 1536MHz@1500mV with radiator, 1296MHz@1340mV without radiator +; max_freq: cpu maximum frequency, based on Hz, can not be more than 1200MHz +; min_freq: cpu minimum frequency, based on Hz, can not be less than 60MHz +; +; LV_count: count of LV_freq/LV_volt, must be < 16 +; +; LV1: core vdd is 1.50v if cpu frequency is (1296Mhz, 1536Mhz] +; LV2: core vdd is 1.34v if cpu frequency is (1200Mhz, 1296Mhz] +; LV3: core vdd is 1.32v if cpu frequency is (1008Mhz, 1200Mhz] +; LV4: core vdd is 1.20v if cpu frequency is (816Mhz, 1008Mhz] +; LV5: core vdd is 1.10v if cpu frequency is (648Mhz, 816Mhz] +; LV6: core vdd is 1.04v if cpu frequency is (0Mhz, 648Mhz] +; LV7: core vdd is 1.04v if cpu frequency is (0Mhz, 648Mhz] +; LV8: core vdd is 1.04v if cpu frequency is (0Mhz, 648Mhz] +; +;---------------------------------------------------------------------------------- [dvfs_table] pmuic_type = 1 pmu_gpio0 = port:PL06<1><1><2><1> @@ -790,4 +821,5 @@ key5_vol = 2000 d7s_used = 0 din_gpio = port:PD00<1><1> clk_gpio = port:PD01<1><1> -stb_gpio = port:PD02<1><1> \ No newline at end of file +stb_gpio = port:PD02<1><1> + diff --git a/config/orangepipc.fex b/config/orangepipc.fex index 7e664323ba..d4226d9f26 100644 --- a/config/orangepipc.fex +++ b/config/orangepipc.fex @@ -517,7 +517,7 @@ smc_sda = port:PA08<2> [usbc0] usb_used = 1 usb_port_type = 2 -usb_detect_type = 1 +usb_detect_type = 0 usb_id_gpio = port:PG12<0><1> usb_det_vbus_gpio = port:PG12<0><1> usb_drv_vbus_gpio = port:PL02<1><0><0> diff --git a/configuration.sh b/configuration.sh index d10723edb5..21bcdd6b20 100644 --- a/configuration.sh +++ b/configuration.sh @@ -216,7 +216,31 @@ LINUXFAMILY="sun8i" BOOTCONFIG="orangepi_plus_defconfig" MODULES="8189es" - MODULES_NEXT="" + MODULES_NEXT="" + CPUMIN="480000" + CPUMAX="1296000" + ;; + + orangepipc)#enabled + #description H3 quad core 1Gb SoC + #build 3wip + LINUXFAMILY="sun8i" + BOOTCONFIG="orangepi_pc_defconfig" + MODULES="" + MODULES_NEXT="" + CPUMIN="480000" + CPUMAX="1296000" + ;; + + orangepione)#enabled + #description H3 quad core 512Mb SoC + #build 3wip + LINUXFAMILY="sun8i" + BOOTCONFIG="orangepi_pc_defconfig" + MODULES="" + MODULES_NEXT="" + CPUMIN="648000" + CPUMAX="1200000" ;; cubox-i)#enabled @@ -313,8 +337,10 @@ KERNEL_DEFAULT_SOURCE="linux-sunxi" # sun8i legacy if [[ $LINUXFAMILY == sun8i ]]; then - KERNEL_DEFAULT="https://github.com/ssvb/linux-sunxi" - KERNEL_DEFAULT_BRANCH="20151207-embedded-lima-memtester-h3" + # KERNEL_DEFAULT="https://github.com/ssvb/linux-sunxi" + # KERNEL_DEFAULT_BRANCH="20151207-embedded-lima-memtester-h3" + KERNEL_DEFAULT="https://github.com/O-Computers/linux-sunxi" + KERNEL_DEFAULT_BRANCH="h3" KERNEL_DEFAULT_SOURCE="linux-sun8i" fi KERNEL_NEXT='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'